~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -31,9 +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 boolean DEBUG = false;
	36	+ static cMaterial[] materialstack = new cMaterial[65536];
	37	+ static boolean[] selectedstack = new boolean[65536];
	38	+ static int materialdepth = 0;
	39	+
37	40	static boolean FRUSTUM = false; // still bogus true; // frustum culling
38	41
39	42	// camera change fix
..	..	@@ -42,25 +45,7 @@
42	45
43	46	static int STEP = 1;
44	47
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;
	48	+ /static/ private boolean CULLFACE = false; // true;
64	49	/static/ boolean NEAREST = false; // true;
65	50	/static/ boolean WIREFRAME = false; // true;
66	51
..	..	@@ -70,8 +55,6 @@
70	55	static int CURRENTANTIALIAS = 0; // 1;
71	56	/static/ boolean RENDERSHADOW = true;
72	57	/static/ int RENDERPROGRAM = 2; // 0 == none, 1 == fast, 2 == normal
73		- static boolean ANIMATION = false;
74		- static String filename;
75	58
76	59	boolean DISPLAYTEXT = false;
77	60	//boolean REDUCETEXTURE = true;
..	..	@@ -97,10 +80,8 @@
97	80
98	81	static boolean textureon = true;
99	82	static boolean LOCALTRANSFORM = false;
100		-private static boolean LIVE = false;
101	83	static boolean FULLSCREEN = false;
102	84	static boolean SUPPORT = true;
103		-static boolean CROWD = false;
104	85	static boolean INERTIA = true;
105	86	static boolean FAST = false;
106	87	static boolean SLOWPOSE = false;
..	..	@@ -108,6 +89,8 @@
108	89
109	90	static int tickcount = 0; // slow pose issue
110	91
	92	+static boolean BUTTONLESSWHEEL = false;
	93	+static boolean ZOOMBOXMODE = false;
111	94	static boolean BOXMODE = false;
112	95	static boolean IMAGEFLIP = false;
113	96	static boolean SMOOTHFOCUS = false;
..	..	@@ -122,7 +105,7 @@
122	105	static boolean OEIL = true;
123	106	static boolean OEILONCE = false; // do oeilon then oeiloff
124	107	static boolean LOOKAT = true;
125		-static boolean RANDOM = true; // false;
	108	+static boolean SWITCH = true; // false;
126	109	static boolean HANDLES = false; // selection doesn't work!!
127	110	static boolean PAINTMODE = false;
128	111
..	..	@@ -165,12 +148,41 @@
165	148	defaultcaps.setAccumBlueBits(16);
166	149	defaultcaps.setAccumAlphaBits(16);
167	150	}
168		- static CameraPane theRenderer;
169		-
	151	+
	152	+ private File defaultDirectory = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory();
	153	+
170	154	void SetAsGLRenderer(boolean b)
171	155	{
172	156	isRenderer = b;
173		- theRenderer = this;
	157	+ Globals.theRenderer = this;
	158	+ }
	159	+
	160	+ CameraPane(Object3D o, Camera cam, boolean withcontext)
	161	+ {
	162	+ super(defaultcaps, null, withcontext?glcontext:null, null);
	163	+
	164	+ //System.out.println("AMERICA AREA = " + (9458886 + 9210755 + 8480395 + 2736391 + 1943018 + 1289475 + 1141569 + 1069350 + 911559 + 721229 + 395886 + 377972 + 246700 + 211156 + 173985 + 141133 + 118279 + 112079 + 108523));
	165	+ glcontext = getContext();
	166	+
	167	+ cameras = new Camera[2];
	168	+ targetLookAts = new cVector[2];
	169	+
	170	+ SetCamera(cam);
	171	+
	172	+ SetLight(new Camera(new cVector(10, 10, -20)));
	173	+
	174	+ object = o;
	175	+
	176	+ setBackground(Color.white);
	177	+
	178	+ addKeyListener(this);
	179	+ addMouseListener(this);
	180	+ addMouseMotionListener(this);
	181	+ addMouseWheelListener(this);
	182	+ //System.out.println("addGLEventListener: " + this);
	183	+ addGLEventListener(this);
	184	+
	185	+// pingthread.start(); // may 2013
174	186	}
175	187
176	188	static boolean AntialiasingEnabled()
..	..	@@ -178,12 +190,53 @@
178	190	return CURRENTANTIALIAS > 0;
179	191	}
180	192
181		- void ClearDepth()
	193	+ /// INTERFACE
	194	+
	195	+ public javax.media.opengl.GL GetGL0()
	196	+ {
	197	+ return null;
	198	+ }
	199	+
	200	+ public int GenList()
	201	+ {
	202	+ javax.media.opengl.GL gl = GetGL();
	203	+ return gl.glGenLists(1);
	204	+ }
	205	+
	206	+ public void NewList(int id)
	207	+ {
	208	+ javax.media.opengl.GL gl = GetGL();
	209	+ gl.glNewList(id, gl.GL_COMPILE); //_AND_EXECUTE);
	210	+ }
	211	+
	212	+ public void CallList(int id)
	213	+ {
	214	+ javax.media.opengl.GL gl = GetGL();
	215	+ gl.glCallList(id);
	216	+ }
	217	+
	218	+ public void EndList()
	219	+ {
	220	+ javax.media.opengl.GL gl = GetGL();
	221	+ gl.glEndList();
	222	+ }
	223	+
	224	+ public boolean IsBoxMode()
	225	+ {
	226	+ return BOXMODE;
	227	+ }
	228	+
	229	+ public boolean IsZoomBoxMode()
	230	+ {
	231	+ return ZOOMBOXMODE;
	232	+ }
	233	+
	234	+ public void ClearDepth()
182	235	{
183	236	GetGL().glClear(GetGL().GL_DEPTH_BUFFER_BIT);
184	237	}
185	238
186		- void DepthTest(boolean depthtest)
	239	+ public void DepthTest(boolean depthtest)
187	240	{
188	241	if (depthtest)
189	242	GetGL().glDepthFunc(GL.GL_LEQUAL);
..	..	@@ -191,7 +244,7 @@
191	244	GetGL().glDepthFunc(GL.GL_ALWAYS);
192	245	}
193	246
194		- void DepthWrite(boolean depthwrite)
	247	+ public void DepthWrite(boolean depthwrite)
195	248	{
196	249	if (depthwrite)
197	250	GetGL().glDepthMask(true);
..	..	@@ -199,12 +252,1616 @@
199	252	GetGL().glDepthMask(false);
200	253	}
201	254
202		- void BackFaceCull(boolean bfc)
	255	+ public void BackFaceCull(boolean bfc)
