~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,11 @@
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	+
767	2401	/**/
768	2402	class CacheTexture
769	2403	{
..	..	@@ -2000,10 +3634,12 @@
2000	3634	*/
2001	3635	TextureData ReduceTexture(TextureData texturedata, int resolution) // String name)
2002	3636	{
	3637	+ int pixelformat = texturedata.getPixelFormat();
	3638	+
2003	3639	int stride = 1;
2004		- if (texturedata.getPixelFormat() == GetGL().GL_RGB \|\| texturedata.getPixelFormat() == GetGL().GL_BGR) // \|\| texturedata.getPixelFormat() == GL.GL_LUMINANCE)
	3640	+ if (pixelformat == GetGL().GL_RGB \|\| pixelformat == GetGL().GL_BGR) // \|\| texturedata.getPixelFormat() == GL.GL_LUMINANCE)
2005	3641	stride = 3;
2006		- if (texturedata.getPixelFormat() == GetGL().GL_RGBA \|\| texturedata.getPixelFormat() == GetGL().GL_BGRA) // \|\| texturedata.getPixelFormat() == GL.GL_LUMINANCE_ALPHA)
	3642	+ if (pixelformat == GetGL().GL_RGBA \|\| pixelformat == GetGL().GL_BGRA) // \|\| texturedata.getPixelFormat() == GL.GL_LUMINANCE_ALPHA)
2007	3643	stride = 4;
2008	3644
2009	3645	int width = texturedata.getWidth();
..	..	@@ -2593,6 +4229,7 @@
2593	4229
2594	4230	com.sun.opengl.util.texture.Texture CompressTexture2(String name)
2595	4231	{
	4232	+ new Exception().printStackTrace();
2596	4233	System.exit(0);
2597	4234	com.sun.opengl.util.texture.Texture texture = null;
2598	4235
..	..	@@ -6269,7 +7906,7 @@
6269	7906	return null;
6270	7907	}
6271	7908
6272		- void ReleaseTextures(cTexture tex)
	7909	+ public void ReleaseTextures(cTexture tex) // INTERFACE
6273	7910	{
6274	7911	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
6275	7912	{
..	..	@@ -6305,9 +7942,67 @@
6305	7942	ReleaseTexture(pigment, false);
6306	7943	}
6307	7944
	7945	+ public void ReleasePigmentTexture(cTexture tex) // INTERFACE
	7946	+ {
	7947	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	7948	+ {
	7949	+ return;
	7950	+ }
	7951	+
	7952	+ if (tex == null)
	7953	+ {
	7954	+ ReleaseTexture(null, false);
	7955	+ return;
	7956	+ }
	7957	+
	7958	+ String pigment = Object3D.GetPigment(tex);
	7959	+
	7960	+ if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	7961	+ {
	7962	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	7963	+ // System.out.println("; bump = " + bump);
	7964	+ }
	7965	+
	7966	+ if (pigment.equals(""))
	7967	+ {
	7968	+ pigment = null;
	7969	+ }
	7970	+
	7971	+ ReleaseTexture(pigment, false);
	7972	+ }
	7973	+
	7974	+ public void ReleaseBumpTexture(cTexture tex) // INTERFACE
	7975	+ {
	7976	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	7977	+ {
	7978	+ return;
	7979	+ }
	7980	+
	7981	+ if (tex == null)
	7982	+ {
	7983	+ ReleaseTexture(null, true);
	7984	+ return;
	7985	+ }
	7986	+
	7987	+ String bump = Object3D.GetBump(tex);
	7988	+
	7989	+ if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	7990	+ {
	7991	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	7992	+ // System.out.println("; bump = " + bump);
	7993	+ }
	7994	+
	7995	+ if (bump.equals(""))
	7996	+ {
	7997	+ bump = null;
	7998	+ }
	7999	+
	8000	+ ReleaseTexture(bump, true);
	8001	+ }
	8002	+
6308	8003	void ReleaseTexture(String tex, boolean bump)
6309	8004	{
6310		- if (// drawMode != 0 \|\| /tex == null \|\|/
	8005	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
6311	8006	ambientOcclusion ) // \|\| !textureon)
6312	8007	{
6313	8008	return;
..	..	@@ -6408,9 +8103,9 @@
6408	8103	}
6409	8104	}
6410	8105
6411		- /boolean/ void BindTextures(cTexture tex, int resolution)
	8106	+ /boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
6412	8107	{
6413		- if (// drawMode != 0 \|\| /tex == null \|\|/
	8108	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
6414	8109	ambientOcclusion ) // \|\| !textureon)
6415	8110	{
6416	8111	return; // false;
..	..	@@ -6453,7 +8148,94 @@
6453	8148	return; // true;
6454	8149	}
6455	8150
6456		- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution)
	8151	+ /boolean/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8152	+ {
	8153	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8154	+ ambientOcclusion ) // \|\| !textureon)
	8155	+ {
	8156	+ return; // false;
	8157	+ }
	8158	+
	8159	+ if (tex == null)
	8160	+ {
	8161	+ BindTexture(null,false,resolution);
	8162	+ return;
	8163	+ }
	8164	+
	8165	+ String pigment = Object3D.GetPigment(tex);
	8166	+
	8167	+ usedtextures.put(pigment, pigment);
	8168	+
	8169	+ if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8170	+ {
	8171	+ // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8172	+ // System.out.println("; bump = " + bump);
	8173	+ }
	8174	+
	8175	+ if (pigment.equals(""))
	8176	+ {
	8177	+ pigment = null;
	8178	+ }
	8179	+
	8180	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8181	+ BindTexture(pigment, false, resolution);
	8182	+ }
	8183	+
	8184	+ /boolean/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8185	+ {
	8186	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8187	+ ambientOcclusion ) // \|\| !textureon)
	8188	+ {
	8189	+ return; // false;
	8190	+ }
	8191	+
	8192	+ if (tex == null)
	8193	+ {
	8194	+ BindTexture(null,true,resolution);
	8195	+ return;
	8196	+ }
	8197	+
	8198	+ String bump = Object3D.GetBump(tex);
	8199	+
	8200	+ usedtextures.put(bump, bump);
	8201	+
	8202	+ if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8203	+ {
	8204	+ // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8205	+ // System.out.println("; bump = " + bump);
	8206	+ }
	8207	+
	8208	+ if (bump.equals(""))
	8209	+ {
	8210	+ bump = null;
	8211	+ }
	8212	+
	8213	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
	8214	+ BindTexture(bump, true, resolution);
	8215	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8216	+ }
	8217	+
	8218	+ java.util.HashSet<String> missingTextures = new java.util.HashSet<String>();
	8219	+
	8220	+ private boolean FileExists(String tex)
	8221	+ {
	8222	+ if (missingTextures.contains(tex))
	8223	+ {
	8224	+ return false;
	8225	+ }
	8226	+
	8227	+ boolean fileExists = new File(tex).exists();
	8228	+
	8229	+ if (!fileExists)
	8230	+ {
	8231	+ // If file exists, the "new File()" is not executed sgain
	8232	+ missingTextures.add(tex);
	8233	+ }
	8234	+
	8235	+ return fileExists;
	8236	+ }
	8237	+
	8238	+ CacheTexture GetCacheTexture(String tex, boolean bump, int resolution) throws Exception
6457	8239	{
6458	8240	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
6459	8241
..	..	@@ -6461,12 +8243,18 @@
6461	8243	{
6462	8244	String texname = tex;
6463	8245
6464		- String[] split = tex.split("Textures");
6465		- if (split.length > 1)
6466		- texname = "/Users/nbriere/Textures" + split[split.length-1];
6467		- else
6468		- if (!texname.startsWith("/"))
6469		- texname = "/Users/nbriere/Textures/" + texname;
	8246	+ String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
	8247	+
	8248	+// String[] split = tex.split("Textures");
	8249	+// if (split.length > 1)
	8250	+// texname = "/Users/nbriere/Textures" + split[split.length-1];
	8251	+// else
	8252	+// if (!texname.startsWith("/"))
	8253	+// texname = "/Users/nbriere/Textures/" + texname;
	8254	+ if (!FileExists(tex))
	8255	+ {
	8256	+ texname = fallbackTextureName;
	8257	+ }
6470	8258
6471	8259	if (CACHETEXTURE)
6472	8260	texture = textures.get(texname); // TEXTURE CACHE
..	..	@@ -6535,7 +8323,7 @@
6535	8323	}
6536	8324
6537	8325	cachename = texname.substring(0, texname.length()-4)+ext+".jpg";
6538		- if (!new File(cachename).exists())
	8326	+ if (!FileExists(cachename))
6539	8327	cachename = texname;
6540	8328	else
6541	8329	processbump = false; // don't process bump map again
..	..	@@ -6557,7 +8345,7 @@
6557	8345	}
6558	8346
6559	8347	cachename = texname.substring(0, texname.length()-4)+ext+".png";
6560		- if (!new File(cachename).exists())
	8348	+ if (!FileExists(cachename))
6561	8349	cachename = texname;
6562	8350	else
6563	8351	processbump = false; // don't process bump map again
..	..	@@ -6566,7 +8354,9 @@
6566	8354	texturedata = GetFileTexture(cachename, processbump, resolution);
6567	8355
6568	8356
6569		- if (texturedata != null)
	8357	+ if (texturedata == null)
	8358	+ throw new Exception();
	8359	+
6570	8360	texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
6571	8361	//texture = GetTexture(tex, bump);
6572	8362	}
..	..	@@ -6688,7 +8478,7 @@
6688	8478	return texture;
6689	8479	}
6690	8480
6691		- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution)
	8481	+ com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution) throws Exception
6692	8482	{
6693	8483	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
6694	8484
..	..	@@ -6706,14 +8496,14 @@
6706	8496	return texture!=null?texture.texture:null;
6707	8497	}
6708	8498
6709		- com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution)
	8499	+ public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution) throws Exception
6710	8500	{
6711	8501	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
6712	8502
6713	8503	return texture!=null?texture.texturedata:null;
6714	8504	}
6715	8505
6716		- boolean BindTexture(String tex, boolean bump, int resolution)
	8506	+ boolean BindTexture(String tex, boolean bump, int resolution) throws Exception