203	256	{
204	257	if (bfc)
205	258	GetGL().glEnable(GetGL().GL_CULL_FACE);
206	259	else
207	260	GetGL().glDisable(GetGL().GL_CULL_FACE);
	261	+ }
	262	+
	263	+ public boolean BackFaceCullMode()
	264	+ {
	265	+ return this.CULLFACE;
	266	+ }
	267	+
	268	+ public boolean IsAmbientOcclusionOn()
	269	+ {
	270	+ return this.ambientOcclusion;
	271	+ }
	272	+
	273	+ public boolean IsDebugSelection()
	274	+ {
	275	+ return DEBUG_SELECTION;
	276	+ }
	277	+
	278	+ public boolean IsFrozen()
	279	+ {
	280	+ boolean selectmode = this.DrawMode() == SELECTION \|\| this.IsDebugSelection();
	281	+
	282	+ return !selectmode && cameracount == 0; // != 0;
	283	+ }
	284	+
	285	+ // Currently in Globals
	286	+ public int DrawMode()
	287	+ {
	288	+ return Globals.DrawMode();
	289	+ }
	290	+
	291	+ public Camera EyeCamera()
	292	+ {
	293	+ return eyeCamera;
	294	+ }
	295	+
	296	+ public Camera LightCamera()
	297	+ {
	298	+ return lightCamera;
	299	+ }
	300	+
	301	+ public Camera ManipCamera()
	302	+ {
	303	+ return manipCamera;
	304	+ }
	305	+
	306	+ public Camera RenderCamera()
	307	+ {
	308	+ return renderCamera;
	309	+ }
	310	+
	311	+ public Camera[] Cameras()
	312	+ {
	313	+ return cameras;
	314	+ }
	315	+
	316	+ public void PushMaterial(Object3D obj, boolean selected)
	317	+ {
	318	+ CameraPane display = this;
	319	+ javax.media.opengl.GL gl = display.GetGL();
	320	+ cMaterial material = obj.material;
	321	+
	322	+ if (material != null)
	323	+ {
	324	+ materialstack[materialdepth] = material;
	325	+ selectedstack[materialdepth] = selected;
	326	+ cStatic.objectstack[materialdepth++] = obj;
	327	+ //System.out.println("material " + material);
	328	+ //Applet3D.tracein(this, selected);
	329	+ //display.vector2buffer = obj.projectedVertices;
	330	+ if (obj instanceof Camera)
	331	+ {
	332	+ display.options1[0] = material.shift;
	333	+ //System.out.println("shift " + material.shift);
	334	+ display.options1[1] = material.lightarea;
	335	+ display.options1[2] = material.shadowbias;
	336	+ display.options1[3] = material.aniso;
	337	+ display.options1[4] = material.anisoV;
	338	+// System.out.println("display.options1[0] " + display.options1[0]);
	339	+// System.out.println("display.options1[1] " + display.options1[1]);
	340	+// System.out.println("display.options1[2] " + display.options1[2]);
	341	+// System.out.println("display.options1[3] " + display.options1[3]);
	342	+// System.out.println("display.options1[4] " + display.options1[4]);
	343	+ display.options2[0] = material.opacity;
	344	+ display.options2[1] = material.diffuse;
	345	+ display.options2[2] = material.factor;
	346	+// System.out.println("display.options2[0] " + display.options2[0]);
	347	+// System.out.println("display.options2[1] " + display.options2[1]);
	348	+// System.out.println("display.options2[2] " + display.options2[2]);
	349	+
	350	+ cColor.HSBtoRGB(material.color, material.modulation, 1, display.options3);
	351	+// System.out.println("display.options3[0] " + display.options3[0]);
	352	+// System.out.println("display.options3[1] " + display.options3[1]);
	353	+// System.out.println("display.options3[2] " + display.options3[2]);
	354	+ display.options4[0] = material.cameralight/0.2f;
	355	+ display.options4[1] = material.subsurface;
	356	+ display.options4[2] = material.sheen;
	357	+// System.out.println("display.options4[0] " + display.options4[0]);
	358	+// System.out.println("display.options4[1] " + display.options4[1]);
	359	+// System.out.println("display.options4[2] " + display.options4[2]);
	360	+
	361	+ // if (display.CURRENTANTIALIAS > 0)
	362	+ // display.options3[3] /= 4;
	363	+
	364	+ /*
	365	+ System.out.println("Focus = " + display.options1[0]);
	366	+ System.out.println("Aperture = " + display.options1[1]);
	367	+ System.out.println("ShadowBlur = " + display.options1[2]);
	368	+ System.out.println("Antialiasing = " + display.options1[3]);
	369	+ System.out.println("Fog = " + display.options2[0]);
	370	+ System.out.println("Intensity = " + display.options2[1]);
	371	+ System.out.println("Elevation = " + display.options2[2]);
	372	+ /**/
	373	+ } else
	374	+ {
	375	+ DrawMaterial(material, selected, obj.projectedVertices);
	376	+ }
	377	+ } else
	378	+ {
	379	+ if (selected && CameraPane.flash)
	380	+ {
	381	+ display.modelParams4[1] = 100;
	382	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 4, display.modelParams4, 0);
	383	+ }
	384	+ }
	385	+ }
	386	+
	387	+ public void PushMaterial2(Object3D obj, boolean selected)
	388	+ {
	389	+ CameraPane display = this;
	390	+ cMaterial material = obj.material;
	391	+
	392	+ if (material != null)
	393	+ {
	394	+ materialstack[materialdepth] = material;
	395	+ selectedstack[materialdepth] = selected;
	396	+ cStatic.objectstack[materialdepth++] = obj;
	397	+ //System.out.println("material " + material);
	398	+ //Applet3D.tracein("selected ", selected);
	399	+ //display.vector2buffer = obj.projectedVertices;
	400	+ display.DrawMaterial(material, selected, obj.projectedVertices);
	401	+ }
	402	+ }
	403	+
	404	+ public void PopMaterial(Object3D obj, boolean selected)
	405	+ {
	406	+ CameraPane display = this;
	407	+ javax.media.opengl.GL gl = display.GetGL();
	408	+ cMaterial material = obj.material;
	409	+
	410	+ //if (parent != null && parent.GetMaterial() != null)
	411	+ // parent.GetMaterial().Draw(display, parent.IsSelected(this));
	412	+ if (material != null)
	413	+ {
	414	+ materialdepth -= 1;
	415	+ if (materialdepth > 0)
	416	+ {
	417	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	418	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
	419	+ }
	420	+ //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
	421	+ } else if (selected && CameraPane.flash && obj.GetMaterial() != null)
	422	+ {
	423	+ display.modelParams4[1] = obj.GetMaterial().cameralight;
	424	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 4, display.modelParams4, 0);
	425	+ }
	426	+ }
	427	+
	428	+ public void PopMaterial2(Object3D obj)
	429	+ {
	430	+ CameraPane display = this;
	431	+ cMaterial material = obj.material;
	432	+
	433	+ if (material != null)
	434	+ {
	435	+ materialdepth -= 1;
	436	+ if (materialdepth > 0)
	437	+ {
	438	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	439	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
	440	+ }
	441	+ //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
	442	+ //else
	443	+ //material.Draw(display, false);
	444	+ }
	445	+ }
	446	+
	447	+ public void DrawFace(Object3D obj, Vertex pv, Vertex qv, Vertex rv, Face face)
	448	+ {
	449	+ CameraPane display = this;
	450	+
	451	+ if (pv.y == -10000 \|\|
	452	+ qv.y == -10000 \|\|
	453	+ rv.y == -10000)
	454	+ return;
	455	+
	456	+// float b = f.nbiterations & 1;
	457	+// float g = (f.nbiterations>>1) & 1;
	458	+// float r = (f.nbiterations>>2) & 1;
	459	+//
	460	+// //if (f.weight == 10000)
	461	+// //{
	462	+// // r = 1; g = b = 0;
	463	+// //}
	464	+// //else
	465	+// //{
	466	+// // assert(f.weight < 10000);
	467	+// r = g = b = (float)bRep.FaceWeight(f)*100;
	468	+// if (r<0)
	469	+// assert(r>=0);
	470	+// //}
	471	+
	472	+ javax.media.opengl.GL gl = display.GetGL();
	473	+
	474	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
	475	+
	476	+ //System.out.println("p = " + pv + "; q = " + qv + "; r = " + rv);
	477	+ if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
	478	+ {
	479	+ //gl.glBegin(gl.GL_TRIANGLES);
	480	+ boolean hasnorm = pv.norm != null && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0)
	481	+ // TEST LIVE NORMALS && !obj.dontselect
	482	+ ;
	483	+ if (!hasnorm)
	484	+ {
	485	+ // System.out.println("Mesh normal");
	486	+ LA.vecSub(pv/.pos/, qv/.pos/, obj.v0);
	487	+ LA.vecSub(pv/.pos/, rv/.pos/, obj.v1);
	488	+ LA.vecCross(obj.v0, obj.v1, obj.v2);
	489	+ LA.vecNormalize(obj.v2);
	490	+ gl.glNormal3f((float) obj.v2.x, (float) obj.v2.y, (float) obj.v2.z);
	491	+ }
	492	+
	493	+ // P
	494	+ float x = (float)pv.x;
	495	+ float y = (float)pv.y;
	496	+ float z = (float)pv.z;
	497	+
	498	+ if (hasnorm)
	499	+ {
	500	+// if (!pv.norm.normalized())
	501	+// assert(pv.norm.normalized());
	502	+
	503	+ //System.out.println("normalp = " + pv.norm.x + ", " + pv.norm.y + ", " + pv.norm.z);
	504	+ float nx = (float)pv.norm.x;
	505	+ float ny = (float)pv.norm.y;
	506	+ float nz = (float)pv.norm.z;
	507	+
	508	+ x += nx * obj.NORMALPUSH;
	509	+ y += ny * obj.NORMALPUSH;
	510	+ z += nz * obj.NORMALPUSH;
	511	+
	512	+ gl.glNormal3f(nx, ny, nz);
	513	+ }
	514	+ gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
	515	+ SetColor(obj, pv);
	516	+ //gl.glColor4f(r, g, b, 1);
	517	+ //gl.glColor4f(pv.boundary, pv.boundary, pv.boundary, 1);
	518	+ if (obj.flipV)
	519	+ gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
	520	+ else
	521	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	522	+ //System.out.println("vertexp = " + pv.x + ", " + pv.y + ", " + pv.z);
	523	+
	524	+ gl.glVertex3f(x, y, z);
	525	+
	526	+ // Q
	527	+ x = (float)qv.x;
	528	+ y = (float)qv.y;
	529	+ z = (float)qv.z;
	530	+
	531	+// Print(pv);
	532	+ if (hasnorm)
	533	+ {
	534	+// assert(qv.norm.normalized());
	535	+ //System.out.println("normalq = " + qv.norm.x + ", " + qv.norm.y + ", " + qv.norm.z);
	536	+ float nx = (float)qv.norm.x;
	537	+ float ny = (float)qv.norm.y;
	538	+ float nz = (float)qv.norm.z;
	539	+
	540	+ x += nx * obj.NORMALPUSH;
	541	+ y += ny * obj.NORMALPUSH;
	542	+ z += nz * obj.NORMALPUSH;
	543	+
	544	+ gl.glNormal3f(nx, ny, nz);
	545	+ }
	546	+ //System.out.println("vertexq = " + qv.s + ", " + qv.t);
	547	+ // boolean locked = false;
	548	+ // float eps = 0.1f;
	549	+ // boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
	550	+
	551	+ // int dot = 0; //*/ (int)f.dot;
	552	+
	553	+ // if ((dot&1) == 0)
	554	+ // dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
	555	+
	556	+ // if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
	557	+ if (obj.flipV)
	558	+ gl.glTexCoord2f((float) qv.s, 1-(float) qv.t);
	559	+ else
	560	+ gl.glTexCoord2f((float) qv.s, (float) qv.t);
	561	+ // else
	562	+ // {
	563	+ // locked = true;
	564	+ // gl.glTexCoord2f((float) pv.s, (float) pv.t);
	565	+ // }
	566	+ gl.glColor4f(qv.AO, qv.AO, qv.AO, 1);
	567	+ SetColor(obj, qv);
	568	+
	569	+ gl.glVertex3f(x, y, z);
	570	+ //gl.glColor4f(r, g, b, 1);
	571	+ //gl.glColor4f(qv.boundary, qv.boundary, qv.boundary, 1);
	572	+ //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
	573	+// Print(qv);
	574	+
	575	+ // R
	576	+ x = (float)rv.x;
	577	+ y = (float)rv.y;
	578	+ z = (float)rv.z;
	579	+
	580	+ if (hasnorm)
	581	+ {
	582	+// assert(rv.norm.normalized());
	583	+ //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
	584	+ float nx = (float)rv.norm.x;
	585	+ float ny = (float)rv.norm.y;
	586	+ float nz = (float)rv.norm.z;
	587	+
	588	+ x += nx * obj.NORMALPUSH;
	589	+ y += ny * obj.NORMALPUSH;
	590	+ z += nz * obj.NORMALPUSH;
	591	+
	592	+ gl.glNormal3f(nx, ny, nz);
	593	+ }
	594	+
	595	+ // if ((dot&4) == 0)
	596	+ // dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
	597	+
	598	+ // if (wrap \|\| !locked && (dot&8) != 0)
	599	+ if (obj.flipV)
	600	+ gl.glTexCoord2f((float) rv.s, 1-(float) rv.t);
	601	+ else
	602	+ gl.glTexCoord2f((float) rv.s, (float) rv.t);
	603	+ // else
	604	+ // gl.glTexCoord2f((float) pv.s, (float) pv.t);
	605	+
	606	+ // f.dot = dot;
	607	+
	608	+ gl.glColor4f(rv.AO, rv.AO, rv.AO, 1);
	609	+ SetColor(obj, rv);
	610	+ //gl.glColor4f(r, g, b, 1);
	611	+ //gl.glColor4f(rv.boundary, rv.boundary, rv.boundary, 1);
	612	+ //System.out.println("vertexr = " + rv.x + ", " + rv.y + ", " + rv.z);
	613	+ gl.glVertex3f(x, y, z);
	614	+// Print(rv);
	615	+ //gl.glEnd();
	616	+ }
	617	+ else
	618	+ {
	619	+ gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
	620	+ gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
	621	+ gl.glVertex3f((float) rv.x, (float) rv.y, (float) rv.z);
	622	+
	623	+ }
	624	+
	625	+ if (false) // (attributes & WIREFRAME) != 0)
	626	+ {
	627	+ gl.glDisable(gl.GL_LIGHTING);
	628	+
	629	+ gl.glBegin(gl.GL_LINE_LOOP);
	630	+ gl.glVertex3d(pv./pos./x, pv./pos./y, pv./pos./z);
	631	+ gl.glVertex3d(qv./pos./x, qv./pos./y, qv./pos./z);
	632	+ gl.glVertex3d(rv./pos./x, rv./pos./y, rv./pos./z);
	633	+ gl.glEnd();
	634	+
	635	+ gl.glEnable(gl.GL_LIGHTING);
	636	+ }
	637	+ }
	638	+
	639	+ /**
	640	+ * <code>draw</code> renders a <code>TriMesh</code> object including
	641	+ * it's normals, colors, textures and vertices.
	642	+ *
	643	+ * @see Renderer#draw(TriMesh)
	644	+ * @param tris
	645	+ * the mesh to render.
	646	+ */
	647	+ public void DrawParticles(TriMesh geo, Object3D shape, boolean selected, boolean rotate) // TriMesh tris)
	648	+ {
	649	+ CameraPane display = this;
	650	+
	651	+ float r = display.modelParams0[0];
	652	+ float g = display.modelParams0[1];
	653	+ float b = display.modelParams0[2];
	654	+ float opacity = display.modelParams5[1];
	655	+
	656	+ //final GL gl = GLU.getCurrentGL();
	657	+ GL gl = display.GetGL(); // getGL();
	658	+
	659	+ FloatBuffer vertBuf = geo.vertBuf;
	660	+
	661	+ int v = vertBuf.capacity();
	662	+
	663	+ int count = 0;
	664	+
	665	+ boolean cf = gl.glIsEnabled(gl.GL_CULL_FACE);
	666	+ gl.glEnable(gl.GL_CULL_FACE);
	667	+ // gl.glScalef(1.0f/1024,1.0f/1024,1.0f/1024);
	668	+ for (int i=0; i<v/3; i++)
	669	+ {
	670	+ int index3 = i*3;
	671	+
	672	+ if (geo.sizeBuf.get(index3+1) == 0)
	673	+ continue;
	674	+
	675	+ count++;
	676	+
	677	+ int index4 = i*4;
	678	+
	679	+ float tx = vertBuf.get(index3);
	680	+ float ty = vertBuf.get(index3+1);
	681	+ float tz = vertBuf.get(index3+2);
	682	+
	683	+ // if (tx == 0 && ty == 0 && tz == 0)
	684	+ // continue;
	685	+
	686	+ gl.glMatrixMode(gl.GL_TEXTURE);
	687	+ gl.glPushMatrix();
	688	+
	689	+ float[] texmat = geo.texmat;
	690	+ texmat[12] = texmat[13] = texmat[14] = i;
	691	+
	692	+ gl.glMultMatrixf(texmat, 0);
	693	+
	694	+ gl.glMatrixMode(gl.GL_MODELVIEW);
	695	+ gl.glPushMatrix();
	696	+
	697	+ gl.glTranslatef(tx,ty,tz);
	698	+
	699	+ if (rotate)
	700	+ gl.glRotatef(i, 0, 1, 0);
	701	+
	702	+ float size = geo.sizeBuf.get(index3) / 100;
	703	+ gl.glScalef(size,size,size);
	704	+
	705	+ float cr = geo.colorBuf.get(index4);
	706	+ float cg = geo.colorBuf.get(index4+1);
	707	+ float cb = geo.colorBuf.get(index4+2);
	708	+ float ca = geo.colorBuf.get(index4+3);
	709	+
	710	+ display.modelParams0[0] = r * cr;
	711	+ display.modelParams0[1] = g * cg;
	712	+ display.modelParams0[2] = b * cb;
	713	+
	714	+ display.modelParams5[1] = opacity * ca;
	715	+
	716	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 0, display.modelParams0, 0);
	717	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 5, display.modelParams5, 0);
	718	+
	719	+ RandomNode.globalseed = (int)geo.sizeBuf.get(index3+2); // i;
	720	+ RandomNode.globalseed2 = RandomNode.globalseed;
	721	+
	722	+// gl.glColor4f(cr,cg,cb,ca);
	723	+ // gl.glScalef(1024/16,1024/16,1024/16);
	724	+ shape.Draw/Node/(display,null,selected,false); // blocked
	725	+ // gl.glScalef(16.0f/1024,16.0f/1024,16.0f/1024);
	726	+ //gl.glTranslatef(-tx,-ty,-tz);
	727	+ gl.glPopMatrix();
	728	+
	729	+ gl.glMatrixMode(gl.GL_TEXTURE);
	730	+ gl.glPopMatrix();
	731	+ }
	732	+ // gl.glScalef(1024,1024,1024);
	733	+ if (!cf)
	734	+ gl.glDisable(gl.GL_CULL_FACE);
	735	+
	736	+ display.modelParams0[0] = r;
	737	+ display.modelParams0[1] = g;
	738	+ display.modelParams0[2] = b;
	739	+
	740	+ display.modelParams5[1] = opacity;
	741	+
	742	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 0, display.modelParams0, 0);
	743	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 5, display.modelParams5, 0);
	744	+
	745	+ gl.glMatrixMode(gl.GL_MODELVIEW);
	746	+
	747	+// System.err.println("total = " + v/3 + "; displayed = " + count);
	748	+ if (true)
	749	+ return;
	750	+
	751	+//// if (!tris.predraw(this))
	752	+//// {
	753	+//// return;
	754	+//// }
	755	+//// if (Debug.stats)
	756	+//// {
	757	+//// StatCollector.addStat(StatType.STAT_TRIANGLE_COUNT, tris.getTriangleCount());
	758	+//// StatCollector.addStat(StatType.STAT_VERTEX_COUNT, tris.getVertexCount());
	759	+//// StatCollector.addStat(StatType.STAT_GEOM_COUNT, 1);
	760	+//// }
	761	+////
	762	+//// if (tris.getDisplayListID() != -1)
	763	+//// {
	764	+//// renderDisplayList(tris);
	765	+//// return;
	766	+//// }
	767	+////
	768	+//// if (!generatingDisplayList)
	769	+//// {
	770	+//// applyStates(tris.states, tris);
	771	+//// }
	772	+//// if (Debug.stats)
	773	+//// {
	774	+//// StatCollector.startStat(StatType.STAT_RENDER_TIMER);
	775	+//// }
	776	+//// boolean transformed = doTransforms(tris);
	777	+//
	778	+// int glMode = GL.GL_TRIANGLES;
	779	+// switch (getMode())
	780	+// {
	781	+// case Triangles:
	782	+// glMode = GL.GL_TRIANGLES;
	783	+// break;
	784	+// case Strip:
	785	+// glMode = GL.GL_TRIANGLE_STRIP;
	786	+// break;
	787	+// case Fan:
	788	+// glMode = GL.GL_TRIANGLE_FAN;
	789	+// break;
	790	+// }
	791	+//
	792	+// if (!predrawGeometry(gl))
	793	+// {
	794	+// // make sure only the necessary indices are sent through on old
	795	+// // cards.
	796	+// IntBuffer indices = this.getIndexBuffer();
	797	+// if (indices == null)
	798	+// {
	799	+// logger.severe("missing indices on geometry object: " + this.toString());
	800	+// } else
	801	+// {
	802	+// indices.rewind();
	803	+// indices.limit(this.getMaxIndex());
	804	+//
	805	+// gl.glDrawElements(glMode, indices.limit(), GL.GL_UNSIGNED_INT, indices); // TODO Check <count> and assumed <type> of GL_UNSIGNED_INT
	806	+//
	807	+// indices.clear();
	808	+// }
	809	+// } else
	810	+// {
	811	+// gl.glDrawElements(glMode, this.getIndexBuffer().limit(),
	812	+// GL.GL_UNSIGNED_INT, 0);
	813	+// }
	814	+//
	815	+//// postdrawGeometry(tris);
	816	+//// if (transformed)
	817	+//// {
	818	+//// undoTransforms(tris);
	819	+//// }
	820	+////
	821	+//// if (Debug.stats)
	822	+//// {
	823	+//// StatCollector.endStat(StatType.STAT_RENDER_TIMER);
	824	+//// }
	825	+//// tris.postdraw(this);
	826	+ }
	827	+
	828	+ static Camera localcamera = new Camera();
	829	+ static cVector from = new cVector();
	830	+ static cVector to = new cVector();
	831	+
	832	+ public void PrepOcclusion(BoundaryRep br, double[][] transform)
	833	+ {
	834	+ CameraPane cp = this;
	835	+
	836	+ Camera keep = cp.RenderCamera();
	837	+ cp.renderCamera = localcamera;
	838	+
	839	+ if (br.trimmed)
	840	+ {
	841	+ float[] colors = new float[br.positions.length / 3];
	842	+
	843	+ int i3 = 0;
	844	+ for (int i = 0; i < br.positions.length / 3; i++, i3 += 3)
	845	+ {
	846	+ if (br.normals[i3] == 0 && br.normals[i3+1] == 0 && br.normals[i3+2] == 0)
	847	+ continue;
	848	+
	849	+ from.set(br.positions[i3], br.positions[i3 + 1], br.positions[i3 + 2]);
	850	+ to.set(br.positions[i3] + br.normals[i3],
	851	+ br.positions[i3 + 1] + br.normals[i3 + 1],
	852	+ br.positions[i3 + 2] + br.normals[i3 + 2]);
	853	+ LA.xformPos(from, transform, from);
	854	+ LA.xformPos(to, transform, to); // RIGID ONLY
	855	+ localcamera.setAim(from, to);
	856	+
	857	+ CameraPane.occlusionbuffer.display();
	858	+
	859	+ if (CameraPane.DEBUG_OCCLUSION)
	860	+ cp.display(); // debug
	861	+
	862	+ colors[i] = cp.vertexOcclusion.r;
	863	+ //colors[i3 + 1] = cp.vertexOcclusion.g;
	864	+ //colors[i3 + 2] = cp.vertexOcclusion.b;
	865	+
	866	+ if ((i % 100) == 0 && i != 0)
	867	+ {
	868	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	869	+ //System.out.println("Color = " + cp.vertexOcclusion.r + ", " + cp.vertexOcclusion.g + ", " + cp.vertexOcclusion.b + "; " + (int)(100.0*i/(positions.length/3)) + "% done");
	870	+ System.out.println((int) (100.0 * i / (br.positions.length / 3)) + "% (" + i + " of " + (br.positions.length / 3) + ")");
	871	+ }
	872	+ }
	873	+
	874	+ br.colors = colors;
	875	+ }
	876	+ else
	877	+ {
	878	+ for (int i = 0; i < br.VertexCount(); i++)
	879	+ {
	880	+ Vertex v = br.GetVertex(i);
	881	+
	882	+ if (v.norm == null \|\| v.norm.x == 0 && v.norm.y == 0 && v.norm.z == 0)
	883	+ continue;
	884	+
	885	+ from.set(v.x, v.y, v.z);
	886	+ to.set(v.x+v.norm.x, v.y+v.norm.y, v.z+v.norm.z);
	887	+ LA.xformPos(from, transform, from);
	888	+ LA.xformPos(to, transform, to); // RIGID ONLY
	889	+ localcamera.setAim(from, to);
	890	+
	891	+ CameraPane.occlusionbuffer.display();
	892	+
	893	+ if (CameraPane.DEBUG_OCCLUSION)
	894	+ cp.display(); // debug
	895	+
	896	+ v.AO = cp.vertexOcclusion.r;
	897	+
	898	+ if ((i % 100) == 0 && i != 0)
	899	+ {
	900	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	901	+ //System.out.println("Color = " + cp.vertexOcclusion.r + ", " + cp.vertexOcclusion.g + ", " + cp.vertexOcclusion.b + "; " + (int)(100.0*i/(positions.length/3)) + "% done");
	902	+ System.out.println((int) (100.0 * i / br.VertexCount()) + "% (" + i + " of " + br.VertexCount() + ")");
	903	+ }
	904	+ }
	905	+ }
	906	+
	907	+ //System.out.println("done.");
	908	+
	909	+ cp.renderCamera = keep;
	910	+ }
	911	+
	912	+ void DrawPointFLow(PointFlow pointFlow, Object3D /Composite/ root, boolean selected, boolean blocked)
	913	+ {
	914	+ CameraPane display = this;
	915	+ pointFlow.CreateHT();
	916	+
	917	+ float r = display.modelParams0[0];
	918	+ float g = display.modelParams0[1];
	919	+ float b = display.modelParams0[2];
	920	+ float opacity = display.modelParams5[1];
	921	+
	922	+ //final GL gl = GLU.getCurrentGL();
	923	+ GL gl = display.GetGL(); // getGL();
	924	+
	925	+ int s = pointFlow.points.size();
	926	+
	927	+ boolean cf = gl.glIsEnabled(gl.GL_CULL_FACE);
	928	+ gl.glEnable(gl.GL_CULL_FACE);
	929	+
	930	+ for (int i=s; --i>=0;)
	931	+ //for (int i=0; i<s; i++)
	932	+ {
	933	+ cVector v = pointFlow.points.get(i);
	934	+
	935	+ double mindist = Double.MAX_VALUE;
	936	+
	937	+ double size = pointFlow.minimumSize;
	938	+
	939	+ double distancenext = 0;
	940	+
	941	+ if (i > 0)
	942	+ {
	943	+ cVector w = pointFlow.points.get(i-1);
	944	+
	945	+ double dist = w.distance(v);
	946	+
	947	+ distancenext = dist;
	948	+
	949	+ if (mindist > dist)
	950	+ {
	951	+ mindist = dist;
	952	+ size = mindist*pointFlow.resizefactor;
	953	+ }
	954	+ }
	955	+
	956	+ if (i < s-1)
	957	+ {
	958	+ cVector w = pointFlow.points.get(i+1);
	959	+
	960	+ double dist = w.distance(v);
	961	+
	962	+ if (mindist > dist)
	963	+ {
	964	+ mindist = dist;
	965	+ size = mindist*pointFlow.resizefactor;
	966	+ }
	967	+ }
	968	+
	969	+ if (size < pointFlow.minimumSize)
	970	+ size = pointFlow.minimumSize;
	971	+ if (size > pointFlow.maximumSize)
	972	+ size = pointFlow.maximumSize;
	973	+
	974	+ double tx = v.x;
	975	+ double ty = v.y;
	976	+ double tz = v.z;
	977	+
	978	+ // if (tx == 0 && ty == 0 && tz == 0)
	979	+ // continue;
	980	+
	981	+ gl.glMatrixMode(gl.GL_TEXTURE);
	982	+ gl.glPushMatrix();
	983	+ pointFlow.texmat[12] = pointFlow.texmat[13] = pointFlow.texmat[14] = i;
	984	+
	985	+ gl.glMultMatrixf(pointFlow.texmat, 0);
	986	+
	987	+ gl.glMatrixMode(gl.GL_MODELVIEW);
	988	+ gl.glPushMatrix();
	989	+
	990	+ gl.glTranslated(tx,ty,tz);
	991	+
	992	+ gl.glScaled(size,size,size);
	993	+
	994	+// float cr = colorBuf.get(index4);
	995	+// float cg = colorBuf.get(index4+1);
	996	+// float cb = colorBuf.get(index4+2);
	997	+// float ca = colorBuf.get(index4+3);
	998	+//
	999	+// display.modelParams0[0] = r * cr;
	1000	+// display.modelParams0[1] = g * cg;
	1001	+// display.modelParams0[2] = b * cb;
	1002	+//
	1003	+// display.modelParams5[1] = opacity * ca;
	1004	+//
	1005	+// gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 0, display.modelParams0, 0);
	1006	+// gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 5, display.modelParams5, 0);
	1007	+//
	1008	+// RandomNode.globalseed = (int)sizeBuf.get(index3+2); // i;
	1009	+// RandomNode.globalseed2 = RandomNode.globalseed;
	1010	+//
	1011	+//// gl.glColor4f(cr,cg,cb,ca);
	1012	+// // gl.glScalef(1024/16,1024/16,1024/16);
	1013	+ pointFlow.geo.Draw/Node/(display,null,selected, blocked);
	1014	+
	1015	+ gl.glPopMatrix();
	1016	+
	1017	+ double step = size/4; //
	1018	+
	1019	+ if (i == 0 \|\| size == 0 \|\| distancenext > 8*size \|\| distancenext < step)
	1020	+ continue;
	1021	+
	1022	+ int nbsteps = (int)(distancenext/step);
	1023	+
	1024	+ step = distancenext/nbsteps;
	1025	+
	1026	+ cVector next = pointFlow.points.get(i-1);
	1027	+
	1028	+ tmp.set(next);
	1029	+ tmp.sub(v);
	1030	+ tmp.normalize();
	1031	+ tmp.mul(step);
	1032	+
	1033	+ // calculate next size
	1034	+ mindist = Double.MAX_VALUE;
	1035	+
	1036	+ double nextsize = pointFlow.minimumSize;
	1037	+
	1038	+ if (i > 1)
	1039	+ {
	1040	+ cVector w = pointFlow.points.get(i-2);
	1041	+
	1042	+ double dist = w.distance(next);
	1043	+
	1044	+ if (mindist > dist)
	1045	+ {
	1046	+ mindist = dist;
	1047	+ nextsize = mindist*pointFlow.resizefactor;
	1048	+ }
	1049	+ }
	1050	+
	1051	+ double dist = v.distance(next);
	1052	+
	1053	+ if (mindist > dist)
	1054	+ {
	1055	+ mindist = dist;
	1056	+ nextsize = mindist*pointFlow.resizefactor;
	1057	+ }
	1058	+
	1059	+ if (nextsize < pointFlow.minimumSize)
	1060	+ nextsize = pointFlow.minimumSize;
	1061	+ if (nextsize > pointFlow.maximumSize)
	1062	+ nextsize = pointFlow.maximumSize;
	1063	+ //
	1064	+
	1065	+ double count = 0;
	1066	+
	1067	+ while (distancenext > 0.000000001) // step
	1068	+ {
	1069	+ gl.glPushMatrix();
	1070	+
	1071	+ gl.glTranslated(tx + tmp.xcount, ty + tmp.ycount, tz + tmp.z*count);
	1072	+
	1073	+ double K = count/nbsteps;
	1074	+
	1075	+ double intersize = Knextsize + (1-K)size;
	1076	+
	1077	+ gl.glScaled(intersize,intersize,intersize);
	1078	+
	1079	+ pointFlow.geo.Draw/Node/(display,null,selected,blocked);
	1080	+
	1081	+ count++;
	1082	+
	1083	+ distancenext -= step;
	1084	+
	1085	+ gl.glPopMatrix();
	1086	+ }
	1087	+
	1088	+ if (count != nbsteps)
	1089	+ assert(count == nbsteps);
	1090	+
	1091	+ // gl.glScalef(16.0f/1024,16.0f/1024,16.0f/1024);
	1092	+ //gl.glTranslatef(-tx,-ty,-tz);
	1093	+
	1094	+ gl.glMatrixMode(gl.GL_TEXTURE);
	1095	+ gl.glPopMatrix();
	1096	+ }
	1097	+
	1098	+ if (!cf)
	1099	+ gl.glDisable(gl.GL_CULL_FACE);
	1100	+
	1101	+// display.modelParams0[0] = r;
	1102	+// display.modelParams0[1] = g;
	1103	+// display.modelParams0[2] = b;
	1104	+//
	1105	+// display.modelParams5[1] = opacity;
	1106	+//
	1107	+// gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 0, display.modelParams0, 0);
	1108	+// gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 5, display.modelParams5, 0);
	1109	+
	1110	+ gl.glMatrixMode(gl.GL_MODELVIEW);
	1111	+ }
	1112	+
	1113	+ public void DrawBox(cVector min, cVector max)
	1114	+ {
	1115	+ javax.media.opengl.GL gl = GetGL();
	1116	+ gl.glBegin(gl.GL_LINES);
	1117	+
	1118	+ gl.glVertex3d(min.x, min.y, min.z);
	1119	+ gl.glVertex3d(min.x, min.y, max.z);
	1120	+ gl.glVertex3d(min.x, min.y, min.z);
	1121	+ gl.glVertex3d(min.x, max.y, min.z);
	1122	+ gl.glVertex3d(min.x, min.y, min.z);
	1123	+ gl.glVertex3d(max.x, min.y, min.z);
	1124	+
	1125	+ gl.glVertex3d(max.x, max.y, max.z);
	1126	+ gl.glVertex3d(min.x, max.y, max.z);
	1127	+ gl.glVertex3d(max.x, max.y, max.z);
	1128	+ gl.glVertex3d(max.x, min.y, max.z);
	1129	+ gl.glVertex3d(max.x, max.y, max.z);
	1130	+ gl.glVertex3d(max.x, max.y, min.z);
	1131	+
	1132	+ gl.glEnd();
	1133	+ }
	1134	+
	1135	+ public void DrawGeometry(BoundaryRep bRep, boolean flipV, boolean selectmode)
	1136	+ {
	1137	+ int[] strips = bRep.getRawIndices();
	1138	+
	1139	+ javax.media.opengl.GL gl = GetGL();
	1140	+
	1141	+ // TRIANGLE STRIP ARRAY
	1142	+ if (bRep.trimmed)
	1143	+ {
	1144	+ float[] v = bRep.getRawVertices();
	1145	+ float[] n = bRep.getRawNormals();
	1146	+ float[] c = bRep.getRawColors();
	1147	+ float[] uv = bRep.getRawUVMap();
	1148	+
	1149	+ int count2 = 0;
	1150	+ int count3 = 0;
	1151	+
	1152	+ if (n.length > 0)
	1153	+ {
	1154	+ for (int i = 0; i < strips.length; i++)
	1155	+ {
	1156	+ gl.glBegin(gl.GL_TRIANGLE_STRIP);
	1157	+
	1158	+ /*
	1159	+ boolean locked = false;
	1160	+ float eps = 0.1f;
	1161	+ boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
	1162	+
	1163	+ int dot = 0;
	1164	+
	1165	+ if ((dot&1) == 0)
	1166	+ dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
	1167	+
	1168	+ if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
	1169	+ gl.glTexCoord2f((float) qv.s, (float) qv.t);
	1170	+ else
	1171	+ {
	1172	+ locked = true;
	1173	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	1174	+ }
	1175	+ //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
	1176	+ gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
	1177	+ if (hasnorm)
	1178	+ {
	1179	+ //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
	1180	+ gl.glNormal3f((float) rv.norm.x, (float) rv.norm.y, (float) rv.norm.z);
	1181	+ }
	1182	+
	1183	+ if ((dot&4) == 0)
	1184	+ dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
	1185	+
	1186	+ if (wrap \|\| !locked && (dot&8) != 0)
	1187	+ gl.glTexCoord2f((float) rv.s, (float) rv.t);
	1188	+ else
	1189	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	1190	+
	1191	+ f.dot = dot;
	1192	+ */
	1193	+
	1194	+ if (!selectmode)
	1195	+ {
	1196	+ if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
	1197	+ {
	1198	+ gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1199	+ } else
	1200	+ {
	1201	+ gl.glNormal3f(0, 0, 1);
	1202	+ }
	1203	+
	1204	+ if (c != null)
	1205	+ //System.out.println("glcolor = " + c[count3] + ", " + c[count3+1] + ", " + c[count3+2]);
	1206	+ {
	1207	+ gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
	1208	+ }
	1209	+ }
	1210	+
	1211	+ if (flipV)
	1212	+ gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
	1213	+ else
	1214	+ gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1215	+
	1216	+ //System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
	1217	+ gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1218	+
	1219	+ count2 += 2;
	1220	+ count3 += 3;
	1221	+ if (!selectmode)
	1222	+ {
	1223	+ if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
	1224	+ {
	1225	+ gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1226	+ } else
	1227	+ {
	1228	+ gl.glNormal3f(0, 0, 1);
	1229	+ }
	1230	+ if (c != null)
	1231	+ {
	1232	+ gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
	1233	+ }
	1234	+ }
	1235	+
	1236	+ if (flipV)
	1237	+ gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
	1238	+ else
	1239	+ gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1240	+
	1241	+ //System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
	1242	+ gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1243	+
	1244	+ count2 += 2;
	1245	+ count3 += 3;
	1246	+ for (int j = 0; j < strips[i] - 2; j++)
	1247	+ {
	1248	+ //gl.glTexCoord2d(...);
	1249	+ if (!selectmode)
	1250	+ {
	1251	+ if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
	1252	+ {
	1253	+ gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1254	+ } else
	1255	+ {
	1256	+ gl.glNormal3f(0, 0, 1);
	1257	+ }
	1258	+ if (c != null)
	1259	+ {
	1260	+ gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
	1261	+ }
	1262	+ }
	1263	+
	1264	+ if (flipV)
	1265	+ gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
	1266	+ else
	1267	+ gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1268	+
	1269	+ //System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
	1270	+ gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1271	+
	1272	+ count2 += 2;
	1273	+ count3 += 3;
	1274	+ }
	1275	+
	1276	+ gl.glEnd();
	1277	+ }
	1278	+ }
	1279	+
	1280	+ assert count3 == v.length;
	1281	+ }
	1282	+ else // !trimmed
	1283	+ {
	1284	+ int count = 0;
	1285	+ for (int i = 0; i < strips.length; i++)
	1286	+ {
	1287	+ gl.glBegin(gl.GL_TRIANGLE_STRIP);
	1288	+
	1289	+ Vertex p = bRep.GetVertex(bRep.indices[count++]);
	1290	+ Vertex q = bRep.GetVertex(bRep.indices[count++]);
	1291	+
	1292	+ drawVertex(gl, p, flipV, selectmode);
	1293	+ drawVertex(gl, q, flipV, selectmode);
	1294	+
	1295	+ for (int j = 0; j < strips[i] - 2; j++)
	1296	+ {
	1297	+ Vertex r = bRep.GetVertex(bRep.indices[count++]);
	1298	+
	1299	+ // if (j%2 == 0)
	1300	+ // drawFace(p, q, r, display, null);
	1301	+ // else
	1302	+ // drawFace(p, r, q, display, null);
	1303	+
	1304	+ // p = q;
	1305	+ // q = r;
	1306	+ drawVertex(gl, r, flipV, selectmode);
	1307	+ }
	1308	+
	1309	+ gl.glEnd();
	1310	+ }
	1311	+ }
	1312	+ }
	1313	+
	1314	+ static cSpring.Point3D temp = new cSpring.Point3D();
	1315	+ static cSpring.Point3D temp2 = new cSpring.Point3D();
	1316	+ static cSpring.Point3D temp3 = new cSpring.Point3D();
	1317	+
	1318	+ public void DrawDynamicMesh(cMesh mesh)
	1319	+ {
	1320	+ GL gl = GetGL(); // getGL();
	1321	+
	1322	+ cSpring.PhysicsController3D Phys = mesh.Phys;
	1323	+
	1324	+ gl.glDisable(gl.GL_LIGHTING);
	1325	+
	1326	+ gl.glLineWidth(1);
	1327	+ gl.glColor3f(1,1,1);
	1328	+ gl.glBegin(gl.GL_LINES);
	1329	+ double scale = 0;
	1330	+ int count = 0;
	1331	+ for (int s=0; s<Phys.allSprings.size(); s++)
	1332	+ {
	1333	+ cSpring.Spring spring = Phys.allSprings.get(s);
	1334	+ if(s == 0)
	1335	+ {
	1336	+ //System.out.println(" spring : " + spring.a.position + "; " + spring.b.position);
	1337	+ }
	1338	+ if (mesh.showsprings)
	1339	+ {
	1340	+ temp.set(spring.a.position);
	1341	+ temp.add(spring.b.position);
	1342	+ temp.mul(0.5);
	1343	+ temp2.set(spring.a.position);
	1344	+ temp2.sub(spring.b.position);
	1345	+ temp2.mul(spring.restLength/2);
	1346	+ temp.sub(temp2);
	1347	+ gl.glVertex3f((float)temp.x, (float)temp.y, (float)temp.z);
	1348	+ temp.add(temp2);
	1349	+ temp.add(temp2);
	1350	+ gl.glVertex3f((float)temp.x, (float)temp.y, (float)temp.z);
	1351	+ }
	1352	+
	1353	+ if (spring.isHandle)
	1354	+ continue;
	1355	+
	1356	+ //if (scale < spring.restLength)
	1357	+ scale += spring.restLength;
	1358	+ count++;
	1359	+ }
	1360	+ gl.glEnd();
	1361	+
	1362	+ if (count == 0)
	1363	+ scale = 0.01;
	1364	+ else
	1365	+ scale /= count * 3;
	1366	+
	1367	+ //scale = 0.25;
	1368	+
	1369	+ if (mesh.ShowInfo())
	1370	+ {
	1371	+ gl.glLineWidth(4);
	1372	+ for (int s=0; s<Phys.allNodes.size(); s++)
	1373	+ {
	1374	+ cSpring.DynamicNode node = Phys.allNodes.get(s);
	1375	+ if (node.mass == 0)
	1376	+ continue;
	1377	+
	1378	+ int i = node.springs==null?-1:node.springs.size();
	1379	+ gl.glColor3f((i>>2)&1,(i>>1)&1,i&1);
	1380	+ //temp.set(node.springForce.x, node.springForce.y, node.springForce.z);
	1381	+ //temp.normalize();
	1382	+ //gl.glColor3d((temp.x+1)/2, (temp.y+1)/2, (temp.z+1)/2);
	1383	+ gl.glBegin(gl.GL_LINES);
	1384	+ gl.glVertex3d(node.position.x, node.position.y, node.position.z);
	1385	+ //gl.glVertex3d(node.position.x + node.normal.xscale, node.position.y + node.normal.yscale, node.position.z + node.normal.z*scale);
	1386	+ gl.glVertex3d(node.position.x + mesh.bRep.GetVertex(s).norm.x*scale,
	1387	+ node.position.y + mesh.bRep.GetVertex(s).norm.y*scale,
	1388	+ node.position.z + mesh.bRep.GetVertex(s).norm.z*scale);
	1389	+ gl.glEnd();
	1390	+ }
	1391	+
	1392	+ gl.glLineWidth(8);
	1393	+ for (int s=0; s<Phys.allNodes.size(); s++)
	1394	+ {
	1395	+ cSpring.DynamicNode node = Phys.allNodes.get(s);
	1396	+
	1397	+ if (node.springs != null)
	1398	+ {
	1399	+ for (int i=0; i<node.springs.size(); i+=1)
	1400	+ {
	1401	+ cSpring.DynamicNode f = node.springs.get(i).GetOther(node);
	1402	+
	1403	+ int c = i+1;
	1404	+ // c = node.springs.get(i).nbcopies;
	1405	+
	1406	+ gl.glColor3f((c>>2)&1,(c>>1)&1,c&1);
	1407	+ gl.glBegin(gl.GL_LINES);
	1408	+ gl.glVertex3d(node.position.x, node.position.y, node.position.z);
	1409	+ 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);
	1410	+ gl.glEnd();
	1411	+ }
	1412	+ }
	1413	+ }
	1414	+
	1415	+ gl.glLineWidth(1);
	1416	+ }
	1417	+
	1418	+ gl.glEnable(gl.GL_LIGHTING);
	1419	+ }
	1420	+
	1421	+ /// INTERFACE
	1422	+
	1423	+ public void StartTriangles()
	1424	+ {
	1425	+ javax.media.opengl.GL gl = GetGL();
	1426	+ gl.glBegin(gl.GL_TRIANGLES);
	1427	+ }
	1428	+
	1429	+ public void EndTriangles()
	1430	+ {
	1431	+ GetGL().glEnd();
	1432	+ }
	1433	+
	1434	+ void drawVertex(javax.media.opengl.GL gl, Vertex pv, boolean flipV, boolean selectmode)
	1435	+ {
	1436	+ if (!selectmode)
	1437	+ {
	1438	+ gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
	1439	+ gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
	1440	+
	1441	+ if (flipV)
	1442	+ gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
	1443	+ else
	1444	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	1445	+ }
	1446	+
	1447	+ gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
	1448	+ }
	1449	+
	1450	+ void SetColor(Object3D obj, Vertex p0)
	1451	+ {
	1452	+ CameraPane display = this;
	1453	+ BoundaryRep bRep = obj.bRep;
	1454	+
	1455	+ if (RENDERPROGRAM == 0)
	1456	+ {
	1457	+ float r = 0;
	1458	+ if (bRep != null)
	1459	+ {
	1460	+ if (bRep.stripified)
	1461	+ {
	1462	+ r = 1;
	1463	+ }
	1464	+ }
	1465	+ float g = 0;
	1466	+ if (bRep != null)
	1467	+ {
	1468	+ if (bRep.trimmed)
	1469	+ {
	1470	+ g = 1;
	1471	+ }
	1472	+ }
	1473	+ float b = 0;
	1474	+ if (obj.support != null && obj.link2master)
	1475	+ {
	1476	+ b = 1;
	1477	+ }
	1478	+ display.GetGL().glColor3f(rp0.AO, gp0.AO, b*p0.AO);
	1479	+ return;
	1480	+ }
	1481	+
	1482	+ if (display.DrawMode() != CameraPane.SHADOW)
	1483	+ return;
	1484	+
	1485	+ javax.media.opengl.GL gl = display.GetGL();
	1486	+// if (true) return;
	1487	+// float ao = p.AO;
	1488	+//
	1489	+// // if (ao == 0 && !bRep.AOdone) // transient problem!
	1490	+// // ao = 1;
	1491	+//
	1492	+// gl.glColor4f(ao, ao, ao, 1);
	1493	+
	1494	+// CameraPane.selectedpoint.
	1495	+// getAverage(cStatic.point1, true);
	1496	+ if (CameraPane.pointflow == null) // !random) // live)
	1497	+ {
	1498	+ return;
	1499	+ }
	1500	+
	1501	+ cStatic.point1.set(0,0,0);
	1502	+ LA.xformPos(cStatic.point1, CameraPane.selectedpoint.toParent, cStatic.point1);
	1503	+
	1504	+ cStatic.point1.sub(p0);
	1505	+
	1506	+
	1507	+// if (marked && (p0.vertexlinks == null \|\| support == null \|\| support.bRep == null)) // no position delta?
	1508	+// {
	1509	+// return;
	1510	+// }
	1511	+
	1512	+ //if (true)
	1513	+ if (cStatic.point1.dot(cStatic.point1) > 0.000001)
	1514	+ {
	1515	+ return;
	1516	+ }
	1517	+
	1518	+ float[] colorV = new float[3];
	1519	+
	1520	+ if (false) // marked)
	1521	+ {
	1522	+ // debug rigging weights
	1523	+ for (int object = 0; object < p0.vertexlinks.length; object++)
	1524	+ {
	1525	+ float weight = p0.weights[object] / p0.totalweight;
	1526	+
	1527	+ // if (weight < 0.1)
	1528	+ // {
	1529	+ // assert(weight == 0);
	1530	+ // continue;
	1531	+ // }
	1532	+
	1533	+ if (p0.vertexlinks[object] == -1)
	1534	+ continue;
	1535	+
	1536	+ Vertex q = obj.support.bRep.GetVertex(p0.vertexlinks[object]);
	1537	+
	1538	+ int color = //1 << object; //
	1539	+ //p.vertexlinks.length;
	1540	+ obj.support.bRep.supports[p0.closestsupport].links[object];
	1541	+ colorV[2] += (color & 1) * weight;
	1542	+ colorV[1] += ((color & 2) >> 1) * weight;
	1543	+ colorV[0] += ((color & 4) >> 2) * weight;
	1544	+ }
	1545	+ }
	1546	+ else
	1547	+ {
	1548	+ if (obj.drawingstarted)
	1549	+ {
	1550	+ // find next point
	1551	+ if (bRep.GetVertex(0).faceindices == null)
	1552	+ {
	1553	+ bRep.InitFaceIndices();
	1554	+ }
	1555	+
	1556	+ double ymin = p0.y;
	1557	+
	1558	+ Vertex newp = p0;
	1559	+
	1560	+ for (int fii = 0; fii < p0.faceindices.length; fii++)
	1561	+ {
	1562	+ int fi = p0.faceindices[fii];
	1563	+
	1564	+ if (fi == -1)
	1565	+ break;
	1566	+
	1567	+ Face f = bRep.GetFace(fi);
	1568	+
	1569	+ Vertex p = bRep.GetVertex(f.p);
	1570	+ Vertex q = bRep.GetVertex(f.q);
	1571	+ Vertex r = bRep.GetVertex(f.r);
	1572	+
	1573	+ int swap = (int)(Math.random()*3);
	1574	+
	1575	+// for (int s=swap; --s>=0;)
	1576	+// {
	1577	+// Vertex t = p;
	1578	+// p = q;
	1579	+// q = r;
	1580	+// r = t;
	1581	+// }
	1582	+ if (ymin > p.y)
	1583	+ {
	1584	+ ymin = p.y;
	1585	+ newp = p;
	1586	+// break;
	1587	+ }
	1588	+ if (ymin > q.y)
	1589	+ {
	1590	+ ymin = q.y;
	1591	+ newp = q;
	1592	+// break;
	1593	+ }
	1594	+ if (ymin > r.y)
	1595	+ {
	1596	+ ymin = r.y;
	1597	+ newp = r;
	1598	+// break;
	1599	+ }
	1600	+ }
	1601	+
	1602	+ CameraPane.selectedpoint.toParent[3][0] = newp.x;
	1603	+ CameraPane.selectedpoint.toParent[3][1] = newp.y;
	1604	+ CameraPane.selectedpoint.toParent[3][2] = newp.z;
	1605	+
	1606	+ obj.drawingstarted = false;
	1607	+
	1608	+ // return;
	1609	+ }
	1610	+
	1611	+ if (false) // CameraPane.DRAW
	1612	+ {
	1613	+ p0.AO = colorV[0] = 2;
	1614	+ colorV[1] = 2;
	1615	+ colorV[2] = 2;
	1616	+ }
	1617	+
	1618	+ CameraPane.pointflow.add(p0);
	1619	+ CameraPane.pointflow.Touch();
	1620	+ }
	1621	+
	1622	+// gl.glColor3f(colorV[0], colorV[1], colorV[2]);
	1623	+// gl.glMaterialfv(gl.GL_FRONT, gl.GL_DIFFUSE, colorV, 0);
	1624	+// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
	1625	+ }
	1626	+
	1627	+ void DrawMaterial(cMaterial material, boolean selected, Object3D.cVector2[] others)
	1628	+ {
	1629	+ CameraPane display = this;
	1630	+ //new Exception().printStackTrace();
	1631	+
	1632	+ if (display.IsFrozen() && !selected \|\| display.IsAmbientOcclusionOn()) // \|\| display.drawMode == display.SHADOW)
	1633	+ {
	1634	+ return;
	1635	+ }
	1636	+
	1637	+ javax.media.opengl.GL gl = display.GetGL();
	1638	+
	1639	+ //Color col = Color.getHSBColor(color,modulation,1);
	1640	+ //col.getColorComponents(ColorSpace.getInstance(ColorSpace.CS_LINEAR_RGB), CameraPane.modelParams0);
	1641	+ if (!material.multiply)
	1642	+ {
	1643	+ display.color = material.color;
	1644	+ display.saturation = material.modulation;
	1645	+ }
	1646	+ else
	1647	+ {
	1648	+ display.color = material.color2;
	1649	+ display.saturation = material.modulation2;
	1650	+ }
	1651	+
	1652	+ cColor.HSBtoRGB(display.color, display.saturation, 1, display.modelParams0);
	1653	+
	1654	+ float[] colorV = Grafreed.colorV;
	1655	+
	1656	+ /**/
	1657	+ if (display.DrawMode() == display.DEFAULT) // && display.RENDERPROGRAM == 0)
	1658	+ {
	1659	+ colorV[0] = display.modelParams0[0] * material.diffuse;
	1660	+ colorV[1] = display.modelParams0[1] * material.diffuse;
	1661	+ colorV[2] = display.modelParams0[2] * material.diffuse;
	1662	+ colorV[3] = 1; // material.opacity;
	1663	+
	1664	+ gl.glColor4f(colorV[0], colorV[1], colorV[2], material.opacity);
	1665	+ //System.out.println("Opacity = " + opacity);
	1666	+
	1667	+ gl.glMaterialfv(gl.GL_FRONT, gl.GL_DIFFUSE, colorV, 0);
	1668	+ //color[0] /= 2; color[1] /= 2; color[2] /= 2;
	1669	+ gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
	1670	+
	1671	+ float amb = material.ambient;
	1672	+ if (amb < material.cameralight)
	1673	+ {
	1674	+ amb = material.cameralight;
	1675	+ }
	1676	+ colorV[0] = display.modelParams0[0] * material.diffuse * amb;
	1677	+ colorV[1] = display.modelParams0[1] * material.diffuse * amb;
	1678	+ colorV[2] = display.modelParams0[2] * material.diffuse * amb;
	1679	+ gl.glMaterialfv(gl.GL_FRONT, gl.GL_AMBIENT, colorV, 0);
	1680	+ //color[0] /= 2; color[1] /= 2; color[2] /= 2;
	1681	+ gl.glMaterialfv(gl.GL_BACK, gl.GL_AMBIENT, colorV, 0);
	1682	+
	1683	+ /**/
	1684	+ colorV[0] = ((1 - material.metalness) + display.modelParams0[0] * material.metalness) * material.specular;
	1685	+ colorV[1] = ((1 - material.metalness) + display.modelParams0[1] * material.metalness) * material.specular;
	1686	+ colorV[2] = ((1 - material.metalness) + display.modelParams0[2] * material.metalness) * material.specular;
	1687	+ gl.glMaterialfv(gl.GL_FRONT, gl.GL_SPECULAR, colorV, 0);
	1688	+ //color[0] /= 2; color[1] /= 2; color[2] /= 2;
	1689	+ gl.glMaterialfv(gl.GL_BACK, gl.GL_SPECULAR, colorV, 0);
	1690	+ colorV[0] = 10 / material.shininess; // 1/0.005f;
	1691	+ //System.out.println("shininess = " + colorV[0]);
	1692	+ if (colorV[0] > 128)
	1693	+ {
	1694	+ colorV[0] = 128;
	1695	+ }
	1696	+ gl.glMaterialfv(gl.GL_FRONT, gl.GL_SHININESS, colorV, 0);
	1697	+ gl.glMaterialfv(gl.GL_BACK, gl.GL_SHININESS, colorV, 0);
	1698	+ /**/
	1699	+ }
	1700	+ /**/
	1701	+
	1702	+ //selected = false;
	1703	+ selected = selected && display.flash;
	1704	+
	1705	+ //display.modelParams0[0] = 0; // pigment.r;
	1706	+ //display.modelParams0[1] = 0; // pigment.g;
	1707	+ //display.modelParams0[2] = 0; // pigment.b;
	1708	+ if (!material.multiply)
	1709	+ {
	1710	+ display.modelParams0[3] = material.metalness;
	1711	+ display.modelParams1[0] = material.diffuse;
	1712	+ display.modelParams1[1] = material.specular;
	1713	+ display.modelParams1[2] = 1 / material.shininess;
	1714	+ display.modelParams1[3] = material.shift;
	1715	+ display.modelParams2[0] = material.ambient;
	1716	+ display.modelParams2[1] = material.lightarea;
	1717	+ //System.out.println("light area = " + lightarea);
	1718	+ display.modelParams2[2] = 1 / material.factor; // diffuseness
	1719	+ display.modelParams2[3] = material.velvet;
	1720	+ display.modelParams3[0] = material.sheen;
	1721	+ display.modelParams3[1] = material.subsurface;
	1722	+ display.modelParams3[2] = material.bump; // backlit
	1723	+ display.modelParams3[3] = material.aniso;
	1724	+ display.modelParams4[0] = material.anisoV;
	1725	+ display.modelParams4[1] = selected ? 100 : material.cameralight;
	1726	+ //System.out.println("selected = " + selected);
	1727	+ display.modelParams4[2] = material.diffuseness;
	1728	+ display.modelParams4[3] = material.shadow;
	1729	+ display.modelParams5[0] = material.texture;
	1730	+ display.modelParams5[1] = material.opacity;
	1731	+ display.modelParams5[2] = material.fakedepth;
	1732	+ display.modelParams5[3] = CameraPane.SHADOWCULLFACE ? 0f : (material.shadowbias - 0.005f) / 10;
	1733	+ }
	1734	+ else
	1735	+ {
	1736	+ display.modelParams0[3] = material.metalness2;
	1737	+ display.modelParams1[0] = material.diffuse2;
	1738	+ display.modelParams1[1] = material.specular2;
	1739	+ display.modelParams1[2] = material.shininess2;
	1740	+ display.modelParams1[3] = material.shift2;
	1741	+ display.modelParams2[0] = material.ambient2;
	1742	+ display.modelParams2[1] = material.lightarea2;
	1743	+ display.modelParams2[2] = material.factor2;
	1744	+ display.modelParams2[3] = material.velvet2;
	1745	+ display.modelParams3[0] = material.sheen2;
	1746	+ display.modelParams3[1] = material.subsurface2;
	1747	+ display.modelParams3[2] = material.bump2;
	1748	+ display.modelParams3[3] = material.aniso2;
	1749	+ display.modelParams4[0] = material.anisoV2;
	1750	+ display.modelParams4[1] = material.cameralight2;
	1751	+ //System.out.println("selected = " + selected);
	1752	+ display.modelParams4[2] = material.diffuseness2;
	1753	+ display.modelParams4[3] = material.shadow2;
	1754	+ display.modelParams5[0] = material.texture2;
	1755	+ display.modelParams5[1] = material.opacity2;
	1756	+ display.modelParams5[2] = material.fakedepth2;
	1757	+ display.modelParams5[3] = material.shadowbias2;
	1758	+ }
	1759	+
	1760	+ display.modelParams6[0] = 0;
	1761	+ display.modelParams6[1] = 0;
	1762	+ display.modelParams6[2] = 0;
	1763	+ display.modelParams6[3] = 0;
	1764	+
	1765	+ display.modelParams7[0] = 0;
	1766	+ display.modelParams7[1] = 1000;
	1767	+ display.modelParams7[2] = 0;
	1768	+ display.modelParams7[3] = 0;
	1769	+
	1770	+ //display.modelParams6[0] = 100; // criss de bug de bump
	1771	+
	1772	+ Object3D.cVector2[] extparams = others; // display.vector2buffer;
	1773	+ if (extparams != null && extparams.length > 0 && extparams[0] != null)
	1774	+ {
	1775	+ display.modelParams6[0] = extparams[0].x / 1000.0f; // bump
	1776	+ display.modelParams6[1] = extparams[0].y / 1000.0f; // noise
	1777	+ if (extparams.length > 1)
	1778	+ {
	1779	+ display.modelParams6[2] = extparams[1].x / 1000.0f; // borderfade
	1780	+ display.modelParams6[3] = extparams[1].y / 1000.0f; // (float)Math.exp(-extparams[1].y / 1000.0f); // fog punchthrough
	1781	+ if (extparams.length > 2)
	1782	+ {
	1783	+ display.modelParams7[0] = extparams[2].x / 1000.0f; // noise power
	1784	+ float x = extparams[2].y / 1000.0f;
	1785	+ //if (x == 0)
	1786	+ // x = 1f;
	1787	+ 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
	1788	+ if (extparams[2].y > 0)
	1789	+ {
	1790	+ //System.out.println("extparams[1].y = " + extparams[1].y);
	1791	+ //System.out.println("extparams[2].y = " + extparams[2].y);
	1792	+ //System.out.println("opacity power = " + display.modelParams7[1]);
	1793	+ }
	1794	+ }
	1795	+ }
	1796	+ }
	1797	+
	1798	+ //if (display.modelParams6[2] != 0)
	1799	+ /*
	1800	+ System.out.println("modelParams0[0] = " + display.modelParams0[0]);
	1801	+ System.out.println("modelParams0[1] = " + display.modelParams0[1]);
	1802	+ System.out.println("modelParams0[2] = " + display.modelParams0[2]);
	1803	+ System.out.println("modelParams0[3] = " + display.modelParams0[3]);
	1804	+ System.out.println("modelParams1[0] = " + display.modelParams1[0]);
	1805	+ System.out.println("modelParams1[1] = " + display.modelParams1[1]);
	1806	+ System.out.println("modelParams1[2] = " + display.modelParams1[2]);
	1807	+ System.out.println("modelParams1[3] = " + display.modelParams1[3]);
	1808	+ System.out.println("modelParams2[0] = " + display.modelParams2[0]);
	1809	+ System.out.println("modelParams2[1] = " + display.modelParams2[1]);
	1810	+ System.out.println("modelParams2[2] = " + display.modelParams2[2]);
	1811	+ System.out.println("modelParams2[3] = " + display.modelParams2[3]);
	1812	+ System.out.println("modelParams3[0] = " + display.modelParams3[0]);
	1813	+ System.out.println("modelParams3[1] = " + display.modelParams3[1]);
	1814	+ System.out.println("modelParams3[2] = " + display.modelParams3[2]);
	1815	+ System.out.println("modelParams3[3] = " + display.modelParams3[3]);
	1816	+ System.out.println("modelParams4[0] = " + display.modelParams4[0]);
	1817	+ System.out.println("modelParams4[1] = " + display.modelParams4[1]);
	1818	+ System.out.println("modelParams4[2] = " + display.modelParams4[2]);
	1819	+ System.out.println("modelParams4[3] = " + display.modelParams4[3]);
	1820	+ System.out.println("modelParams5[0] = " + display.modelParams5[0]);
	1821	+ System.out.println("modelParams5[1] = " + display.modelParams5[1]);
	1822	+ System.out.println("modelParams5[2] = " + display.modelParams5[2]);
	1823	+ System.out.println("modelParams5[3] = " + display.modelParams5[3]);
	1824	+ System.out.println("modelParams6[0] = " + display.modelParams6[0]);
	1825	+ System.out.println("modelParams6[1] = " + display.modelParams6[1]);
	1826	+ System.out.println("modelParams6[2] = " + display.modelParams6[2]);
	1827	+ System.out.println("modelParams6[3] = " + display.modelParams6[3]);
	1828	+ System.out.println("modelParams7[0] = " + display.modelParams7[0]);
	1829	+ System.out.println("modelParams7[1] = " + display.modelParams7[1]);
	1830	+ System.out.println("modelParams7[2] = " + display.modelParams7[2]);
	1831	+ System.out.println("modelParams7[3] = " + display.modelParams7[3]);
	1832	+ /**/
	1833	+ //assert (display.modelParams6[2] == 0);
	1834	+
	1835	+ //System.out.println("noise power = " + display.modelParams7[0]);
	1836	+ //System.out.println("shadowbias = " + shadowbias);
	1837	+
	1838	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 0, display.modelParams0, 0);
	1839	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 1, display.modelParams1, 0);
	1840	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 2, display.modelParams2, 0);
	1841	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 3, display.modelParams3, 0);
	1842	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 4, display.modelParams4, 0);
	1843	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 5, display.modelParams5, 0);
	1844	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 6, display.modelParams6, 0);
	1845	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 7, display.modelParams7, 0);
	1846	+
	1847	+ int mode = display.FP_SHADER;
	1848	+
	1849	+ if (material.aniso != material.anisoV \|\| material.aniso > 0.002)
	1850	+ {
	1851	+ mode \|= display.FP_ANISO;
	1852	+ }
	1853	+
	1854	+ display.EnableProgram(mode);
	1855	+
	1856	+ //System.out.println("opacity power = " + display.modelParams7[1]);
	1857	+
	1858	+ if (!material.multiply)
	1859	+ {
	1860	+ if (Globals.drawMode == CameraPane.SHADOW)
	1861	+ gl.glDepthMask(material.opacity >= 0.9 && display.modelParams7[1] > 0.1);
	1862	+ else
	1863	+ gl.glDepthMask(material.opacity >= 0.99);
	1864	+ }
208	1865	}
209	1866
210	1867	int matrixdepth = 0; // 10000; // CONFLICT WITH cMESH... WARNING WARNING WARNING WARNING WARNING WARNING !!!!!!!!!!!! 0;
..	..	@@ -225,7 +1882,7 @@
225	1882	currentGL.glMultMatrixd(model, 0);
226	1883	}
227	1884
228		- void PushMatrix(double[][] matrix, int count)
	1885	+ public void PushMatrix(double[][] matrix, int count) // INTERFACE
229	1886	{
230	1887	matrixdepth++;
231	1888	// GrafreeD.tracein(matrix);
..	..	@@ -254,7 +1911,7 @@
254	1911	void PushMatrix(double[][] matrix)
255	1912	{
256	1913	// GrafreeD.tracein(matrix);
257		- PushMatrix(matrix,1);
	1914	+ PushMatrix(matrix, 1);
258	1915	}
259	1916
260	1917	void PushMatrix()
..	..	@@ -270,7 +1927,7 @@
270	1927
271	1928	double[][] tmpmat = new double[4][4];
272	1929
273		- void PopMatrix(double[][] inverse)
	1930	+ public void PopMatrix(double[][] inverse) // INTERFACE
274	1931	{
275	1932	--matrixdepth;
276	1933
..	..	@@ -310,7 +1967,7 @@
310	1967	PushTextureMatrix(matrix, 1);
311	1968	}
312	1969
313		- void PushTextureMatrix(double[][] matrix, int count)
	1970	+ public void PushTextureMatrix(double[][] matrix, int count) // INTERFACE
314	1971	{
315	1972	currentGL.glActiveTexture(GetGL().GL_TEXTURE0);
316	1973
..	..	@@ -324,7 +1981,7 @@
324	1981	currentGL.glMatrixMode(GetGL().GL_MODELVIEW);
325	1982	}
326	1983
327		- void PopTextureMatrix(double[][] inverse)
	1984	+ public void PopTextureMatrix(double[][] inverse) // INTERFACE
328	1985	{
329	1986	currentGL.glActiveTexture(GetGL().GL_TEXTURE0);
330	1987	currentGL.glMatrixMode(GetGL().GL_TEXTURE);
..	..	@@ -351,15 +2008,15 @@
351	2008
352	2009	static int camerachangeframe;
353	2010
354		- boolean SetCamera(Camera cam)
	2011	+ public boolean SetCamera(Camera cam)
355	2012	{
356	2013	// may 2014 if (cam == cameras[0] \|\| cam == cameras[1])
357	2014	// return false;
358	2015
359		- if (REFUSEMODE && isLIVE() && camerachangeframe != 0 && camerachangeframe != framecount)
	2016	+ if (REFUSEMODE && Globals.isLIVE() && camerachangeframe != 0 && camerachangeframe != Globals.framecount)
360	2017	{
361	2018	// check for last change
362		- if (framecount < camerachangeframe + 400) // 120 == 1 second
	2019	+ if (Globals.framecount < camerachangeframe + 400) // 120 == 1 second
363	2020	{
364	2021	// refuse the camera change
365	2022	System.err.println("Camera " + cam + " REFUSED");
..	..	@@ -367,7 +2024,7 @@
367	2024	}
368	2025	}
369	2026
370		- camerachangeframe = framecount;
	2027	+ camerachangeframe = Globals.framecount;
371	2028
372	2029	cam.hAspect = -1; // Read only
373	2030
..	..	@@ -398,7 +2055,7 @@
398	2055	{
399	2056	//System.err.println("Oeil on");
400	2057	TRACK = true;
401		-// JUNE 2014 if (TRACK && trackedobject != null && drawMode == SHADOW) // && !lightMode)
	2058	+// JUNE 2014 if (TRACK && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
402	2059	// object.editWindow.ScreenFit(trackedobject);
403	2060	//pingthread.StepToTarget(true);
404	2061	}
..	..	@@ -407,7 +2064,7 @@
407	2064	{
408	2065	//System.err.println("Oeil on");
409	2066	OEIL = true;
410		- if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && drawMode == SHADOW) // && !lightMode)
	2067	+ if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
411	2068	object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
412	2069	//pingthread.StepToTarget(true);
413	2070	}
..	..	@@ -471,39 +2128,12 @@
471	2128	{
472	2129	frozen ^= true;
473	2130	// Weird...
474		- lighttouched = true;
	2131	+ Globals.lighttouched = true;
475	2132	}
476	2133
477	2134	void ToggleDL()
478	2135	{
479	2136	mainDL ^= true;
480		- }
481		-
482		- void ToggleTexture()
483		- {
484		- textureon ^= true;
485		- }
486		-
487		- void ToggleLive()
488		- {
489		- setLIVE(isLIVE() ^ true);
490		-
491		- System.err.println("LIVE = " + isLIVE());
492		-
493		- if (!isLIVE()) // save sound
494		- GrafreeD.savesound = true; // wav.save();
495		- // else
496		- repaint(); // start loop // may 2013
497		- }
498		-
499		- void ToggleSupport()
500		- {
501		- SUPPORT ^= true;
502		- }
503		-
504		- void ToggleAbort()
505		- {
506		- ABORTMODE ^= true;
507	2137	}
508	2138
509	2139	void ToggleFullScreen()
..	..	@@ -513,12 +2143,7 @@
513	2143
514	2144	void ToggleCrowd()
515	2145	{
516		- CROWD ^= true;
517		- }
518		-
519		- void ToggleInertia()
520		- {
521		- INERTIA ^= true;
	2146	+ Globals.CROWD ^= true;
522	2147	}
523	2148
524	2149	void ToggleLocal()
..	..	@@ -526,62 +2151,89 @@
526	2151	LOCALTRANSFORM ^= true;
527	2152	}
528	2153
529		- void ToggleFast()
	2154	+ public void ToggleTexture()
	2155	+ {
	2156	+ textureon ^= true;
	2157	+ }
	2158	+
	2159	+ public void ToggleLive()
	2160	+ {
	2161	+ Globals.setLIVE(Globals.isLIVE() ^ true);
	2162	+
	2163	+ System.err.println("LIVE = " + Globals.isLIVE());
	2164	+
	2165	+ if (!Globals.isLIVE()) // save sound
	2166	+ Grafreed.savesound = true; // wav.save();
	2167	+ // else
	2168	+ repaint(); // start loop // may 2013
	2169	+ }
	2170	+
	2171	+ public void ToggleSupport()
	2172	+ {
	2173	+ SUPPORT ^= true;
	2174	+ }
	2175	+
	2176	+ public void ToggleAbort()
	2177	+ {
	2178	+ ABORTMODE ^= true;
	2179	+ }
	2180	+
	2181	+ public void ToggleInertia()
	2182	+ {
	2183	+ INERTIA ^= true;
	2184	+ }
	2185	+
	2186	+ public void ToggleFast()
530	2187	{
531	2188	FAST ^= true;
532	2189	}
533	2190
534		- void ToggleSlowPose()
	2191	+ public void ToggleSlowPose()
535	2192	{
536	2193	SLOWPOSE ^= true;
537	2194	}
538	2195
539		- void ToggleFootContact()
540		- {
541		- FOOTCONTACT ^= true;
542		- }
543		-
544		- void ToggleBoxMode()
	2196	+ public void ToggleBoxMode()
545	2197	{
546	2198	BOXMODE ^= true;
547	2199	}
548	2200
549		- void ToggleSmoothFocus()
	2201	+ public void ToggleZoomBoxMode()
	2202	+ {
	2203	+ ZOOMBOXMODE ^= true;
	2204	+ }
	2205	+
	2206	+ public void ToggleSmoothFocus()
550	2207	{
551	2208	SMOOTHFOCUS ^= true;
552	2209	}
553	2210
554		- void ToggleImageFlip()
	2211	+ public void ToggleImageFlip()
555	2212	{
556	2213	IMAGEFLIP ^= true;
557	2214	}
558	2215
559		- void ToggleSpeakerMocap()
	2216	+ public void ToggleSpeakerMocap()
560	2217	{
561	2218	SPEAKERMOCAP ^= true;
562	2219	}
563	2220
564		- void ToggleSpeakerCamera()
	2221	+ public void ToggleSpeakerCamera()
565	2222	{
566	2223	SPEAKERCAMERA ^= true;
567	2224	}
568	2225
569		- void ToggleSpeakerFocus()
	2226	+ public void ToggleSpeakerFocus()
570	2227	{
571	2228	SPEAKERFOCUS ^= true;
572	2229	}
573	2230
574		- void ToggleDebug()
575		- {
576		- DEBUG ^= true;
577		- }
578		-
579		- void ToggleFrustum()
	2231	+ public void ToggleFrustum()
580	2232	{
581	2233	FRUSTUM ^= true;
582	2234	}
583	2235
584		- void ToggleTrack()
	2236	+ public void ToggleTrack()
585	2237	{
586	2238	TRACK ^= true;
587	2239	if (TRACK)
..	..	@@ -600,25 +2252,35 @@
600	2252	repaint();
601	2253	}
602	2254
603		- void ToggleTrackOnce()
	2255	+ public void ToggleTrackOnce()
604	2256	{
605	2257	TRACKONCE ^= true;
606	2258	}
607	2259
608		- void ToggleShadowTrack()
	2260	+ public void ToggleShadowTrack()
609	2261	{
610	2262	SHADOWTRACK ^= true;
611	2263	repaint();
612	2264	}
613	2265
614		- void ToggleOeil()
	2266	+ public void ToggleOeil()
615	2267	{
616	2268	OEIL ^= true;
617	2269	}
618	2270
619		- void ToggleOeilOnce()
	2271	+ public void ToggleOeilOnce()
620	2272	{
621	2273	OEILONCE ^= true;
	2274	+ }
	2275	+
	2276	+ void ToggleFootContact()
	2277	+ {
	2278	+ FOOTCONTACT ^= true;
	2279	+ }
	2280	+
	2281	+ void ToggleDebug()
	2282	+ {
	2283	+ Globals.DEBUG ^= true;
622	2284	}
623	2285
624	2286	void ToggleLookAt()
..	..	@@ -626,9 +2288,9 @@
626	2288	LOOKAT ^= true;
627	2289	}
628	2290
629		- void ToggleRandom()
	2291	+ void ToggleSwitch()