6717	8507	{
6718	8508	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
6719	8509	{
..	..	@@ -7310,9 +9100,9 @@
7310	9100	static boolean occlusionInitialized = false;
7311	9101	boolean selection = false;
7312	9102	boolean pointselection = false;
7313		- /static/ boolean lighttouched = true;
	9103	+ ///static/ boolean lighttouched = true;
7314	9104	boolean deselect;
7315		- boolean ambientOcclusion = false;
	9105	+ private boolean ambientOcclusion = false;
7316	9106	static boolean flash = false;
7317	9107	/static/ boolean wait = false;
7318	9108	boolean displaydone = false; // after repaint() calls
..	..	@@ -7442,6 +9232,8 @@
7442	9232	//gl.glFrustum(-0.5scale, 0.5scale, -0.5scale, 0.5scale, 1, 100);
7443	9233	//glu.gluPerspective(lightshaper_fovy, 1, lightshaper_zNear, lightshaper_zFar);
7444	9234	double scale = lightCamera.SCALE / lightCamera.Distance();
	9235	+// PATCH FILLE AUX JEANS
	9236	+ //scale *= lightCamera.shaper_fovy / 25;
7445	9237	gl.glScaled(2 * scale, 2 * scale, -scale);
7446	9238	gl.glTranslated(0, 0, lightCamera.DECAL);
7447	9239
..	..	@@ -7588,17 +9380,40 @@
7588	9380	jy8[3] = 0.5f;
7589	9381	}
7590	9382
7591		- float[] options1 = new float[]{1000, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
	9383	+ float[] options1 = new float[]{100, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
7592	9384	float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
7593		- float[] options3 = new float[]{1, 1, 1, 1}; // fog color. image intensity
	9385	+ float[] options3 = new float[]{1, 1, 1, 0}; // fog color
	9386	+ float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
7594	9387
	9388	+ void ResetOptions()
	9389	+ {
	9390	+ options1[0] = 100;
	9391	+ options1[1] = 0.025f;
	9392	+ options1[2] = 0.01f;
	9393	+ options1[3] = 0;
	9394	+ options1[4] = 0;
	9395	+
	9396	+ options2[0] = 0;
	9397	+ options2[1] = 0.75f;
	9398	+ options2[2] = 0;
	9399	+ options2[3] = 0;
	9400	+
	9401	+ options3[0] = 1;
	9402	+ options3[1] = 1;
	9403	+ options3[2] = 1;
	9404	+ options3[3] = 0;
	9405	+
	9406	+ options4[0] = 1;
	9407	+ options4[1] = 0;
	9408	+ options4[2] = 1;
	9409	+ options4[3] = 0;
	9410	+ }
	9411	+
7595	9412	static int imagecount = 0; // movie generation
7596	9413
7597	9414	static int jitter = 0;
7598	9415
7599	9416	boolean restartframe = false;
7600		-
7601		- static int framecount = 0; // general-purpose global count
7602	9417
7603	9418	void displayAntiAliased(javax.media.opengl.GL gl)
7604	9419	{
..	..	@@ -7630,7 +9445,7 @@
7630	9445	gl.glClear(gl.GL_ACCUM_BUFFER_BIT);
7631	9446	for (jitter = 0; jitter < ACSIZE; jitter++) //, GrafreeD.wav.cursor += LIVE ? 735 : 0)
7632	9447	{
7633		- framecount++;
	9448	+ Globals.framecount++;
7634	9449
7635	9450	if (CameraPane.tickcount > 0)
7636	9451	CameraPane.tickcount--;
..	..	@@ -7668,7 +9483,7 @@
7668	9483
7669	9484	gl.glLightfv(gl.GL_LIGHT0, gl.GL_POSITION, pos, 0);
7670	9485	*/
7671		- lighttouched = true;
	9486	+ Globals.lighttouched = true;
7672	9487	//System.err.println(" shadowbuffer: " + jitter);
7673	9488	shadowbuffer.display();
7674	9489
..	..	@@ -7689,8 +9504,8 @@
7689	9504	assert (parentcam != renderCamera);
7690	9505
7691	9506	if (renderCamera != lightCamera)
7692		- for (int count = parentcam.GetTransformCount(); --count>=0;)
7693		- LA.matConcat(parentcam.toParent, matrix, matrix);
	9507	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9508	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
7694	9509
7695	9510	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
7696	9511
..	..	@@ -7705,8 +9520,8 @@
7705	9520	LA.matCopy(renderCamera.fromScreen, matrix);
7706	9521
7707	9522	if (renderCamera != lightCamera)
7708		- for (int count = parentcam.GetTransformCount(); --count>=0;)
7709		- LA.matConcat(matrix, parentcam.fromParent, matrix);
	9523	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9524	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
7710	9525
7711	9526	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
7712	9527
..	..	@@ -7778,7 +9593,7 @@
7778	9593	//gl.glFlush();
7779	9594	gl.glAccum(gl.GL_ACCUM, 1.0f / ACSIZE);
7780	9595
7781		- if (ANIMATION && ABORTED)
	9596	+ if (Globals.ANIMATION && ABORTED)
7782	9597	{
7783	9598	System.err.println(" ABORTED FRAME");
7784	9599	break;
..	..	@@ -7808,7 +9623,7 @@
7808	9623	setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
7809	9624
7810	9625	// save image
7811		- if (ANIMATION && !ABORTED)
	9626	+ if (Globals.ANIMATION && !ABORTED)
7812	9627	{
7813	9628	VPwidth = viewport[2];
7814	9629	VPheight = viewport[3];
..	..	@@ -7919,11 +9734,11 @@
7919	9734
7920	9735	// imagecount++;
7921	9736
7922		- String fullname = filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
	9737	+ String fullname = Globals.filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
7923	9738
7924	9739	if (!BOXMODE)
7925	9740	{
7926		- System.out.println("image: " + fullname + " (" + (GrafreeD.wav.cursor / 735 / 4) + ")");
	9741	+ System.out.println("image: " + fullname + " (wav cursor=" + (Grafreed.wav.cursor / 735 / 4) + ")");
7927	9742	}
7928	9743
7929	9744	if (!BOXMODE)
..	..	@@ -7961,7 +9776,7 @@
7961	9776	ABORTED = false;
7962	9777	}
7963	9778	else
7964		- GrafreeD.wav.cursor += 735 * ACSIZE;
	9779	+ Grafreed.wav.cursor += 735 * ACSIZE;
7965	9780
7966	9781	if (false)
7967	9782	{
..	..	@@ -8615,13 +10430,6 @@
8615	10430	}
8616	10431	}
8617	10432
8618		- boolean IsFrozen()
8619		- {
8620		- boolean selectmode = drawMode == SELECTION \|\| CameraPane.DEBUG_SELECTION;
8621		-
8622		- return !selectmode && cameracount == 0; // != 0;
8623		- }
8624		-
8625	10433	boolean niceon = false;
8626	10434	javax.swing.Timer AAtimer = new javax.swing.Timer(750, this);
8627	10435	boolean currentlydrawing = false;
..	..	@@ -8631,16 +10439,16 @@
8631	10439
8632	10440	public void display(GLAutoDrawable drawable)
8633	10441	{
8634		- if (GrafreeD.savesound && GrafreeD.hassound)
	10442	+ if (Grafreed.savesound && Grafreed.hassound)
8635	10443	{
8636		- GrafreeD.wav.save();
8637		- GrafreeD.savesound = false;
8638		- GrafreeD.hassound = false;
	10444	+ Grafreed.wav.save();
	10445	+ Grafreed.savesound = false;
	10446	+ Grafreed.hassound = false;
8639	10447	}
8640	10448	// if (DEBUG_SELECTION)
8641	10449	// {
8642		-// if (drawMode != SELECTION)
8643		-// drawMode = SELECTION;
	10450	+// if (DrawMode() != SELECTION)
	10451	+// DrawMode() = SELECTION;
8644	10452	// }
8645	10453
8646	10454	if (!isRenderer)
..	..	@@ -8696,9 +10504,9 @@
8696	10504
8697	10505	//ANTIALIAS = 0;
8698	10506
8699		- if (drawMode == DEFAULT) // && CURRENTANTIALIAS > 0)
	10507	+ if (DrawMode() == DEFAULT) // && CURRENTANTIALIAS > 0)
8700	10508	{
8701		- if (niceon \|\| isLIVE())
	10509	+ if (niceon \|\| Globals.isLIVE())
8702	10510	{
8703	10511	//if(active == 0)
8704	10512	// antialiaser = null;
..	..	@@ -8711,6 +10519,7 @@
8711	10519	ANTIALIAS = 0;
8712	10520	//System.out.println("RESTART");
8713	10521	AAtimer.restart();
	10522	+ Globals.TIMERRUNNING = true;
8714	10523	}
8715	10524	}
8716	10525	}
..	..	@@ -8723,7 +10532,7 @@
8723	10532	assert eyeCamera.shaper_zFar == 1E5f; // 500.0f;
8724	10533	*/
8725	10534
8726		- if (drawMode == DEFAULT)
	10535	+ if (DrawMode() == DEFAULT)
8727	10536	{
8728	10537	currentlydrawing = true;
8729	10538	}
..	..	@@ -8754,18 +10563,18 @@
8754	10563
8755	10564	// if(Applet3D.clipboard != null)
8756	10565	// System.out.println("Clipboard = " + Applet3D.clipboard); //.get(0).parent);
8757		-//drawMode = SELECTION;
	10566	+//DrawMode() = SELECTION;
8758	10567	indexcount = 0;
8759	10568
8760		- if (drawMode == OCCLUSION)
	10569	+ if (DrawMode() == OCCLUSION)
8761	10570	{
8762		- drawMode = DEFAULT;
	10571	+ Globals.drawMode = DEFAULT; // WARNING
8763	10572	ambientOcclusion = true;
8764	10573	setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
8765	10574	Object3D theobject = object;
8766	10575	Object3D theparent = object.parent;
8767	10576	object.parent = null;
8768		- object = (Object3D)GrafreeD.clone(object);
	10577	+ object = (Object3D)Grafreed.clone(object);
8769	10578	object.Stripify();
8770	10579	if (theobject.selection == null \|\| theobject.selection.Size() == 0)
8771	10580	theobject.PreprocessOcclusion(this);
..	..	@@ -8778,19 +10587,20 @@
8778	10587	ambientOcclusion = false;
8779	10588	}
8780	10589
8781		- if (lighttouched && drawMode == DEFAULT && !lightMode) // && !FROZEN)
	10590	+ if (//Globals.lighttouched &&
	10591	+ DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
8782	10592	{
8783	10593	//if (RENDERSHADOW) // ?
8784	10594	if (!IsFrozen())
8785	10595	{
8786	10596	// dec 2012
8787		- if (!(!flash && !lightMode && drawMode == DEFAULT && ANTIALIAS > 0))
	10597	+ if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
8788	10598	{
8789		- framecount++;
	10599	+ Globals.framecount++;
8790	10600	shadowbuffer.display();
8791	10601	}
8792	10602	}
8793		- lighttouched = false; // ??
	10603	+ Globals.lighttouched = false; // ??
8794	10604	//drawing = true;
8795	10605	//lighttouched = true;
8796	10606	}
..	..	@@ -8811,9 +10621,9 @@
8811	10621	//eyeCamera.shaper_fovy = 1;
8812	10622	}
8813	10623
8814		- if ((RENDERPROGRAM != 0 \|\| ambientOcclusion \|\| spherical) && drawMode == DEFAULT) // SELECTION)
	10624	+ if ((RENDERPROGRAM != 0 \|\| ambientOcclusion \|\| spherical) && DrawMode() == DEFAULT) // SELECTION)
8815	10625	{
8816		- //System.out.println("drawMode = " + drawMode);
	10626	+ //System.out.println("DrawMode() = " + DrawMode());
8817	10627	vertexMode \|= VP_PASS;
8818	10628	//vertexMode \|= VP_PROJECTION;
8819	10629	if (!ambientOcclusion)
..	..	@@ -8873,7 +10683,7 @@
8873	10683	Camera cam = renderCamera; // lightMode?lightCamera:eyeCamera;
8874	10684	//Camera lightcam = new Camera(light0);
8875	10685
8876		- if (drawMode == SHADOW)
	10686	+ if (DrawMode() == SHADOW)
8877	10687	{
8878	10688	/*
8879	10689	gl.glMatrixMode(GL.GL_MODELVIEW);
..	..	@@ -8911,8 +10721,8 @@
8911	10721
8912	10722	// if (parentcam != renderCamera) // not a light
8913	10723	if (cam != lightCamera)
8914		- for (int count = parentcam.GetTransformCount(); --count>=0;)
8915		- LA.matConcat(parentcam.toParent, matrix, matrix);
	10724	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10725	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
8916	10726
8917	10727	for (int j = 0; j < 4; j++)
8918	10728	{
..	..	@@ -8926,8 +10736,8 @@
8926	10736
8927	10737	// if (parentcam != renderCamera) // not a light
8928	10738	if (cam != lightCamera)
8929		- for (int count = parentcam.GetTransformCount(); --count>=0;)
8930		- LA.matConcat(matrix, parentcam.fromParent, matrix);
	10739	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10740	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
8931	10741
8932	10742	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
8933	10743
..	..	@@ -8963,7 +10773,7 @@
8963	10773	gl.glClear(gl.GL_DEPTH_BUFFER_BIT);
8964	10774	} else
8965	10775	{
8966		- if (drawMode != DEFAULT)
	10776	+ if (DrawMode() != DEFAULT)
8967	10777	{
8968	10778	gl.glClearColor(1, 1, 1, 0);
8969	10779	} // 1);
..	..	@@ -9028,7 +10838,7 @@
9028	10838
9029	10839	fast &= !ambientOcclusion;
9030	10840
9031		- if (drawMode == DEFAULT)
	10841	+ if (DrawMode() == DEFAULT)
9032	10842	{
9033	10843	//gl.glEnable(gl.GL_ALPHA_TEST);
9034	10844	//gl.glActiveTexture(GL.GL_TEXTURE0);
..	..	@@ -9089,6 +10899,8 @@
9089	10899	//gl.glFrustum(-0.5scale, 0.5scale, -0.5scale, 0.5scale, 1, 100);
9090	10900	//glu.gluPerspective(lightshaper_fovy, 1, lightshaper_zNear, lightshaper_zFar);
9091	10901	double scale = lightCamera.SCALE / lightCamera.Distance();
	10902	+// PATCH FILLE AUX JEANS
	10903	+ //scale *= lightCamera.shaper_fovy / 25;
9092	10904	gl.glScaled(2 * scale, 2 * scale, -scale);
9093	10905	gl.glTranslated(0, 0, lightCamera.DECAL);
9094	10906
..	..	@@ -9184,7 +10996,16 @@
9184	10996	// Bump noise
9185	10997	gl.glActiveTexture(GL.GL_TEXTURE6);
9186	10998	//gl.glBindTexture(GL.GL_TEXTURE_2D, bump_noise);
9187		- BindTexture(NOISE_TEXTURE, false, 2);
	10999	+
	11000	+ try
	11001	+ {
	11002	+ BindTexture(NOISE_TEXTURE, false, 2);
	11003	+ }
	11004	+ catch (Exception e)
	11005	+ {
	11006	+ System.err.println("FAILED: " + NOISE_TEXTURE);
	11007	+ }
	11008	+
9188	11009
9189	11010	gl.glActiveTexture(GL.GL_TEXTURE0);
9190	11011	gl.glEnable(GL.GL_TEXTURE_2D);
..	..	@@ -9224,10 +11045,12 @@
9224	11045	gl.glMatrixMode(gl.GL_PROJECTION);
9225	11046	gl.glLoadIdentity();
9226	11047
9227		- if (drawMode == SHADOW \|\| cam == lightCamera) // \|\| (vertexMode&VP_PROJECTION) != 0)
	11048	+ if (DrawMode() == SHADOW \|\| cam == lightCamera) // \|\| (vertexMode&VP_PROJECTION) != 0)
9228	11049	{
9229	11050	//glu.gluPerspective(lightshaper_fovy, 1, lightshaper_zNear, lightshaper_zFar);
9230	11051	double scale = lightCamera.SCALE / lightCamera.Distance();
	11052	+// PATCH FILLE AUX JEANS
	11053	+ //scale *= lightCamera.shaper_fovy / 25;
9231	11054	gl.glScaled(2 * scale, 2 * scale, -scale);
9232	11055	gl.glTranslated(0, 0, lightCamera.DECAL);
9233	11056	//System.out.println("DECAL = " + LIGHTDECAL + "; SCALE = " + LIGHTSCALE);
..	..	@@ -9280,7 +11103,7 @@
9280	11103	//gl.glPushMatrix();
9281	11104	gl.glLoadIdentity();
9282	11105
9283		- if (!ambientOcclusion) // drawMode != OCCLUSION)
	11106	+ if (!ambientOcclusion) // DrawMode() != OCCLUSION)
9284	11107	{
9285	11108	//LA.xformPos(light0, lightCamera.fromScreen, light);
9286	11109	LA.xformDir(dirlight, lightCamera.fromScreen, lightposition);
..	..	@@ -9307,8 +11130,8 @@
9307	11130	System.err.println("parentcam != renderCamera");
9308	11131
9309	11132	// if (cam != lightCamera)
9310		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9311		- LA.xformDir(lightposition, parentcam.toParent, lightposition); // may 2013
	11133	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11134	+ LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
9312	11135	}
9313	11136
9314	11137	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -9329,8 +11152,8 @@
9329	11152	if (true) // TODO
9330	11153	{
9331	11154	if (cam != lightCamera)
9332		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9333		- LA.xformDir(light0, parentcam.toParent, light0); // may 2013
	11155	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11156	+ LA.xformDir(light0, parentcam.GlobalTransform(), light0); // may 2013
9334	11157	}
9335	11158
9336	11159	LA.xformPos(light0, cam.toScreen, light0);
..	..	@@ -9367,7 +11190,7 @@
9367	11190	}
9368	11191
9369	11192	/**/
9370		- if (true) // drawMode == SELECTION) // != DEFAULT)
	11193	+ if (true) // DrawMode() == SELECTION) // != DEFAULT)
9371	11194	gl.glDisable(gl.GL_LIGHTING);
9372	11195	else
9373	11196	gl.glEnable(gl.GL_LIGHTING);
..	..	@@ -9379,12 +11202,13 @@
9379	11202
9380	11203	gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 63, options2, 0);
9381	11204	gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 62, options3, 0);
	11205	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 61, options4, 0);
9382	11206
9383	11207	options2[0] *= renderCamera.Distance();
9384	11208
9385	11209	lightslot = 64;
9386	11210
9387		- if (!frozen && !ambientOcclusion && isRenderer && drawMode == DEFAULT)
	11211	+ if (!frozen && !ambientOcclusion && isRenderer && DrawMode() == DEFAULT)
9388	11212	{
9389	11213	DrawLights(object);
9390	11214	}
..	..	@@ -9395,7 +11219,7 @@
9395	11219	fragmentMode \|= (lightslot - 64) << 2; // 1; // first bit is available for aniso
9396	11220	//System.out.println("fragmentMode = " + fragmentMode);
9397	11221
9398		- if (drawMode == DEFAULT \|\| drawMode == SELECTION \|\| DEBUG_SELECTION)
	11222	+ if (DrawMode() == DEFAULT \|\| DrawMode() == SELECTION \|\| IsDebugSelection())
9399	11223	{
9400	11224	/*
9401	11225	if (CULLFACE \|\| (ambientOcclusion && OCCLUSION_CULLING))
..	..	@@ -9428,7 +11252,7 @@
9428	11252	}
9429	11253	}
9430	11254
9431		- if (drawMode == DEFAULT)
	11255	+ if (DrawMode() == DEFAULT)
9432	11256	{
9433	11257	if (WIREFRAME && !ambientOcclusion)
9434	11258	{
..	..	@@ -9446,7 +11270,7 @@
9446	11270	gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9447	11271	gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9448	11272
9449		- if (!fast/RENDERPROGRAM != 0/ && (drawMode == DEFAULT \|\| drawMode == SHADOW)) // && !WIREFRAME) //
	11273	+ if (!fast/RENDERPROGRAM != 0/ && (DrawMode() == DEFAULT \|\| DrawMode() == SHADOW)) // && !WIREFRAME) //
9450	11274	{
9451	11275	if (vertexMode != 0) // && !fast)
9452	11276	{
..	..	@@ -9466,7 +11290,7 @@
9466	11290	}
9467	11291	}
9468	11292
9469		- if (false) // fast && !IsFreezed() && drawMode != SELECTION && !ambientOcclusion)
	11293	+ if (false) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
9470	11294	{
9471	11295	//gl.glDepthFunc(GL.GL_LEQUAL);
9472	11296	//gl.glClear(gl.GL_COLOR_BUFFER_BIT \| gl.GL_DEPTH_BUFFER_BIT);
..	..	@@ -9494,7 +11318,7 @@
9494	11318	//gl.glDepthMask(false);
9495	11319	}
9496	11320
9497		- if (false) // drawMode == SHADOW)
	11321	+ if (false) // DrawMode() == SHADOW)
9498	11322	{
9499	11323	//SetColumnMajorData(cameraInverseTransform, view_1);
9500	11324	//System.out.println("light = " + cameraInverseTransform);
..	..	@@ -9508,16 +11332,16 @@
9508	11332	//System.out.println("object = " + object);
9509	11333	if (!frozen && !imageLocked)
9510	11334	{
9511		- if (!flash && !lightMode && drawMode == DEFAULT && ANTIALIAS > 0)
	11335	+ if (!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0)
9512	11336	{
9513	11337	displayAntiAliased(gl);
9514	11338	} else
9515	11339	{
9516	11340	programcount = 0;
9517		- int keepmode = drawMode;
	11341	+ int keepmode = DrawMode();
9518	11342	// if (DEBUG_SELECTION)
9519	11343	// {
9520		-// drawMode = SELECTION;
	11344	+// DrawMode() = SELECTION;
9521	11345	// }
9522	11346	// for point selection
9523	11347	// gl.glGetDoublev(gl.GL_MODELVIEW_MATRIX, tempmat, 0);
..	..	@@ -9527,10 +11351,10 @@
9527	11351	DrawObject(gl);
9528	11352
9529	11353	// jan 2013 System.err.println("RESET ABORT (display)");
9530		- // if (drawMode == DEFAULT)
	11354	+ // if (DrawMode() == DEFAULT)
9531	11355	// ABORTED = false;
9532	11356	fullreset = false;
9533		- drawMode = keepmode;
	11357	+ Globals.drawMode = keepmode; // WARNING
9534	11358	//System.out.println("PROGRAM SWITCH " + programcount);
9535	11359	}
9536	11360	}
..	..	@@ -9538,11 +11362,11 @@
9538	11362	gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9539	11363	gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9540	11364
9541		- if (drawMode == DEFAULT)
	11365	+ if (DrawMode() == DEFAULT)
9542	11366	{
9543	11367	ReleaseTexture(NOISE_TEXTURE, false);
9544	11368	}
9545		- //if (drawMode == DEFAULT)
	11369	+ //if (DrawMode() == DEFAULT)
9546	11370	{
9547	11371
9548	11372	gl.glActiveTexture(GL.GL_TEXTURE1);
..	..	@@ -9554,7 +11378,7 @@
9554	11378	//else
9555	11379	//gl.glDisable(gl.GL_TEXTURE_2D);
9556	11380	//gl.glPopMatrix();
9557		- if (imageCompleted && ANTIALIAS > 0 && drawMode == DEFAULT && cam != lightCamera && !ambientOcclusion)
	11381	+ if (imageCompleted && ANTIALIAS > 0 && DrawMode() == DEFAULT && cam != lightCamera && !ambientOcclusion)
9558	11382	{
9559	11383	//new Exception().printStackTrace();
9560	11384	//System.out.println("Draw image " + width + ", " + height);
..	..	@@ -9596,7 +11420,7 @@
9596	11420	//gl.glFlush();
9597	11421	}
9598	11422
9599		- if (flash && drawMode == DEFAULT)
	11423	+ if (flash && DrawMode() == DEFAULT)
9600	11424	{
9601	11425	flash = false;
9602	11426	wait = true;
..	..	@@ -9604,9 +11428,9 @@
9604	11428	}
9605	11429
9606	11430	//drawing = false;
9607		- //if(drawMode == DEFAULT)
	11431	+ //if(DrawMode() == DEFAULT)
9608	11432	// niceon = false;
9609		- if (drawMode == DEFAULT)
	11433	+ if (DrawMode() == DEFAULT)
9610	11434	{
9611	11435	currentlydrawing = false;
9612	11436	}
..	..	@@ -9626,7 +11450,7 @@
9626	11450	repaint();
9627	11451	}
9628	11452
9629		- if (isLIVE() && drawMode == DEFAULT) // may 2013
	11453	+ if (Globals.isLIVE() && DrawMode() == DEFAULT) // may 2013
9630	11454	repaint();
9631	11455
9632	11456	displaydone = true;
..	..	@@ -9645,8 +11469,14 @@
9645	11469	{
9646	11470	renderpass++;
9647	11471	// System.out.println("Draw object... ");
	11472	+ STEP = 1;
9648	11473	if (FAST) // in case there is no script
9649		- STEP = 16;
	11474	+ STEP = 8;
	11475	+
	11476	+ if (CURRENTANTIALIAS == 0 \|\| ACSIZE == 1)
	11477	+ {
	11478	+ STEP *= 4;
	11479	+ }
9650	11480
9651	11481	//object.FullInvariants();
9652	11482
..	..	@@ -9660,22 +11490,43 @@
9660	11490	e.printStackTrace();
9661	11491	}
9662	11492
9663		- if (GrafreeD.RENDERME > 0)
9664		- GrafreeD.RENDERME--; // mechante magouille
	11493	+ if (Grafreed.RENDERME > 0)
	11494	+ Grafreed.RENDERME--; // mechante magouille
9665	11495
9666		- ONESTEP = false;
	11496	+ Globals.ONESTEP = false;
9667	11497	}
9668	11498
9669	11499	static boolean zoomonce = false;
9670	11500
	11501	+ static void CreateSelectedPoint()
	11502	+ {
	11503	+ if (selectedpoint == null)
	11504	+ {
	11505	+ debugpointG = new Sphere();
	11506	+ debugpointP = new Sphere();
	11507	+ debugpointC = new Sphere();
	11508	+ debugpointR = new Sphere();
	11509	+
	11510	+ selectedpoint = new Superellipsoid();
	11511	+
	11512	+ for (int i=0; i<8; i++)
	11513	+ {
	11514	+ debugpoints[i] = new Sphere();
	11515	+ }
	11516	+ }
	11517	+ }
	11518	+
9671	11519	void DrawObject(GL gl, boolean draw)
9672	11520	{
	11521	+ // To clear camera values
	11522	+ ResetOptions();
	11523	+
9673	11524	//System.out.println("DRAW OBJECT " + mouseDown);
9674		-// drawMode = SELECTION;
	11525	+// DrawMode() = SELECTION;
9675	11526	//GL gl = getGL();
9676	11527	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
9677	11528	{
9678		- if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && drawMode == SHADOW) // && !lightMode)
	11529	+ if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
9679	11530	object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
9680	11531	pingthread.StepToTarget(true); // true);
9681	11532	// zoomonce = false;
..	..	@@ -9696,9 +11547,9 @@
9696	11547	callist = gl.glGenLists(1);
9697	11548	}
9698	11549
9699		- boolean selectmode = drawMode == SELECTION \|\| CameraPane.DEBUG_SELECTION;
	11550	+ boolean selectmode = DrawMode() == SELECTION \|\| IsDebugSelection();
9700	11551
9701		- boolean active = !selectmode; // drawMode != SELECTION; // mouseDown;
	11552	+ boolean active = !selectmode; // DrawMode() != SELECTION; // mouseDown;
9702	11553
9703	11554	if (!mainDL \|\| !active \|\| touched)
9704	11555	{
..	..	@@ -9725,13 +11576,20 @@
9725	11576	PushMatrix(ClickInfo.matbuffer);
9726	11577	}
9727	11578
9728		- if (drawMode == 0)
	11579	+ if (DrawMode() == 0)
9729	11580	{
9730	11581	// System.out.println("CLEAR +++++++++++++++ +++++++++++++++ +++++++++++++++ +++++++++++++++");
9731	11582
9732	11583	usedtextures.clear();
9733	11584
9734		- BindTextures(DEFAULT_TEXTURES, 2);
	11585	+ try
	11586	+ {
	11587	+ BindTextures(DEFAULT_TEXTURES, 2);
	11588	+ }
	11589	+ catch (Exception e)
	11590	+ {
	11591	+ System.err.println("FAILED: " + DEFAULT_TEXTURES);
	11592	+ }
9735	11593	}
9736	11594	//System.out.println("--> " + stackdepth);
9737	11595	// GrafreeD.traceon();
..	..	@@ -9739,10 +11597,11 @@
9739	11597	// DRAW
9740	11598	object.draw(this, /(Composite)/ object, false, false);
9741	11599
9742		- if (drawMode == DEFAULT)
	11600	+ if (DrawMode() == DEFAULT)
9743	11601	{
9744		- if (DEBUG)
	11602	+ if (Globals.DEBUG)
9745	11603	{
	11604	+ CreateSelectedPoint();
9746	11605	float radius = 0.05f;
9747	11606	if (selectedpoint.radius != radius)
9748	11607	{
..	..	@@ -9750,40 +11609,40 @@
9750	11609	selectedpoint.radius = radius;
9751	11610	selectedpoint.recalculate();
9752	11611	selectedpoint.material = new cMaterial();
9753		- selectedpoint.material.color = 0.25f;
	11612	+ selectedpoint.material.color = 0.15f; // Yellow
9754	11613	selectedpoint.material.modulation = 0.75f;
9755	11614
9756		- debugpoint.radius = radius;
9757		- debugpoint.recalculate();
9758		- debugpoint.material = new cMaterial();
9759		- debugpoint.material.color = 0.25f;
9760		- debugpoint.material.modulation = 0.75f;
	11615	+ debugpointG.radius = radius;
	11616	+ debugpointG.recalculate();
	11617	+ debugpointG.material = new cMaterial();
	11618	+ debugpointG.material.color = 0.25f; // Green
	11619	+ debugpointG.material.modulation = 0.75f;
9761	11620
9762		- debugpoint2.radius = radius;
9763		- debugpoint2.recalculate();
9764		- debugpoint2.material = new cMaterial();
9765		- debugpoint2.material.color = 0.75f;
9766		- debugpoint2.material.modulation = 0.75f;
	11621	+ debugpointP.radius = radius;
	11622	+ debugpointP.recalculate();
	11623	+ debugpointP.material = new cMaterial();
	11624	+ debugpointP.material.color = 0.75f; // Purple
	11625	+ debugpointP.material.modulation = 0.75f;
9767	11626
9768		- debugpoint3.radius = radius;
9769		- debugpoint3.recalculate();
9770		- debugpoint3.material = new cMaterial();
9771		- debugpoint3.material.color = 0.5f;
9772		- debugpoint3.material.modulation = 0.75f;
	11627	+ debugpointC.radius = radius;
	11628	+ debugpointC.recalculate();
	11629	+ debugpointC.material = new cMaterial();
	11630	+ debugpointC.material.color = 0.5f; // Cyan
	11631	+ debugpointC.material.modulation = 0.75f;
9773	11632
9774		- debugpoint4.radius = radius;
9775		- debugpoint4.recalculate();
9776		- debugpoint4.material = new cMaterial();
9777		- debugpoint4.material.color = 0f;
9778		- debugpoint4.material.modulation = 0.75f;
	11633	+ debugpointR.radius = radius;
	11634	+ debugpointR.recalculate();
	11635	+ debugpointR.material = new cMaterial();
	11636	+ debugpointR.material.color = 0f; // Red
	11637	+ debugpointR.material.modulation = 0.75f;
9779	11638
9780	11639	InitPoints(radius);
9781	11640	}
9782	11641	selectedpoint.draw(this, /(Composite)/ null, false, false);
9783		- debugpoint.draw(this, /(Composite)/ null, false,false);
9784		- debugpoint2.draw(this, /(Composite)/ null, false,false);
9785		- debugpoint3.draw(this, /(Composite)/ null, false,false);
9786		- debugpoint4.draw(this, /(Composite)/ null, false,false);
	11642	+ debugpointG.draw(this, /(Composite)/ null, false,false);
	11643	+ debugpointP.draw(this, /(Composite)/ null, false,false);
	11644	+ debugpointC.draw(this, /(Composite)/ null, false,false);
	11645	+ debugpointR.draw(this, /(Composite)/ null, false,false);
9787	11646	// DrawPoints(this);
9788	11647	}
9789	11648
..	..	@@ -9791,7 +11650,7 @@
9791	11650	}
9792	11651	// GrafreeD.traceoff();
9793	11652	//System.out.println(stackdepth);
9794		- if (drawMode == 0)
	11653	+ if (DrawMode() == 0)
9795	11654	{
9796	11655	ReleaseTextures(DEFAULT_TEXTURES);
9797	11656
..	..	@@ -9816,17 +11675,26 @@
9816	11675
9817	11676	checker = null;
9818	11677
9819		- if (!ambientOcclusion && !IsFrozen() && drawMode == DEFAULT)
	11678	+ if (!ambientOcclusion && !IsFrozen() && DrawMode() == DEFAULT)
9820	11679	FindChecker(object);
9821	11680
9822		- if (checker != null && drawMode == DEFAULT)
	11681	+ if (checker != null && DrawMode() == DEFAULT)
9823	11682	{
9824		- // BindTexture(IMMORTAL_TEXTURE);
	11683	+ //BindTexture(IMMORTAL_TEXTURE);
	11684	+ try
	11685	+ {
	11686	+ BindTextures(checker.GetTextures(), checker.texres);
	11687	+ }
	11688	+ catch (Exception e)
	11689	+ {
	11690	+ System.err.println("FAILED: " + checker.GetTextures());
	11691	+ }
9825	11692	// NEAREST
9826	11693	GetGL().glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST); // GL.GL_LINEAR);
9827	11694	DrawChecker(gl);
9828	11695	//checker.Draw(this, null, false);
9829	11696	// ReleaseTexture(IMMORTAL_TEXTURE);
	11697	+ ReleaseTextures(checker.GetTextures());
9830	11698	}
9831	11699
9832	11700	if (object.parent != null)
..	..	@@ -9839,7 +11707,7 @@
9839	11707	//gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9840	11708	//gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9841	11709
9842		- if (DISPLAYTEXT && drawMode == DEFAULT)
	11710	+ if (DISPLAYTEXT && DrawMode() == DEFAULT)
9843	11711	{
9844	11712	// Draw it once, then use the raster
9845	11713	Balloon(gl, balloon.createGraphics());
..	..	@@ -9895,14 +11763,14 @@
9895	11763	int[] xs = new int[3];
9896	11764	int[] ys = new int[3];
9897	11765
9898		- void DrawString(Object3D obj) // String string)
	11766	+ public void DrawString(Object3D obj) // String string) // INTERFACE
9899	11767	{
9900		- if (!DISPLAYTEXT \|\| drawMode != DEFAULT)
	11768	+ if (!DISPLAYTEXT \|\| DrawMode() != DEFAULT)
9901	11769	{
9902	11770	return;
9903	11771	}
9904	11772
9905		- String string = obj.GetToolTip();
	11773	+ String string = obj.toString(); //.GetToolTip();
9906	11774
9907	11775	GL gl = GetGL();
9908	11776
..	..	@@ -10219,8 +12087,8 @@
10219	12087	//obj.TransformToWorld(light, light);
10220	12088	for (int i = tp.size(); --i >= 0;)
10221	12089	{
10222		- for (int count = tp.get(i).GetTransformCount(); --count>=0;)
10223		- LA.xformPos(light, tp.get(i).toParent, light);
	12090	+ //for (int count = tp.get(i).GetTransformCount(); --count>=0;)
	12091	+ LA.xformPos(light, tp.get(i).GlobalTransformInv(), light);
10224	12092	}
10225	12093
10226	12094
..	..	@@ -10237,8 +12105,8 @@
10237	12105	parentcam = cameras[0];
10238	12106	}
10239	12107
10240		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10241		- LA.xformPos(light, parentcam.toParent, light); // may 2013
	12108	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	12109	+ LA.xformPos(light, parentcam.GlobalTransform(), light); // may 2013
10242	12110
10243	12111	LA.xformPos(light, renderCamera.toScreen, light);
10244	12112
..	..	@@ -10357,11 +12225,13 @@
10357	12225	"PARAM params6 = program.env[6];" + // bump, noise, borderfade, fog punchthrough
10358	12226	"PARAM params7 = program.env[7];" + // noise power, opacity power
10359	12227	"PARAM options0 = program.env[63];" + // fog density, intensity, elevation
10360		- "PARAM options1 = program.env[62];" + // fog rgb color, image intensity
	12228	+ "PARAM options1 = program.env[62];" + // fog rgb color
	12229	+ "PARAM options2 = program.env[61];" + // image intensity, subsurface, lightsheen
10361	12230	"PARAM pointlight = program.env[127];" + // ...
10362	12231	"PARAM zero = { 0.0, 0.0, 0.0, 0.0 };" +
10363	12232	"PARAM halfhalf = { 0.25, 0.25, 0.25, 1.0 };" +
10364	12233	"PARAM half = { 0.5, 0.5, 0.5, 1.0 };" +
	12234	+ "PARAM threequarter = { 0.75, 0.75, 0.75, 1.0 };" +
10365	12235	"PARAM two = { 2.0, 2.0, 2.0, 1.0 };" +
10366	12236	"PARAM ten = { 10, 10, 10, 1.0 };" +
10367	12237	"PARAM one3rd = { 0.5, 0.33333333333, 0.333333333, 1.0 };" +
..	..	@@ -10382,6 +12252,7 @@
10382	12252	"PARAM lodbias = { 10,10,10,10 };" + // 20, -2, -20, 1.0 };" +
10383	12253	"PARAM infinity = { 100000000, 100000000, 100000000, 1.0 };" +
10384	12254	"PARAM one2048th = { 0.00048828125, 0.00048828125, 0.00048828125, 1.0 };" +
	12255	+ "PARAM ninetenth = { 0.9, 0.9, 0.9, 1.0 };" +
10385	12256	"PARAM almostone = { 0.999, 0.999, 0.999, 1.0 };" +
10386	12257	"PARAM c256 = { 256, 256, 256, 1.0 };" +
10387	12258	"PARAM c256i = { 0.00390625, 0.00390625, 0.00390625, 1.0 };" +
..	..	@@ -10422,6 +12293,10 @@
10422	12293	"TEMP R1;" +
10423	12294	"TEMP R2;" +
10424	12295	"TEMP R3;" +
	12296	+ "TEMP min;" +
	12297	+ "TEMP max;" +
	12298	+ "TEMP average;" +
	12299	+ "TEMP saturation;" +
10425	12300	"TEMP keep1;" +
10426	12301	"TEMP keep2;" +
10427	12302	"TEMP keep3;" +
..	..	@@ -10845,8 +12720,8 @@
10845	12720
10846	12721	// display shadow only (bump == 0)
10847	12722	"SUB temp.x, half.x, shadow.x;" +
10848		- "MOV temp.y, -params6.x;" +
10849		- "SLT temp.z, temp.y, zero.x;" +
	12723	+ "MOV temp.y, -params5.z;" + // params6.x;" +
	12724	+ "SLT temp.z, temp.y, -one2048th.x;" +
10850	12725	"SUB temp.y, one.x, temp.z;" +
10851	12726	"MUL temp.x, temp.x, temp.y;" +
10852	12727	"KIL temp.x;" +
..	..	@@ -10952,10 +12827,42 @@
10952	12827
10953	12828	// skin?
10954	12829	// Saturation for skin
10955		- /**/ // c'est ici
10956		- (Skinshader? "DP3 temp.x, final,one;" +
	12830	+ /**/
	12831	+ (Skinshader?
	12832	+ "DP3 average.x, final,one;" +
	12833	+ "MUL average, one3rd.xxxx,average.xxxx;" +
	12834	+
	12835	+ "MIN min.x, final.x,final.y;" +
	12836	+ "MIN min.x, min.x,final.z;" +
	12837	+
	12838	+ "MAX max.x, final.x,final.y;" +
	12839	+ "MAX max.x, max.x,final.z;" +
	12840	+ "MOV max, max.xxxx;" +
	12841	+
	12842	+ "SUB saturation, max, final;" +
	12843	+
	12844	+ "ADD temp.x, max.x, one10th.x;" +
	12845	+ "RCP temp.x, temp.x;" +
	12846	+ "MUL temp.x, temp.x, half.x;" +
	12847	+ "MUL saturation, saturation, temp.xxxx;" +
	12848	+
	12849	+ "DP3 ndotl.x, normald, light;" +
	12850	+ "MAX ndotl.x, ndotl.x, -ndotl.x;" +
	12851	+
	12852	+ "SUB temp.x, one.x, ndotl.x;" +
	12853	+ // Tuning for default skin
	12854	+ //"ADD temp.x, temp.x, options2.z;" + // lightsheen
	12855	+ "MAD temp.x, options2.z, half.y, temp.x;" + // lightsheen
	12856	+ "ADD temp.y, one.y, options2.y;" + // subsurface
	12857	+ "MUL temp.x, temp.x, temp.y;" +
	12858	+
	12859	+ "MUL saturation, saturation, temp.xxxx;" +
	12860	+ "SUB_SAT temp, max, saturation;" +
	12861	+/**
	12862	+ "DP3 temp.x, final,one;" +
10957	12863	"MUL R2, one3rd.xxxx,temp.xxxx;" +
10958		- "SUB temp, final,R2;" +
	12864	+ "SUB temp, final, R2;" +
	12865	+
10959	12866	// using light angle
10960	12867	"DP3 ndotl.x, normald,light;" +
10961	12868	//"SLT ndotl.y, ndotl.x, zero.x;" +
..	..	@@ -10968,7 +12875,6 @@
10968	12875	// using light intensity
10969	12876	"MOV ndotl.z, R2.x;" +
10970	12877	"MUL ndotl.z, ndotl.z, ndotl.z;" + // tuning...
10971		-
10972	12878	// june 2014
10973	12879	"MAD R1.x, ndotl.z,slope.y,one.x;" +
10974	12880	// "SUB ndotl.x, one.x, ndotl.x;" +
..	..	@@ -10980,6 +12886,7 @@
10980	12886	//"MUL R2.y, shadow.x,R2.y;" + // avril 2014
10981	12887
10982	12888	"MAD temp.x, R2.y, ndotl.y, temp.x;" + // red shift (skin)
	12889	+/**/
10983	12890
10984	12891	// "ADD final, R2,temp;" +
10985	12892	"MOV final, temp;"
..	..	@@ -11069,7 +12976,7 @@
11069	12976	/**/
11070	12977	// HDR
11071	12978	"MOV temp.z, final.a;" +
11072		- "MUL final, final,options1.w;" +
	12979	+ "MUL final, final,options2.x;" +
11073	12980	"MOV final.a, temp.z;" +
11074	12981	/**/
11075	12982
..	..	@@ -11145,7 +13052,7 @@
11145	13052	//once = true;
11146	13053	}
11147	13054
11148		- System.out.print("Program #" + mode + "; length = " + program.length());
	13055	+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
11149	13056	System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
11150	13057	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
11151	13058
..	..	@@ -11262,6 +13169,7 @@
11262	13169	String Shadow(String depth, String shadow)
11263	13170	{
11264	13171	return "MAX temp.x, ndotl.x, one64th.x;" +
	13172	+ "MIN temp.x, temp.x, ninetenth.x;" +
11265	13173	/**/
11266	13174	// Sine
11267	13175	"MUL temp.y, temp.x, temp.x;" +
..	..	@@ -11277,12 +13185,16 @@
11277	13185
11278	13186	"ADD " + depth + ".z, " + depth + ".z, temp.x;" +
11279	13187	//"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing!
	13188	+
	13189	+ // Compare fragment depth in light space with shadowmap.
11280	13190	"SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" +
11281	13191	"SGE temp.y, temp.x, zero.x;" +
11282		- "SUB " + shadow + ".y, one.x, temp.y;" +
	13192	+ "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded
	13193	+
	13194	+ // Reverse comparison
11283	13195	"SUB temp.x, one.x, temp.x;" +
11284	13196	"MUL " + shadow + ".x, temp.x, temp.y;" +
11285		- "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded
	13197	+ "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse
11286	13198	"POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth
11287	13199
11288	13200	"SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" +
..	..	@@ -11296,6 +13208,10 @@
11296	13208	// No shadow for backface
11297	13209	"DP3 temp.x, normal, lightd;" +
11298	13210	"SLT temp.x, temp.x, zero.x;" + // shadoweps
	13211	+ "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
	13212	+
	13213	+ // No shadow when out of frustrum
	13214	+ "SGE temp.x, " + depth + ".z, one.z;" +
11299	13215	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
11300	13216	"";
11301	13217	}
..	..	@@ -11442,7 +13358,8 @@
11442	13358	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
11443	13359	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
11444	13360	/static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
11445		- Object3D.cVector2[] vector2buffer;
	13361	+
	13362	+ //Object3D.cVector2[] vector2buffer;
11446	13363
11447	13364	// IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
11448	13365	// OUT : diff, spec
..	..	@@ -11854,7 +13771,7 @@
11854	13771	public void mousePressed(MouseEvent e)
11855	13772	{
11856	13773	//System.out.println("mousePressed: " + e);
11857		- clickStart(e.getX(), e.getY(), e.getModifiersEx());
	13774	+ clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
11858	13775	}
11859	13776
11860	13777	static long prevtime = 0;
..	..	@@ -11881,14 +13798,16 @@
11881	13798
11882	13799	//System.err.println("Dtime = " + Dtime + "; units = " + e.getUnitsToScroll() + "; ratio (units/ms) = " + ratio);
11883	13800
	13801	+ if (BUTTONLESSWHEEL)
11884	13802	if (Math.abs(ratio) < 0.1 \|\| Math.abs(Dtime) == 0) // < 30)
11885	13803	{
11886	13804	return;
11887	13805	}
11888	13806
	13807	+ boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
11889	13808
11890	13809	// TIMER
11891		- if (!wheeltimer.isRunning() && e.getModifiersEx() == 0) // VR
	13810	+ if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
11892	13811	{
11893	13812	keepboxmode = BOXMODE;
11894	13813	keepsupport = SUPPORT;
..	..	@@ -11928,8 +13847,8 @@
11928	13847	// mode \|= META;
11929	13848	//}
11930	13849
11931		- SetMouseMode(WHEEL \| e.getModifiersEx());
11932		- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0);
	13850	+ SetMouseMode(e.getModifiers(), WHEEL \| e.getModifiersEx());
	13851	+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
11933	13852	anchorX = ax;
11934	13853	anchorY = ay;
11935	13854	prevX = px;
..	..	@@ -11963,6 +13882,7 @@
11963	13882	else
11964	13883	if (evt.getSource() == AAtimer)
11965	13884	{
	13885	+ Globals.TIMERRUNNING = false;
11966	13886	if (mouseDown)
11967	13887	{
11968	13888	//new Exception().printStackTrace();
..	..	@@ -11988,6 +13908,10 @@
11988	13908	// LIVE = waslive;
11989	13909	// wasliveok = true;
11990	13910	// waslive = false;
	13911	+
	13912	+ // May 2019 Forget it:
	13913	+ if (true)
	13914	+ return;
11991	13915
11992	13916	// source == timer
11993	13917	if (mouseDown)
..	..	@@ -12017,7 +13941,7 @@
12017	13941	// ObjEditor.tweenManager.update(1f / 60f);
12018	13942
12019	13943	// fev 2014???
12020		- if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && drawMode == SHADOW) // && !lightMode)
	13944	+ if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
12021	13945	object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
12022	13946	pingthread.StepToTarget(true); // true);
12023	13947	}
..	..	@@ -12027,12 +13951,13 @@
12027	13951
12028	13952	javax.swing.Timer timer = new javax.swing.Timer(350, this);
12029	13953
12030		- void clickStart(int x, int y, int modifiers)
	13954	+ void clickStart(int x, int y, int modifiers, int modifiersex)
12031	13955	{
12032	13956	if (!wasliveok)
12033	13957	return;
12034	13958
12035	13959	AAtimer.restart(); //
	13960	+ Globals.TIMERRUNNING = true;
12036	13961
12037	13962	// waslive = LIVE;
12038	13963	// LIVE = false;
..	..	@@ -12044,7 +13969,7 @@
12044	13969	// touched = true; // main DL
12045	13970	if (isRenderer)
12046	13971	{
12047		- SetMouseMode(modifiers);
	13972	+ SetMouseMode(modifiers, modifiersex);
12048	13973	}
12049	13974
12050	13975	selectX = anchorX = x;
..	..	@@ -12057,7 +13982,7 @@
12057	13982	clicked = true;
12058	13983	hold = false;
12059	13984
12060		- if (((modifiers & ~1024) & ~0) == 0) // Single or multiple selection
	13985	+ if (((modifiersex & ~1024) & ~0) == 0) // Single or multiple selection
12061	13986	// june 2013 means CTRL_CLICK: if (((modifiers & ~1024) & ~128) == 0) // Single or multiple selection
12062	13987	{
12063	13988	// System.out.println("RESTART II " + modifiers);
..	..	@@ -12088,7 +14013,7 @@
12088	14013	info.camera = renderCamera;
12089	14014	info.x = x;
12090	14015	info.y = y;
12091		- info.modifiers = modifiers;
	14016	+ info.modifiers = modifiersex;
12092	14017	editObj = object.doEditClick(info, 0);
12093	14018	if (!editObj)
12094	14019	{
..	..	@@ -12105,11 +14030,14 @@
12105	14030
12106	14031	public void mouseDragged(MouseEvent e)
12107	14032	{
	14033	+ Globals.MOUSEDRAGGED = true;
	14034	+
	14035	+ //System.out.println("mouseDragged: " + e);
12108	14036	if (isRenderer)
12109	14037	movingcamera = true;
	14038	+
12110	14039	//if (drawing)
12111	14040	//return;
12112		- //System.out.println("mouseDragged: " + e);
12113	14041	if ((e.getModifiersEx() & CTRL) != 0
12114	14042	\|\| (e.getModifiersEx() & COMMAND) != 0) // \|\| IsFrozen())
12115	14043	{
..	..	@@ -12117,7 +14045,7 @@
12117	14045	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
12118	14046	}
12119	14047	else
12120		- drag(e.getX(), e.getY(), e.getModifiersEx());
	14048	+ drag(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
12121	14049
12122	14050	//try { Thread.sleep(1); } catch (Exception ex) {}
12123	14051	}
..	..	@@ -12129,6 +14057,11 @@
12129	14057	cVector tmp = new cVector();
12130	14058	cVector tmp2 = new cVector();
12131	14059	boolean isMoving;
	14060	+
	14061	+ public cVector TargetLookAt()
	14062	+ {
	14063	+ return targetLookAt;
	14064	+ }
12132	14065
12133	14066	class PingThread extends Thread
12134	14067	{
..	..	@@ -12268,7 +14201,7 @@
12268	14201	//System.out.println("---------------- ---------- Paint " + tmp.length2());
12269	14202	if (lightMode)
12270	14203	{
12271		- lighttouched = true;
	14204	+ Globals.lighttouched = true;
12272	14205	}
12273	14206
12274	14207	if (OEILONCE && OEIL)
..	..	@@ -12285,6 +14218,7 @@
12285	14218
12286	14219	public void run()
12287	14220	{
	14221	+ new Exception().printStackTrace();
12288	14222	System.exit(0);
12289	14223	for (;;)
12290	14224	{
..	..	@@ -12326,7 +14260,7 @@
12326	14260	mouseDown = false;
12327	14261	if (lightMode)
12328	14262	{
12329		- lighttouched = true;
	14263	+ Globals.lighttouched = true;
12330	14264	}
12331	14265	repaint();
12332	14266	alreadypainted = true;
..	..	@@ -12334,7 +14268,7 @@
12334	14268	isMoving = false;
12335	14269	} //??
12336	14270
12337		- if (isLIVE() && !alreadypainted)
	14271	+ if (Globals.isLIVE() && !alreadypainted)
12338	14272	{
12339	14273	// FOR DEBUG BREAKPOINT USING PAUSE: while (true)
12340	14274	repaint();
..	..	@@ -12346,9 +14280,9 @@
12346	14280	{
12347	14281	if (lightMode)
12348	14282	{
12349		- lighttouched = true;
	14283	+ Globals.lighttouched = true;
12350	14284	}
12351		- drag(X, (mouseMode != 0) ? Y : anchorY, MODIFIERS);
	14285	+ drag(X, (mouseMode != 0) ? Y : anchorY, 0, MODIFIERS);
12352	14286	}
12353	14287	//else
12354	14288	}
..	..	@@ -12448,7 +14382,7 @@
12448	14382	int X, Y;
12449	14383	boolean SX, SY;
12450	14384
12451		- void drag(int x, int y, int modifiers)
	14385	+ void drag(int x, int y, int modifiers, int modifiersex)
12452	14386	{
12453	14387	if (IsFrozen())
12454	14388	{
..	..	@@ -12457,17 +14391,17 @@
12457	14391
12458	14392	drag = true; // NEW
12459	14393
12460		- boolean continuous = (modifiers & COMMAND) == COMMAND;
	14394	+ boolean continuous = (modifiersex & COMMAND) == COMMAND;
12461	14395
12462	14396	X = x;
12463	14397	Y = y;
12464	14398	// floating state for animation
12465		- MODIFIERS = modifiers;
12466		- modifiers &= ~1024;
	14399	+ MODIFIERS = modifiersex;
	14400	+ modifiersex &= ~1024;
12467	14401	if (false) // modifiers != 0)
12468	14402	{
12469	14403	//new Exception().printStackTrace();
12470		- System.out.println("mouseDragged: " + modifiers);
	14404	+ System.out.println("mouseDragged: " + modifiersex);
12471	14405	System.out.println("SHIFT = " + SHIFT);
12472	14406	System.out.println("CONTROL = " + COMMAND);
12473	14407	System.out.println("META = " + META);
..	..	@@ -12487,7 +14421,8 @@
12487	14421	info.camera = renderCamera;
12488	14422	info.x = x;
12489	14423	info.y = y;
12490		- object.editWindow.copy.doEditDrag(info);
	14424	+ object.GetWindow().copy
	14425	+ .doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
12491	14426	} else
12492	14427	{
12493	14428	if (x < startX)
..	..	@@ -12589,6 +14524,7 @@
12589	14524	{
12590	14525	manipCamera.Translate(dx, dy, getWidth());
12591	14526	}
	14527	+ else
12592	14528	if ((mouseMode & ZOOM) == 0 && (mouseMode & VR) != 0)
12593	14529	{
12594	14530	manipCamera.RotateInterest(dx, dy);
..	..	@@ -12599,7 +14535,7 @@
12599	14535
12600	14536	if (manipCamera == lightCamera)
12601	14537	{
12602		- lighttouched = true;
	14538	+ Globals.lighttouched = true;
12603	14539	}
12604	14540	/*
12605	14541	switch (mode)
..	..	@@ -12638,7 +14574,6 @@
12638	14574	public void mouseMoved(MouseEvent e)
12639	14575	{
12640	14576	//System.out.println("mouseMoved: " + e);
12641		-
12642	14577	if (isRenderer)
12643	14578	return;
12644	14579
..	..	@@ -12651,7 +14586,9 @@
12651	14586	ci.camera = renderCamera;
12652	14587	if (!isRenderer)
12653	14588	{
12654		- if (object.editWindow.copy.doEditClick(ci, 0))
	14589	+ //ObjEditor editWindow = object.editWindow;
	14590	+ //Object3D copy = editWindow.copy;
	14591	+ if (object.doEditClick(ci, 0))
12655	14592	{
12656	14593	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
12657	14594	} else
..	..	@@ -12663,7 +14600,10 @@
12663	14600
12664	14601	public void mouseReleased(MouseEvent e)
12665	14602	{
	14603	+ Globals.MOUSEDRAGGED = false;
	14604	+
12666	14605	movingcamera = false;
	14606	+ X = Y = 0;
12667	14607	//System.out.println("mouseReleased: " + e);
12668	14608	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
12669	14609	}
..	..	@@ -12686,9 +14626,9 @@
12686	14626	boolean control = ((modifiers & CTRL) != 0); // june 2013: for point selection
12687	14627	boolean command = ((modifiers & COMMAND) != 0); // june 2013: for multiple selection
12688	14628
12689		- if (control \|\| command \|\| IsFrozen())
	14629	+// No delay if (control \|\| command \|\| IsFrozen())
12690	14630	timeout = true;
12691		- else
	14631	+// ?? May 2019 else
12692	14632	// timer.setDelay((modifiers & 128) != 0?0:350);
12693	14633	mouseDown = false;
12694	14634	if (!control && !command) // june 2013
..	..	@@ -12798,7 +14738,7 @@
12798	14738	System.out.println("keyReleased: " + e);
12799	14739	}
12800	14740
12801		- void SetMouseMode(int modifiers)
	14741	+ void SetMouseMode(int modifiers, int modifiersex)
12802	14742	{
12803	14743	//System.out.println("SetMouseMode = " + modifiers);
12804	14744	//modifiers &= ~1024;
..	..	@@ -12810,24 +14750,27 @@
12810	14750	//if (modifiers == 0) // \|\| (modifiers == (1024 \| CONTROL)))
12811	14751	// return;
12812	14752	//System.out.println("SetMode = " + modifiers);
12813		- if ((modifiers & WHEEL) == WHEEL)
	14753	+ if ((modifiersex & WHEEL) == WHEEL)
12814	14754	{
12815	14755	mouseMode \|= ZOOM;
12816	14756	}
12817		- if ((modifiers & META) == META)
	14757	+
	14758	+ boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
	14759	+ if (capsLocked) // \|\| (modifiers & META) == META)
12818	14760	{
12819	14761	mouseMode \|= VR; // BACKFORTH;
12820	14762	}
12821		- if ((modifiers & CTRLCLICK) == CTRLCLICK)
12822		- {
12823		- mouseMode \|= SELECT; // BACKFORTH;
12824		- }
12825		- if ((modifiers & COMMAND) == COMMAND)
	14763	+ if ((modifiersex & CTRLCLICK) == CTRLCLICK)
12826	14764	{
12827	14765	mouseMode \|= SELECT;
12828	14766	}
12829		- if ((modifiers & SHIFT) == SHIFT \|\| forcetranslate)
	14767	+ if ((modifiersex & COMMAND) == COMMAND)
12830	14768	{
	14769	+ mouseMode \|= SELECT;
	14770	+ }
	14771	+ if ((modifiersex & SHIFT) == SHIFT \|\| forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
	14772	+ {
	14773	+ mouseMode &= ~VR;
12831	14774	mouseMode \|= TRANSLATE;
12832	14775	}
12833	14776	// if ((modifiers & SHIFT_META) == SHIFT_META)
..	..	@@ -12854,10 +14797,10 @@
12854	14797
12855	14798	if (isRenderer) //
12856	14799	{
12857		- SetMouseMode(modifiers);
	14800	+ SetMouseMode(0, modifiers);
12858	14801	}
12859	14802
12860		- theRenderer.keyPressed(key);
	14803	+ Globals.theRenderer.keyPressed(key);
12861	14804	}
12862	14805
12863	14806	int kompactbit = 4; // power bit
..	..	@@ -12869,7 +14812,7 @@
12869	14812	float SATPOW = 1; // 2; // 0.5f;
12870	14813	float BRIPOW = 1; // 0.5f; // 0.5f;
12871	14814
12872		- void keyPressed(int key)
	14815	+ public void keyPressed(int key)
12873	14816	{
12874	14817	if (key >= '0' && key <= '5')
12875	14818	clampbit = (key-'0');
..	..	@@ -12984,7 +14927,7 @@
12984	14927	case 'B':
12985	14928	BRISMOOTH ^= true;
12986	14929	SHADOWCULLFACE ^= true;
12987		- lighttouched = true;
	14930	+ Globals.lighttouched = true;
12988	14931	repaint();
12989	14932	break;
12990	14933	case 'b':
..	..	@@ -13026,8 +14969,14 @@
13026	14969	RevertCamera();
13027	14970	repaint();
13028	14971	break;
13029		- case 'L':
13030	14972	case 'l':
	14973	+ lightMode ^= true;
	14974	+ Globals.lighttouched = true;
	14975	+ manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
	14976	+ targetLookAt.set(manipCamera.lookAt);
	14977	+ repaint();
	14978	+ break;
	14979	+ case 'L':
13031	14980	if (lightMode)
13032	14981	{
13033	14982	lightMode = false;
..	..	@@ -13084,7 +15033,7 @@
13084	15033	repaint();
13085	15034	break;
13086	15035	case 'O':
13087		- drawMode = OCCLUSION;
	15036	+ Globals.drawMode = OCCLUSION; // WARNING
13088	15037	repaint();
13089	15038	break;
13090	15039	case 'o':
..	..	@@ -13174,24 +15123,22 @@
13174	15123	kompactbit = 6;
13175	15124	break;
13176	15125	case ' ':
13177		- lightMode ^= true;
13178		- lighttouched = true;
13179		- manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
13180		- targetLookAt.set(manipCamera.lookAt);
	15126	+ ObjEditor.theFrame.ToggleFullScreen();
13181	15127	repaint();
13182	15128	break;
13183	15129	//case '`' :
13184	15130	case ESC:
13185	15131	RENDERPROGRAM += 1;
13186	15132	RENDERPROGRAM %= 3;
	15133	+
13187	15134	repaint();
13188	15135	break;
13189	15136	case 'Z':
13190		- RESIZETEXTURE ^= true;
13191		- break;
	15137	+ //RESIZETEXTURE ^= true;
	15138	+ //break;
13192	15139	case 'z':
13193		- RENDERSHADOW ^= true;
13194		- lighttouched = true;
	15140	+ Globals.RENDERSHADOW ^= true;
	15141	+ Globals.lighttouched = true;
13195	15142	repaint();
13196	15143	break;
13197	15144	//case UP:
..	..	@@ -13217,7 +15164,8 @@
13217	15164	FlipTransform();
13218	15165	break;
13219	15166	case ENTER:
13220		- object.editWindow.ScreenFit(); // Edit();
	15167	+ // object.editWindow.ScreenFit(); // Edit();
	15168	+ ToggleLive();
13221	15169	break;
13222	15170	case DELETE:
13223	15171	ClearSelection();
..	..	@@ -13305,6 +15253,7 @@
13305	15253	}
13306	15254	//System.out.println("shaper_fovy = " + manipCamera.shaper_fovy);
13307	15255	}
	15256	+
13308	15257	static double OCCLUSIONBOOST = 1; // 0.5;
13309	15258
13310	15259	void keyReleased(int key, int modifiers)
..	..	@@ -13312,11 +15261,11 @@
13312	15261	//mode = ROTATE;
13313	15262	if ((MODIFIERS & COMMAND) == 0) // VR??
13314	15263	{
13315		- SetMouseMode(modifiers);
	15264	+ SetMouseMode(0, modifiers);
13316	15265	}
13317	15266	}
13318	15267
13319		- protected void processKeyEvent(KeyEvent e)
	15268	+ public void processKeyEvent(KeyEvent e)
13320	15269	{
13321	15270	switch (e.getID())
13322	15271	{
..	..	@@ -13446,8 +15395,9 @@
13446	15395
13447	15396	protected void processMouseMotionEvent(MouseEvent e)
13448	15397	{
13449		- //System.out.println("processMouseMotionEvent: " + mouseMode);
13450		- if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
	15398	+ //System.out.println("processMouseMotionEvent: " + mouseMode + " " + e.getModifiers() + " " + e.getModifiersEx() + " " + e.getButton());
	15399	+ //if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
	15400	+ if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (e.getModifiers() & MouseEvent.BUTTON3_MASK) == 0 && (mouseMode & SELECT) == 0)
13451	15401	{
13452	15402	mouseMoved(e);
13453	15403	} else
..	..	@@ -13472,11 +15422,12 @@
13472	15422	}
13473	15423	*/
13474	15424
13475		- object.editWindow.EditSelection();
	15425	+ object.editWindow.EditSelection(false);
13476	15426	}
13477	15427
13478	15428	void SelectParent()
13479	15429	{
	15430	+ new Exception().printStackTrace();
13480	15431	System.exit(0);
13481	15432	Composite group = (Composite) object;
13482	15433	java.util.Vector selectees = new java.util.Vector(group.selection);
..	..	@@ -13500,6 +15451,7 @@
13500	15451
13501	15452	void SelectChildren()
13502	15453	{
	15454	+ new Exception().printStackTrace();
13503	15455	System.exit(0);
13504	15456	/*
13505	15457	Composite group = (Composite) object;
..	..	@@ -13664,7 +15616,9 @@
13664	15616	info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
13665	15617	//Image img = CreateImage(width, height);
13666	15618	//System.out.println("width = " + width + "; height = " + height + "\n");
	15619	+
13667	15620	Graphics gr = g; // img.getGraphics();
	15621	+
13668	15622	if (!hasMarquee)
13669	15623	{
13670	15624	if (Xmin < Xmax) // !locked)
..	..	@@ -13762,14 +15716,33 @@
13762	15716	if (!isRenderer)
13763	15717	{
13764	15718	object.drawEditHandles(info, 0);
	15719	+
	15720	+ if (drag && (X != 0 \|\| Y != 0) && object.selection.Size() > 0)
	15721	+ {
	15722	+ switch (object.selection.get(0).hitSomething)
	15723	+ {
	15724	+ case Object3D.hitCenter: gr.setColor(Color.pink);
	15725	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15726	+ break;
	15727	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	15728	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15729	+ break;
	15730	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	15731	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15732	+ break;
	15733	+ }
	15734	+
	15735	+ }
13765	15736	}
13766	15737	}
	15738	+
13767	15739	if (isRenderer)
13768	15740	{
13769	15741	//gr.setColor(Color.black);
13770	15742	//gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
13771	15743	//gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
13772	15744	}
	15745	+
13773	15746	if (hasMarquee)
13774	15747	{
13775	15748	gr.setXORMode(Color.white);
..	..	@@ -13792,6 +15765,7 @@
13792	15765	//if (g != gr) g.drawImage(img, 0, 0, width, height, null);
13793	15766	}
13794	15767
	15768	+ // To avoid clear.
13795	15769	public void update(Graphics g)
13796	15770	{
13797	15771	paint(g);
..	..	@@ -13881,6 +15855,7 @@
13881	15855	public boolean mouseDown(Event evt, int x, int y)
13882	15856	{
13883	15857	System.out.println("mouseDown: " + evt);
	15858	+ System.exit(0);
13884	15859	/*
13885	15860	locked = true;
13886	15861	drag = false;
..	..	@@ -13924,7 +15899,7 @@
13924	15899	{
13925	15900	keyPressed(0, modifiers);
13926	15901	}
13927		- clickStart(x, y, modifiers);
	15902	+ // clickStart(x, y, modifiers);
13928	15903	return true;
13929	15904	}
13930	15905
..	..	@@ -14042,7 +16017,7 @@
14042	16017	{
14043	16018	keyReleased(0, 0);
14044	16019	}
14045		- drag(x, y, modifiers);
	16020	+ drag(x, y, 0, modifiers);
14046	16021	return true;
14047	16022	}
14048	16023
..	..	@@ -14174,7 +16149,7 @@
14174	16149	Object3D object;
14175	16150	static Object3D trackedobject;
14176	16151	Camera renderCamera; // Light or Eye (or Occlusion)
14177		- /static/ Camera manipCamera; // Light or Eye
	16152	+ /static/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
14178	16153	/static/ Camera eyeCamera;
14179	16154	/static/ Camera lightCamera;
14180	16155	int cameracount;
..	..	@@ -14394,7 +16369,7 @@
14394	16369	gl.glPushAttrib(GL.GL_ALL_ATTRIB_BITS);
14395	16370	gl.glPushMatrix();
14396	16371	gl.glLoadIdentity();
14397		- PushMatrix(checker.toParent);
	16372	+ //PushMatrix(checker.toParent);
14398	16373
14399	16374	gl.glMatrixMode(GL.GL_TEXTURE);
14400	16375	gl.glPushMatrix();
..	..	@@ -14417,8 +16392,8 @@
14417	16392
14418	16393	gl.glNormal3f(0.0f, 0.0f, 1.0f);
14419	16394
14420		- float step = 0.1666f; //0.25f;
14421		- float stepv = step * 1652 / 998;
	16395	+ float step = 2; // 0.1666f; //0.25f;
	16396	+ float stepv = 2; // step * 1652 / 998;
14422	16397
14423	16398	int i0 = 0;
14424	16399	/*
..	..	@@ -14454,20 +16429,21 @@
14454	16429	/**/
14455	16430	//checker.GetMaterial().opacity = 1.1f;
14456	16431	////checker.GetMaterial().ambient = 0.99f;
14457		- Object3D.materialstack[Object3D.materialdepth] = checker.material;
14458		- Object3D.selectedstack[Object3D.materialdepth] = false;
14459		- cStatic.objectstack[Object3D.materialdepth++] = checker;
	16432	+ materialstack[materialdepth] = checker.material;
	16433	+ selectedstack[materialdepth] = false;
	16434	+ cStatic.objectstack[materialdepth++] = checker;
14460	16435	//System.out.println("material " + material);
14461	16436	//Applet3D.tracein(this, selected);
14462		- vector2buffer = checker.projectedVertices;
	16437	+ //vector2buffer = checker.projectedVertices;
14463	16438
14464		- checker.GetMaterial().Draw(this, false); // true);
	16439	+ //checker.GetMaterial().Draw(this, false); // true);
	16440	+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
14465	16441
14466		- Object3D.materialdepth -= 1;
14467		- if (Object3D.materialdepth > 0)
	16442	+ materialdepth -= 1;
	16443	+ if (materialdepth > 0)
14468	16444	{
14469		- vector2buffer = cStatic.objectstack[Object3D.materialdepth - 1].projectedVertices;
14470		- Object3D.materialstack[Object3D.materialdepth - 1].Draw(this, Object3D.selectedstack[Object3D.materialdepth - 1]);
	16445	+ //vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	16446	+ DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
14471	16447	}
14472	16448	//checker.GetMaterial().opacity = 1f;
14473	16449	////checker.GetMaterial().ambient = 1f;
..	..	@@ -14488,15 +16464,27 @@
14488	16464
14489	16465	//float u = (i+1)/2;
14490	16466	//float v = (j+1)/2;
14491		- gl.glTexCoord2f((i + 1) / 2, (j + 1) / 2); // (1,0) // (i+1+step)/2,(j+1)/2);
	16467	+ if (checker.flipV)
	16468	+ gl.glTexCoord2f((i + 1) / 2, 1 - (j + 1) / 2);
	16469	+ else
	16470	+ gl.glTexCoord2f((i + 1) / 2, (j + 1) / 2); // (1,0) // (i+1+step)/2,(j+1)/2);
14492	16471	gl.glVertex3f(i, j, -0.5f);
14493	16472
	16473	+ if (checker.flipV)
	16474	+ gl.glTexCoord2f((i + 1 + step) / 2, 1 - (j + 1) / 2); // (1,1) // (i+1+step)/2,(j+1+step)/2);
	16475	+ else
14494	16476	gl.glTexCoord2f((i + 1 + step) / 2, (j + 1) / 2); // (1,1) // (i+1+step)/2,(j+1+step)/2);
14495	16477	gl.glVertex3f(i + step, j, -0.5f);
14496	16478
	16479	+ if (checker.flipV)
	16480	+ gl.glTexCoord2f((i + 1 + step) / 2, 1 - (j + 1 + stepv) / 2); // (0,1) //(i+1)/2,(j+1+step)/2);
	16481	+ else
14497	16482	gl.glTexCoord2f((i + 1 + step) / 2, (j + 1 + stepv) / 2); // (0,1) //(i+1)/2,(j+1+step)/2);
14498	16483	gl.glVertex3f(i + step, j + stepv, -0.5f);
14499	16484
	16485	+ if (checker.flipV)
	16486	+ gl.glTexCoord2f((i + 1) / 2, 1 - (j + 1 + stepv) / 2); // (0,0) //(i+1)/2,(j+1)/2);
	16487	+ else
14500	16488	gl.glTexCoord2f((i + 1) / 2, (j + 1 + stepv) / 2); // (0,0) //(i+1)/2,(j+1)/2);
14501	16489	gl.glVertex3f(i, j + stepv, -0.5f);
14502	16490	}
..	..	@@ -14508,7 +16496,7 @@
14508	16496	gl.glMatrixMode(GL.GL_PROJECTION);
14509	16497	gl.glPopMatrix();
14510	16498	gl.glMatrixMode(GL.GL_MODELVIEW);
14511		- PopMatrix(null); // checker.toParent); // null);
	16499	+ //PopMatrix(null); // checker.toParent); // null);
14512	16500	gl.glPopMatrix();
14513	16501	PopTextureMatrix(checker.toParent);
14514	16502	gl.glMatrixMode(GL.GL_TEXTURE);
..	..	@@ -14599,6 +16587,7 @@
14599	16587	{
14600	16588	if (!selection)
14601	16589	{
	16590	+ new Exception().printStackTrace();
14602	16591	System.exit(0);
14603	16592	return;
14604	16593	}
..	..	@@ -14621,14 +16610,14 @@
14621	16610
14622	16611	//int tmp = selection_view;
14623	16612	//selection_view = -1;
14624		- int temp = drawMode;
14625		- drawMode = SELECTION;
	16613	+ int temp = DrawMode();
	16614	+ Globals.drawMode = SELECTION; // WARNING
14626	16615	indexcount = 0;
14627	16616	parent.display(drawable);
14628	16617	//selection_view = tmp;
14629	16618	//if (temp == SELECTION)
14630	16619	// temp = DEFAULT; // patch for selection debug
14631		- drawMode = temp;
	16620	+ Globals.drawMode = temp; // WARNING
14632	16621
14633	16622	//gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
14634	16623
..	..	@@ -14678,6 +16667,13 @@
14678	16667	// System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
14679	16668	// System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
14680	16669
	16670	+ CreateSelectedPoint();
	16671	+
	16672	+ // Will fit the mesh !!!
	16673	+ selectedpoint.toParent[0][0] = 0.0001;
	16674	+ selectedpoint.toParent[1][1] = 0.0001;
	16675	+ selectedpoint.toParent[2][2] = 0.0001;
	16676	+
14681	16677	glu.gluUnProject(x,y,depth,view,0,tempmat2,0,viewport,0,selectedpoint.toParent[3],0);
14682	16678
14683	16679	// if (object.selection != null && object.selection.Size() > 0)
..	..	@@ -14721,16 +16717,16 @@
14721	16717	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]));
14722	16718	}
14723	16719
14724		- previousselectedpoint = (Sphere) GrafreeD.clone(selectedpoint);
	16720	+ previousselectedpoint = (Sphere) Grafreed.clone(selectedpoint);
14725	16721	}
14726	16722	}
14727	16723
14728	16724	if (!movingcamera && !PAINTMODE)
14729	16725	object.editWindow.ScreenFitPoint(); // fev 2014
14730	16726
14731		- if (PAINTMODE && GrafreeD.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	16727	+ if (PAINTMODE && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
14732	16728	{
14733		- Object3D paintobj = GrafreeD.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
	16729	+ Object3D paintobj = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
14734	16730
14735	16731	Object3D group = new Object3D("inst" + paintcount++);
14736	16732
..	..	@@ -14886,7 +16882,7 @@
14886	16882	gl.glDisable(gl.GL_CULL_FACE);
14887	16883	}
14888	16884
14889		- if (!RENDERSHADOW)
	16885	+ if (!Globals.RENDERSHADOW)
14890	16886	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
14891	16887
14892	16888	// SB gl.glPolygonOffset(2.5f, 10);
..	..	@@ -14896,14 +16892,14 @@
14896	16892	//gl.glColorMask(false, false, false, false);
14897	16893
14898	16894	//render_scene_from_light_view(gl, drawable, 0, 0);
14899		- if (RENDERSHADOW && lighttouched && !movingcamera) // && !parent.IsFreezed())
	16895	+ if (Globals.RENDERSHADOW && Globals.lighttouched && (!movingcamera \|\| !Globals.FREEZEONMOVE)) // && !parent.IsFreezed())
14900	16896	{
14901	16897	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
14902	16898
14903		- int temp = drawMode;
14904		- drawMode = SHADOW;
	16899	+ int temp = DrawMode();
	16900	+ Globals.drawMode = SHADOW; // WARNING
14905	16901	parent.display(drawable);
14906		- drawMode = temp;
	16902	+ Globals.drawMode = temp; // WARNING
14907	16903	}
14908	16904
14909	16905	gl.glCullFace(gl.GL_BACK);
..	..	@@ -14956,7 +16952,6 @@
14956	16952
14957	16953	class AntialiasBuffer implements GLEventListener
14958	16954	{
14959		-
14960	16955	CameraPane parent = null;
14961	16956
14962	16957	AntialiasBuffer(CameraPane p)
..	..	@@ -15066,13 +17061,19 @@
15066	17061	gl.glFlush();
15067	17062
15068	17063	/**/
15069		- gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_BGRA, GL.GL_UNSIGNED_INT_8_8_8_8_REV, occlusionsizebuffer);
	17064	+ gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusionsizebuffer);
15070	17065
15071		- int[] pixels = occlusionsizebuffer.array();
	17066	+ float[] pixels = occlusionsizebuffer.array();
15072	17067
15073	17068	double r = 0, g = 0, b = 0;
15074	17069
15075	17070	double count = 0;
	17071	+
	17072	+ gl.glGetDoublev(gl.GL_PROJECTION_MATRIX, tempmat2, 0);
	17073	+
	17074	+ float mindepth = 1;
	17075	+
	17076	+ double FACTOR = 1;
15076	17077
15077	17078	for (int i = 0; i < pixels.length; i++)
15078	17079	{
..	..	@@ -15157,7 +17158,7 @@
15157	17158
15158	17159	double scale = ray.z; // 1; // cos
15159	17160
15160		- int p = pixels[newindex];
	17161	+ float depth = pixels[newindex];
15161	17162
15162	17163	/*
15163	17164	int newindex2 = (x + 1) * OCCLUSION_SIZE + y;
..	..	@@ -15181,10 +17182,23 @@
15181	17182	scale = (1 - modu) * modv;
15182	17183	*/
15183	17184
15184		- r += ((p >> 16) & 0xFF) * scale / 255;
15185		- g += ((p >> 8) & 0xFF) * scale / 255;
15186		- b += (p & 0xFF) * scale / 255;
	17185	+ //r += ((p >> 16) & 0xFF) * scale / 255;
	17186	+ //g += ((p >> 8) & 0xFF) * scale / 255;
	17187	+ //b += (p & 0xFF) * scale / 255;
	17188	+
	17189	+ if (mindepth > depth)
	17190	+ {
	17191	+ mindepth = depth;
	17192	+ }
15187	17193
	17194	+ double z_eye = tempmat2[34 + 2] / (depth -2.0 + 1.0 - tempmat2[2*4 + 2]);
	17195	+
	17196	+ double factor = 1 - Math.exp(-z_eye * z_eye / FACTOR);
	17197	+
	17198	+ r += factor * scale;
	17199	+ g += factor * scale;
	17200	+ b += factor * scale;
	17201	+
15188	17202	count += scale;
15189	17203	}
15190	17204
..	..	@@ -15282,12 +17296,6 @@
15282	17296	GLUT glut = new GLUT();
15283	17297
15284	17298
15285		- static final public int DEFAULT = 0;
15286		- static final public int SELECTION = 1;
15287		- static final public int SHADOW = 2;
15288		- static final public int OCCLUSION = 3;
15289		- static
15290		- public int drawMode = DEFAULT;
15291	17299	public boolean spherical = false;
15292	17300	static boolean DEBUG_OCCLUSION = false;
15293	17301	static boolean DEBUG_SELECTION = false;
..	..	@@ -15300,23 +17308,15 @@
15300	17308	int AAbuffersize = 0;
15301	17309
15302	17310	//double[] selectedpoint = new double[3];
15303		- static Sphere selectedpoint = new Sphere();
	17311	+ static Superellipsoid selectedpoint;
15304	17312	static Sphere previousselectedpoint = null;
15305		- static Sphere debugpoint = new Sphere();
15306		- static Sphere debugpoint2 = new Sphere();
15307		- static Sphere debugpoint3 = new Sphere();
15308		- static Sphere debugpoint4 = new Sphere();
	17313	+ static Sphere debugpointG;
	17314	+ static Sphere debugpointP;
	17315	+ static Sphere debugpointC;
	17316	+ static Sphere debugpointR;
15309	17317
15310	17318	static Sphere debugpoints[] = new Sphere[8];
15311	17319
15312		- static
15313		- {
15314		- for (int i=0; i<8; i++)
15315		- {
15316		- debugpoints[i] = new Sphere();
15317		- }
15318		- }
15319		-
15320	17320	static void InitPoints(float radius)
15321	17321	{
15322	17322	for (int i=0; i<8; i++)
..	..	@@ -15336,7 +17336,7 @@
15336	17336	}
15337	17337	}
15338	17338
15339		- static void DrawPoints(CameraPane cpane)
	17339	+ static void DrawPoints(iCameraPane cpane)
15340	17340	{
15341	17341	for (int i=0; i<8; i++) // first and last are red
15342	17342	{
..	..	@@ -15358,7 +17358,8 @@
15358	17358	static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
15359	17359	static IntBuffer selectsizebuffer = IntBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
15360	17360	static java.nio.FloatBuffer pointselectsizebuffer = java.nio.FloatBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
15361		- static IntBuffer occlusionsizebuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17361	+ //static IntBuffer occlusionsizebuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17362	+ static java.nio.FloatBuffer occlusionsizebuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
15362	17363	static BufferedImage bufimage = new BufferedImage(TEX_SIZE, TEX_SIZE, BufferedImage.TYPE_INT_RGB);
15363	17364	static BufferedImage textest = new cBufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB);
15364	17365	static java.util.Vector<BufferedImage> billboards = new java.util.Vector<BufferedImage>();
..	..	@@ -15367,10 +17368,11 @@
15367	17368	static IntBuffer textbuffer = null; // IntBuffer.allocate(TEXT_WIDTH88 * TEXT_HEIGHT);
15368	17369	// Depth buffer format
15369	17370	//private int depth_format;
15370		- static public void NextIndex(Object3D o, GL gl)
	17371	+
	17372	+ public void NextIndex()
15371	17373	{
15372	17374	indexcount+=16;
15373		- gl.glColor3d(((indexcount >>> 16) & 255) / 255.0, ((indexcount >>> 8) & 255) / 255.0, ((indexcount) & 255) / 255.0);
	17375	+ GetGL().glColor3d(((indexcount >>> 16) & 255) / 255.0, ((indexcount >>> 8) & 255) / 255.0, ((indexcount) & 255) / 255.0);
15374	17376	//objects[indexcount] = o;
15375	17377	//System.out.println("indexcount = " + indexcount);
15376	17378	}