630	2292	{
631		- RANDOM ^= true;
	2293	+ SWITCH ^= true;
632	2294	}
633	2295
634	2296	void ToggleHandles()
..	..	@@ -672,34 +2334,6 @@
672	2334	//assert (cam.hAspect == 0);
673	2335	cam.hAspect = 0;
674	2336	lightCamera = cam;
675		- }
676		-
677		- CameraPane(Object3D o, Camera cam, boolean withcontext)
678		- {
679		- super(defaultcaps, null, withcontext?glcontext:null, null);
680		-
681		- //System.out.println("AMERICA AREA = " + (9458886 + 9210755 + 8480395 + 2736391 + 1943018 + 1289475 + 1141569 + 1069350 + 911559 + 721229 + 395886 + 377972 + 246700 + 211156 + 173985 + 141133 + 118279 + 112079 + 108523));
682		- glcontext = getContext();
683		-
684		- cameras = new Camera[2];
685		- targetLookAts = new cVector[2];
686		-
687		- SetCamera(cam);
688		-
689		- SetLight(new Camera(new cVector(10, 10, -20)));
690		-
691		- object = o;
692		-
693		- setBackground(Color.white);
694		-
695		- addKeyListener(this);
696		- addMouseListener(this);
697		- addMouseMotionListener(this);
698		- addMouseWheelListener(this);
699		- //System.out.println("addGLEventListener: " + this);
700		- addGLEventListener(this);
701		-
702		-// pingthread.start(); // may 2013
703	2337	}
704	2338
705	2339	private static void ApplyTransform(GL gl, Mat4f xform)
..	..	@@ -759,11 +2393,133 @@
759	2393
760	2394	GL currentGL;
761	2395
762		- GL GetGL()
	2396	+ public GL GetGL() // INTERFACE
763	2397	{
764	2398	return currentGL;
765	2399	}
766		-
	2400	+
	2401	+ private void GetRemoteZip(String url, String name, boolean unzip, boolean save)
	2402	+ {
	2403	+ java.net.URL u;
	2404	+ InputStream is = null;
	2405	+ DataInputStream dis;
	2406	+ java.util.zip.ZipInputStream zis;
	2407	+ //String s;
	2408	+
	2409	+ System.out.println("GetRemoteZip " + name);
	2410	+
	2411	+ int total = 0; // dis.available();
	2412	+
	2413	+ byte[] bytes = new byte[16384];
	2414	+
	2415	+ try
	2416	+ {
	2417	+ u = new java.net.URL(url + name);
	2418	+ is = u.openStream();
	2419	+
	2420	+ System.out.println(url + name);
	2421	+
	2422	+ if (unzip)
	2423	+ {
	2424	+ //dis = new DataInputStream(new BufferedInputStream(is));
	2425	+ zis = new java.util.zip.ZipInputStream(new BufferedInputStream(is));
	2426	+ //while ((s = dis.readLine()) != null)
	2427	+
	2428	+ if (save)
	2429	+ new java.io.File(name).mkdirs();
	2430	+
	2431	+ // FileOutputStream stream = new FileOutputStream("test.zip");
	2432	+ //
	2433	+ // int count;
	2434	+ //
	2435	+ // while ((count = dis.read(bytes)) != -1)
	2436	+ // {
	2437	+ // //System.out.println(s);
	2438	+ // System.out.println(count);
	2439	+ // total += count;
	2440	+ // stream.write(bytes);
	2441	+ // }
	2442	+ //
	2443	+ // stream.close();
	2444	+
	2445	+ // now iterate through each item in the stream. The get next
	2446	+ // entry call will return a ZipEntry for each file in the
	2447	+ // stream
	2448	+ java.util.zip.ZipEntry entry;
	2449	+ while((entry = zis.getNextEntry())!=null)
	2450	+ {
	2451	+ if (entry.getName().endsWith(".gsm"))
	2452	+ {
	2453	+ continue;
	2454	+ }
	2455	+
	2456	+ String s = String.format("Entry: %s len %d added %TD",
	2457	+ entry.getName(), entry.getSize(),
	2458	+ new java.util.Date(entry.getTime()));
	2459	+ System.out.println(s);
	2460	+
	2461	+ if (save)
	2462	+ {
	2463	+ // Once we get the entry from the stream, the stream is
	2464	+ // positioned read to read the raw data, and we keep
	2465	+ // reading until read returns 0 or less.
	2466	+ String outpath = name + "/" + entry.getName();
	2467	+ FileOutputStream output = null;
	2468	+ try
	2469	+ {
	2470	+ output = new FileOutputStream(outpath);
	2471	+ int len = 0;
	2472	+ while ((len = zis.read(bytes)) > 0)
	2473	+ {
	2474	+ output.write(bytes, 0, len);
	2475	+ }
	2476	+ }
	2477	+ finally
	2478	+ {
	2479	+ // we must always close the output file
	2480	+ if(output!=null) output.close();
	2481	+ }
	2482	+ }
	2483	+ }
	2484	+ }
	2485	+ }
	2486	+ catch (java.net.MalformedURLException mue)
	2487	+ {
	2488	+ System.err.println("Ouch - a MalformedURLException happened.");
	2489	+ mue.printStackTrace();
	2490	+ //System.exit(2);
	2491	+ }
	2492	+ catch (IOException ioe)
	2493	+ {
	2494	+ //System.err.println("Oops - an IOException happened.");
	2495	+ //ioe.printStackTrace();
	2496	+ //System.exit(3);
	2497	+ }
	2498	+ finally
	2499	+ {
	2500	+ try
	2501	+ {
	2502	+ if (is != null)
	2503	+ is.close();
	2504	+ }
	2505	+ catch (IOException ioe)
	2506	+ {
	2507	+ }
	2508	+ }
	2509	+
	2510	+ // System.out.println("length = " + total);
	2511	+
	2512	+// try
	2513	+// {
	2514	+// Runtime.getRuntime().exec("/usr/local/bin/wget https://archive3d.net/?a=download&do=get&id=7caca905");
	2515	+// }
	2516	+// catch (Exception e)
	2517	+// {
	2518	+// e.printStackTrace();
	2519	+// }
	2520	+
	2521	+ }
	2522	+
767	2523	/**/
768	2524	class CacheTexture
769	2525	{
..	..	@@ -2595,6 +4351,7 @@
2595	4351
2596	4352	com.sun.opengl.util.texture.Texture CompressTexture2(String name)
2597	4353	{
	4354	+ new Exception().printStackTrace();
2598	4355	System.exit(0);
2599	4356	com.sun.opengl.util.texture.Texture texture = null;
2600	4357
..	..	@@ -6271,7 +8028,7 @@
6271	8028	return null;
6272	8029	}
6273	8030
6274		- void ReleaseTextures(cTexture tex)
	8031	+ public void ReleaseTextures(cTexture tex) // INTERFACE
6275	8032	{
6276	8033	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
6277	8034	{
..	..	@@ -6307,9 +8064,67 @@
6307	8064	ReleaseTexture(pigment, false);
6308	8065	}
6309	8066
	8067	+ public void ReleasePigmentTexture(cTexture tex) // INTERFACE
	8068	+ {
	8069	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	8070	+ {
	8071	+ return;
	8072	+ }
	8073	+
	8074	+ if (tex == null)
	8075	+ {
	8076	+ ReleaseTexture(null, false);
	8077	+ return;
	8078	+ }
	8079	+
	8080	+ String pigment = Object3D.GetPigment(tex);
	8081	+
	8082	+ if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8083	+ {
	8084	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	8085	+ // System.out.println("; bump = " + bump);
	8086	+ }
	8087	+
	8088	+ if (pigment.equals(""))
	8089	+ {
	8090	+ pigment = null;
	8091	+ }
	8092	+
	8093	+ ReleaseTexture(pigment, false);
	8094	+ }
	8095	+
	8096	+ public void ReleaseBumpTexture(cTexture tex) // INTERFACE
	8097	+ {
	8098	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	8099	+ {
	8100	+ return;
	8101	+ }
	8102	+
	8103	+ if (tex == null)
	8104	+ {
	8105	+ ReleaseTexture(null, true);
	8106	+ return;
	8107	+ }
	8108	+
	8109	+ String bump = Object3D.GetBump(tex);
	8110	+
	8111	+ if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8112	+ {
	8113	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	8114	+ // System.out.println("; bump = " + bump);
	8115	+ }
	8116	+
	8117	+ if (bump.equals(""))
	8118	+ {
	8119	+ bump = null;
	8120	+ }
	8121	+
	8122	+ ReleaseTexture(bump, true);
	8123	+ }
	8124	+
6310	8125	void ReleaseTexture(String tex, boolean bump)
6311	8126	{
6312		- if (// drawMode != 0 \|\| /tex == null \|\|/
	8127	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
6313	8128	ambientOcclusion ) // \|\| !textureon)
6314	8129	{
6315	8130	return;
..	..	@@ -6410,9 +8225,9 @@
6410	8225	}
6411	8226	}
6412	8227
6413		- /boolean/ void BindTextures(cTexture tex, int resolution)
	8228	+ /boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
6414	8229	{
6415		- if (// drawMode != 0 \|\| /tex == null \|\|/
	8230	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
6416	8231	ambientOcclusion ) // \|\| !textureon)
6417	8232	{
6418	8233	return; // false;
..	..	@@ -6455,7 +8270,94 @@
6455	8270	return; // true;
6456	8271	}
6457	8272
6458		- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution)
	8273	+ /boolean/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8274	+ {
	8275	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8276	+ ambientOcclusion ) // \|\| !textureon)
	8277	+ {
	8278	+ return; // false;
	8279	+ }
	8280	+
	8281	+ if (tex == null)
	8282	+ {
	8283	+ BindTexture(null,false,resolution);
	8284	+ return;
	8285	+ }
	8286	+
	8287	+ String pigment = Object3D.GetPigment(tex);
	8288	+
	8289	+ usedtextures.put(pigment, pigment);
	8290	+
	8291	+ if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8292	+ {
	8293	+ // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8294	+ // System.out.println("; bump = " + bump);
	8295	+ }
	8296	+
	8297	+ if (pigment.equals(""))
	8298	+ {
	8299	+ pigment = null;
	8300	+ }
	8301	+
	8302	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8303	+ BindTexture(pigment, false, resolution);
	8304	+ }
	8305	+
	8306	+ /boolean/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8307	+ {
	8308	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8309	+ ambientOcclusion ) // \|\| !textureon)
	8310	+ {
	8311	+ return; // false;
	8312	+ }
	8313	+
	8314	+ if (tex == null)
	8315	+ {
	8316	+ BindTexture(null,true,resolution);
	8317	+ return;
	8318	+ }
	8319	+
	8320	+ String bump = Object3D.GetBump(tex);
	8321	+
	8322	+ usedtextures.put(bump, bump);
	8323	+
	8324	+ if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8325	+ {
	8326	+ // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8327	+ // System.out.println("; bump = " + bump);
	8328	+ }
	8329	+
	8330	+ if (bump.equals(""))
	8331	+ {
	8332	+ bump = null;
	8333	+ }
	8334	+
	8335	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
	8336	+ BindTexture(bump, true, resolution);
	8337	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8338	+ }
	8339	+
	8340	+ java.util.HashSet<String> missingTextures = new java.util.HashSet<String>();
	8341	+
	8342	+ private boolean FileExists(String tex)
	8343	+ {
	8344	+ if (missingTextures.contains(tex))
	8345	+ {
	8346	+ return false;
	8347	+ }
	8348	+
	8349	+ boolean fileExists = new File(tex).exists();
	8350	+
	8351	+ if (!fileExists)
	8352	+ {
	8353	+ // If file exists, the "new File()" is not executed sgain
	8354	+ missingTextures.add(tex);
	8355	+ }
	8356	+
	8357	+ return fileExists;
	8358	+ }
	8359	+
	8360	+ CacheTexture GetCacheTexture(String tex, boolean bump, int resolution) throws Exception
6459	8361	{
6460	8362	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
6461	8363
..	..	@@ -6463,12 +8365,18 @@
6463	8365	{
6464	8366	String texname = tex;
6465	8367
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;
	8368	+ String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
	8369	+
	8370	+// String[] split = tex.split("Textures");
	8371	+// if (split.length > 1)
	8372	+// texname = "/Users/nbriere/Textures" + split[split.length-1];
	8373	+// else
	8374	+// if (!texname.startsWith("/"))
	8375	+// texname = "/Users/nbriere/Textures/" + texname;
	8376	+ if (!FileExists(tex))
	8377	+ {
	8378	+ texname = fallbackTextureName;
	8379	+ }
6472	8380
6473	8381	if (CACHETEXTURE)
6474	8382	texture = textures.get(texname); // TEXTURE CACHE
..	..	@@ -6537,7 +8445,7 @@
6537	8445	}
6538	8446
6539	8447	cachename = texname.substring(0, texname.length()-4)+ext+".jpg";
6540		- if (!new File(cachename).exists())
	8448	+ if (!FileExists(cachename))
6541	8449	cachename = texname;
6542	8450	else
6543	8451	processbump = false; // don't process bump map again
..	..	@@ -6559,7 +8467,7 @@
6559	8467	}
6560	8468
6561	8469	cachename = texname.substring(0, texname.length()-4)+ext+".png";
6562		- if (!new File(cachename).exists())
	8470	+ if (!FileExists(cachename))
6563	8471	cachename = texname;
6564	8472	else
6565	8473	processbump = false; // don't process bump map again
..	..	@@ -6568,7 +8476,9 @@
6568	8476	texturedata = GetFileTexture(cachename, processbump, resolution);
6569	8477
6570	8478
6571		- if (texturedata != null)
	8479	+ if (texturedata == null)
	8480	+ throw new Exception();
	8481	+
6572	8482	texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
6573	8483	//texture = GetTexture(tex, bump);
6574	8484	}
..	..	@@ -6690,7 +8600,7 @@
6690	8600	return texture;
6691	8601	}
6692	8602
6693		- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution)
	8603	+ com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution) throws Exception
6694	8604	{
6695	8605	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
6696	8606
..	..	@@ -6708,14 +8618,14 @@
6708	8618	return texture!=null?texture.texture:null;
6709	8619	}
6710	8620
6711		- com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution)
	8621	+ public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution) throws Exception
6712	8622	{
6713	8623	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
6714	8624
6715	8625	return texture!=null?texture.texturedata:null;
6716	8626	}
6717	8627
6718		- boolean BindTexture(String tex, boolean bump, int resolution)
	8628	+ boolean BindTexture(String tex, boolean bump, int resolution) throws Exception
6719	8629	{
6720	8630	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
6721	8631	{
..	..	@@ -7312,9 +9222,9 @@
7312	9222	static boolean occlusionInitialized = false;
7313	9223	boolean selection = false;
7314	9224	boolean pointselection = false;
7315		- /static/ boolean lighttouched = true;
	9225	+ ///static/ boolean lighttouched = true;
7316	9226	boolean deselect;
7317		- boolean ambientOcclusion = false;
	9227	+ private boolean ambientOcclusion = false;
7318	9228	static boolean flash = false;
7319	9229	/static/ boolean wait = false;
7320	9230	boolean displaydone = false; // after repaint() calls
..	..	@@ -7444,6 +9354,8 @@
7444	9354	//gl.glFrustum(-0.5scale, 0.5scale, -0.5scale, 0.5scale, 1, 100);
7445	9355	//glu.gluPerspective(lightshaper_fovy, 1, lightshaper_zNear, lightshaper_zFar);
7446	9356	double scale = lightCamera.SCALE / lightCamera.Distance();
	9357	+// PATCH FILLE AUX JEANS
	9358	+ //scale *= lightCamera.shaper_fovy / 25;
7447	9359	gl.glScaled(2 * scale, 2 * scale, -scale);
7448	9360	gl.glTranslated(0, 0, lightCamera.DECAL);
7449	9361
..	..	@@ -7590,18 +9502,40 @@
7590	9502	jy8[3] = 0.5f;
7591	9503	}
7592	9504
7593		- float[] options1 = new float[]{1000, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
	9505	+ float[] options1 = new float[]{100, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
7594	9506	float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
7595	9507	float[] options3 = new float[]{1, 1, 1, 0}; // fog color
7596	9508	float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
7597	9509
	9510	+ void ResetOptions()
	9511	+ {
	9512	+ options1[0] = 100;
	9513	+ options1[1] = 0.025f;
	9514	+ options1[2] = 0.01f;
	9515	+ options1[3] = 0;
	9516	+ options1[4] = 0;
	9517	+
	9518	+ options2[0] = 0;
	9519	+ options2[1] = 0.75f;
	9520	+ options2[2] = 0;
	9521	+ options2[3] = 0;
	9522	+
	9523	+ options3[0] = 1;
	9524	+ options3[1] = 1;
	9525	+ options3[2] = 1;
	9526	+ options3[3] = 0;
	9527	+
	9528	+ options4[0] = 1;
	9529	+ options4[1] = 0;
	9530	+ options4[2] = 1;
	9531	+ options4[3] = 0;
	9532	+ }
	9533	+
7598	9534	static int imagecount = 0; // movie generation
7599	9535
7600	9536	static int jitter = 0;
7601	9537
7602	9538	boolean restartframe = false;
7603		-
7604		- static int framecount = 0; // general-purpose global count
7605	9539
7606	9540	void displayAntiAliased(javax.media.opengl.GL gl)
7607	9541	{
..	..	@@ -7633,7 +9567,7 @@
7633	9567	gl.glClear(gl.GL_ACCUM_BUFFER_BIT);
7634	9568	for (jitter = 0; jitter < ACSIZE; jitter++) //, GrafreeD.wav.cursor += LIVE ? 735 : 0)
7635	9569	{
7636		- framecount++;
	9570	+ Globals.framecount++;
7637	9571
7638	9572	if (CameraPane.tickcount > 0)
7639	9573	CameraPane.tickcount--;
..	..	@@ -7671,7 +9605,7 @@
7671	9605
7672	9606	gl.glLightfv(gl.GL_LIGHT0, gl.GL_POSITION, pos, 0);
7673	9607	*/
7674		- lighttouched = true;
	9608	+ Globals.lighttouched = true;
7675	9609	//System.err.println(" shadowbuffer: " + jitter);
7676	9610	shadowbuffer.display();
7677	9611
..	..	@@ -7692,8 +9626,8 @@
7692	9626	assert (parentcam != renderCamera);
7693	9627
7694	9628	if (renderCamera != lightCamera)
7695		- for (int count = parentcam.GetTransformCount(); --count>=0;)
7696		- LA.matConcat(parentcam.toParent, matrix, matrix);
	9629	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9630	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
7697	9631
7698	9632	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
7699	9633
..	..	@@ -7708,8 +9642,8 @@
7708	9642	LA.matCopy(renderCamera.fromScreen, matrix);
7709	9643
7710	9644	if (renderCamera != lightCamera)
7711		- for (int count = parentcam.GetTransformCount(); --count>=0;)
7712		- LA.matConcat(matrix, parentcam.fromParent, matrix);
	9645	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9646	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
7713	9647
7714	9648	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
7715	9649
..	..	@@ -7781,7 +9715,7 @@
7781	9715	//gl.glFlush();
7782	9716	gl.glAccum(gl.GL_ACCUM, 1.0f / ACSIZE);
7783	9717
7784		- if (ANIMATION && ABORTED)
	9718	+ if (Globals.ANIMATION && ABORTED)
7785	9719	{
7786	9720	System.err.println(" ABORTED FRAME");
7787	9721	break;
..	..	@@ -7811,7 +9745,7 @@
7811	9745	setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
7812	9746
7813	9747	// save image
7814		- if (ANIMATION && !ABORTED)
	9748	+ if (Globals.ANIMATION && !ABORTED)
7815	9749	{
7816	9750	VPwidth = viewport[2];
7817	9751	VPheight = viewport[3];
..	..	@@ -7922,11 +9856,11 @@
7922	9856
7923	9857	// imagecount++;
7924	9858
7925		- String fullname = filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
	9859	+ String fullname = Globals.filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
7926	9860
7927	9861	if (!BOXMODE)
7928	9862	{
7929		- System.out.println("image: " + fullname + " (wav cursor=" + (GrafreeD.wav.cursor / 735 / 4) + ")");
	9863	+ System.out.println("image: " + fullname + " (wav cursor=" + (Grafreed.wav.cursor / 735 / 4) + ")");
7930	9864	}
7931	9865
7932	9866	if (!BOXMODE)
..	..	@@ -7964,7 +9898,7 @@
7964	9898	ABORTED = false;
7965	9899	}
7966	9900	else
7967		- GrafreeD.wav.cursor += 735 * ACSIZE;
	9901	+ Grafreed.wav.cursor += 735 * ACSIZE;
7968	9902
7969	9903	if (false)
7970	9904	{
..	..	@@ -8618,13 +10552,6 @@
8618	10552	}
8619	10553	}
8620	10554
8621		- boolean IsFrozen()
8622		- {
8623		- boolean selectmode = drawMode == SELECTION \|\| CameraPane.DEBUG_SELECTION;
8624		-
8625		- return !selectmode && cameracount == 0; // != 0;
8626		- }
8627		-
8628	10555	boolean niceon = false;
8629	10556	javax.swing.Timer AAtimer = new javax.swing.Timer(750, this);
8630	10557	boolean currentlydrawing = false;
..	..	@@ -8634,16 +10561,16 @@
8634	10561
8635	10562	public void display(GLAutoDrawable drawable)
8636	10563	{
8637		- if (GrafreeD.savesound && GrafreeD.hassound)
	10564	+ if (Grafreed.savesound && Grafreed.hassound)
8638	10565	{
8639		- GrafreeD.wav.save();
8640		- GrafreeD.savesound = false;
8641		- GrafreeD.hassound = false;
	10566	+ Grafreed.wav.save();
	10567	+ Grafreed.savesound = false;
	10568	+ Grafreed.hassound = false;
8642	10569	}
8643	10570	// if (DEBUG_SELECTION)
8644	10571	// {
8645		-// if (drawMode != SELECTION)
8646		-// drawMode = SELECTION;
	10572	+// if (DrawMode() != SELECTION)
	10573	+// DrawMode() = SELECTION;
8647	10574	// }
8648	10575
8649	10576	if (!isRenderer)
..	..	@@ -8699,9 +10626,9 @@
8699	10626
8700	10627	//ANTIALIAS = 0;
8701	10628
8702		- if (drawMode == DEFAULT) // && CURRENTANTIALIAS > 0)
	10629	+ if (DrawMode() == DEFAULT) // && CURRENTANTIALIAS > 0)
8703	10630	{
8704		- if (niceon \|\| isLIVE())
	10631	+ if (niceon \|\| Globals.isLIVE())
8705	10632	{
8706	10633	//if(active == 0)
8707	10634	// antialiaser = null;
..	..	@@ -8714,6 +10641,7 @@
8714	10641	ANTIALIAS = 0;
8715	10642	//System.out.println("RESTART");
8716	10643	AAtimer.restart();
	10644	+ Globals.TIMERRUNNING = true;
8717	10645	}
8718	10646	}
8719	10647	}
..	..	@@ -8726,7 +10654,7 @@
8726	10654	assert eyeCamera.shaper_zFar == 1E5f; // 500.0f;
8727	10655	*/
8728	10656
8729		- if (drawMode == DEFAULT)
	10657	+ if (DrawMode() == DEFAULT)
8730	10658	{
8731	10659	currentlydrawing = true;
8732	10660	}
..	..	@@ -8757,18 +10685,18 @@
8757	10685
8758	10686	// if(Applet3D.clipboard != null)
8759	10687	// System.out.println("Clipboard = " + Applet3D.clipboard); //.get(0).parent);
8760		-//drawMode = SELECTION;
	10688	+//DrawMode() = SELECTION;
8761	10689	indexcount = 0;
8762	10690
8763		- if (drawMode == OCCLUSION)
	10691	+ if (DrawMode() == OCCLUSION)
8764	10692	{
8765		- drawMode = DEFAULT;
	10693	+ Globals.drawMode = DEFAULT; // WARNING
8766	10694	ambientOcclusion = true;
8767	10695	setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
8768	10696	Object3D theobject = object;
8769	10697	Object3D theparent = object.parent;
8770	10698	object.parent = null;
8771		- object = (Object3D)GrafreeD.clone(object);
	10699	+ object = (Object3D)Grafreed.clone(object);
8772	10700	object.Stripify();
8773	10701	if (theobject.selection == null \|\| theobject.selection.Size() == 0)
8774	10702	theobject.PreprocessOcclusion(this);
..	..	@@ -8781,19 +10709,20 @@
8781	10709	ambientOcclusion = false;
8782	10710	}
8783	10711
8784		- if (lighttouched && drawMode == DEFAULT && !lightMode) // && !FROZEN)
	10712	+ if (//Globals.lighttouched &&
	10713	+ DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
8785	10714	{
8786	10715	//if (RENDERSHADOW) // ?
8787	10716	if (!IsFrozen())
8788	10717	{
8789	10718	// dec 2012
8790		- if (!ambientOcclusion && !(!flash && !lightMode && drawMode == DEFAULT && ANTIALIAS > 0))
	10719	+ if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
8791	10720	{
8792		- framecount++;
	10721	+ Globals.framecount++;
8793	10722	shadowbuffer.display();
8794	10723	}
8795	10724	}
8796		- lighttouched = false; // ??
	10725	+ Globals.lighttouched = false; // ??
8797	10726	//drawing = true;
8798	10727	//lighttouched = true;
8799	10728	}
..	..	@@ -8814,9 +10743,9 @@
8814	10743	//eyeCamera.shaper_fovy = 1;
8815	10744	}
8816	10745
8817		- if ((RENDERPROGRAM != 0 \|\| ambientOcclusion \|\| spherical) && drawMode == DEFAULT) // SELECTION)
	10746	+ if ((RENDERPROGRAM != 0 \|\| ambientOcclusion \|\| spherical) && DrawMode() == DEFAULT) // SELECTION)
8818	10747	{
8819		- //System.out.println("drawMode = " + drawMode);
	10748	+ //System.out.println("DrawMode() = " + DrawMode());
8820	10749	vertexMode \|= VP_PASS;
8821	10750	//vertexMode \|= VP_PROJECTION;
8822	10751	if (!ambientOcclusion)
..	..	@@ -8876,7 +10805,7 @@
8876	10805	Camera cam = renderCamera; // lightMode?lightCamera:eyeCamera;
8877	10806	//Camera lightcam = new Camera(light0);
8878	10807
8879		- if (drawMode == SHADOW)
	10808	+ if (DrawMode() == SHADOW)
8880	10809	{
8881	10810	/*
8882	10811	gl.glMatrixMode(GL.GL_MODELVIEW);
..	..	@@ -8914,8 +10843,8 @@
8914	10843
8915	10844	// if (parentcam != renderCamera) // not a light
8916	10845	if (cam != lightCamera)
8917		- for (int count = parentcam.GetTransformCount(); --count>=0;)
8918		- LA.matConcat(parentcam.toParent, matrix, matrix);
	10846	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10847	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
8919	10848
8920	10849	for (int j = 0; j < 4; j++)
8921	10850	{
..	..	@@ -8929,8 +10858,8 @@
8929	10858
8930	10859	// if (parentcam != renderCamera) // not a light
8931	10860	if (cam != lightCamera)
8932		- for (int count = parentcam.GetTransformCount(); --count>=0;)
8933		- LA.matConcat(matrix, parentcam.fromParent, matrix);
	10861	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10862	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
8934	10863
8935	10864	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
8936	10865
..	..	@@ -8966,7 +10895,7 @@
8966	10895	gl.glClear(gl.GL_DEPTH_BUFFER_BIT);
8967	10896	} else
8968	10897	{
8969		- if (drawMode != DEFAULT)
	10898	+ if (DrawMode() != DEFAULT)
8970	10899	{
8971	10900	gl.glClearColor(1, 1, 1, 0);
8972	10901	} // 1);
..	..	@@ -9031,7 +10960,7 @@
9031	10960
9032	10961	fast &= !ambientOcclusion;
9033	10962
9034		- if (drawMode == DEFAULT)
	10963	+ if (DrawMode() == DEFAULT)
9035	10964	{
9036	10965	//gl.glEnable(gl.GL_ALPHA_TEST);
9037	10966	//gl.glActiveTexture(GL.GL_TEXTURE0);
..	..	@@ -9092,6 +11021,8 @@
9092	11021	//gl.glFrustum(-0.5scale, 0.5scale, -0.5scale, 0.5scale, 1, 100);
9093	11022	//glu.gluPerspective(lightshaper_fovy, 1, lightshaper_zNear, lightshaper_zFar);
9094	11023	double scale = lightCamera.SCALE / lightCamera.Distance();
	11024	+// PATCH FILLE AUX JEANS
	11025	+ //scale *= lightCamera.shaper_fovy / 25;
9095	11026	gl.glScaled(2 * scale, 2 * scale, -scale);
9096	11027	gl.glTranslated(0, 0, lightCamera.DECAL);
9097	11028
..	..	@@ -9187,7 +11118,16 @@
9187	11118	// Bump noise
9188	11119	gl.glActiveTexture(GL.GL_TEXTURE6);
9189	11120	//gl.glBindTexture(GL.GL_TEXTURE_2D, bump_noise);
9190		- BindTexture(NOISE_TEXTURE, false, 2);
	11121	+
	11122	+ try
	11123	+ {
	11124	+ BindTexture(NOISE_TEXTURE, false, 2);
	11125	+ }
	11126	+ catch (Exception e)
	11127	+ {
	11128	+ System.err.println("FAILED: " + NOISE_TEXTURE);
	11129	+ }
	11130	+
9191	11131
9192	11132	gl.glActiveTexture(GL.GL_TEXTURE0);
9193	11133	gl.glEnable(GL.GL_TEXTURE_2D);
..	..	@@ -9227,10 +11167,12 @@
9227	11167	gl.glMatrixMode(gl.GL_PROJECTION);
9228	11168	gl.glLoadIdentity();
9229	11169
9230		- if (drawMode == SHADOW \|\| cam == lightCamera) // \|\| (vertexMode&VP_PROJECTION) != 0)
	11170	+ if (DrawMode() == SHADOW \|\| cam == lightCamera) // \|\| (vertexMode&VP_PROJECTION) != 0)
9231	11171	{
9232	11172	//glu.gluPerspective(lightshaper_fovy, 1, lightshaper_zNear, lightshaper_zFar);
9233	11173	double scale = lightCamera.SCALE / lightCamera.Distance();
	11174	+// PATCH FILLE AUX JEANS
	11175	+ //scale *= lightCamera.shaper_fovy / 25;
9234	11176	gl.glScaled(2 * scale, 2 * scale, -scale);
9235	11177	gl.glTranslated(0, 0, lightCamera.DECAL);
9236	11178	//System.out.println("DECAL = " + LIGHTDECAL + "; SCALE = " + LIGHTSCALE);
..	..	@@ -9283,7 +11225,7 @@
9283	11225	//gl.glPushMatrix();
9284	11226	gl.glLoadIdentity();
9285	11227
9286		- if (!ambientOcclusion) // drawMode != OCCLUSION)
	11228	+ if (!ambientOcclusion) // DrawMode() != OCCLUSION)
9287	11229	{
9288	11230	//LA.xformPos(light0, lightCamera.fromScreen, light);
9289	11231	LA.xformDir(dirlight, lightCamera.fromScreen, lightposition);
..	..	@@ -9310,8 +11252,8 @@
9310	11252	System.err.println("parentcam != renderCamera");
9311	11253
9312	11254	// if (cam != lightCamera)
9313		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9314		- LA.xformDir(lightposition, parentcam.toParent, lightposition); // may 2013
	11255	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11256	+ LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
9315	11257	}
9316	11258
9317	11259	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -9332,8 +11274,8 @@
9332	11274	if (true) // TODO
9333	11275	{
9334	11276	if (cam != lightCamera)
9335		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9336		- LA.xformDir(light0, parentcam.toParent, light0); // may 2013
	11277	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11278	+ LA.xformDir(light0, parentcam.GlobalTransform(), light0); // may 2013
9337	11279	}
9338	11280
9339	11281	LA.xformPos(light0, cam.toScreen, light0);
..	..	@@ -9370,7 +11312,7 @@
9370	11312	}
9371	11313
9372	11314	/**/
9373		- if (true) // drawMode == SELECTION) // != DEFAULT)
	11315	+ if (true) // DrawMode() == SELECTION) // != DEFAULT)
9374	11316	gl.glDisable(gl.GL_LIGHTING);
9375	11317	else
9376	11318	gl.glEnable(gl.GL_LIGHTING);
..	..	@@ -9388,7 +11330,7 @@
9388	11330
9389	11331	lightslot = 64;
9390	11332
9391		- if (!frozen && !ambientOcclusion && isRenderer && drawMode == DEFAULT)
	11333	+ if (!frozen && !ambientOcclusion && isRenderer && DrawMode() == DEFAULT)
9392	11334	{
9393	11335	DrawLights(object);
9394	11336	}
..	..	@@ -9399,7 +11341,7 @@
9399	11341	fragmentMode \|= (lightslot - 64) << 2; // 1; // first bit is available for aniso
9400	11342	//System.out.println("fragmentMode = " + fragmentMode);
9401	11343
9402		- if (drawMode == DEFAULT \|\| drawMode == SELECTION \|\| DEBUG_SELECTION)
	11344	+ if (DrawMode() == DEFAULT \|\| DrawMode() == SELECTION \|\| IsDebugSelection())
9403	11345	{
9404	11346	/*
9405	11347	if (CULLFACE \|\| (ambientOcclusion && OCCLUSION_CULLING))
..	..	@@ -9432,7 +11374,7 @@
9432	11374	}
9433	11375	}
9434	11376
9435		- if (drawMode == DEFAULT)
	11377	+ if (DrawMode() == DEFAULT)
9436	11378	{
9437	11379	if (WIREFRAME && !ambientOcclusion)
9438	11380	{
..	..	@@ -9450,7 +11392,7 @@
9450	11392	gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9451	11393	gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9452	11394
9453		- if (!fast/RENDERPROGRAM != 0/ && (drawMode == DEFAULT \|\| drawMode == SHADOW)) // && !WIREFRAME) //
	11395	+ if (!fast/RENDERPROGRAM != 0/ && (DrawMode() == DEFAULT \|\| DrawMode() == SHADOW)) // && !WIREFRAME) //
9454	11396	{
9455	11397	if (vertexMode != 0) // && !fast)
9456	11398	{
..	..	@@ -9470,7 +11412,7 @@
9470	11412	}
9471	11413	}
9472	11414
9473		- if (false) // fast && !IsFreezed() && drawMode != SELECTION && !ambientOcclusion)
	11415	+ if (false) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
9474	11416	{
9475	11417	//gl.glDepthFunc(GL.GL_LEQUAL);
9476	11418	//gl.glClear(gl.GL_COLOR_BUFFER_BIT \| gl.GL_DEPTH_BUFFER_BIT);
..	..	@@ -9498,7 +11440,7 @@
9498	11440	//gl.glDepthMask(false);
9499	11441	}
9500	11442
9501		- if (false) // drawMode == SHADOW)
	11443	+ if (false) // DrawMode() == SHADOW)
9502	11444	{
9503	11445	//SetColumnMajorData(cameraInverseTransform, view_1);
9504	11446	//System.out.println("light = " + cameraInverseTransform);
..	..	@@ -9512,16 +11454,16 @@
9512	11454	//System.out.println("object = " + object);
9513	11455	if (!frozen && !imageLocked)
9514	11456	{
9515		- if (!flash && !lightMode && drawMode == DEFAULT && ANTIALIAS > 0)
	11457	+ if (!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0)
9516	11458	{
9517	11459	displayAntiAliased(gl);
9518	11460	} else
9519	11461	{
9520	11462	programcount = 0;
9521		- int keepmode = drawMode;
	11463	+ int keepmode = DrawMode();
9522	11464	// if (DEBUG_SELECTION)
9523	11465	// {
9524		-// drawMode = SELECTION;
	11466	+// DrawMode() = SELECTION;
9525	11467	// }
9526	11468	// for point selection
9527	11469	// gl.glGetDoublev(gl.GL_MODELVIEW_MATRIX, tempmat, 0);
..	..	@@ -9531,10 +11473,10 @@
9531	11473	DrawObject(gl);
9532	11474
9533	11475	// jan 2013 System.err.println("RESET ABORT (display)");
9534		- // if (drawMode == DEFAULT)
	11476	+ // if (DrawMode() == DEFAULT)
9535	11477	// ABORTED = false;
9536	11478	fullreset = false;
9537		- drawMode = keepmode;
	11479	+ Globals.drawMode = keepmode; // WARNING
9538	11480	//System.out.println("PROGRAM SWITCH " + programcount);
9539	11481	}
9540	11482	}
..	..	@@ -9542,11 +11484,11 @@
9542	11484	gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9543	11485	gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9544	11486
9545		- if (drawMode == DEFAULT)
	11487	+ if (DrawMode() == DEFAULT)
9546	11488	{
9547	11489	ReleaseTexture(NOISE_TEXTURE, false);
9548	11490	}
9549		- //if (drawMode == DEFAULT)
	11491	+ //if (DrawMode() == DEFAULT)
9550	11492	{
9551	11493
9552	11494	gl.glActiveTexture(GL.GL_TEXTURE1);
..	..	@@ -9558,7 +11500,7 @@
9558	11500	//else
9559	11501	//gl.glDisable(gl.GL_TEXTURE_2D);
9560	11502	//gl.glPopMatrix();
9561		- if (imageCompleted && ANTIALIAS > 0 && drawMode == DEFAULT && cam != lightCamera && !ambientOcclusion)
	11503	+ if (imageCompleted && ANTIALIAS > 0 && DrawMode() == DEFAULT && cam != lightCamera && !ambientOcclusion)
9562	11504	{
9563	11505	//new Exception().printStackTrace();
9564	11506	//System.out.println("Draw image " + width + ", " + height);
..	..	@@ -9600,7 +11542,7 @@
9600	11542	//gl.glFlush();
9601	11543	}
9602	11544
9603		- if (flash && drawMode == DEFAULT)
	11545	+ if (flash && DrawMode() == DEFAULT)
9604	11546	{
9605	11547	flash = false;
9606	11548	wait = true;
..	..	@@ -9608,9 +11550,9 @@
9608	11550	}
9609	11551
9610	11552	//drawing = false;
9611		- //if(drawMode == DEFAULT)
	11553	+ //if(DrawMode() == DEFAULT)
9612	11554	// niceon = false;
9613		- if (drawMode == DEFAULT)
	11555	+ if (DrawMode() == DEFAULT)
9614	11556	{
9615	11557	currentlydrawing = false;
9616	11558	}
..	..	@@ -9630,7 +11572,7 @@
9630	11572	repaint();
9631	11573	}
9632	11574
9633		- if (isLIVE() && drawMode == DEFAULT) // may 2013
	11575	+ if (Globals.isLIVE() && DrawMode() == DEFAULT) // may 2013
9634	11576	repaint();
9635	11577
9636	11578	displaydone = true;
..	..	@@ -9649,8 +11591,14 @@
9649	11591	{
9650	11592	renderpass++;
9651	11593	// System.out.println("Draw object... ");
	11594	+ STEP = 1;
9652	11595	if (FAST) // in case there is no script
9653		- STEP = 16;
	11596	+ STEP = 8;
	11597	+
	11598	+ if (CURRENTANTIALIAS == 0 \|\| ACSIZE == 1)
	11599	+ {
	11600	+ STEP *= 4;
	11601	+ }
9654	11602
9655	11603	//object.FullInvariants();
9656	11604
..	..	@@ -9664,22 +11612,43 @@
9664	11612	e.printStackTrace();
9665	11613	}
9666	11614
9667		- if (GrafreeD.RENDERME > 0)
9668		- GrafreeD.RENDERME--; // mechante magouille
	11615	+ if (Grafreed.RENDERME > 0)
	11616	+ Grafreed.RENDERME--; // mechante magouille
9669	11617
9670		- ONESTEP = false;
	11618	+ Globals.ONESTEP = false;
9671	11619	}
9672	11620
9673	11621	static boolean zoomonce = false;
9674	11622
	11623	+ static void CreateSelectedPoint()
	11624	+ {
	11625	+ if (selectedpoint == null)
	11626	+ {
	11627	+ debugpointG = new Sphere();
	11628	+ debugpointP = new Sphere();
	11629	+ debugpointC = new Sphere();
	11630	+ debugpointR = new Sphere();
	11631	+
	11632	+ selectedpoint = new Superellipsoid();
	11633	+
	11634	+ for (int i=0; i<8; i++)
	11635	+ {
	11636	+ debugpoints[i] = new Sphere();
	11637	+ }
	11638	+ }
	11639	+ }
	11640	+
9675	11641	void DrawObject(GL gl, boolean draw)
9676	11642	{
	11643	+ // To clear camera values
	11644	+ ResetOptions();
	11645	+
9677	11646	//System.out.println("DRAW OBJECT " + mouseDown);
9678		-// drawMode = SELECTION;
	11647	+// DrawMode() = SELECTION;
9679	11648	//GL gl = getGL();
9680	11649	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
9681	11650	{
9682		- if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && drawMode == SHADOW) // && !lightMode)
	11651	+ if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
9683	11652	object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
9684	11653	pingthread.StepToTarget(true); // true);
9685	11654	// zoomonce = false;
..	..	@@ -9700,9 +11669,9 @@
9700	11669	callist = gl.glGenLists(1);
9701	11670	}
9702	11671
9703		- boolean selectmode = drawMode == SELECTION \|\| CameraPane.DEBUG_SELECTION;
	11672	+ boolean selectmode = DrawMode() == SELECTION \|\| IsDebugSelection();
9704	11673
9705		- boolean active = !selectmode; // drawMode != SELECTION; // mouseDown;
	11674	+ boolean active = !selectmode; // DrawMode() != SELECTION; // mouseDown;
9706	11675
9707	11676	if (!mainDL \|\| !active \|\| touched)
9708	11677	{
..	..	@@ -9729,13 +11698,20 @@
9729	11698	PushMatrix(ClickInfo.matbuffer);
9730	11699	}
9731	11700
9732		- if (drawMode == 0)
	11701	+ if (DrawMode() == 0)
9733	11702	{
9734	11703	// System.out.println("CLEAR +++++++++++++++ +++++++++++++++ +++++++++++++++ +++++++++++++++");
9735	11704
9736	11705	usedtextures.clear();
9737	11706
9738		- BindTextures(DEFAULT_TEXTURES, 2);
	11707	+ try
	11708	+ {
	11709	+ BindTextures(DEFAULT_TEXTURES, 2);
	11710	+ }
	11711	+ catch (Exception e)
	11712	+ {
	11713	+ System.err.println("FAILED: " + DEFAULT_TEXTURES);
	11714	+ }
9739	11715	}
9740	11716	//System.out.println("--> " + stackdepth);
9741	11717	// GrafreeD.traceon();
..	..	@@ -9743,10 +11719,11 @@
9743	11719	// DRAW
9744	11720	object.draw(this, /(Composite)/ object, false, false);
9745	11721
9746		- if (drawMode == DEFAULT)
	11722	+ if (DrawMode() == DEFAULT)
9747	11723	{
9748		- if (DEBUG)
	11724	+ if (Globals.DEBUG)
9749	11725	{
	11726	+ CreateSelectedPoint();
9750	11727	float radius = 0.05f;
9751	11728	if (selectedpoint.radius != radius)
9752	11729	{
..	..	@@ -9754,40 +11731,40 @@
9754	11731	selectedpoint.radius = radius;
9755	11732	selectedpoint.recalculate();
9756	11733	selectedpoint.material = new cMaterial();
9757		- selectedpoint.material.color = 0.25f;
	11734	+ selectedpoint.material.color = 0.15f; // Yellow
9758	11735	selectedpoint.material.modulation = 0.75f;
9759	11736
9760		- debugpoint.radius = radius;
9761		- debugpoint.recalculate();
9762		- debugpoint.material = new cMaterial();
9763		- debugpoint.material.color = 0.25f;
9764		- debugpoint.material.modulation = 0.75f;
	11737	+ debugpointG.radius = radius;
	11738	+ debugpointG.recalculate();
	11739	+ debugpointG.material = new cMaterial();
	11740	+ debugpointG.material.color = 0.25f; // Green
	11741	+ debugpointG.material.modulation = 0.75f;
9765	11742
9766		- debugpoint2.radius = radius;
9767		- debugpoint2.recalculate();
9768		- debugpoint2.material = new cMaterial();
9769		- debugpoint2.material.color = 0.75f;
9770		- debugpoint2.material.modulation = 0.75f;
	11743	+ debugpointP.radius = radius;
	11744	+ debugpointP.recalculate();
	11745	+ debugpointP.material = new cMaterial();
	11746	+ debugpointP.material.color = 0.75f; // Purple
	11747	+ debugpointP.material.modulation = 0.75f;
9771	11748
9772		- debugpoint3.radius = radius;
9773		- debugpoint3.recalculate();
9774		- debugpoint3.material = new cMaterial();
9775		- debugpoint3.material.color = 0.5f;
9776		- debugpoint3.material.modulation = 0.75f;
	11749	+ debugpointC.radius = radius;
	11750	+ debugpointC.recalculate();
	11751	+ debugpointC.material = new cMaterial();
	11752	+ debugpointC.material.color = 0.5f; // Cyan
	11753	+ debugpointC.material.modulation = 0.75f;
9777	11754
9778		- debugpoint4.radius = radius;
9779		- debugpoint4.recalculate();
9780		- debugpoint4.material = new cMaterial();
9781		- debugpoint4.material.color = 0f;
9782		- debugpoint4.material.modulation = 0.75f;
	11755	+ debugpointR.radius = radius;
	11756	+ debugpointR.recalculate();
	11757	+ debugpointR.material = new cMaterial();
	11758	+ debugpointR.material.color = 0f; // Red
	11759	+ debugpointR.material.modulation = 0.75f;
9783	11760
9784	11761	InitPoints(radius);
9785	11762	}
9786	11763	selectedpoint.draw(this, /(Composite)/ null, false, false);
9787		- debugpoint.draw(this, /(Composite)/ null, false,false);
9788		- debugpoint2.draw(this, /(Composite)/ null, false,false);
9789		- debugpoint3.draw(this, /(Composite)/ null, false,false);
9790		- debugpoint4.draw(this, /(Composite)/ null, false,false);
	11764	+ debugpointG.draw(this, /(Composite)/ null, false,false);
	11765	+ debugpointP.draw(this, /(Composite)/ null, false,false);
	11766	+ debugpointC.draw(this, /(Composite)/ null, false,false);
	11767	+ debugpointR.draw(this, /(Composite)/ null, false,false);
9791	11768	// DrawPoints(this);
9792	11769	}
9793	11770
..	..	@@ -9795,7 +11772,7 @@
9795	11772	}
9796	11773	// GrafreeD.traceoff();
9797	11774	//System.out.println(stackdepth);
9798		- if (drawMode == 0)
	11775	+ if (DrawMode() == 0)
9799	11776	{
9800	11777	ReleaseTextures(DEFAULT_TEXTURES);
9801	11778
..	..	@@ -9820,17 +11797,26 @@
9820	11797
9821	11798	checker = null;
9822	11799
9823		- if (!ambientOcclusion && !IsFrozen() && drawMode == DEFAULT)
	11800	+ if (!ambientOcclusion && !IsFrozen() && DrawMode() == DEFAULT)
9824	11801	FindChecker(object);
9825	11802
9826		- if (checker != null && drawMode == DEFAULT)
	11803	+ if (checker != null && DrawMode() == DEFAULT)
9827	11804	{
9828		- // BindTexture(IMMORTAL_TEXTURE);
	11805	+ //BindTexture(IMMORTAL_TEXTURE);
	11806	+ try
	11807	+ {
	11808	+ BindTextures(checker.GetTextures(), checker.texres);
	11809	+ }
	11810	+ catch (Exception e)
	11811	+ {
	11812	+ System.err.println("FAILED: " + checker.GetTextures());
	11813	+ }
9829	11814	// NEAREST
9830	11815	GetGL().glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST); // GL.GL_LINEAR);
9831	11816	DrawChecker(gl);
9832	11817	//checker.Draw(this, null, false);
9833	11818	// ReleaseTexture(IMMORTAL_TEXTURE);
	11819	+ ReleaseTextures(checker.GetTextures());
9834	11820	}
9835	11821
9836	11822	if (object.parent != null)
..	..	@@ -9843,7 +11829,7 @@
9843	11829	//gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9844	11830	//gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9845	11831
9846		- if (DISPLAYTEXT && drawMode == DEFAULT)
	11832	+ if (DISPLAYTEXT && DrawMode() == DEFAULT)
9847	11833	{
9848	11834	// Draw it once, then use the raster
9849	11835	Balloon(gl, balloon.createGraphics());
..	..	@@ -9899,14 +11885,14 @@
9899	11885	int[] xs = new int[3];
9900	11886	int[] ys = new int[3];
9901	11887
9902		- void DrawString(Object3D obj) // String string)
	11888	+ public void DrawString(Object3D obj) // String string) // INTERFACE
9903	11889	{
9904		- if (!DISPLAYTEXT \|\| drawMode != DEFAULT)
	11890	+ if (!DISPLAYTEXT \|\| DrawMode() != DEFAULT)
9905	11891	{
9906	11892	return;
9907	11893	}
9908	11894
9909		- String string = obj.GetToolTip();
	11895	+ String string = obj.toString(); //.GetToolTip();
9910	11896
9911	11897	GL gl = GetGL();
9912	11898
..	..	@@ -10223,8 +12209,8 @@
10223	12209	//obj.TransformToWorld(light, light);
10224	12210	for (int i = tp.size(); --i >= 0;)
10225	12211	{
10226		- for (int count = tp.get(i).GetTransformCount(); --count>=0;)
10227		- LA.xformPos(light, tp.get(i).toParent, light);
	12212	+ //for (int count = tp.get(i).GetTransformCount(); --count>=0;)
	12213	+ LA.xformPos(light, tp.get(i).GlobalTransformInv(), light);
10228	12214	}
10229	12215
10230	12216
..	..	@@ -10241,8 +12227,8 @@
10241	12227	parentcam = cameras[0];
10242	12228	}
10243	12229
10244		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10245		- LA.xformPos(light, parentcam.toParent, light); // may 2013
	12230	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	12231	+ LA.xformPos(light, parentcam.GlobalTransform(), light); // may 2013
10246	12232
10247	12233	LA.xformPos(light, renderCamera.toScreen, light);
10248	12234
..	..	@@ -10388,6 +12374,7 @@
10388	12374	"PARAM lodbias = { 10,10,10,10 };" + // 20, -2, -20, 1.0 };" +
10389	12375	"PARAM infinity = { 100000000, 100000000, 100000000, 1.0 };" +
10390	12376	"PARAM one2048th = { 0.00048828125, 0.00048828125, 0.00048828125, 1.0 };" +
	12377	+ "PARAM ninetenth = { 0.9, 0.9, 0.9, 1.0 };" +
10391	12378	"PARAM almostone = { 0.999, 0.999, 0.999, 1.0 };" +
10392	12379	"PARAM c256 = { 256, 256, 256, 1.0 };" +
10393	12380	"PARAM c256i = { 0.00390625, 0.00390625, 0.00390625, 1.0 };" +
..	..	@@ -10855,8 +12842,8 @@
10855	12842
10856	12843	// display shadow only (bump == 0)
10857	12844	"SUB temp.x, half.x, shadow.x;" +
10858		- "MOV temp.y, -params6.x;" +
10859		- "SLT temp.z, temp.y, zero.x;" +
	12845	+ "MOV temp.y, -params5.z;" + // params6.x;" +
	12846	+ "SLT temp.z, temp.y, -one2048th.x;" +
10860	12847	"SUB temp.y, one.x, temp.z;" +
10861	12848	"MUL temp.x, temp.x, temp.y;" +
10862	12849	"KIL temp.x;" +
..	..	@@ -10985,8 +12972,10 @@
10985	12972	"MAX ndotl.x, ndotl.x, -ndotl.x;" +
10986	12973
10987	12974	"SUB temp.x, one.x, ndotl.x;" +
10988		- "ADD temp.x, temp.x, options2.z;" + // lightsheen
10989		- "ADD temp.y, one.y, options2.y;" + // sursurface
	12975	+ // Tuning for default skin
	12976	+ //"ADD temp.x, temp.x, options2.z;" + // lightsheen
	12977	+ "MAD temp.x, options2.z, half.y, temp.x;" + // lightsheen
	12978	+ "ADD temp.y, one.y, options2.y;" + // subsurface
10990	12979	"MUL temp.x, temp.x, temp.y;" +
10991	12980
10992	12981	"MUL saturation, saturation, temp.xxxx;" +
..	..	@@ -11185,7 +13174,7 @@
11185	13174	//once = true;
11186	13175	}
11187	13176
11188		- System.out.print("Program #" + mode + "; length = " + program.length());
	13177	+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
11189	13178	System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
11190	13179	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
11191	13180
..	..	@@ -11302,6 +13291,7 @@
11302	13291	String Shadow(String depth, String shadow)
11303	13292	{
11304	13293	return "MAX temp.x, ndotl.x, one64th.x;" +
	13294	+ "MIN temp.x, temp.x, ninetenth.x;" +
11305	13295	/**/
11306	13296	// Sine
11307	13297	"MUL temp.y, temp.x, temp.x;" +
..	..	@@ -11317,12 +13307,16 @@
11317	13307
11318	13308	"ADD " + depth + ".z, " + depth + ".z, temp.x;" +
11319	13309	//"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing!
	13310	+
	13311	+ // Compare fragment depth in light space with shadowmap.
11320	13312	"SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" +
11321	13313	"SGE temp.y, temp.x, zero.x;" +
11322		- "SUB " + shadow + ".y, one.x, temp.y;" +
	13314	+ "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded
	13315	+
	13316	+ // Reverse comparison
11323	13317	"SUB temp.x, one.x, temp.x;" +
11324	13318	"MUL " + shadow + ".x, temp.x, temp.y;" +
11325		- "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded
	13319	+ "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse
11326	13320	"POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth
11327	13321
11328	13322	"SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" +
..	..	@@ -11336,6 +13330,10 @@
11336	13330	// No shadow for backface
11337	13331	"DP3 temp.x, normal, lightd;" +
11338	13332	"SLT temp.x, temp.x, zero.x;" + // shadoweps
	13333	+ "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
	13334	+
	13335	+ // No shadow when out of frustrum
	13336	+ "SGE temp.x, " + depth + ".z, one.z;" +
11339	13337	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
11340	13338	"";
11341	13339	}
..	..	@@ -11482,7 +13480,8 @@
11482	13480	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
11483	13481	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
11484	13482	/static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
11485		- Object3D.cVector2[] vector2buffer;
	13483	+
	13484	+ //Object3D.cVector2[] vector2buffer;
11486	13485
11487	13486	// IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
11488	13487	// OUT : diff, spec
..	..	@@ -11498,9 +13497,10 @@
11498	13497	"DP3 " + dest + ".z," + "normals," + "eye;" +
11499	13498	"MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
11500	13499	//"MOV " + dest + ".w," + "normal.z;" +
11501		- "MUL " + dest + ".z," + "params2.w," + dest + ".x;" +
11502		- "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
11503		- //"MOV " + dest + ".z," + "params2.w;" +
	13500	+// "MUL " + dest + ".z," + "params2.w," + dest + ".x;" + // PRETTY HEURISTIC FOR VELVET
	13501	+// "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
	13502	+
	13503	+ "MOV " + dest + ".z," + "params2.w;" + // EXACT
11504	13504	"POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
11505	13505	"RCP " + dest + ".w," + dest + ".w;" +
11506	13506	//"RSQ " + dest + ".w," + dest + ".w;" +
..	..	@@ -11894,7 +13894,7 @@
11894	13894	public void mousePressed(MouseEvent e)
11895	13895	{
11896	13896	//System.out.println("mousePressed: " + e);
11897		- clickStart(e.getX(), e.getY(), e.getModifiersEx());
	13897	+ clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
11898	13898	}
11899	13899
11900	13900	static long prevtime = 0;
..	..	@@ -11921,14 +13921,16 @@
11921	13921
11922	13922	//System.err.println("Dtime = " + Dtime + "; units = " + e.getUnitsToScroll() + "; ratio (units/ms) = " + ratio);
11923	13923
	13924	+ if (BUTTONLESSWHEEL)
11924	13925	if (Math.abs(ratio) < 0.1 \|\| Math.abs(Dtime) == 0) // < 30)
11925	13926	{
11926	13927	return;
11927	13928	}
11928	13929
	13930	+ boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
11929	13931
11930	13932	// TIMER
11931		- if (!wheeltimer.isRunning() && e.getModifiersEx() == 0) // VR
	13933	+ if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
11932	13934	{
11933	13935	keepboxmode = BOXMODE;
11934	13936	keepsupport = SUPPORT;
..	..	@@ -11968,8 +13970,8 @@
11968	13970	// mode \|= META;
11969	13971	//}
11970	13972
11971		- SetMouseMode(WHEEL \| e.getModifiersEx());
11972		- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0);
	13973	+ SetMouseMode(e.getModifiers(), WHEEL \| e.getModifiersEx());
	13974	+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
11973	13975	anchorX = ax;
11974	13976	anchorY = ay;
11975	13977	prevX = px;
..	..	@@ -12003,6 +14005,7 @@
12003	14005	else
12004	14006	if (evt.getSource() == AAtimer)
12005	14007	{
	14008	+ Globals.TIMERRUNNING = false;
12006	14009	if (mouseDown)
12007	14010	{
12008	14011	//new Exception().printStackTrace();
..	..	@@ -12028,6 +14031,10 @@
12028	14031	// LIVE = waslive;
12029	14032	// wasliveok = true;
12030	14033	// waslive = false;
	14034	+
	14035	+ // May 2019 Forget it:
	14036	+ if (true)
	14037	+ return;
12031	14038
12032	14039	// source == timer
12033	14040	if (mouseDown)
..	..	@@ -12057,7 +14064,7 @@
12057	14064	// ObjEditor.tweenManager.update(1f / 60f);
12058	14065
12059	14066	// fev 2014???
12060		- if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && drawMode == SHADOW) // && !lightMode)
	14067	+ if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
12061	14068	object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
12062	14069	pingthread.StepToTarget(true); // true);
12063	14070	}
..	..	@@ -12067,12 +14074,13 @@
12067	14074
12068	14075	javax.swing.Timer timer = new javax.swing.Timer(350, this);
12069	14076
12070		- void clickStart(int x, int y, int modifiers)
	14077	+ void clickStart(int x, int y, int modifiers, int modifiersex)
12071	14078	{
12072	14079	if (!wasliveok)
12073	14080	return;
12074	14081
12075	14082	AAtimer.restart(); //
	14083	+ Globals.TIMERRUNNING = true;
12076	14084
12077	14085	// waslive = LIVE;
12078	14086	// LIVE = false;
..	..	@@ -12084,7 +14092,7 @@
12084	14092	// touched = true; // main DL
12085	14093	if (isRenderer)
12086	14094	{
12087		- SetMouseMode(modifiers);
	14095	+ SetMouseMode(modifiers, modifiersex);
12088	14096	}
12089	14097
12090	14098	selectX = anchorX = x;
..	..	@@ -12097,7 +14105,7 @@
12097	14105	clicked = true;
12098	14106	hold = false;
12099	14107
12100		- if (((modifiers & ~1024) & ~0) == 0) // Single or multiple selection
	14108	+ if (((modifiersex & ~1024) & ~0) == 0) // Single or multiple selection
12101	14109	// june 2013 means CTRL_CLICK: if (((modifiers & ~1024) & ~128) == 0) // Single or multiple selection
12102	14110	{
12103	14111	// System.out.println("RESTART II " + modifiers);
..	..	@@ -12128,7 +14136,7 @@
12128	14136	info.camera = renderCamera;
12129	14137	info.x = x;
12130	14138	info.y = y;
12131		- info.modifiers = modifiers;
	14139	+ info.modifiers = modifiersex;
12132	14140	editObj = object.doEditClick(info, 0);
12133	14141	if (!editObj)
12134	14142	{
..	..	@@ -12145,11 +14153,14 @@
12145	14153
12146	14154	public void mouseDragged(MouseEvent e)
12147	14155	{
	14156	+ Globals.MOUSEDRAGGED = true;
	14157	+
	14158	+ //System.out.println("mouseDragged: " + e);
12148	14159	if (isRenderer)
12149	14160	movingcamera = true;
	14161	+
12150	14162	//if (drawing)
12151	14163	//return;
12152		- //System.out.println("mouseDragged: " + e);
12153	14164	if ((e.getModifiersEx() & CTRL) != 0
12154	14165	\|\| (e.getModifiersEx() & COMMAND) != 0) // \|\| IsFrozen())
12155	14166	{
..	..	@@ -12157,7 +14168,7 @@
12157	14168	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
12158	14169	}
12159	14170	else
12160		- drag(e.getX(), e.getY(), e.getModifiersEx());
	14171	+ drag(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
12161	14172
12162	14173	//try { Thread.sleep(1); } catch (Exception ex) {}
12163	14174	}
..	..	@@ -12169,6 +14180,11 @@
12169	14180	cVector tmp = new cVector();
12170	14181	cVector tmp2 = new cVector();
12171	14182	boolean isMoving;
	14183	+
	14184	+ public cVector TargetLookAt()
	14185	+ {
	14186	+ return targetLookAt;
	14187	+ }
12172	14188
12173	14189	class PingThread extends Thread
12174	14190	{
..	..	@@ -12308,7 +14324,7 @@
12308	14324	//System.out.println("---------------- ---------- Paint " + tmp.length2());
12309	14325	if (lightMode)
12310	14326	{
12311		- lighttouched = true;
	14327	+ Globals.lighttouched = true;
12312	14328	}
12313	14329
12314	14330	if (OEILONCE && OEIL)
..	..	@@ -12325,6 +14341,7 @@
12325	14341
12326	14342	public void run()
12327	14343	{
	14344	+ new Exception().printStackTrace();
12328	14345	System.exit(0);
12329	14346	for (;;)
12330	14347	{
..	..	@@ -12366,7 +14383,7 @@
12366	14383	mouseDown = false;
12367	14384	if (lightMode)
12368	14385	{
12369		- lighttouched = true;
	14386	+ Globals.lighttouched = true;
12370	14387	}
12371	14388	repaint();
12372	14389	alreadypainted = true;
..	..	@@ -12374,7 +14391,7 @@
12374	14391	isMoving = false;
12375	14392	} //??
12376	14393
12377		- if (isLIVE() && !alreadypainted)
	14394	+ if (Globals.isLIVE() && !alreadypainted)
12378	14395	{
12379	14396	// FOR DEBUG BREAKPOINT USING PAUSE: while (true)
12380	14397	repaint();
..	..	@@ -12386,9 +14403,9 @@
12386	14403	{
12387	14404	if (lightMode)
12388	14405	{
12389		- lighttouched = true;
	14406	+ Globals.lighttouched = true;
12390	14407	}
12391		- drag(X, (mouseMode != 0) ? Y : anchorY, MODIFIERS);
	14408	+ drag(X, (mouseMode != 0) ? Y : anchorY, 0, MODIFIERS);
12392	14409	}
12393	14410	//else
12394	14411	}
..	..	@@ -12488,7 +14505,7 @@
12488	14505	int X, Y;
12489	14506	boolean SX, SY;
12490	14507
12491		- void drag(int x, int y, int modifiers)
	14508	+ void drag(int x, int y, int modifiers, int modifiersex)
12492	14509	{
12493	14510	if (IsFrozen())
12494	14511	{
..	..	@@ -12497,17 +14514,17 @@
12497	14514
12498	14515	drag = true; // NEW
12499	14516
12500		- boolean continuous = (modifiers & COMMAND) == COMMAND;
	14517	+ boolean continuous = (modifiersex & COMMAND) == COMMAND;
12501	14518
12502	14519	X = x;
12503	14520	Y = y;
12504	14521	// floating state for animation
12505		- MODIFIERS = modifiers;
12506		- modifiers &= ~1024;
	14522	+ MODIFIERS = modifiersex;
	14523	+ modifiersex &= ~1024;
12507	14524	if (false) // modifiers != 0)
12508	14525	{
12509	14526	//new Exception().printStackTrace();
12510		- System.out.println("mouseDragged: " + modifiers);
	14527	+ System.out.println("mouseDragged: " + modifiersex);
12511	14528	System.out.println("SHIFT = " + SHIFT);
12512	14529	System.out.println("CONTROL = " + COMMAND);
12513	14530	System.out.println("META = " + META);
..	..	@@ -12527,7 +14544,8 @@
12527	14544	info.camera = renderCamera;
12528	14545	info.x = x;
12529	14546	info.y = y;
12530		- object.editWindow.copy.doEditDrag(info);
	14547	+ object.GetWindow().copy
	14548	+ .doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
12531	14549	} else
12532	14550	{
12533	14551	if (x < startX)
..	..	@@ -12629,6 +14647,7 @@
12629	14647	{
12630	14648	manipCamera.Translate(dx, dy, getWidth());
12631	14649	}
	14650	+ else
12632	14651	if ((mouseMode & ZOOM) == 0 && (mouseMode & VR) != 0)
12633	14652	{
12634	14653	manipCamera.RotateInterest(dx, dy);
..	..	@@ -12639,7 +14658,7 @@
12639	14658
12640	14659	if (manipCamera == lightCamera)
12641	14660	{
12642		- lighttouched = true;
	14661	+ Globals.lighttouched = true;
12643	14662	}
12644	14663	/*
12645	14664	switch (mode)
..	..	@@ -12678,7 +14697,6 @@
12678	14697	public void mouseMoved(MouseEvent e)
12679	14698	{
12680	14699	//System.out.println("mouseMoved: " + e);
12681		-
12682	14700	if (isRenderer)
12683	14701	return;
12684	14702
..	..	@@ -12691,7 +14709,9 @@
12691	14709	ci.camera = renderCamera;
12692	14710	if (!isRenderer)
12693	14711	{
12694		- if (object.editWindow.copy.doEditClick(ci, 0))
	14712	+ //ObjEditor editWindow = object.editWindow;
	14713	+ //Object3D copy = editWindow.copy;
	14714	+ if (object.doEditClick(ci, 0))
12695	14715	{
12696	14716	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
12697	14717	} else
..	..	@@ -12703,7 +14723,10 @@
12703	14723
12704	14724	public void mouseReleased(MouseEvent e)
12705	14725	{
	14726	+ Globals.MOUSEDRAGGED = false;
	14727	+
12706	14728	movingcamera = false;
	14729	+ X = Y = 0;
12707	14730	//System.out.println("mouseReleased: " + e);
12708	14731	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
12709	14732	}
..	..	@@ -12726,9 +14749,9 @@
12726	14749	boolean control = ((modifiers & CTRL) != 0); // june 2013: for point selection
12727	14750	boolean command = ((modifiers & COMMAND) != 0); // june 2013: for multiple selection
12728	14751
12729		- if (control \|\| command \|\| IsFrozen())
	14752	+// No delay if (control \|\| command \|\| IsFrozen())
12730	14753	timeout = true;
12731		- else
	14754	+// ?? May 2019 else
12732	14755	// timer.setDelay((modifiers & 128) != 0?0:350);
12733	14756	mouseDown = false;
12734	14757	if (!control && !command) // june 2013
..	..	@@ -12838,7 +14861,7 @@
12838	14861	System.out.println("keyReleased: " + e);
12839	14862	}
12840	14863
12841		- void SetMouseMode(int modifiers)
	14864	+ void SetMouseMode(int modifiers, int modifiersex)
12842	14865	{
12843	14866	//System.out.println("SetMouseMode = " + modifiers);
12844	14867	//modifiers &= ~1024;
..	..	@@ -12850,24 +14873,27 @@
12850	14873	//if (modifiers == 0) // \|\| (modifiers == (1024 \| CONTROL)))
12851	14874	// return;
12852	14875	//System.out.println("SetMode = " + modifiers);
12853		- if ((modifiers & WHEEL) == WHEEL)
	14876	+ if ((modifiersex & WHEEL) == WHEEL)
12854	14877	{
12855	14878	mouseMode \|= ZOOM;
12856	14879	}
12857		- if ((modifiers & META) == META)
	14880	+
	14881	+ boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
	14882	+ if (capsLocked) // \|\| (modifiers & META) == META)
12858	14883	{
12859	14884	mouseMode \|= VR; // BACKFORTH;
12860	14885	}
12861		- if ((modifiers & CTRLCLICK) == CTRLCLICK)
12862		- {
12863		- mouseMode \|= SELECT; // BACKFORTH;
12864		- }
12865		- if ((modifiers & COMMAND) == COMMAND)
	14886	+ if ((modifiersex & CTRLCLICK) == CTRLCLICK)
12866	14887	{
12867	14888	mouseMode \|= SELECT;
12868	14889	}
12869		- if ((modifiers & SHIFT) == SHIFT \|\| forcetranslate)
	14890	+ if ((modifiersex & COMMAND) == COMMAND)
12870	14891	{
	14892	+ mouseMode \|= SELECT;
	14893	+ }
	14894	+ if ((modifiersex & SHIFT) == SHIFT \|\| forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
	14895	+ {
	14896	+ mouseMode &= ~VR;
12871	14897	mouseMode \|= TRANSLATE;
12872	14898	}
12873	14899	// if ((modifiers & SHIFT_META) == SHIFT_META)
..	..	@@ -12894,10 +14920,10 @@
12894	14920
12895	14921	if (isRenderer) //
12896	14922	{
12897		- SetMouseMode(modifiers);
	14923	+ SetMouseMode(0, modifiers);
12898	14924	}
12899	14925
12900		- theRenderer.keyPressed(key);
	14926	+ Globals.theRenderer.keyPressed(key);
12901	14927	}
12902	14928
12903	14929	int kompactbit = 4; // power bit
..	..	@@ -12909,7 +14935,7 @@
12909	14935	float SATPOW = 1; // 2; // 0.5f;
12910	14936	float BRIPOW = 1; // 0.5f; // 0.5f;
12911	14937
12912		- void keyPressed(int key)
	14938	+ public void keyPressed(int key)
12913	14939	{
12914	14940	if (key >= '0' && key <= '5')
12915	14941	clampbit = (key-'0');
..	..	@@ -13024,7 +15050,7 @@
13024	15050	case 'B':
13025	15051	BRISMOOTH ^= true;
13026	15052	SHADOWCULLFACE ^= true;
13027		- lighttouched = true;
	15053	+ Globals.lighttouched = true;
13028	15054	repaint();
13029	15055	break;
13030	15056	case 'b':
..	..	@@ -13066,8 +15092,14 @@
13066	15092	RevertCamera();
13067	15093	repaint();
13068	15094	break;
13069		- case 'L':
13070	15095	case 'l':
	15096	+ lightMode ^= true;
	15097	+ Globals.lighttouched = true;
	15098	+ manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
	15099	+ targetLookAt.set(manipCamera.lookAt);
	15100	+ repaint();
	15101	+ break;
	15102	+ case 'L':
13071	15103	if (lightMode)
13072	15104	{
13073	15105	lightMode = false;
..	..	@@ -13124,7 +15156,7 @@
13124	15156	repaint();
13125	15157	break;
13126	15158	case 'O':
13127		- drawMode = OCCLUSION;
	15159	+ Globals.drawMode = OCCLUSION; // WARNING
13128	15160	repaint();
13129	15161	break;
13130	15162	case 'o':
..	..	@@ -13210,28 +15242,26 @@
13210	15242	case '_':
13211	15243	kompactbit = 5;
13212	15244	break;
13213		- case '+':
13214		- kompactbit = 6;
13215		- break;
	15245	+// case '+':
	15246	+// kompactbit = 6;
	15247	+// break;
13216	15248	case ' ':
13217		- lightMode ^= true;
13218		- lighttouched = true;
13219		- manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
13220		- targetLookAt.set(manipCamera.lookAt);
	15249	+ ObjEditor.theFrame.ToggleFullScreen();
13221	15250	repaint();
13222	15251	break;
13223	15252	//case '`' :
13224	15253	case ESC:
13225	15254	RENDERPROGRAM += 1;
13226	15255	RENDERPROGRAM %= 3;
	15256	+
13227	15257	repaint();
13228	15258	break;
13229	15259	case 'Z':
13230		- RESIZETEXTURE ^= true;
13231		- break;
	15260	+ //RESIZETEXTURE ^= true;
	15261	+ //break;
13232	15262	case 'z':
13233		- RENDERSHADOW ^= true;
13234		- lighttouched = true;
	15263	+ Globals.RENDERSHADOW ^= true;
	15264	+ Globals.lighttouched = true;
13235	15265	repaint();
13236	15266	break;
13237	15267	//case UP:
..	..	@@ -13257,13 +15287,21 @@
13257	15287	FlipTransform();
13258	15288	break;
13259	15289	case ENTER:
13260		- object.editWindow.ScreenFit(); // Edit();
	15290	+ // object.editWindow.ScreenFit(); // Edit();
	15291	+ ToggleLive();
13261	15292	break;
13262	15293	case DELETE:
13263	15294	ClearSelection();
13264	15295	break;
13265		- /*
13266	15296	case '+':
	15297	+
	15298	+ //for (int i=0; i<0x7FFFFFFF; i++)
	15299	+ {
	15300	+ //String.format("%08X", i); // "7caca905"
	15301	+ GetRemoteZip("https://archive3d.net/?a=download&do=get&id=", "7caca905", true, true);
	15302	+ }
	15303	+
	15304	+ /*
13267	15305	//fontsize += 1;
13268	15306	bbzoom *= 2;
13269	15307	repaint();
..	..	@@ -13345,6 +15383,7 @@
13345	15383	}
13346	15384	//System.out.println("shaper_fovy = " + manipCamera.shaper_fovy);
13347	15385	}
	15386	+
13348	15387	static double OCCLUSIONBOOST = 1; // 0.5;
13349	15388
13350	15389	void keyReleased(int key, int modifiers)
..	..	@@ -13352,11 +15391,11 @@
13352	15391	//mode = ROTATE;
13353	15392	if ((MODIFIERS & COMMAND) == 0) // VR??
13354	15393	{
13355		- SetMouseMode(modifiers);
	15394	+ SetMouseMode(0, modifiers);
13356	15395	}
13357	15396	}
13358	15397
13359		- protected void processKeyEvent(KeyEvent e)
	15398	+ public void processKeyEvent(KeyEvent e)
13360	15399	{
13361	15400	switch (e.getID())
13362	15401	{
..	..	@@ -13486,8 +15525,9 @@
13486	15525
13487	15526	protected void processMouseMotionEvent(MouseEvent e)
13488	15527	{
13489		- //System.out.println("processMouseMotionEvent: " + mouseMode);
13490		- if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
	15528	+ //System.out.println("processMouseMotionEvent: " + mouseMode + " " + e.getModifiers() + " " + e.getModifiersEx() + " " + e.getButton());
	15529	+ //if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
	15530	+ if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (e.getModifiers() & MouseEvent.BUTTON3_MASK) == 0 && (mouseMode & SELECT) == 0)
13491	15531	{
13492	15532	mouseMoved(e);
13493	15533	} else
..	..	@@ -13512,11 +15552,12 @@
13512	15552	}
13513	15553	*/
13514	15554
13515		- object.editWindow.EditSelection();
	15555	+ object.editWindow.EditSelection(false);
13516	15556	}
13517	15557
13518	15558	void SelectParent()
13519	15559	{
	15560	+ new Exception().printStackTrace();
13520	15561	System.exit(0);
13521	15562	Composite group = (Composite) object;
13522	15563	java.util.Vector selectees = new java.util.Vector(group.selection);
..	..	@@ -13540,6 +15581,7 @@
13540	15581
13541	15582	void SelectChildren()
13542	15583	{
	15584	+ new Exception().printStackTrace();
13543	15585	System.exit(0);
13544	15586	/*
13545	15587	Composite group = (Composite) object;
..	..	@@ -13704,7 +15746,9 @@
13704	15746	info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
13705	15747	//Image img = CreateImage(width, height);
13706	15748	//System.out.println("width = " + width + "; height = " + height + "\n");
	15749	+
13707	15750	Graphics gr = g; // img.getGraphics();
	15751	+
13708	15752	if (!hasMarquee)
13709	15753	{
13710	15754	if (Xmin < Xmax) // !locked)
..	..	@@ -13802,14 +15846,33 @@
13802	15846	if (!isRenderer)
13803	15847	{
13804	15848	object.drawEditHandles(info, 0);
	15849	+
	15850	+ if (drag && (X != 0 \|\| Y != 0) && object.selection.Size() > 0)
	15851	+ {
	15852	+ switch (object.selection.get(0).hitSomething)
	15853	+ {
	15854	+ case Object3D.hitCenter: gr.setColor(Color.pink);
	15855	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15856	+ break;
	15857	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	15858	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15859	+ break;
	15860	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	15861	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15862	+ break;
	15863	+ }
	15864	+
	15865	+ }
13805	15866	}
13806	15867	}
	15868	+
13807	15869	if (isRenderer)
13808	15870	{
13809	15871	//gr.setColor(Color.black);
13810	15872	//gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
13811	15873	//gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
13812	15874	}
	15875	+
13813	15876	if (hasMarquee)
13814	15877	{
13815	15878	gr.setXORMode(Color.white);
..	..	@@ -13832,6 +15895,7 @@
13832	15895	//if (g != gr) g.drawImage(img, 0, 0, width, height, null);
13833	15896	}
13834	15897
	15898	+ // To avoid clear.
13835	15899	public void update(Graphics g)
13836	15900	{
13837	15901	paint(g);
..	..	@@ -13921,6 +15985,7 @@
13921	15985	public boolean mouseDown(Event evt, int x, int y)
13922	15986	{
13923	15987	System.out.println("mouseDown: " + evt);
	15988	+ System.exit(0);
13924	15989	/*
13925	15990	locked = true;
13926	15991	drag = false;
..	..	@@ -13964,7 +16029,7 @@
13964	16029	{
13965	16030	keyPressed(0, modifiers);
13966	16031	}
13967		- clickStart(x, y, modifiers);
	16032	+ // clickStart(x, y, modifiers);
13968	16033	return true;
13969	16034	}
13970	16035
..	..	@@ -14082,7 +16147,7 @@
14082	16147	{
14083	16148	keyReleased(0, 0);
14084	16149	}
14085		- drag(x, y, modifiers);
	16150	+ drag(x, y, 0, modifiers);
14086	16151	return true;
14087	16152	}
14088	16153
..	..	@@ -14214,7 +16279,7 @@
14214	16279	Object3D object;
14215	16280	static Object3D trackedobject;
14216	16281	Camera renderCamera; // Light or Eye (or Occlusion)
14217		- /static/ Camera manipCamera; // Light or Eye
	16282	+ /static/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
14218	16283	/static/ Camera eyeCamera;
14219	16284	/static/ Camera lightCamera;
14220	16285	int cameracount;
..	..	@@ -14434,7 +16499,7 @@
14434	16499	gl.glPushAttrib(GL.GL_ALL_ATTRIB_BITS);
14435	16500	gl.glPushMatrix();
14436	16501	gl.glLoadIdentity();
14437		- PushMatrix(checker.toParent);
	16502	+ //PushMatrix(checker.toParent);
14438	16503
14439	16504	gl.glMatrixMode(GL.GL_TEXTURE);
14440	16505	gl.glPushMatrix();
..	..	@@ -14457,8 +16522,8 @@
14457	16522
14458	16523	gl.glNormal3f(0.0f, 0.0f, 1.0f);
14459	16524
14460		- float step = 0.1666f; //0.25f;
14461		- float stepv = step * 1652 / 998;
	16525	+ float step = 2; // 0.1666f; //0.25f;
	16526	+ float stepv = 2; // step * 1652 / 998;
14462	16527
14463	16528	int i0 = 0;
14464	16529	/*
..	..	@@ -14494,20 +16559,21 @@
14494	16559	/**/
14495	16560	//checker.GetMaterial().opacity = 1.1f;
14496	16561	////checker.GetMaterial().ambient = 0.99f;
14497		- Object3D.materialstack[Object3D.materialdepth] = checker.material;
14498		- Object3D.selectedstack[Object3D.materialdepth] = false;
14499		- cStatic.objectstack[Object3D.materialdepth++] = checker;
	16562	+ materialstack[materialdepth] = checker.material;
	16563	+ selectedstack[materialdepth] = false;
	16564	+ cStatic.objectstack[materialdepth++] = checker;
14500	16565	//System.out.println("material " + material);
14501	16566	//Applet3D.tracein(this, selected);
14502		- vector2buffer = checker.projectedVertices;
	16567	+ //vector2buffer = checker.projectedVertices;
14503	16568
14504		- checker.GetMaterial().Draw(this, false); // true);
	16569	+ //checker.GetMaterial().Draw(this, false); // true);
	16570	+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
14505	16571
14506		- Object3D.materialdepth -= 1;
14507		- if (Object3D.materialdepth > 0)
	16572	+ materialdepth -= 1;
	16573	+ if (materialdepth > 0)
14508	16574	{
14509		- vector2buffer = cStatic.objectstack[Object3D.materialdepth - 1].projectedVertices;
14510		- Object3D.materialstack[Object3D.materialdepth - 1].Draw(this, Object3D.selectedstack[Object3D.materialdepth - 1]);
	16575	+ //vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	16576	+ DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
14511	16577	}
14512	16578	//checker.GetMaterial().opacity = 1f;
14513	16579	////checker.GetMaterial().ambient = 1f;
..	..	@@ -14528,15 +16594,27 @@
14528	16594
14529	16595	//float u = (i+1)/2;
14530	16596	//float v = (j+1)/2;
14531		- gl.glTexCoord2f((i + 1) / 2, (j + 1) / 2); // (1,0) // (i+1+step)/2,(j+1)/2);
	16597	+ if (checker.flipV)
	16598	+ gl.glTexCoord2f((i + 1) / 2, 1 - (j + 1) / 2);
	16599	+ else
	16600	+ gl.glTexCoord2f((i + 1) / 2, (j + 1) / 2); // (1,0) // (i+1+step)/2,(j+1)/2);
14532	16601	gl.glVertex3f(i, j, -0.5f);
14533	16602
	16603	+ if (checker.flipV)
	16604	+ gl.glTexCoord2f((i + 1 + step) / 2, 1 - (j + 1) / 2); // (1,1) // (i+1+step)/2,(j+1+step)/2);
	16605	+ else
14534	16606	gl.glTexCoord2f((i + 1 + step) / 2, (j + 1) / 2); // (1,1) // (i+1+step)/2,(j+1+step)/2);
14535	16607	gl.glVertex3f(i + step, j, -0.5f);
14536	16608
	16609	+ if (checker.flipV)
	16610	+ gl.glTexCoord2f((i + 1 + step) / 2, 1 - (j + 1 + stepv) / 2); // (0,1) //(i+1)/2,(j+1+step)/2);
	16611	+ else
14537	16612	gl.glTexCoord2f((i + 1 + step) / 2, (j + 1 + stepv) / 2); // (0,1) //(i+1)/2,(j+1+step)/2);
14538	16613	gl.glVertex3f(i + step, j + stepv, -0.5f);
14539	16614
	16615	+ if (checker.flipV)
	16616	+ gl.glTexCoord2f((i + 1) / 2, 1 - (j + 1 + stepv) / 2); // (0,0) //(i+1)/2,(j+1)/2);
	16617	+ else
14540	16618	gl.glTexCoord2f((i + 1) / 2, (j + 1 + stepv) / 2); // (0,0) //(i+1)/2,(j+1)/2);
14541	16619	gl.glVertex3f(i, j + stepv, -0.5f);
14542	16620	}
..	..	@@ -14548,7 +16626,7 @@
14548	16626	gl.glMatrixMode(GL.GL_PROJECTION);
14549	16627	gl.glPopMatrix();
14550	16628	gl.glMatrixMode(GL.GL_MODELVIEW);
14551		- PopMatrix(null); // checker.toParent); // null);
	16629	+ //PopMatrix(null); // checker.toParent); // null);
14552	16630	gl.glPopMatrix();
14553	16631	PopTextureMatrix(checker.toParent);
14554	16632	gl.glMatrixMode(GL.GL_TEXTURE);
..	..	@@ -14639,6 +16717,7 @@
14639	16717	{
14640	16718	if (!selection)
14641	16719	{
	16720	+ new Exception().printStackTrace();
14642	16721	System.exit(0);
14643	16722	return;
14644	16723	}
..	..	@@ -14661,14 +16740,14 @@
14661	16740
14662	16741	//int tmp = selection_view;
14663	16742	//selection_view = -1;
14664		- int temp = drawMode;
14665		- drawMode = SELECTION;
	16743	+ int temp = DrawMode();
	16744	+ Globals.drawMode = SELECTION; // WARNING
14666	16745	indexcount = 0;
14667	16746	parent.display(drawable);
14668	16747	//selection_view = tmp;
14669	16748	//if (temp == SELECTION)
14670	16749	// temp = DEFAULT; // patch for selection debug
14671		- drawMode = temp;
	16750	+ Globals.drawMode = temp; // WARNING
14672	16751
14673	16752	//gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
14674	16753
..	..	@@ -14718,6 +16797,13 @@
14718	16797	// System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
14719	16798	// System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
14720	16799
	16800	+ CreateSelectedPoint();
	16801	+
	16802	+ // Will fit the mesh !!!
	16803	+ selectedpoint.toParent[0][0] = 0.0001;
	16804	+ selectedpoint.toParent[1][1] = 0.0001;
	16805	+ selectedpoint.toParent[2][2] = 0.0001;
	16806	+
14721	16807	glu.gluUnProject(x,y,depth,view,0,tempmat2,0,viewport,0,selectedpoint.toParent[3],0);
14722	16808
14723	16809	// if (object.selection != null && object.selection.Size() > 0)
..	..	@@ -14761,16 +16847,16 @@
14761	16847	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]));
14762	16848	}
14763	16849
14764		- previousselectedpoint = (Sphere) GrafreeD.clone(selectedpoint);
	16850	+ previousselectedpoint = (Sphere) Grafreed.clone(selectedpoint);
14765	16851	}
14766	16852	}
14767	16853
14768	16854	if (!movingcamera && !PAINTMODE)
14769	16855	object.editWindow.ScreenFitPoint(); // fev 2014
14770	16856
14771		- if (PAINTMODE && GrafreeD.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	16857	+ if (PAINTMODE && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
14772	16858	{
14773		- Object3D paintobj = GrafreeD.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
	16859	+ Object3D paintobj = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
14774	16860
14775	16861	Object3D group = new Object3D("inst" + paintcount++);
14776	16862
..	..	@@ -14827,6 +16913,11 @@
14827	16913	//System.out.println("objects[color] = " + objects[color]);
14828	16914	//objects[color].Select();
14829	16915	indexcount = 0;
	16916	+ ObjEditor window = object.GetWindow();
	16917	+ if (window != null && deselect)
	16918	+ {
	16919	+ window.Select(null, deselect, true);
	16920	+ }
14830	16921	object.Select(color, deselect);
14831	16922	}
14832	16923
..	..	@@ -14926,7 +17017,7 @@
14926	17017	gl.glDisable(gl.GL_CULL_FACE);
14927	17018	}
14928	17019
14929		- if (!RENDERSHADOW)
	17020	+ if (!Globals.RENDERSHADOW)
14930	17021	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
14931	17022
14932	17023	// SB gl.glPolygonOffset(2.5f, 10);
..	..	@@ -14936,14 +17027,14 @@
14936	17027	//gl.glColorMask(false, false, false, false);
14937	17028
14938	17029	//render_scene_from_light_view(gl, drawable, 0, 0);
14939		- if (RENDERSHADOW && lighttouched && !movingcamera) // && !parent.IsFreezed())
	17030	+ if (Globals.RENDERSHADOW && Globals.lighttouched && (!movingcamera \|\| !Globals.FREEZEONMOVE)) // && !parent.IsFreezed())
14940	17031	{
14941	17032	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
14942	17033
14943		- int temp = drawMode;
14944		- drawMode = SHADOW;
	17034	+ int temp = DrawMode();
	17035	+ Globals.drawMode = SHADOW; // WARNING
14945	17036	parent.display(drawable);
14946		- drawMode = temp;
	17037	+ Globals.drawMode = temp; // WARNING
14947	17038	}
14948	17039
14949	17040	gl.glCullFace(gl.GL_BACK);
..	..	@@ -14996,7 +17087,6 @@
14996	17087
14997	17088	class AntialiasBuffer implements GLEventListener
14998	17089	{
14999		-
15000	17090	CameraPane parent = null;
15001	17091
15002	17092	AntialiasBuffer(CameraPane p)
..	..	@@ -15106,13 +17196,19 @@
15106	17196	gl.glFlush();
15107	17197
15108	17198	/**/
15109		- gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_BGRA, GL.GL_UNSIGNED_INT_8_8_8_8_REV, occlusionsizebuffer);
	17199	+ gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusionsizebuffer);
15110	17200
15111		- int[] pixels = occlusionsizebuffer.array();
	17201	+ float[] pixels = occlusionsizebuffer.array();
15112	17202
15113	17203	double r = 0, g = 0, b = 0;
15114	17204
15115	17205	double count = 0;
	17206	+
	17207	+ gl.glGetDoublev(gl.GL_PROJECTION_MATRIX, tempmat2, 0);
	17208	+
	17209	+ float mindepth = 1;
	17210	+
	17211	+ double FACTOR = 1;
15116	17212
15117	17213	for (int i = 0; i < pixels.length; i++)
15118	17214	{
..	..	@@ -15197,7 +17293,7 @@
15197	17293
15198	17294	double scale = ray.z; // 1; // cos
15199	17295
15200		- int p = pixels[newindex];
	17296	+ float depth = pixels[newindex];
15201	17297
15202	17298	/*
15203	17299	int newindex2 = (x + 1) * OCCLUSION_SIZE + y;
..	..	@@ -15221,10 +17317,23 @@
15221	17317	scale = (1 - modu) * modv;
15222	17318	*/
15223	17319
15224		- r += ((p >> 16) & 0xFF) * scale / 255;
15225		- g += ((p >> 8) & 0xFF) * scale / 255;
15226		- b += (p & 0xFF) * scale / 255;
	17320	+ //r += ((p >> 16) & 0xFF) * scale / 255;
	17321	+ //g += ((p >> 8) & 0xFF) * scale / 255;
	17322	+ //b += (p & 0xFF) * scale / 255;
	17323	+
	17324	+ if (mindepth > depth)
	17325	+ {
	17326	+ mindepth = depth;
	17327	+ }
15227	17328
	17329	+ double z_eye = tempmat2[34 + 2] / (depth -2.0 + 1.0 - tempmat2[2*4 + 2]);
	17330	+
	17331	+ double factor = 1 - Math.exp(-z_eye * z_eye / FACTOR);
	17332	+
	17333	+ r += factor * scale;
	17334	+ g += factor * scale;
	17335	+ b += factor * scale;
	17336	+
15228	17337	count += scale;
15229	17338	}
15230	17339
..	..	@@ -15322,12 +17431,6 @@
15322	17431	GLUT glut = new GLUT();
15323	17432
15324	17433
15325		- static final public int DEFAULT = 0;
15326		- static final public int SELECTION = 1;
15327		- static final public int SHADOW = 2;
15328		- static final public int OCCLUSION = 3;
15329		- static
15330		- public int drawMode = DEFAULT;
15331	17434	public boolean spherical = false;
15332	17435	static boolean DEBUG_OCCLUSION = false;
15333	17436	static boolean DEBUG_SELECTION = false;
..	..	@@ -15340,23 +17443,15 @@
15340	17443	int AAbuffersize = 0;
15341	17444
15342	17445	//double[] selectedpoint = new double[3];
15343		- static Sphere selectedpoint = new Sphere();
	17446	+ static Superellipsoid selectedpoint;
15344	17447	static Sphere previousselectedpoint = null;
15345		- static Sphere debugpoint = new Sphere();
15346		- static Sphere debugpoint2 = new Sphere();
15347		- static Sphere debugpoint3 = new Sphere();
15348		- static Sphere debugpoint4 = new Sphere();
	17448	+ static Sphere debugpointG;
	17449	+ static Sphere debugpointP;
	17450	+ static Sphere debugpointC;
	17451	+ static Sphere debugpointR;
15349	17452
15350	17453	static Sphere debugpoints[] = new Sphere[8];
15351	17454
15352		- static
15353		- {
15354		- for (int i=0; i<8; i++)
15355		- {
15356		- debugpoints[i] = new Sphere();
15357		- }
15358		- }
15359		-
15360	17455	static void InitPoints(float radius)
15361	17456	{
15362	17457	for (int i=0; i<8; i++)
..	..	@@ -15376,7 +17471,7 @@
15376	17471	}
15377	17472	}
15378	17473
15379		- static void DrawPoints(CameraPane cpane)
	17474	+ static void DrawPoints(iCameraPane cpane)
15380	17475	{
15381	17476	for (int i=0; i<8; i++) // first and last are red
15382	17477	{
..	..	@@ -15398,7 +17493,8 @@
15398	17493	static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
15399	17494	static IntBuffer selectsizebuffer = IntBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
15400	17495	static java.nio.FloatBuffer pointselectsizebuffer = java.nio.FloatBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
15401		- static IntBuffer occlusionsizebuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17496	+ //static IntBuffer occlusionsizebuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17497	+ static java.nio.FloatBuffer occlusionsizebuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
15402	17498	static BufferedImage bufimage = new BufferedImage(TEX_SIZE, TEX_SIZE, BufferedImage.TYPE_INT_RGB);
15403	17499	static BufferedImage textest = new cBufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB);
15404	17500	static java.util.Vector<BufferedImage> billboards = new java.util.Vector<BufferedImage>();
..	..	@@ -15407,10 +17503,11 @@
15407	17503	static IntBuffer textbuffer = null; // IntBuffer.allocate(TEXT_WIDTH88 * TEXT_HEIGHT);
15408	17504	// Depth buffer format
15409	17505	//private int depth_format;
15410		- static public void NextIndex(Object3D o, GL gl)
	17506	+
	17507	+ public void NextIndex()
15411	17508	{
15412	17509	indexcount+=16;
15413		- gl.glColor3d(((indexcount >>> 16) & 255) / 255.0, ((indexcount >>> 8) & 255) / 255.0, ((indexcount) & 255) / 255.0);
	17510	+ GetGL().glColor3d(((indexcount >>> 16) & 255) / 255.0, ((indexcount >>> 8) & 255) / 255.0, ((indexcount) & 255) / 255.0);
15414	17511	//objects[indexcount] = o;
15415	17512	//System.out.println("indexcount = " + indexcount);
15416	17513	}