~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -31,8 +31,12 @@
31	31
32	32	import gleem.linalg.Mat4f;
33	33
34		-class CameraPane extends GLCanvas implements Runnable, GLEventListener, ActionListener, MouseWheelListener, MouseMotionListener, MouseListener, KeyListener
	34	+class CameraPane extends GLCanvas implements iCameraPane, Runnable, GLEventListener, ActionListener, MouseWheelListener, MouseMotionListener, MouseListener, KeyListener
35	35	{
	36	+ static cMaterial[] materialstack = new cMaterial[65536];
	37	+ static boolean[] selectedstack = new boolean[65536];
	38	+ static int materialdepth = 0;
	39	+
36	40	static boolean DEBUG = false;
37	41	static boolean FRUSTUM = false; // still bogus true; // frustum culling
38	42
..	..	@@ -42,25 +46,7 @@
42	46
43	47	static int STEP = 1;
44	48
45		- static boolean ONESTEP = false; // do LIVE once
46		-
47		- /**
48		- * @return the LIVE
49		- */
50		- public static boolean isLIVE()
51		- {
52		- return LIVE \|\| ONESTEP;
53		- }
54		-
55		- /**
56		- * @param aLIVE the LIVE to set
57		- */
58		- public static void setLIVE(boolean aLIVE)
59		- {
60		- LIVE = aLIVE;
61		- }
62		-
63		- /static/ boolean CULLFACE = false; // true;
	49	+ /static/ private boolean CULLFACE = false; // true;
64	50	/static/ boolean NEAREST = false; // true;
65	51	/static/ boolean WIREFRAME = false; // true;
66	52
..	..	@@ -70,8 +56,6 @@
70	56	static int CURRENTANTIALIAS = 0; // 1;
71	57	/static/ boolean RENDERSHADOW = true;
72	58	/static/ int RENDERPROGRAM = 2; // 0 == none, 1 == fast, 2 == normal
73		- static boolean ANIMATION = false;
74		- static String filename;
75	59
76	60	boolean DISPLAYTEXT = false;
77	61	//boolean REDUCETEXTURE = true;
..	..	@@ -97,10 +81,8 @@
97	81
98	82	static boolean textureon = true;
99	83	static boolean LOCALTRANSFORM = false;
100		-private static boolean LIVE = false;
101	84	static boolean FULLSCREEN = false;
102	85	static boolean SUPPORT = true;
103		-static boolean CROWD = false;
104	86	static boolean INERTIA = true;
105	87	static boolean FAST = false;
106	88	static boolean SLOWPOSE = false;
..	..	@@ -108,6 +90,8 @@
108	90
109	91	static int tickcount = 0; // slow pose issue
110	92
	93	+static boolean BUTTONLESSWHEEL = false;
	94	+static boolean ZOOMBOXMODE = false;
111	95	static boolean BOXMODE = false;
112	96	static boolean IMAGEFLIP = false;
113	97	static boolean SMOOTHFOCUS = false;
..	..	@@ -122,7 +106,7 @@
122	106	static boolean OEIL = true;
123	107	static boolean OEILONCE = false; // do oeilon then oeiloff
124	108	static boolean LOOKAT = true;
125		-static boolean RANDOM = true; // false;
	109	+static boolean SWITCH = true; // false;
126	110	static boolean HANDLES = false; // selection doesn't work!!
127	111	static boolean PAINTMODE = false;
128	112
..	..	@@ -165,12 +149,41 @@
165	149	defaultcaps.setAccumBlueBits(16);
166	150	defaultcaps.setAccumAlphaBits(16);
167	151	}
168		- static CameraPane theRenderer;
169		-
	152	+
	153	+ private File defaultDirectory = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory();
	154	+
170	155	void SetAsGLRenderer(boolean b)
171	156	{
172	157	isRenderer = b;
173		- theRenderer = this;
	158	+ Globals.theRenderer = this;
	159	+ }
	160	+
	161	+ CameraPane(Object3D o, Camera cam, boolean withcontext)
	162	+ {
	163	+ super(defaultcaps, null, withcontext?glcontext:null, null);
	164	+
	165	+ //System.out.println("AMERICA AREA = " + (9458886 + 9210755 + 8480395 + 2736391 + 1943018 + 1289475 + 1141569 + 1069350 + 911559 + 721229 + 395886 + 377972 + 246700 + 211156 + 173985 + 141133 + 118279 + 112079 + 108523));
	166	+ glcontext = getContext();
	167	+
	168	+ cameras = new Camera[2];
	169	+ targetLookAts = new cVector[2];
	170	+
	171	+ SetCamera(cam);
	172	+
	173	+ SetLight(new Camera(new cVector(10, 10, -20)));
	174	+
	175	+ object = o;
	176	+
	177	+ setBackground(Color.white);
	178	+
	179	+ addKeyListener(this);
	180	+ addMouseListener(this);
	181	+ addMouseMotionListener(this);
	182	+ addMouseWheelListener(this);
	183	+ //System.out.println("addGLEventListener: " + this);
	184	+ addGLEventListener(this);
	185	+
	186	+// pingthread.start(); // may 2013
174	187	}
175	188
176	189	static boolean AntialiasingEnabled()
..	..	@@ -178,12 +191,53 @@
178	191	return CURRENTANTIALIAS > 0;
179	192	}
180	193
181		- void ClearDepth()
	194	+ /// INTERFACE
	195	+
	196	+ public javax.media.opengl.GL GetGL0()
	197	+ {
	198	+ return null;
	199	+ }
	200	+
	201	+ public int GenList()
	202	+ {
	203	+ javax.media.opengl.GL gl = GetGL();
	204	+ return gl.glGenLists(1);
	205	+ }
	206	+
	207	+ public void NewList(int id)
	208	+ {
	209	+ javax.media.opengl.GL gl = GetGL();
	210	+ gl.glNewList(id, gl.GL_COMPILE); //_AND_EXECUTE);
	211	+ }
	212	+
	213	+ public void CallList(int id)
	214	+ {
	215	+ javax.media.opengl.GL gl = GetGL();
	216	+ gl.glCallList(id);
	217	+ }
	218	+
	219	+ public void EndList()
	220	+ {
	221	+ javax.media.opengl.GL gl = GetGL();
	222	+ gl.glEndList();
	223	+ }
	224	+
	225	+ public boolean IsBoxMode()
	226	+ {
	227	+ return BOXMODE;
	228	+ }
	229	+
	230	+ public boolean IsZoomBoxMode()
	231	+ {
	232	+ return ZOOMBOXMODE;
	233	+ }
	234	+
	235	+ public void ClearDepth()
182	236	{
183	237	GetGL().glClear(GetGL().GL_DEPTH_BUFFER_BIT);
184	238	}
185	239
186		- void DepthTest(boolean depthtest)
	240	+ public void DepthTest(boolean depthtest)
187	241	{
188	242	if (depthtest)
189	243	GetGL().glDepthFunc(GL.GL_LEQUAL);
..	..	@@ -191,7 +245,7 @@
191	245	GetGL().glDepthFunc(GL.GL_ALWAYS);
192	246	}
193	247
194		- void DepthWrite(boolean depthwrite)
	248	+ public void DepthWrite(boolean depthwrite)
195	249	{
196	250	if (depthwrite)
197	251	GetGL().glDepthMask(true);
..	..	@@ -199,12 +253,1594 @@
199	253	GetGL().glDepthMask(false);
200	254	}
201	255
202		- void BackFaceCull(boolean bfc)
	256	+ public void BackFaceCull(boolean bfc)
203	257	{
204	258	if (bfc)
205	259	GetGL().glEnable(GetGL().GL_CULL_FACE);
206	260	else
207	261	GetGL().glDisable(GetGL().GL_CULL_FACE);
	262	+ }
	263	+
	264	+ public boolean BackFaceCullMode()
	265	+ {
	266	+ return this.CULLFACE;
	267	+ }
	268	+
	269	+ public boolean IsAmbientOcclusionOn()
	270	+ {
	271	+ return this.ambientOcclusion;
	272	+ }
	273	+
	274	+ public boolean IsDebugSelection()
	275	+ {
	276	+ return DEBUG_SELECTION;
	277	+ }
	278	+
	279	+ public boolean IsFrozen()
	280	+ {
	281	+ boolean selectmode = this.DrawMode() == SELECTION \|\| this.IsDebugSelection();
	282	+
	283	+ return !selectmode && cameracount == 0; // != 0;
	284	+ }
	285	+
	286	+ // Currently in Globals
	287	+ public int DrawMode()
	288	+ {
	289	+ return Globals.DrawMode();
	290	+ }
	291	+
	292	+ public Camera EyeCamera()
	293	+ {
	294	+ return eyeCamera;
	295	+ }
	296	+
	297	+ public Camera LightCamera()
	298	+ {
	299	+ return lightCamera;
	300	+ }
	301	+
	302	+ public Camera ManipCamera()
	303	+ {
	304	+ return manipCamera;
	305	+ }
	306	+
	307	+ public Camera RenderCamera()
	308	+ {
	309	+ return renderCamera;
	310	+ }
	311	+
	312	+ public Camera[] Cameras()
	313	+ {
	314	+ return cameras;
	315	+ }
	316	+
	317	+ public void PushMaterial(Object3D obj, boolean selected)
	318	+ {
	319	+ CameraPane display = this;
	320	+ javax.media.opengl.GL gl = display.GetGL();
	321	+ cMaterial material = obj.material;
	322	+
	323	+ if (material != null)
	324	+ {
	325	+ materialstack[materialdepth] = material;
	326	+ selectedstack[materialdepth] = selected;
	327	+ cStatic.objectstack[materialdepth++] = obj;
	328	+ //System.out.println("material " + material);
	329	+ //Applet3D.tracein(this, selected);
	330	+ display.vector2buffer = obj.projectedVertices;
	331	+ if (obj instanceof Camera)
	332	+ {
	333	+ display.options1[0] = material.shift;
	334	+ //System.out.println("shift " + material.shift);
	335	+ display.options1[1] = material.lightarea;
	336	+ display.options1[2] = material.shadowbias;
	337	+ display.options1[3] = material.aniso;
	338	+ display.options1[4] = material.anisoV;
	339	+ display.options2[0] = material.opacity;
	340	+ display.options2[1] = material.diffuse;
	341	+ display.options2[2] = material.factor;
	342	+
	343	+ cColor.HSBtoRGB(material.color, material.modulation, 1, display.options3);
	344	+ display.options4[0] = material.cameralight/0.2f;
	345	+ display.options4[1] = material.subsurface;
	346	+ display.options4[2] = material.sheen;
	347	+
	348	+ // if (display.CURRENTANTIALIAS > 0)
	349	+ // display.options3[3] /= 4;
	350	+
	351	+ /*
	352	+ System.out.println("Focus = " + display.options1[0]);
	353	+ System.out.println("Aperture = " + display.options1[1]);
	354	+ System.out.println("ShadowBlur = " + display.options1[2]);
	355	+ System.out.println("Antialiasing = " + display.options1[3]);
	356	+ System.out.println("Fog = " + display.options2[0]);
	357	+ System.out.println("Intensity = " + display.options2[1]);
	358	+ System.out.println("Elevation = " + display.options2[2]);
	359	+ /**/
	360	+ } else
	361	+ {
	362	+ DrawMaterial(material, selected);
	363	+ }
	364	+ } else
	365	+ {
	366	+ if (selected && CameraPane.flash)
	367	+ {
	368	+ display.modelParams4[1] = 100;
	369	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 4, display.modelParams4, 0);
	370	+ }
	371	+ }
	372	+ }
	373	+
	374	+ public void PushMaterial2(Object3D obj, boolean selected)
	375	+ {
	376	+ CameraPane display = this;
	377	+ cMaterial material = obj.material;
	378	+
	379	+ if (material != null)
	380	+ {
	381	+ materialstack[materialdepth] = material;
	382	+ selectedstack[materialdepth] = selected;
	383	+ cStatic.objectstack[materialdepth++] = obj;
	384	+ //System.out.println("material " + material);
	385	+ //Applet3D.tracein("selected ", selected);
	386	+ display.vector2buffer = obj.projectedVertices;
	387	+ display.DrawMaterial(material, selected);
	388	+ }
	389	+ }
	390	+
	391	+ public void PopMaterial(Object3D obj, boolean selected)
	392	+ {
	393	+ CameraPane display = this;
	394	+ javax.media.opengl.GL gl = display.GetGL();
	395	+ cMaterial material = obj.material;
	396	+
	397	+ //if (parent != null && parent.GetMaterial() != null)
	398	+ // parent.GetMaterial().Draw(display, parent.IsSelected(this));
	399	+ if (material != null)
	400	+ {
	401	+ materialdepth -= 1;
	402	+ if (materialdepth > 0)
	403	+ {
	404	+ display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	405	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	406	+ }
	407	+ //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
	408	+ } else if (selected && CameraPane.flash && obj.GetMaterial() != null)
	409	+ {
	410	+ display.modelParams4[1] = obj.GetMaterial().cameralight;
	411	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 4, display.modelParams4, 0);
	412	+ }
	413	+ }
	414	+
	415	+ public void PopMaterial2(Object3D obj)
	416	+ {
	417	+ CameraPane display = this;
	418	+ cMaterial material = obj.material;
	419	+
	420	+ if (material != null)
	421	+ {
	422	+ materialdepth -= 1;
	423	+ if (materialdepth > 0)
	424	+ {
	425	+ display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	426	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	427	+ }
	428	+ //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
	429	+ //else
	430	+ //material.Draw(display, false);
	431	+ }
	432	+ }
	433	+
	434	+ public void DrawFace(Object3D obj, Vertex pv, Vertex qv, Vertex rv, Face face)
	435	+ {
	436	+ CameraPane display = this;
	437	+
	438	+ if (pv.y == -10000 \|\|
	439	+ qv.y == -10000 \|\|
	440	+ rv.y == -10000)
	441	+ return;
	442	+
	443	+// float b = f.nbiterations & 1;
	444	+// float g = (f.nbiterations>>1) & 1;
	445	+// float r = (f.nbiterations>>2) & 1;
	446	+//
	447	+// //if (f.weight == 10000)
	448	+// //{
	449	+// // r = 1; g = b = 0;
	450	+// //}
	451	+// //else
	452	+// //{
	453	+// // assert(f.weight < 10000);
	454	+// r = g = b = (float)bRep.FaceWeight(f)*100;
	455	+// if (r<0)
	456	+// assert(r>=0);
	457	+// //}
	458	+
	459	+ javax.media.opengl.GL gl = display.GetGL();
	460	+
	461	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
	462	+
	463	+ //System.out.println("p = " + pv + "; q = " + qv + "; r = " + rv);
	464	+ if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
	465	+ {
	466	+ //gl.glBegin(gl.GL_TRIANGLES);
	467	+ boolean hasnorm = pv.norm != null && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0);
	468	+ if (!hasnorm)
	469	+ {
	470	+ // System.out.println("FUCK!!");
	471	+ LA.vecSub(pv/.pos/, qv/.pos/, obj.v0);
	472	+ LA.vecSub(pv/.pos/, rv/.pos/, obj.v1);
	473	+ LA.vecCross(obj.v0, obj.v1, obj.v2);
	474	+ LA.vecNormalize(obj.v2);
	475	+ gl.glNormal3f((float) obj.v2.x, (float) obj.v2.y, (float) obj.v2.z);
	476	+ }
	477	+
	478	+ // P
	479	+ float x = (float)pv.x;
	480	+ float y = (float)pv.y;
	481	+ float z = (float)pv.z;
	482	+
	483	+ if (hasnorm)
	484	+ {
	485	+// if (!pv.norm.normalized())
	486	+// assert(pv.norm.normalized());
	487	+
	488	+ //System.out.println("normalp = " + pv.norm.x + ", " + pv.norm.y + ", " + pv.norm.z);
	489	+ float nx = (float)pv.norm.x;
	490	+ float ny = (float)pv.norm.y;
	491	+ float nz = (float)pv.norm.z;
	492	+
	493	+ x += nx * obj.NORMALPUSH;
	494	+ y += ny * obj.NORMALPUSH;
	495	+ z += nz * obj.NORMALPUSH;
	496	+
	497	+ gl.glNormal3f(nx, ny, nz);
	498	+ }
	499	+ gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
	500	+ SetColor(obj, pv);
	501	+ //gl.glColor4f(r, g, b, 1);
	502	+ //gl.glColor4f(pv.boundary, pv.boundary, pv.boundary, 1);
	503	+ if (obj.flipV)
	504	+ gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
	505	+ else
	506	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	507	+ //System.out.println("vertexp = " + pv.x + ", " + pv.y + ", " + pv.z);
	508	+
	509	+ gl.glVertex3f(x, y, z);
	510	+
	511	+ // Q
	512	+ x = (float)qv.x;
	513	+ y = (float)qv.y;
	514	+ z = (float)qv.z;
	515	+
	516	+// Print(pv);
	517	+ if (hasnorm)
	518	+ {
	519	+// assert(qv.norm.normalized());
	520	+ //System.out.println("normalq = " + qv.norm.x + ", " + qv.norm.y + ", " + qv.norm.z);
	521	+ float nx = (float)qv.norm.x;
	522	+ float ny = (float)qv.norm.y;
	523	+ float nz = (float)qv.norm.z;
	524	+
	525	+ x += nx * obj.NORMALPUSH;
	526	+ y += ny * obj.NORMALPUSH;
	527	+ z += nz * obj.NORMALPUSH;
	528	+
	529	+ gl.glNormal3f(nx, ny, nz);
	530	+ }
	531	+ //System.out.println("vertexq = " + qv.s + ", " + qv.t);
	532	+ // boolean locked = false;
	533	+ // float eps = 0.1f;
	534	+ // boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
	535	+
	536	+ // int dot = 0; //*/ (int)f.dot;
	537	+
	538	+ // if ((dot&1) == 0)
	539	+ // dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
	540	+
	541	+ // if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
	542	+ if (obj.flipV)
	543	+ gl.glTexCoord2f((float) qv.s, 1-(float) qv.t);
	544	+ else
	545	+ gl.glTexCoord2f((float) qv.s, (float) qv.t);
	546	+ // else
	547	+ // {
	548	+ // locked = true;
	549	+ // gl.glTexCoord2f((float) pv.s, (float) pv.t);
	550	+ // }
	551	+ gl.glColor4f(qv.AO, qv.AO, qv.AO, 1);
	552	+ SetColor(obj, qv);
	553	+
	554	+ gl.glVertex3f(x, y, z);
	555	+ //gl.glColor4f(r, g, b, 1);
	556	+ //gl.glColor4f(qv.boundary, qv.boundary, qv.boundary, 1);
	557	+ //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
	558	+// Print(qv);
	559	+
	560	+ // R
	561	+ x = (float)rv.x;
	562	+ y = (float)rv.y;
	563	+ z = (float)rv.z;
	564	+
	565	+ if (hasnorm)
	566	+ {
	567	+// assert(rv.norm.normalized());
	568	+ //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
	569	+ float nx = (float)rv.norm.x;
	570	+ float ny = (float)rv.norm.y;
	571	+ float nz = (float)rv.norm.z;
	572	+
	573	+ x += nx * obj.NORMALPUSH;
	574	+ y += ny * obj.NORMALPUSH;
	575	+ z += nz * obj.NORMALPUSH;
	576	+
	577	+ gl.glNormal3f(nx, ny, nz);
	578	+ }
	579	+
	580	+ // if ((dot&4) == 0)
	581	+ // dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
	582	+
	583	+ // if (wrap \|\| !locked && (dot&8) != 0)
	584	+ if (obj.flipV)
	585	+ gl.glTexCoord2f((float) rv.s, 1-(float) rv.t);
	586	+ else
	587	+ gl.glTexCoord2f((float) rv.s, (float) rv.t);
	588	+ // else
	589	+ // gl.glTexCoord2f((float) pv.s, (float) pv.t);
	590	+
	591	+ // f.dot = dot;
	592	+
	593	+ gl.glColor4f(rv.AO, rv.AO, rv.AO, 1);
	594	+ SetColor(obj, rv);
	595	+ //gl.glColor4f(r, g, b, 1);
	596	+ //gl.glColor4f(rv.boundary, rv.boundary, rv.boundary, 1);
	597	+ //System.out.println("vertexr = " + rv.x + ", " + rv.y + ", " + rv.z);
	598	+ gl.glVertex3f(x, y, z);
	599	+// Print(rv);
	600	+ //gl.glEnd();
	601	+ }
	602	+ else
	603	+ {
	604	+ gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
	605	+ gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
	606	+ gl.glVertex3f((float) rv.x, (float) rv.y, (float) rv.z);
	607	+
	608	+ }
	609	+
	610	+ if (false) // (attributes & WIREFRAME) != 0)
	611	+ {
	612	+ gl.glDisable(gl.GL_LIGHTING);
	613	+
	614	+ gl.glBegin(gl.GL_LINE_LOOP);
	615	+ gl.glVertex3d(pv./pos./x, pv./pos./y, pv./pos./z);
	616	+ gl.glVertex3d(qv./pos./x, qv./pos./y, qv./pos./z);
	617	+ gl.glVertex3d(rv./pos./x, rv./pos./y, rv./pos./z);
	618	+ gl.glEnd();
	619	+
	620	+ gl.glEnable(gl.GL_LIGHTING);
	621	+ }
	622	+ }
	623	+
	624	+ /**
	625	+ * <code>draw</code> renders a <code>TriMesh</code> object including
	626	+ * it's normals, colors, textures and vertices.
	627	+ *
	628	+ * @see Renderer#draw(TriMesh)
	629	+ * @param tris
	630	+ * the mesh to render.
	631	+ */
	632	+ public void DrawParticles(TriMesh geo, Object3D shape, boolean selected, boolean rotate) // TriMesh tris)
	633	+ {
	634	+ CameraPane display = this;
	635	+
	636	+ float r = display.modelParams0[0];
	637	+ float g = display.modelParams0[1];
	638	+ float b = display.modelParams0[2];
	639	+ float opacity = display.modelParams5[1];
	640	+
	641	+ //final GL gl = GLU.getCurrentGL();
	642	+ GL gl = display.GetGL(); // getGL();
	643	+
	644	+ FloatBuffer vertBuf = geo.vertBuf;
	645	+
	646	+ int v = vertBuf.capacity();
	647	+
	648	+ int count = 0;
	649	+
	650	+ boolean cf = gl.glIsEnabled(gl.GL_CULL_FACE);
	651	+ gl.glEnable(gl.GL_CULL_FACE);
	652	+ // gl.glScalef(1.0f/1024,1.0f/1024,1.0f/1024);
	653	+ for (int i=0; i<v/3; i++)
	654	+ {
	655	+ int index3 = i*3;
	656	+
	657	+ if (geo.sizeBuf.get(index3+1) == 0)
	658	+ continue;
	659	+
	660	+ count++;
	661	+
	662	+ int index4 = i*4;
	663	+
	664	+ float tx = vertBuf.get(index3);
	665	+ float ty = vertBuf.get(index3+1);
	666	+ float tz = vertBuf.get(index3+2);
	667	+
	668	+ // if (tx == 0 && ty == 0 && tz == 0)
	669	+ // continue;
	670	+
	671	+ gl.glMatrixMode(gl.GL_TEXTURE);
	672	+ gl.glPushMatrix();
	673	+
	674	+ float[] texmat = geo.texmat;
	675	+ texmat[12] = texmat[13] = texmat[14] = i;
	676	+
	677	+ gl.glMultMatrixf(texmat, 0);
	678	+
	679	+ gl.glMatrixMode(gl.GL_MODELVIEW);
	680	+ gl.glPushMatrix();
	681	+
	682	+ gl.glTranslatef(tx,ty,tz);
	683	+
	684	+ if (rotate)
	685	+ gl.glRotatef(i, 0, 1, 0);
	686	+
	687	+ float size = geo.sizeBuf.get(index3) / 100;
	688	+ gl.glScalef(size,size,size);
	689	+
	690	+ float cr = geo.colorBuf.get(index4);
	691	+ float cg = geo.colorBuf.get(index4+1);
	692	+ float cb = geo.colorBuf.get(index4+2);
	693	+ float ca = geo.colorBuf.get(index4+3);
	694	+
	695	+ display.modelParams0[0] = r * cr;
	696	+ display.modelParams0[1] = g * cg;
	697	+ display.modelParams0[2] = b * cb;
	698	+
	699	+ display.modelParams5[1] = opacity * ca;
	700	+
	701	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 0, display.modelParams0, 0);
	702	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 5, display.modelParams5, 0);
	703	+
	704	+ RandomNode.globalseed = (int)geo.sizeBuf.get(index3+2); // i;
	705	+ RandomNode.globalseed2 = RandomNode.globalseed;
	706	+
	707	+// gl.glColor4f(cr,cg,cb,ca);
	708	+ // gl.glScalef(1024/16,1024/16,1024/16);
	709	+ shape.Draw/Node/(display,null,selected,false); // blocked
	710	+ // gl.glScalef(16.0f/1024,16.0f/1024,16.0f/1024);
	711	+ //gl.glTranslatef(-tx,-ty,-tz);
	712	+ gl.glPopMatrix();
	713	+
	714	+ gl.glMatrixMode(gl.GL_TEXTURE);
	715	+ gl.glPopMatrix();
	716	+ }
	717	+ // gl.glScalef(1024,1024,1024);
	718	+ if (!cf)
	719	+ gl.glDisable(gl.GL_CULL_FACE);
	720	+
	721	+ display.modelParams0[0] = r;
	722	+ display.modelParams0[1] = g;
	723	+ display.modelParams0[2] = b;
	724	+
	725	+ display.modelParams5[1] = opacity;
	726	+
	727	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 0, display.modelParams0, 0);
	728	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 5, display.modelParams5, 0);
	729	+
	730	+ gl.glMatrixMode(gl.GL_MODELVIEW);
	731	+
	732	+// System.err.println("total = " + v/3 + "; displayed = " + count);
	733	+ if (true)
	734	+ return;
	735	+
	736	+//// if (!tris.predraw(this))
	737	+//// {
	738	+//// return;
	739	+//// }
	740	+//// if (Debug.stats)
	741	+//// {
	742	+//// StatCollector.addStat(StatType.STAT_TRIANGLE_COUNT, tris.getTriangleCount());
	743	+//// StatCollector.addStat(StatType.STAT_VERTEX_COUNT, tris.getVertexCount());
	744	+//// StatCollector.addStat(StatType.STAT_GEOM_COUNT, 1);
	745	+//// }
	746	+////
	747	+//// if (tris.getDisplayListID() != -1)
	748	+//// {
	749	+//// renderDisplayList(tris);
	750	+//// return;
	751	+//// }
	752	+////
	753	+//// if (!generatingDisplayList)
	754	+//// {
	755	+//// applyStates(tris.states, tris);
	756	+//// }
	757	+//// if (Debug.stats)
	758	+//// {
	759	+//// StatCollector.startStat(StatType.STAT_RENDER_TIMER);
	760	+//// }
	761	+//// boolean transformed = doTransforms(tris);
	762	+//
	763	+// int glMode = GL.GL_TRIANGLES;
	764	+// switch (getMode())
	765	+// {
	766	+// case Triangles:
	767	+// glMode = GL.GL_TRIANGLES;
	768	+// break;
	769	+// case Strip:
	770	+// glMode = GL.GL_TRIANGLE_STRIP;
	771	+// break;
	772	+// case Fan:
	773	+// glMode = GL.GL_TRIANGLE_FAN;
	774	+// break;
	775	+// }
	776	+//
	777	+// if (!predrawGeometry(gl))
	778	+// {
	779	+// // make sure only the necessary indices are sent through on old
	780	+// // cards.
	781	+// IntBuffer indices = this.getIndexBuffer();
	782	+// if (indices == null)
	783	+// {
	784	+// logger.severe("missing indices on geometry object: " + this.toString());
	785	+// } else
	786	+// {
	787	+// indices.rewind();
	788	+// indices.limit(this.getMaxIndex());
	789	+//
	790	+// gl.glDrawElements(glMode, indices.limit(), GL.GL_UNSIGNED_INT, indices); // TODO Check <count> and assumed <type> of GL_UNSIGNED_INT
	791	+//
	792	+// indices.clear();
	793	+// }
	794	+// } else
	795	+// {
	796	+// gl.glDrawElements(glMode, this.getIndexBuffer().limit(),
	797	+// GL.GL_UNSIGNED_INT, 0);
	798	+// }
	799	+//
	800	+//// postdrawGeometry(tris);
	801	+//// if (transformed)
	802	+//// {
	803	+//// undoTransforms(tris);
	804	+//// }
	805	+////
	806	+//// if (Debug.stats)
	807	+//// {
	808	+//// StatCollector.endStat(StatType.STAT_RENDER_TIMER);
	809	+//// }
	810	+//// tris.postdraw(this);
	811	+ }
	812	+
	813	+ static Camera localcamera = new Camera();
	814	+ static cVector from = new cVector();
	815	+ static cVector to = new cVector();
	816	+
	817	+ public void PrepOcclusion(BoundaryRep br, double[][] transform)
	818	+ {
	819	+ CameraPane cp = this;
	820	+
	821	+ Camera keep = cp.RenderCamera();
	822	+ cp.renderCamera = localcamera;
	823	+
	824	+ if (br.trimmed)
	825	+ {
	826	+ float[] colors = new float[br.positions.length / 3];
	827	+
	828	+ int i3 = 0;
	829	+ for (int i = 0; i < br.positions.length / 3; i++, i3 += 3)
	830	+ {
	831	+ if (br.normals[i3] == 0 && br.normals[i3+1] == 0 && br.normals[i3+2] == 0)
	832	+ continue;
	833	+
	834	+ from.set(br.positions[i3], br.positions[i3 + 1], br.positions[i3 + 2]);
	835	+ to.set(br.positions[i3] + br.normals[i3],
	836	+ br.positions[i3 + 1] + br.normals[i3 + 1],
	837	+ br.positions[i3 + 2] + br.normals[i3 + 2]);
	838	+ LA.xformPos(from, transform, from);
	839	+ LA.xformPos(to, transform, to); // RIGID ONLY
	840	+ localcamera.setAim(from, to);
	841	+
	842	+ CameraPane.occlusionbuffer.display();
	843	+
	844	+ if (CameraPane.DEBUG_OCCLUSION)
	845	+ cp.display(); // debug
	846	+
	847	+ colors[i] = cp.vertexOcclusion.r;
	848	+ //colors[i3 + 1] = cp.vertexOcclusion.g;
	849	+ //colors[i3 + 2] = cp.vertexOcclusion.b;
	850	+
	851	+ if ((i % 100) == 0 && i != 0)
	852	+ {
	853	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	854	+ //System.out.println("Color = " + cp.vertexOcclusion.r + ", " + cp.vertexOcclusion.g + ", " + cp.vertexOcclusion.b + "; " + (int)(100.0*i/(positions.length/3)) + "% done");
	855	+ System.out.println((int) (100.0 * i / (br.positions.length / 3)) + "% (" + i + " of " + (br.positions.length / 3) + ")");
	856	+ }
	857	+ }
	858	+
	859	+ br.colors = colors;
	860	+ }
	861	+ else
	862	+ {
	863	+ for (int i = 0; i < br.VertexCount(); i++)
	864	+ {
	865	+ Vertex v = br.GetVertex(i);
	866	+
	867	+ if (v.norm == null \|\| v.norm.x == 0 && v.norm.y == 0 && v.norm.z == 0)
	868	+ continue;
	869	+
	870	+ from.set(v.x, v.y, v.z);
	871	+ to.set(v.x+v.norm.x, v.y+v.norm.y, v.z+v.norm.z);
	872	+ LA.xformPos(from, transform, from);
	873	+ LA.xformPos(to, transform, to); // RIGID ONLY
	874	+ localcamera.setAim(from, to);
	875	+
	876	+ CameraPane.occlusionbuffer.display();
	877	+
	878	+ if (CameraPane.DEBUG_OCCLUSION)
	879	+ cp.display(); // debug
	880	+
	881	+ v.AO = cp.vertexOcclusion.r;
	882	+
	883	+ if ((i % 100) == 0 && i != 0)
	884	+ {
	885	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	886	+ //System.out.println("Color = " + cp.vertexOcclusion.r + ", " + cp.vertexOcclusion.g + ", " + cp.vertexOcclusion.b + "; " + (int)(100.0*i/(positions.length/3)) + "% done");
	887	+ System.out.println((int) (100.0 * i / br.VertexCount()) + "% (" + i + " of " + br.VertexCount() + ")");
	888	+ }
	889	+ }
	890	+ }
	891	+
	892	+ //System.out.println("done.");
	893	+
	894	+ cp.renderCamera = keep;
	895	+ }
	896	+
	897	+ void DrawPointFLow(PointFlow pointFlow, Object3D /Composite/ root, boolean selected, boolean blocked)
	898	+ {
	899	+ CameraPane display = this;
	900	+ pointFlow.CreateHT();
	901	+
	902	+ float r = display.modelParams0[0];
	903	+ float g = display.modelParams0[1];
	904	+ float b = display.modelParams0[2];
	905	+ float opacity = display.modelParams5[1];
	906	+
	907	+ //final GL gl = GLU.getCurrentGL();
	908	+ GL gl = display.GetGL(); // getGL();
	909	+
	910	+ int s = pointFlow.points.size();
	911	+
	912	+ boolean cf = gl.glIsEnabled(gl.GL_CULL_FACE);
	913	+ gl.glEnable(gl.GL_CULL_FACE);
	914	+
	915	+ for (int i=s; --i>=0;)
	916	+ //for (int i=0; i<s; i++)
	917	+ {
	918	+ cVector v = pointFlow.points.get(i);
	919	+
	920	+ double mindist = Double.MAX_VALUE;
	921	+
	922	+ double size = pointFlow.minimumSize;
	923	+
	924	+ double distancenext = 0;
	925	+
	926	+ if (i > 0)
	927	+ {
	928	+ cVector w = pointFlow.points.get(i-1);
	929	+
	930	+ double dist = w.distance(v);
	931	+
	932	+ distancenext = dist;
	933	+
	934	+ if (mindist > dist)
	935	+ {
	936	+ mindist = dist;
	937	+ size = mindist*pointFlow.resizefactor;
	938	+ }
	939	+ }
	940	+
	941	+ if (i < s-1)
	942	+ {
	943	+ cVector w = pointFlow.points.get(i+1);
	944	+
	945	+ double dist = w.distance(v);
	946	+
	947	+ if (mindist > dist)
	948	+ {
	949	+ mindist = dist;
	950	+ size = mindist*pointFlow.resizefactor;
	951	+ }
	952	+ }
	953	+
	954	+ if (size < pointFlow.minimumSize)
	955	+ size = pointFlow.minimumSize;
	956	+ if (size > pointFlow.maximumSize)
	957	+ size = pointFlow.maximumSize;
	958	+
	959	+ double tx = v.x;
	960	+ double ty = v.y;
	961	+ double tz = v.z;
	962	+
	963	+ // if (tx == 0 && ty == 0 && tz == 0)
	964	+ // continue;
	965	+
	966	+ gl.glMatrixMode(gl.GL_TEXTURE);
	967	+ gl.glPushMatrix();
	968	+ pointFlow.texmat[12] = pointFlow.texmat[13] = pointFlow.texmat[14] = i;
	969	+
	970	+ gl.glMultMatrixf(pointFlow.texmat, 0);
	971	+
	972	+ gl.glMatrixMode(gl.GL_MODELVIEW);
	973	+ gl.glPushMatrix();
	974	+
	975	+ gl.glTranslated(tx,ty,tz);
	976	+
	977	+ gl.glScaled(size,size,size);
	978	+
	979	+// float cr = colorBuf.get(index4);
	980	+// float cg = colorBuf.get(index4+1);
	981	+// float cb = colorBuf.get(index4+2);
	982	+// float ca = colorBuf.get(index4+3);
	983	+//
	984	+// display.modelParams0[0] = r * cr;
	985	+// display.modelParams0[1] = g * cg;
	986	+// display.modelParams0[2] = b * cb;
	987	+//
	988	+// display.modelParams5[1] = opacity * ca;
	989	+//
	990	+// gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 0, display.modelParams0, 0);
	991	+// gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 5, display.modelParams5, 0);
	992	+//
	993	+// RandomNode.globalseed = (int)sizeBuf.get(index3+2); // i;
	994	+// RandomNode.globalseed2 = RandomNode.globalseed;
	995	+//
	996	+//// gl.glColor4f(cr,cg,cb,ca);
	997	+// // gl.glScalef(1024/16,1024/16,1024/16);
	998	+ pointFlow.geo.Draw/Node/(display,null,selected, blocked);
	999	+
	1000	+ gl.glPopMatrix();
	1001	+
	1002	+ double step = size/4; //
	1003	+
	1004	+ if (i == 0 \|\| size == 0 \|\| distancenext > 8*size \|\| distancenext < step)
	1005	+ continue;
	1006	+
	1007	+ int nbsteps = (int)(distancenext/step);
	1008	+
	1009	+ step = distancenext/nbsteps;
	1010	+
	1011	+ cVector next = pointFlow.points.get(i-1);
	1012	+
	1013	+ tmp.set(next);
	1014	+ tmp.sub(v);
	1015	+ tmp.normalize();
	1016	+ tmp.mul(step);
	1017	+
	1018	+ // calculate next size
	1019	+ mindist = Double.MAX_VALUE;
	1020	+
	1021	+ double nextsize = pointFlow.minimumSize;
	1022	+
	1023	+ if (i > 1)
	1024	+ {
	1025	+ cVector w = pointFlow.points.get(i-2);
	1026	+
	1027	+ double dist = w.distance(next);
	1028	+
	1029	+ if (mindist > dist)
	1030	+ {
	1031	+ mindist = dist;
	1032	+ nextsize = mindist*pointFlow.resizefactor;
	1033	+ }
	1034	+ }
	1035	+
	1036	+ double dist = v.distance(next);
	1037	+
	1038	+ if (mindist > dist)
	1039	+ {
	1040	+ mindist = dist;
	1041	+ nextsize = mindist*pointFlow.resizefactor;
	1042	+ }
	1043	+
	1044	+ if (nextsize < pointFlow.minimumSize)
	1045	+ nextsize = pointFlow.minimumSize;
	1046	+ if (nextsize > pointFlow.maximumSize)
	1047	+ nextsize = pointFlow.maximumSize;
	1048	+ //
	1049	+
	1050	+ double count = 0;
	1051	+
	1052	+ while (distancenext > 0.000000001) // step
	1053	+ {
	1054	+ gl.glPushMatrix();
	1055	+
	1056	+ gl.glTranslated(tx + tmp.xcount, ty + tmp.ycount, tz + tmp.z*count);
	1057	+
	1058	+ double K = count/nbsteps;
	1059	+
	1060	+ double intersize = Knextsize + (1-K)size;
	1061	+
	1062	+ gl.glScaled(intersize,intersize,intersize);
	1063	+
	1064	+ pointFlow.geo.Draw/Node/(display,null,selected,blocked);
	1065	+
	1066	+ count++;
	1067	+
	1068	+ distancenext -= step;
	1069	+
	1070	+ gl.glPopMatrix();
	1071	+ }
	1072	+
	1073	+ if (count != nbsteps)
	1074	+ assert(count == nbsteps);
	1075	+
	1076	+ // gl.glScalef(16.0f/1024,16.0f/1024,16.0f/1024);
	1077	+ //gl.glTranslatef(-tx,-ty,-tz);
	1078	+
	1079	+ gl.glMatrixMode(gl.GL_TEXTURE);
	1080	+ gl.glPopMatrix();
	1081	+ }
	1082	+
	1083	+ if (!cf)
	1084	+ gl.glDisable(gl.GL_CULL_FACE);
	1085	+
	1086	+// display.modelParams0[0] = r;
	1087	+// display.modelParams0[1] = g;
	1088	+// display.modelParams0[2] = b;
	1089	+//
	1090	+// display.modelParams5[1] = opacity;
	1091	+//
	1092	+// gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 0, display.modelParams0, 0);
	1093	+// gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 5, display.modelParams5, 0);
	1094	+
	1095	+ gl.glMatrixMode(gl.GL_MODELVIEW);
	1096	+ }
	1097	+
	1098	+ public void DrawBox(cVector min, cVector max)
	1099	+ {
	1100	+ javax.media.opengl.GL gl = GetGL();
	1101	+ gl.glBegin(gl.GL_LINES);
	1102	+
	1103	+ gl.glVertex3d(min.x, min.y, min.z);
	1104	+ gl.glVertex3d(min.x, min.y, max.z);
	1105	+ gl.glVertex3d(min.x, min.y, min.z);
	1106	+ gl.glVertex3d(min.x, max.y, min.z);
	1107	+ gl.glVertex3d(min.x, min.y, min.z);
	1108	+ gl.glVertex3d(max.x, min.y, min.z);
	1109	+
	1110	+ gl.glVertex3d(max.x, max.y, max.z);
	1111	+ gl.glVertex3d(min.x, max.y, max.z);
	1112	+ gl.glVertex3d(max.x, max.y, max.z);
	1113	+ gl.glVertex3d(max.x, min.y, max.z);
	1114	+ gl.glVertex3d(max.x, max.y, max.z);
	1115	+ gl.glVertex3d(max.x, max.y, min.z);
	1116	+
	1117	+ gl.glEnd();
	1118	+ }
	1119	+
	1120	+ public void DrawGeometry(BoundaryRep bRep, boolean flipV, boolean selectmode)
	1121	+ {
	1122	+ int[] strips = bRep.getRawIndices();
	1123	+
	1124	+ javax.media.opengl.GL gl = GetGL();
	1125	+
	1126	+ // TRIANGLE STRIP ARRAY
	1127	+ if (bRep.trimmed)
	1128	+ {
	1129	+ float[] v = bRep.getRawVertices();
	1130	+ float[] n = bRep.getRawNormals();
	1131	+ float[] c = bRep.getRawColors();
	1132	+ float[] uv = bRep.getRawUVMap();
	1133	+
	1134	+ int count2 = 0;
	1135	+ int count3 = 0;
	1136	+
	1137	+ if (n.length > 0)
	1138	+ {
	1139	+ for (int i = 0; i < strips.length; i++)
	1140	+ {
	1141	+ gl.glBegin(gl.GL_TRIANGLE_STRIP);
	1142	+
	1143	+ /*
	1144	+ boolean locked = false;
	1145	+ float eps = 0.1f;
	1146	+ boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
	1147	+
	1148	+ int dot = 0;
	1149	+
	1150	+ if ((dot&1) == 0)
	1151	+ dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
	1152	+
	1153	+ if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
	1154	+ gl.glTexCoord2f((float) qv.s, (float) qv.t);
	1155	+ else
	1156	+ {
	1157	+ locked = true;
	1158	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	1159	+ }
	1160	+ //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
	1161	+ gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
	1162	+ if (hasnorm)
	1163	+ {
	1164	+ //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
	1165	+ gl.glNormal3f((float) rv.norm.x, (float) rv.norm.y, (float) rv.norm.z);
	1166	+ }
	1167	+
	1168	+ if ((dot&4) == 0)
	1169	+ dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
	1170	+
	1171	+ if (wrap \|\| !locked && (dot&8) != 0)
	1172	+ gl.glTexCoord2f((float) rv.s, (float) rv.t);
	1173	+ else
	1174	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	1175	+
	1176	+ f.dot = dot;
	1177	+ */
	1178	+
	1179	+ if (!selectmode)
	1180	+ {
	1181	+ if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
	1182	+ {
	1183	+ gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1184	+ } else
	1185	+ {
	1186	+ gl.glNormal3f(0, 0, 1);
	1187	+ }
	1188	+
	1189	+ if (c != null)
	1190	+ //System.out.println("glcolor = " + c[count3] + ", " + c[count3+1] + ", " + c[count3+2]);
	1191	+ {
	1192	+ gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
	1193	+ }
	1194	+ }
	1195	+ if (flipV)
	1196	+ gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
	1197	+ else
	1198	+ gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1199	+ //System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
	1200	+ gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1201	+
	1202	+ count2 += 2;
	1203	+ count3 += 3;
	1204	+ if (!selectmode)
	1205	+ {
	1206	+ if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
	1207	+ {
	1208	+ gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1209	+ } else
	1210	+ {
	1211	+ gl.glNormal3f(0, 0, 1);
	1212	+ }
	1213	+ if (c != null)
	1214	+ {
	1215	+ gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
	1216	+ }
	1217	+ }
	1218	+ if (flipV)
	1219	+ gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
	1220	+ else
	1221	+ gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1222	+ //System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
	1223	+ gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1224	+
	1225	+ count2 += 2;
	1226	+ count3 += 3;
	1227	+ for (int j = 0; j < strips[i] - 2; j++)
	1228	+ {
	1229	+ //gl.glTexCoord2d(...);
	1230	+ if (!selectmode)
	1231	+ {
	1232	+ if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
	1233	+ {
	1234	+ gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1235	+ } else
	1236	+ {
	1237	+ gl.glNormal3f(0, 0, 1);
	1238	+ }
	1239	+ if (c != null)
	1240	+ {
	1241	+ gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
	1242	+ }
	1243	+ }
	1244	+
	1245	+ if (flipV)
	1246	+ gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
	1247	+ else
	1248	+ gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1249	+ //System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
	1250	+ gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1251	+ count2 += 2;
	1252	+ count3 += 3;
	1253	+ }
	1254	+
	1255	+ gl.glEnd();
	1256	+ }
	1257	+ }
	1258	+
	1259	+ assert count3 == v.length;
	1260	+ }
	1261	+ else // !trimmed
	1262	+ {
	1263	+ int count = 0;
	1264	+ for (int i = 0; i < strips.length; i++)
	1265	+ {
	1266	+ gl.glBegin(gl.GL_TRIANGLE_STRIP);
	1267	+
	1268	+ Vertex p = bRep.GetVertex(bRep.indices[count++]);
	1269	+ Vertex q = bRep.GetVertex(bRep.indices[count++]);
	1270	+
	1271	+ drawVertex(gl, p, flipV, selectmode);
	1272	+ drawVertex(gl, q, flipV, selectmode);
	1273	+
	1274	+ for (int j = 0; j < strips[i] - 2; j++)
	1275	+ {
	1276	+ Vertex r = bRep.GetVertex(bRep.indices[count++]);
	1277	+
	1278	+ // if (j%2 == 0)
	1279	+ // drawFace(p, q, r, display, null);
	1280	+ // else
	1281	+ // drawFace(p, r, q, display, null);
	1282	+
	1283	+ // p = q;
	1284	+ // q = r;
	1285	+ drawVertex(gl, r, flipV, selectmode);
	1286	+ }
	1287	+
	1288	+ gl.glEnd();
	1289	+ }
	1290	+ }
	1291	+ }
	1292	+
	1293	+ static cSpring.Point3D temp = new cSpring.Point3D();
	1294	+ static cSpring.Point3D temp2 = new cSpring.Point3D();
	1295	+ static cSpring.Point3D temp3 = new cSpring.Point3D();
	1296	+
	1297	+ public void DrawDynamicMesh(cMesh mesh)
	1298	+ {
	1299	+ GL gl = GetGL(); // getGL();
	1300	+
	1301	+ cSpring.PhysicsController3D Phys = mesh.Phys;
	1302	+
	1303	+ gl.glDisable(gl.GL_LIGHTING);
	1304	+
	1305	+ gl.glLineWidth(1);
	1306	+ gl.glColor3f(1,1,1);
	1307	+ gl.glBegin(gl.GL_LINES);
	1308	+ double scale = 0;
	1309	+ int count = 0;
	1310	+ for (int s=0; s<Phys.allSprings.size(); s++)
	1311	+ {
	1312	+ cSpring.Spring spring = Phys.allSprings.get(s);
	1313	+ if(s == 0)
	1314	+ {
	1315	+ //System.out.println(" spring : " + spring.a.position + "; " + spring.b.position);
	1316	+ }
	1317	+ if (mesh.showsprings)
	1318	+ {
	1319	+ temp.set(spring.a.position);
	1320	+ temp.add(spring.b.position);
	1321	+ temp.mul(0.5);
	1322	+ temp2.set(spring.a.position);
	1323	+ temp2.sub(spring.b.position);
	1324	+ temp2.mul(spring.restLength/2);
	1325	+ temp.sub(temp2);
	1326	+ gl.glVertex3f((float)temp.x, (float)temp.y, (float)temp.z);
	1327	+ temp.add(temp2);
	1328	+ temp.add(temp2);
	1329	+ gl.glVertex3f((float)temp.x, (float)temp.y, (float)temp.z);
	1330	+ }
	1331	+
	1332	+ if (spring.isHandle)
	1333	+ continue;
	1334	+
	1335	+ //if (scale < spring.restLength)
	1336	+ scale += spring.restLength;
	1337	+ count++;
	1338	+ }
	1339	+ gl.glEnd();
	1340	+
	1341	+ if (count == 0)
	1342	+ scale = 0.01;
	1343	+ else
	1344	+ scale /= count * 3;
	1345	+
	1346	+ //scale = 0.25;
	1347	+
	1348	+ if (mesh.ShowInfo())
	1349	+ {
	1350	+ gl.glLineWidth(4);
	1351	+ for (int s=0; s<Phys.allNodes.size(); s++)
	1352	+ {
	1353	+ cSpring.DynamicNode node = Phys.allNodes.get(s);
	1354	+ if (node.mass == 0)
	1355	+ continue;
	1356	+
	1357	+ int i = node.springs==null?-1:node.springs.size();
	1358	+ gl.glColor3f((i>>2)&1,(i>>1)&1,i&1);
	1359	+ //temp.set(node.springForce.x, node.springForce.y, node.springForce.z);
	1360	+ //temp.normalize();
	1361	+ //gl.glColor3d((temp.x+1)/2, (temp.y+1)/2, (temp.z+1)/2);
	1362	+ gl.glBegin(gl.GL_LINES);
	1363	+ gl.glVertex3d(node.position.x, node.position.y, node.position.z);
	1364	+ //gl.glVertex3d(node.position.x + node.normal.xscale, node.position.y + node.normal.yscale, node.position.z + node.normal.z*scale);
	1365	+ gl.glVertex3d(node.position.x + mesh.bRep.GetVertex(s).norm.x*scale,
	1366	+ node.position.y + mesh.bRep.GetVertex(s).norm.y*scale,
	1367	+ node.position.z + mesh.bRep.GetVertex(s).norm.z*scale);
	1368	+ gl.glEnd();
	1369	+ }
	1370	+
	1371	+ gl.glLineWidth(8);
	1372	+ for (int s=0; s<Phys.allNodes.size(); s++)
	1373	+ {
	1374	+ cSpring.DynamicNode node = Phys.allNodes.get(s);
	1375	+
	1376	+ if (node.springs != null)
	1377	+ {
	1378	+ for (int i=0; i<node.springs.size(); i+=1)
	1379	+ {
	1380	+ cSpring.DynamicNode f = node.springs.get(i).GetOther(node);
	1381	+
	1382	+ int c = i+1;
	1383	+ // c = node.springs.get(i).nbcopies;
	1384	+
	1385	+ gl.glColor3f((c>>2)&1,(c>>1)&1,c&1);
	1386	+ gl.glBegin(gl.GL_LINES);
	1387	+ gl.glVertex3d(node.position.x, node.position.y, node.position.z);
	1388	+ gl.glVertex3d(f.position.x/3+node.position.x2/3, f.position.y/3+node.position.y2/3, f.position.z/3+node.position.z*2/3);
	1389	+ gl.glEnd();
	1390	+ }
	1391	+ }
	1392	+ }
	1393	+
	1394	+ gl.glLineWidth(1);
	1395	+ }
	1396	+
	1397	+ gl.glEnable(gl.GL_LIGHTING);
	1398	+ }
	1399	+
	1400	+ /// INTERFACE
	1401	+
	1402	+ public void StartTriangles()
	1403	+ {
	1404	+ javax.media.opengl.GL gl = GetGL();
	1405	+ gl.glBegin(gl.GL_TRIANGLES);
	1406	+ }
	1407	+
	1408	+ public void EndTriangles()
	1409	+ {
	1410	+ GetGL().glEnd();
	1411	+ }
	1412	+
	1413	+ void drawVertex(javax.media.opengl.GL gl, Vertex pv, boolean flipV, boolean selectmode)
	1414	+ {
	1415	+ if (!selectmode)
	1416	+ {
	1417	+ gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
	1418	+ gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
	1419	+
	1420	+ if (flipV)
	1421	+ gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
	1422	+ else
	1423	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	1424	+ }
	1425	+
	1426	+ gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
	1427	+ }
	1428	+
	1429	+ void SetColor(Object3D obj, Vertex p0)
	1430	+ {
	1431	+ CameraPane display = this;
	1432	+ BoundaryRep bRep = obj.bRep;
	1433	+
	1434	+ if (RENDERPROGRAM == 0)
	1435	+ {
	1436	+ float r = 0;
	1437	+ if (bRep != null)
	1438	+ {
	1439	+ if (bRep.stripified)
	1440	+ {
	1441	+ r = 1;
	1442	+ }
	1443	+ }
	1444	+ float g = 0;
	1445	+ if (bRep != null)
	1446	+ {
	1447	+ if (bRep.trimmed)
	1448	+ {
	1449	+ g = 1;
	1450	+ }
	1451	+ }
	1452	+ float b = 0;
	1453	+ if (obj.support != null && obj.link2master)
	1454	+ {
	1455	+ b = 1;
	1456	+ }
	1457	+ display.GetGL().glColor3f(rp0.AO, gp0.AO, b*p0.AO);
	1458	+ return;
	1459	+ }
	1460	+
	1461	+ if (display.DrawMode() != CameraPane.SHADOW)
	1462	+ return;
	1463	+
	1464	+ javax.media.opengl.GL gl = display.GetGL();
	1465	+// if (true) return;
	1466	+// float ao = p.AO;
	1467	+//
	1468	+// // if (ao == 0 && !bRep.AOdone) // transient problem!
	1469	+// // ao = 1;
	1470	+//
	1471	+// gl.glColor4f(ao, ao, ao, 1);
	1472	+
	1473	+// CameraPane.selectedpoint.
	1474	+// getAverage(cStatic.point1, true);
	1475	+ if (CameraPane.pointflow == null) // !random) // live)
	1476	+ {
	1477	+ return;
	1478	+ }
	1479	+
	1480	+ cStatic.point1.set(0,0,0);
	1481	+ LA.xformPos(cStatic.point1, CameraPane.selectedpoint.toParent, cStatic.point1);
	1482	+
	1483	+ cStatic.point1.sub(p0);
	1484	+
	1485	+
	1486	+// if (marked && (p0.vertexlinks == null \|\| support == null \|\| support.bRep == null)) // no position delta?
	1487	+// {
	1488	+// return;
	1489	+// }
	1490	+
	1491	+ //if (true)
	1492	+ if (cStatic.point1.dot(cStatic.point1) > 0.000001)
	1493	+ {
	1494	+ return;
	1495	+ }
	1496	+
	1497	+ float[] colorV = new float[3];
	1498	+
	1499	+ if (false) // marked)
	1500	+ {
	1501	+ // debug rigging weights
	1502	+ for (int object = 0; object < p0.vertexlinks.length; object++)
	1503	+ {
	1504	+ float weight = p0.weights[object] / p0.totalweight;
	1505	+
	1506	+ // if (weight < 0.1)
	1507	+ // {
	1508	+ // assert(weight == 0);
	1509	+ // continue;
	1510	+ // }
	1511	+
	1512	+ if (p0.vertexlinks[object] == -1)
	1513	+ continue;
	1514	+
	1515	+ Vertex q = obj.support.bRep.GetVertex(p0.vertexlinks[object]);
	1516	+
	1517	+ int color = //1 << object; //
	1518	+ //p.vertexlinks.length;
	1519	+ obj.support.bRep.supports[p0.closestsupport].links[object];
	1520	+ colorV[2] += (color & 1) * weight;
	1521	+ colorV[1] += ((color & 2) >> 1) * weight;
	1522	+ colorV[0] += ((color & 4) >> 2) * weight;
	1523	+ }
	1524	+ }
	1525	+ else
	1526	+ {
	1527	+ if (obj.drawingstarted)
	1528	+ {
	1529	+ // find next point
	1530	+ if (bRep.GetVertex(0).faceindices == null)
	1531	+ {
	1532	+ bRep.InitFaceIndices();
	1533	+ }
	1534	+
	1535	+ double ymin = p0.y;
	1536	+
	1537	+ Vertex newp = p0;
	1538	+
	1539	+ for (int fii = 0; fii < p0.faceindices.length; fii++)
	1540	+ {
	1541	+ int fi = p0.faceindices[fii];
	1542	+
	1543	+ if (fi == -1)
	1544	+ break;
	1545	+
	1546	+ Face f = bRep.GetFace(fi);
	1547	+
	1548	+ Vertex p = bRep.GetVertex(f.p);
	1549	+ Vertex q = bRep.GetVertex(f.q);
	1550	+ Vertex r = bRep.GetVertex(f.r);
	1551	+
	1552	+ int swap = (int)(Math.random()*3);
	1553	+
	1554	+// for (int s=swap; --s>=0;)
	1555	+// {
	1556	+// Vertex t = p;
	1557	+// p = q;
	1558	+// q = r;
	1559	+// r = t;
	1560	+// }
	1561	+ if (ymin > p.y)
	1562	+ {
	1563	+ ymin = p.y;
	1564	+ newp = p;
	1565	+// break;
	1566	+ }
	1567	+ if (ymin > q.y)
	1568	+ {
	1569	+ ymin = q.y;
	1570	+ newp = q;
	1571	+// break;
	1572	+ }
	1573	+ if (ymin > r.y)
	1574	+ {
	1575	+ ymin = r.y;
	1576	+ newp = r;
	1577	+// break;
	1578	+ }
	1579	+ }
	1580	+
	1581	+ CameraPane.selectedpoint.toParent[3][0] = newp.x;
	1582	+ CameraPane.selectedpoint.toParent[3][1] = newp.y;
	1583	+ CameraPane.selectedpoint.toParent[3][2] = newp.z;
	1584	+
	1585	+ obj.drawingstarted = false;
	1586	+
	1587	+ // return;
	1588	+ }
	1589	+
	1590	+ if (false) // CameraPane.DRAW
	1591	+ {
	1592	+ p0.AO = colorV[0] = 2;
	1593	+ colorV[1] = 2;
	1594	+ colorV[2] = 2;
	1595	+ }
	1596	+
	1597	+ CameraPane.pointflow.add(p0);
	1598	+ CameraPane.pointflow.Touch();
	1599	+ }
	1600	+
	1601	+// gl.glColor3f(colorV[0], colorV[1], colorV[2]);
	1602	+// gl.glMaterialfv(gl.GL_FRONT, gl.GL_DIFFUSE, colorV, 0);
	1603	+// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
	1604	+ }
	1605	+
	1606	+ void DrawMaterial(cMaterial material, boolean selected)
	1607	+ {
	1608	+ CameraPane display = this;
	1609	+ //new Exception().printStackTrace();
	1610	+
	1611	+ if (display.IsFrozen() && !selected \|\| display.IsAmbientOcclusionOn()) // \|\| display.drawMode == display.SHADOW)
	1612	+ {
	1613	+ return;
	1614	+ }
	1615	+
	1616	+ javax.media.opengl.GL gl = display.GetGL();
	1617	+
	1618	+ //Color col = Color.getHSBColor(color,modulation,1);
	1619	+ //col.getColorComponents(ColorSpace.getInstance(ColorSpace.CS_LINEAR_RGB), CameraPane.modelParams0);
	1620	+ if (!material.multiply)
	1621	+ {
	1622	+ display.color = material.color;
	1623	+ display.saturation = material.modulation;
	1624	+ }
	1625	+ else
	1626	+ {
	1627	+ display.color = material.color2;
	1628	+ display.saturation = material.modulation2;
	1629	+ }
	1630	+
	1631	+ cColor.HSBtoRGB(display.color, display.saturation, 1, display.modelParams0);
	1632	+
	1633	+ float[] colorV = Grafreed.colorV;
	1634	+
	1635	+ /**/
	1636	+ if (display.DrawMode() == display.DEFAULT) // && display.RENDERPROGRAM == 0)
	1637	+ {
	1638	+ colorV[0] = display.modelParams0[0] * material.diffuse;
	1639	+ colorV[1] = display.modelParams0[1] * material.diffuse;
	1640	+ colorV[2] = display.modelParams0[2] * material.diffuse;
	1641	+ colorV[3] = material.opacity;
	1642	+
	1643	+ gl.glColor4f(colorV[0], colorV[1], colorV[2], material.opacity);
	1644	+ //System.out.println("Opacity = " + opacity);
	1645	+
	1646	+ gl.glMaterialfv(gl.GL_FRONT, gl.GL_DIFFUSE, colorV, 0);
	1647	+ //color[0] /= 2; color[1] /= 2; color[2] /= 2;
	1648	+ gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
	1649	+
	1650	+ float amb = material.ambient;
	1651	+ if (amb < material.cameralight)
	1652	+ {
	1653	+ amb = material.cameralight;
	1654	+ }
	1655	+ colorV[0] = display.modelParams0[0] * material.diffuse * amb;
	1656	+ colorV[1] = display.modelParams0[1] * material.diffuse * amb;
	1657	+ colorV[2] = display.modelParams0[2] * material.diffuse * amb;
	1658	+ gl.glMaterialfv(gl.GL_FRONT, gl.GL_AMBIENT, colorV, 0);
	1659	+ //color[0] /= 2; color[1] /= 2; color[2] /= 2;
	1660	+ gl.glMaterialfv(gl.GL_BACK, gl.GL_AMBIENT, colorV, 0);
	1661	+
	1662	+ /**/
	1663	+ colorV[0] = ((1 - material.metalness) + display.modelParams0[0] * material.metalness) * material.specular;
	1664	+ colorV[1] = ((1 - material.metalness) + display.modelParams0[1] * material.metalness) * material.specular;
	1665	+ colorV[2] = ((1 - material.metalness) + display.modelParams0[2] * material.metalness) * material.specular;
	1666	+ gl.glMaterialfv(gl.GL_FRONT, gl.GL_SPECULAR, colorV, 0);
	1667	+ //color[0] /= 2; color[1] /= 2; color[2] /= 2;
	1668	+ gl.glMaterialfv(gl.GL_BACK, gl.GL_SPECULAR, colorV, 0);
	1669	+ colorV[0] = 10 / material.shininess; // 1/0.005f;
	1670	+ //System.out.println("shininess = " + colorV[0]);
	1671	+ if (colorV[0] > 128)
	1672	+ {
	1673	+ colorV[0] = 128;
	1674	+ }
	1675	+ gl.glMaterialfv(gl.GL_FRONT, gl.GL_SHININESS, colorV, 0);
	1676	+ gl.glMaterialfv(gl.GL_BACK, gl.GL_SHININESS, colorV, 0);
	1677	+ /**/
	1678	+ }
	1679	+ /**/
	1680	+
	1681	+ //selected = false;
	1682	+ selected = selected && display.flash;
	1683	+
	1684	+ //display.modelParams0[0] = 0; // pigment.r;
	1685	+ //display.modelParams0[1] = 0; // pigment.g;
	1686	+ //display.modelParams0[2] = 0; // pigment.b;
	1687	+ if (!material.multiply)
	1688	+ {
	1689	+ display.modelParams0[3] = material.metalness;
	1690	+ display.modelParams1[0] = material.diffuse;
	1691	+ display.modelParams1[1] = material.specular;
	1692	+ display.modelParams1[2] = 1 / material.shininess;
	1693	+ display.modelParams1[3] = material.shift;
	1694	+ display.modelParams2[0] = material.ambient;
	1695	+ display.modelParams2[1] = material.lightarea;
	1696	+ //System.out.println("light area = " + lightarea);
	1697	+ display.modelParams2[2] = 1 / material.factor; // diffuseness
	1698	+ display.modelParams2[3] = material.velvet;
	1699	+ display.modelParams3[0] = material.sheen;
	1700	+ display.modelParams3[1] = material.subsurface;
	1701	+ display.modelParams3[2] = material.bump; // backlit
	1702	+ display.modelParams3[3] = material.aniso;
	1703	+ display.modelParams4[0] = material.anisoV;
	1704	+ display.modelParams4[1] = selected ? 100 : material.cameralight;
	1705	+ //System.out.println("selected = " + selected);
	1706	+ display.modelParams4[2] = material.diffuseness;
	1707	+ display.modelParams4[3] = material.shadow;
	1708	+ display.modelParams5[0] = material.texture;
	1709	+ display.modelParams5[1] = material.opacity;
	1710	+ display.modelParams5[2] = material.fakedepth;
	1711	+ display.modelParams5[3] = CameraPane.SHADOWCULLFACE ? 0f : (material.shadowbias - 0.005f) / 10;
	1712	+ }
	1713	+ else
	1714	+ {
	1715	+ display.modelParams0[3] = material.metalness2;
	1716	+ display.modelParams1[0] = material.diffuse2;
	1717	+ display.modelParams1[1] = material.specular2;
	1718	+ display.modelParams1[2] = material.shininess2;
	1719	+ display.modelParams1[3] = material.shift2;
	1720	+ display.modelParams2[0] = material.ambient2;
	1721	+ display.modelParams2[1] = material.lightarea2;
	1722	+ display.modelParams2[2] = material.factor2;
	1723	+ display.modelParams2[3] = material.velvet2;
	1724	+ display.modelParams3[0] = material.sheen2;
	1725	+ display.modelParams3[1] = material.subsurface2;
	1726	+ display.modelParams3[2] = material.bump2;
	1727	+ display.modelParams3[3] = material.aniso2;
	1728	+ display.modelParams4[0] = material.anisoV2;
	1729	+ display.modelParams4[1] = material.cameralight2;
	1730	+ //System.out.println("selected = " + selected);
	1731	+ display.modelParams4[2] = material.diffuseness2;
	1732	+ display.modelParams4[3] = material.shadow2;
	1733	+ display.modelParams5[0] = material.texture2;
	1734	+ display.modelParams5[1] = material.opacity2;
	1735	+ display.modelParams5[2] = material.fakedepth2;
	1736	+ display.modelParams5[3] = material.shadowbias2;
	1737	+ }
	1738	+
	1739	+ display.modelParams6[0] = 0;
	1740	+ display.modelParams6[1] = 0;
	1741	+ display.modelParams6[2] = 0;
	1742	+ display.modelParams6[3] = 0;
	1743	+
	1744	+ display.modelParams7[0] = 0;
	1745	+ display.modelParams7[1] = 1000;
	1746	+ display.modelParams7[2] = 0;
	1747	+ display.modelParams7[3] = 0;
	1748	+
	1749	+ display.modelParams6[0] = 100; // criss de bug de bump
	1750	+
	1751	+ Object3D.cVector2[] extparams = display.vector2buffer;
	1752	+ if (extparams != null && extparams.length > 0 && extparams[0] != null)
	1753	+ {
	1754	+ display.modelParams6[0] = extparams[0].x / 1000.0f; // bump
	1755	+ display.modelParams6[1] = extparams[0].y / 1000.0f; // noise
	1756	+ if (extparams.length > 1)
	1757	+ {
	1758	+ display.modelParams6[2] = extparams[1].x / 1000.0f; // borderfade
	1759	+ display.modelParams6[3] = extparams[1].y / 1000.0f; // (float)Math.exp(-extparams[1].y / 1000.0f); // fog punchthrough
	1760	+ if (extparams.length > 2)
	1761	+ {
	1762	+ display.modelParams7[0] = extparams[2].x / 1000.0f; // noise power
	1763	+ float x = extparams[2].y / 1000.0f;
	1764	+ //if (x == 0)
	1765	+ // x = 1f;
	1766	+ display.modelParams7[1] = 1 / x / x / x / x / x / x / x / x / x / x / x / x / x; // (float)Math.pow(-Math.log((extparams[2].y+0.00) / 1000.0f), 1); // opacity power
	1767	+ if (extparams[2].y > 0)
	1768	+ {
	1769	+ //System.out.println("extparams[1].y = " + extparams[1].y);
	1770	+ //System.out.println("extparams[2].y = " + extparams[2].y);
	1771	+ //System.out.println("opacity power = " + display.modelParams7[1]);
	1772	+ }
	1773	+ }
	1774	+ }
	1775	+ }
	1776	+
	1777	+ //if (display.modelParams6[2] != 0)
	1778	+ /*
	1779	+ System.out.println("modelParams0[0] = " + display.modelParams0[0]);
	1780	+ System.out.println("modelParams0[1] = " + display.modelParams0[1]);
	1781	+ System.out.println("modelParams0[2] = " + display.modelParams0[2]);
	1782	+ System.out.println("modelParams0[3] = " + display.modelParams0[3]);
	1783	+ System.out.println("modelParams1[0] = " + display.modelParams1[0]);
	1784	+ System.out.println("modelParams1[1] = " + display.modelParams1[1]);
	1785	+ System.out.println("modelParams1[2] = " + display.modelParams1[2]);
	1786	+ System.out.println("modelParams1[3] = " + display.modelParams1[3]);
	1787	+ System.out.println("modelParams2[0] = " + display.modelParams2[0]);
	1788	+ System.out.println("modelParams2[1] = " + display.modelParams2[1]);
	1789	+ System.out.println("modelParams2[2] = " + display.modelParams2[2]);
	1790	+ System.out.println("modelParams2[3] = " + display.modelParams2[3]);
	1791	+ System.out.println("modelParams3[0] = " + display.modelParams3[0]);
	1792	+ System.out.println("modelParams3[1] = " + display.modelParams3[1]);
	1793	+ System.out.println("modelParams3[2] = " + display.modelParams3[2]);
	1794	+ System.out.println("modelParams3[3] = " + display.modelParams3[3]);
	1795	+ System.out.println("modelParams4[0] = " + display.modelParams4[0]);
	1796	+ System.out.println("modelParams4[1] = " + display.modelParams4[1]);
	1797	+ System.out.println("modelParams4[2] = " + display.modelParams4[2]);
	1798	+ System.out.println("modelParams4[3] = " + display.modelParams4[3]);
	1799	+ System.out.println("modelParams5[0] = " + display.modelParams5[0]);
	1800	+ System.out.println("modelParams5[1] = " + display.modelParams5[1]);
	1801	+ System.out.println("modelParams5[2] = " + display.modelParams5[2]);
	1802	+ System.out.println("modelParams5[3] = " + display.modelParams5[3]);
	1803	+ System.out.println("modelParams6[0] = " + display.modelParams6[0]);
	1804	+ System.out.println("modelParams6[1] = " + display.modelParams6[1]);
	1805	+ System.out.println("modelParams6[2] = " + display.modelParams6[2]);
	1806	+ System.out.println("modelParams6[3] = " + display.modelParams6[3]);
	1807	+ System.out.println("modelParams7[0] = " + display.modelParams7[0]);
	1808	+ System.out.println("modelParams7[1] = " + display.modelParams7[1]);
	1809	+ System.out.println("modelParams7[2] = " + display.modelParams7[2]);
	1810	+ System.out.println("modelParams7[3] = " + display.modelParams7[3]);
	1811	+ /**/
	1812	+ //assert (display.modelParams6[2] == 0);
	1813	+
	1814	+ //System.out.println("noise power = " + display.modelParams7[0]);
	1815	+ //System.out.println("shadowbias = " + shadowbias);
	1816	+
	1817	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 0, display.modelParams0, 0);
	1818	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 1, display.modelParams1, 0);
	1819	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 2, display.modelParams2, 0);
	1820	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 3, display.modelParams3, 0);
	1821	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 4, display.modelParams4, 0);
	1822	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 5, display.modelParams5, 0);
	1823	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 6, display.modelParams6, 0);
	1824	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 7, display.modelParams7, 0);
	1825	+
	1826	+ int mode = display.FP_SHADER;
	1827	+
	1828	+ if (material.aniso != material.anisoV \|\| material.aniso > 0.002)
	1829	+ {
	1830	+ mode \|= display.FP_ANISO;
	1831	+ }
	1832	+
	1833	+ display.EnableProgram(mode);
	1834	+
	1835	+ //System.out.println("opacity power = " + display.modelParams7[1]);
	1836	+
	1837	+ if (!material.multiply)
	1838	+ {
	1839	+ if (Globals.drawMode == CameraPane.SHADOW)
	1840	+ gl.glDepthMask(material.opacity >= 0.9 && display.modelParams7[1] > 0.1);
	1841	+ else
	1842	+ gl.glDepthMask(material.opacity >= 0.99);
	1843	+ }
208	1844	}
209	1845
210	1846	int matrixdepth = 0; // 10000; // CONFLICT WITH cMESH... WARNING WARNING WARNING WARNING WARNING WARNING !!!!!!!!!!!! 0;
..	..	@@ -225,10 +1861,10 @@
225	1861	currentGL.glMultMatrixd(model, 0);
226	1862	}
227	1863
228		- void PushMatrix(double[][] matrix, int count)
	1864	+ public void PushMatrix(double[][] matrix, int count) // INTERFACE
229	1865	{
230	1866	matrixdepth++;
231		- // GraphreeD.tracein(matrix);
	1867	+ // GrafreeD.tracein(matrix);
232	1868	if (matrix == null)
233	1869	return; // Identity
234	1870
..	..	@@ -253,13 +1889,13 @@
253	1889
254	1890	void PushMatrix(double[][] matrix)
255	1891	{
256		- // GraphreeD.tracein(matrix);
257		- PushMatrix(matrix,1);
	1892	+ // GrafreeD.tracein(matrix);
	1893	+ PushMatrix(matrix, 1);
258	1894	}
259	1895
260	1896	void PushMatrix()
261	1897	{
262		- // GraphreeD.tracein(null);
	1898	+ // GrafreeD.tracein(null);
263	1899	if (matrixdepth++ < MAXSTACK - 1)
264	1900	{
265	1901	currentGL.glPushMatrix();
..	..	@@ -270,11 +1906,11 @@
270	1906
271	1907	double[][] tmpmat = new double[4][4];
272	1908
273		- void PopMatrix(double[][] inverse)
	1909	+ public void PopMatrix(double[][] inverse) // INTERFACE
274	1910	{
275	1911	--matrixdepth;
276	1912
277		- // GraphreeD.traceout(inverse);
	1913	+ // GrafreeD.traceout(inverse);
278	1914	if (inverse == null)
279	1915	return; // Identity
280	1916
..	..	@@ -292,7 +1928,7 @@
292	1928
293	1929	void PopMatrix()
294	1930	{
295		- // GraphreeD.traceout(null);
	1931	+ // GrafreeD.traceout(null);
296	1932	// inverse == null??
297	1933	if (--matrixdepth < MAXSTACK - 1)
298	1934	{
..	..	@@ -310,7 +1946,7 @@
310	1946	PushTextureMatrix(matrix, 1);
311	1947	}
312	1948
313		- void PushTextureMatrix(double[][] matrix, int count)
	1949	+ public void PushTextureMatrix(double[][] matrix, int count) // INTERFACE
314	1950	{
315	1951	currentGL.glActiveTexture(GetGL().GL_TEXTURE0);
316	1952
..	..	@@ -324,7 +1960,7 @@
324	1960	currentGL.glMatrixMode(GetGL().GL_MODELVIEW);
325	1961	}
326	1962
327		- void PopTextureMatrix(double[][] inverse)
	1963	+ public void PopTextureMatrix(double[][] inverse) // INTERFACE
328	1964	{
329	1965	currentGL.glActiveTexture(GetGL().GL_TEXTURE0);
330	1966	currentGL.glMatrixMode(GetGL().GL_TEXTURE);
..	..	@@ -351,15 +1987,15 @@
351	1987
352	1988	static int camerachangeframe;
353	1989
354		- boolean SetCamera(Camera cam)
	1990	+ public boolean SetCamera(Camera cam)
355	1991	{
356	1992	// may 2014 if (cam == cameras[0] \|\| cam == cameras[1])
357	1993	// return false;
358	1994
359		- if (REFUSEMODE && isLIVE() && camerachangeframe != 0 && camerachangeframe != framecount)
	1995	+ if (REFUSEMODE && Globals.isLIVE() && camerachangeframe != 0 && camerachangeframe != Globals.framecount)
360	1996	{
361	1997	// check for last change
362		- if (framecount < camerachangeframe + 400) // 120 == 1 second
	1998	+ if (Globals.framecount < camerachangeframe + 400) // 120 == 1 second
363	1999	{
364	2000	// refuse the camera change
365	2001	System.err.println("Camera " + cam + " REFUSED");
..	..	@@ -367,7 +2003,7 @@
367	2003	}
368	2004	}
369	2005
370		- camerachangeframe = framecount;
	2006	+ camerachangeframe = Globals.framecount;
371	2007
372	2008	cam.hAspect = -1; // Read only
373	2009
..	..	@@ -398,7 +2034,7 @@
398	2034	{
399	2035	//System.err.println("Oeil on");
400	2036	TRACK = true;
401		-// JUNE 2014 if (TRACK && trackedobject != null && drawMode == SHADOW) // && !lightMode)
	2037	+// JUNE 2014 if (TRACK && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
402	2038	// object.editWindow.ScreenFit(trackedobject);
403	2039	//pingthread.StepToTarget(true);
404	2040	}
..	..	@@ -407,7 +2043,7 @@
407	2043	{
408	2044	//System.err.println("Oeil on");
409	2045	OEIL = true;
410		- if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && drawMode == SHADOW) // && !lightMode)
	2046	+ if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
411	2047	object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
412	2048	//pingthread.StepToTarget(true);
413	2049	}
..	..	@@ -471,39 +2107,12 @@
471	2107	{
472	2108	frozen ^= true;
473	2109	// Weird...
474		- lighttouched = true;
	2110	+ Globals.lighttouched = true;
475	2111	}
476	2112
477	2113	void ToggleDL()
478	2114	{
479	2115	mainDL ^= true;
480		- }
481		-
482		- void ToggleTexture()
483		- {
484		- textureon ^= true;
485		- }
486		-
487		- void ToggleLive()
488		- {
489		- setLIVE(isLIVE() ^ true);
490		-
491		- System.err.println("LIVE = " + isLIVE());
492		-
493		- if (!isLIVE()) // save sound
494		- GraphreeD.savesound = true; // wav.save();
495		- // else
496		- repaint(); // start loop // may 2013
497		- }
498		-
499		- void ToggleSupport()
500		- {
501		- SUPPORT ^= true;
502		- }
503		-
504		- void ToggleAbort()
505		- {
506		- ABORTMODE ^= true;
507	2116	}
508	2117
509	2118	void ToggleFullScreen()
..	..	@@ -513,12 +2122,7 @@
513	2122
514	2123	void ToggleCrowd()
515	2124	{
516		- CROWD ^= true;
517		- }
518		-
519		- void ToggleInertia()
520		- {
521		- INERTIA ^= true;
	2125	+ Globals.CROWD ^= true;
522	2126	}
523	2127
524	2128	void ToggleLocal()
..	..	@@ -526,62 +2130,89 @@
526	2130	LOCALTRANSFORM ^= true;
527	2131	}
528	2132
529		- void ToggleFast()
	2133	+ public void ToggleTexture()
	2134	+ {
	2135	+ textureon ^= true;
	2136	+ }
	2137	+
	2138	+ public void ToggleLive()
	2139	+ {
	2140	+ Globals.setLIVE(Globals.isLIVE() ^ true);
	2141	+
	2142	+ System.err.println("LIVE = " + Globals.isLIVE());
	2143	+
	2144	+ if (!Globals.isLIVE()) // save sound
	2145	+ Grafreed.savesound = true; // wav.save();
	2146	+ // else
	2147	+ repaint(); // start loop // may 2013
	2148	+ }
	2149	+
	2150	+ public void ToggleSupport()
	2151	+ {
	2152	+ SUPPORT ^= true;
	2153	+ }
	2154	+
	2155	+ public void ToggleAbort()
	2156	+ {
	2157	+ ABORTMODE ^= true;
	2158	+ }
	2159	+
	2160	+ public void ToggleInertia()
	2161	+ {
	2162	+ INERTIA ^= true;
	2163	+ }
	2164	+
	2165	+ public void ToggleFast()
530	2166	{
531	2167	FAST ^= true;
532	2168	}
533	2169
534		- void ToggleSlowPose()
	2170	+ public void ToggleSlowPose()
535	2171	{
536	2172	SLOWPOSE ^= true;
537	2173	}
538	2174
539		- void ToggleFootContact()
540		- {
541		- FOOTCONTACT ^= true;
542		- }
543		-
544		- void ToggleBoxMode()
	2175	+ public void ToggleBoxMode()
545	2176	{
546	2177	BOXMODE ^= true;
547	2178	}
548	2179
549		- void ToggleSmoothFocus()
	2180	+ public void ToggleZoomBoxMode()
	2181	+ {
	2182	+ ZOOMBOXMODE ^= true;
	2183	+ }
	2184	+
	2185	+ public void ToggleSmoothFocus()
550	2186	{
551	2187	SMOOTHFOCUS ^= true;
552	2188	}
553	2189
554		- void ToggleImageFlip()
	2190	+ public void ToggleImageFlip()
555	2191	{
556	2192	IMAGEFLIP ^= true;
557	2193	}
558	2194
559		- void ToggleSpeakerMocap()
	2195	+ public void ToggleSpeakerMocap()
560	2196	{
561	2197	SPEAKERMOCAP ^= true;
562	2198	}
563	2199
564		- void ToggleSpeakerCamera()
	2200	+ public void ToggleSpeakerCamera()
565	2201	{
566	2202	SPEAKERCAMERA ^= true;
567	2203	}
568	2204
569		- void ToggleSpeakerFocus()
	2205	+ public void ToggleSpeakerFocus()
570	2206	{
571	2207	SPEAKERFOCUS ^= true;
572	2208	}
573	2209
574		- void ToggleDebug()
575		- {
576		- DEBUG ^= true;
577		- }
578		-
579		- void ToggleFrustum()
	2210	+ public void ToggleFrustum()
580	2211	{
581	2212	FRUSTUM ^= true;
582	2213	}
583	2214
584		- void ToggleTrack()
	2215	+ public void ToggleTrack()
585	2216	{
586	2217	TRACK ^= true;
587	2218	if (TRACK)
..	..	@@ -600,25 +2231,35 @@
600	2231	repaint();
601	2232	}
602	2233
603		- void ToggleTrackOnce()
	2234	+ public void ToggleTrackOnce()
604	2235	{
605	2236	TRACKONCE ^= true;
606	2237	}
607	2238
608		- void ToggleShadowTrack()
	2239	+ public void ToggleShadowTrack()
609	2240	{
610	2241	SHADOWTRACK ^= true;
611	2242	repaint();
612	2243	}
613	2244
614		- void ToggleOeil()
	2245	+ public void ToggleOeil()
615	2246	{
616	2247	OEIL ^= true;
617	2248	}
618	2249
619		- void ToggleOeilOnce()
	2250	+ public void ToggleOeilOnce()
620	2251	{
621	2252	OEILONCE ^= true;
	2253	+ }
	2254	+
	2255	+ void ToggleFootContact()
	2256	+ {
	2257	+ FOOTCONTACT ^= true;
	2258	+ }
	2259	+
	2260	+ void ToggleDebug()
	2261	+ {
	2262	+ DEBUG ^= true;
622	2263	}
623	2264
624	2265	void ToggleLookAt()
..	..	@@ -626,9 +2267,9 @@
626	2267	LOOKAT ^= true;
627	2268	}
628	2269
629		- void ToggleRandom()
	2270	+ void ToggleSwitch()
630	2271	{
631		- RANDOM ^= true;
	2272	+ SWITCH ^= true;
632	2273	}
633	2274
634	2275	void ToggleHandles()
..	..	@@ -672,34 +2313,6 @@
672	2313	//assert (cam.hAspect == 0);
673	2314	cam.hAspect = 0;
674	2315	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	2316	}
704	2317
705	2318	private static void ApplyTransform(GL gl, Mat4f xform)
..	..	@@ -759,15 +2372,17 @@
759	2372
760	2373	GL currentGL;
761	2374
762		- GL GetGL()
	2375	+ public GL GetGL() // INTERFACE
763	2376	{
764	2377	return currentGL;
765	2378	}
766		-
	2379	+
767	2380	/**/
768	2381	class CacheTexture
769	2382	{
770	2383	com.sun.opengl.util.texture.Texture texture;
	2384	+ com.sun.opengl.util.texture.TextureData texturedata;
	2385	+
771	2386	int resolution;
772	2387
773	2388	CacheTexture(com.sun.opengl.util.texture.Texture tex, int res)
..	..	@@ -1998,10 +3613,12 @@
1998	3613	*/
1999	3614	TextureData ReduceTexture(TextureData texturedata, int resolution) // String name)
2000	3615	{
	3616	+ int pixelformat = texturedata.getPixelFormat();
	3617	+
2001	3618	int stride = 1;
2002		- if (texturedata.getPixelFormat() == GetGL().GL_RGB \|\| texturedata.getPixelFormat() == GetGL().GL_BGR) // \|\| texturedata.getPixelFormat() == GL.GL_LUMINANCE)
	3619	+ if (pixelformat == GetGL().GL_RGB \|\| pixelformat == GetGL().GL_BGR) // \|\| texturedata.getPixelFormat() == GL.GL_LUMINANCE)
2003	3620	stride = 3;
2004		- if (texturedata.getPixelFormat() == GetGL().GL_RGBA \|\| texturedata.getPixelFormat() == GetGL().GL_BGRA) // \|\| texturedata.getPixelFormat() == GL.GL_LUMINANCE_ALPHA)
	3621	+ if (pixelformat == GetGL().GL_RGBA \|\| pixelformat == GetGL().GL_BGRA) // \|\| texturedata.getPixelFormat() == GL.GL_LUMINANCE_ALPHA)
2005	3622	stride = 4;
2006	3623
2007	3624	int width = texturedata.getWidth();
..	..	@@ -2591,6 +4208,7 @@
2591	4208
2592	4209	com.sun.opengl.util.texture.Texture CompressTexture2(String name)
2593	4210	{
	4211	+ new Exception().printStackTrace();
2594	4212	System.exit(0);
2595	4213	com.sun.opengl.util.texture.Texture texture = null;
2596	4214
..	..	@@ -6267,7 +7885,7 @@
6267	7885	return null;
6268	7886	}
6269	7887
6270		- void ReleaseTextures(cTexture tex)
	7888	+ public void ReleaseTextures(cTexture tex) // INTERFACE
6271	7889	{
6272	7890	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
6273	7891	{
..	..	@@ -6305,7 +7923,7 @@
6305	7923
6306	7924	void ReleaseTexture(String tex, boolean bump)
6307	7925	{
6308		- if (// drawMode != 0 \|\| /tex == null \|\|/
	7926	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
6309	7927	ambientOcclusion ) // \|\| !textureon)
6310	7928	{
6311	7929	return;
..	..	@@ -6331,7 +7949,7 @@
6331	7949	{
6332	7950	bumpdepth--;
6333	7951
6334		- // GraphreeD.trace("POP " + tex + "(" + pigmentdepth + ")" + " : " + pigmentstack[pigmentdepth] + " vs " + texture);
	7952	+ // GrafreeD.trace("POP " + tex + "(" + pigmentdepth + ")" + " : " + pigmentstack[pigmentdepth] + " vs " + texture);
6335	7953	if (bumpstack[bumpdepth] != (texture!=null?texture.texture:null))
6336	7954	{
6337	7955	// assert (bumpstack[bumpdepth] == texture);
..	..	@@ -6361,7 +7979,7 @@
6361	7979	{
6362	7980	pigmentdepth--;
6363	7981
6364		- // GraphreeD.trace("POP " + tex + "(" + pigmentdepth + ")" + " : " + pigmentstack[pigmentdepth] + " vs " + texture);
	7982	+ // GrafreeD.trace("POP " + tex + "(" + pigmentdepth + ")" + " : " + pigmentstack[pigmentdepth] + " vs " + texture);
6365	7983	if (pigmentstack[pigmentdepth] != (texture!=null?texture.texture:null))
6366	7984	{
6367	7985	// assert (pigmentstack[pigmentdepth] == texture);
..	..	@@ -6406,9 +8024,9 @@
6406	8024	}
6407	8025	}
6408	8026
6409		- /boolean/ void BindTextures(cTexture tex, int resolution)
	8027	+ /boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
6410	8028	{
6411		- if (// drawMode != 0 \|\| /tex == null \|\|/
	8029	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
6412	8030	ambientOcclusion ) // \|\| !textureon)
6413	8031	{
6414	8032	return; // false;
..	..	@@ -6451,7 +8069,27 @@
6451	8069	return; // true;
6452	8070	}
6453	8071
6454		- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution)
	8072	+ java.util.HashSet<String> missingTextures = new java.util.HashSet<String>();
	8073	+
	8074	+ private boolean FileExists(String tex)
	8075	+ {
	8076	+ if (missingTextures.contains(tex))
	8077	+ {
	8078	+ return false;
	8079	+ }
	8080	+
	8081	+ boolean fileExists = new File(tex).exists();
	8082	+
	8083	+ if (!fileExists)
	8084	+ {
	8085	+ // If file exists, the "new File()" is not executed sgain
	8086	+ missingTextures.add(tex);
	8087	+ }
	8088	+
	8089	+ return fileExists;
	8090	+ }
	8091	+
	8092	+ CacheTexture GetCacheTexture(String tex, boolean bump, int resolution) throws Exception
6455	8093	{
6456	8094	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
6457	8095
..	..	@@ -6459,12 +8097,18 @@
6459	8097	{
6460	8098	String texname = tex;
6461	8099
6462		- String[] split = tex.split("Textures");
6463		- if (split.length > 1)
6464		- texname = "/Users/nbriere/Textures" + split[split.length-1];
6465		- else
6466		- if (!texname.startsWith("/"))
6467		- texname = "/Users/nbriere/Textures/" + texname;
	8100	+ String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
	8101	+
	8102	+// String[] split = tex.split("Textures");
	8103	+// if (split.length > 1)
	8104	+// texname = "/Users/nbriere/Textures" + split[split.length-1];
	8105	+// else
	8106	+// if (!texname.startsWith("/"))
	8107	+// texname = "/Users/nbriere/Textures/" + texname;
	8108	+ if (!FileExists(tex))
	8109	+ {
	8110	+ texname = fallbackTextureName;
	8111	+ }
6468	8112
6469	8113	if (CACHETEXTURE)
6470	8114	texture = textures.get(texname); // TEXTURE CACHE
..	..	@@ -6533,7 +8177,7 @@
6533	8177	}
6534	8178
6535	8179	cachename = texname.substring(0, texname.length()-4)+ext+".jpg";
6536		- if (!new File(cachename).exists())
	8180	+ if (!FileExists(cachename))
6537	8181	cachename = texname;
6538	8182	else
6539	8183	processbump = false; // don't process bump map again
..	..	@@ -6555,7 +8199,7 @@
6555	8199	}
6556	8200
6557	8201	cachename = texname.substring(0, texname.length()-4)+ext+".png";
6558		- if (!new File(cachename).exists())
	8202	+ if (!FileExists(cachename))
6559	8203	cachename = texname;
6560	8204	else
6561	8205	processbump = false; // don't process bump map again
..	..	@@ -6564,7 +8208,9 @@
6564	8208	texturedata = GetFileTexture(cachename, processbump, resolution);
6565	8209
6566	8210
6567		- if (texturedata != null)
	8211	+ if (texturedata == null)
	8212	+ throw new Exception();
	8213	+
6568	8214	texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
6569	8215	//texture = GetTexture(tex, bump);
6570	8216	}
..	..	@@ -6665,6 +8311,8 @@
6665	8311	thetex.texture.dispose();
6666	8312	textures.remove(texname);
6667	8313	}
	8314	+
	8315	+ texture.texturedata = texturedata;
6668	8316	textures.put(texname, texture);
6669	8317
6670	8318	// newtex = true;
..	..	@@ -6681,21 +8329,35 @@
6681	8329	}
6682	8330	}
6683	8331
	8332	+ return texture;
	8333	+ }
	8334	+
	8335	+ com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution) throws Exception
	8336	+ {
	8337	+ CacheTexture texture = GetCacheTexture(tex, bump, resolution);
	8338	+
6684	8339	if (bump)
6685	8340	{
6686		- // GraphreeD.trace("PUSH BUMP " + tex + "(" + bumpdepth + ")" + " : " + texture);
	8341	+ // GrafreeD.trace("PUSH BUMP " + tex + "(" + bumpdepth + ")" + " : " + texture);
6687	8342	bumpstack[bumpdepth++] = texture!=null?texture.texture:null;
6688	8343	}
6689	8344	else
6690	8345	{
6691		- // GraphreeD.trace("PUSH PIGMENT " + tex + "(" + pigmentdepth + ")" + " : " + texture);
	8346	+ // GrafreeD.trace("PUSH PIGMENT " + tex + "(" + pigmentdepth + ")" + " : " + texture);
6692	8347	pigmentstack[pigmentdepth++] = texture!=null?texture.texture:null;
6693	8348	}
6694	8349
6695	8350	return texture!=null?texture.texture:null;
6696	8351	}
6697	8352
6698		- boolean BindTexture(String tex, boolean bump, int resolution)
	8353	+ public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution) throws Exception
	8354	+ {
	8355	+ CacheTexture texture = GetCacheTexture(tex, bump, resolution);
	8356	+
	8357	+ return texture!=null?texture.texturedata:null;
	8358	+ }
	8359	+
	8360	+ boolean BindTexture(String tex, boolean bump, int resolution) throws Exception
6699	8361	{
6700	8362	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
6701	8363	{
..	..	@@ -7292,9 +8954,9 @@
7292	8954	static boolean occlusionInitialized = false;
7293	8955	boolean selection = false;
7294	8956	boolean pointselection = false;
7295		- /static/ boolean lighttouched = true;
	8957	+ ///static/ boolean lighttouched = true;
7296	8958	boolean deselect;
7297		- boolean ambientOcclusion = false;
	8959	+ private boolean ambientOcclusion = false;
7298	8960	static boolean flash = false;
7299	8961	/static/ boolean wait = false;
7300	8962	boolean displaydone = false; // after repaint() calls
..	..	@@ -7424,6 +9086,8 @@
7424	9086	//gl.glFrustum(-0.5scale, 0.5scale, -0.5scale, 0.5scale, 1, 100);
7425	9087	//glu.gluPerspective(lightshaper_fovy, 1, lightshaper_zNear, lightshaper_zFar);
7426	9088	double scale = lightCamera.SCALE / lightCamera.Distance();
	9089	+// PATCH FILLE AUX JEANS
	9090	+ //scale *= lightCamera.shaper_fovy / 25;
7427	9091	gl.glScaled(2 * scale, 2 * scale, -scale);
7428	9092	gl.glTranslated(0, 0, lightCamera.DECAL);
7429	9093
..	..	@@ -7572,15 +9236,14 @@
7572	9236
7573	9237	float[] options1 = new float[]{1000, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
7574	9238	float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
7575		- float[] options3 = new float[]{1, 1, 1, 1}; // fog color. image intensity
	9239	+ float[] options3 = new float[]{1, 1, 1, 0}; // fog color
	9240	+ float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
7576	9241
7577	9242	static int imagecount = 0; // movie generation
7578	9243
7579	9244	static int jitter = 0;
7580	9245
7581	9246	boolean restartframe = false;
7582		-
7583		- static int framecount = 0; // general-purpose global count
7584	9247
7585	9248	void displayAntiAliased(javax.media.opengl.GL gl)
7586	9249	{
..	..	@@ -7610,14 +9273,14 @@
7610	9273
7611	9274	//System.out.println("start frame");
7612	9275	gl.glClear(gl.GL_ACCUM_BUFFER_BIT);
7613		- for (jitter = 0; jitter < ACSIZE; jitter++) //, GraphreeD.wav.cursor += LIVE ? 735 : 0)
	9276	+ for (jitter = 0; jitter < ACSIZE; jitter++) //, GrafreeD.wav.cursor += LIVE ? 735 : 0)
7614	9277	{
7615		- framecount++;
	9278	+ Globals.framecount++;
7616	9279
7617	9280	if (CameraPane.tickcount > 0)
7618	9281	CameraPane.tickcount--;
7619	9282
7620		-// GraphreeD.wav.cursor += 735; // 44100 Hz / 120 Hz * 2 (for 16 bits)
	9283	+// GrafreeD.wav.cursor += 735; // 44100 Hz / 120 Hz * 2 (for 16 bits)
7621	9284	// restartframe = true;
7622	9285	if (options1[2] > 100 && (jitter%2==0))
7623	9286	{
..	..	@@ -7650,7 +9313,7 @@
7650	9313
7651	9314	gl.glLightfv(gl.GL_LIGHT0, gl.GL_POSITION, pos, 0);
7652	9315	*/
7653		- lighttouched = true;
	9316	+ Globals.lighttouched = true;
7654	9317	//System.err.println(" shadowbuffer: " + jitter);
7655	9318	shadowbuffer.display();
7656	9319
..	..	@@ -7671,8 +9334,8 @@
7671	9334	assert (parentcam != renderCamera);
7672	9335
7673	9336	if (renderCamera != lightCamera)
7674		- for (int count = parentcam.GetTransformCount(); --count>=0;)
7675		- LA.matConcat(parentcam.toParent, matrix, matrix);
	9337	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9338	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
7676	9339
7677	9340	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
7678	9341
..	..	@@ -7687,8 +9350,8 @@
7687	9350	LA.matCopy(renderCamera.fromScreen, matrix);
7688	9351
7689	9352	if (renderCamera != lightCamera)
7690		- for (int count = parentcam.GetTransformCount(); --count>=0;)
7691		- LA.matConcat(matrix, parentcam.fromParent, matrix);
	9353	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9354	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
7692	9355
7693	9356	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
7694	9357
..	..	@@ -7760,7 +9423,7 @@
7760	9423	//gl.glFlush();
7761	9424	gl.glAccum(gl.GL_ACCUM, 1.0f / ACSIZE);
7762	9425
7763		- if (ANIMATION && ABORTED)
	9426	+ if (Globals.ANIMATION && ABORTED)
7764	9427	{
7765	9428	System.err.println(" ABORTED FRAME");
7766	9429	break;
..	..	@@ -7790,7 +9453,7 @@
7790	9453	setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
7791	9454
7792	9455	// save image
7793		- if (ANIMATION && !ABORTED)
	9456	+ if (Globals.ANIMATION && !ABORTED)
7794	9457	{
7795	9458	VPwidth = viewport[2];
7796	9459	VPheight = viewport[3];
..	..	@@ -7901,11 +9564,11 @@
7901	9564
7902	9565	// imagecount++;
7903	9566
7904		- String fullname = filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
	9567	+ String fullname = Globals.filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
7905	9568
7906	9569	if (!BOXMODE)
7907	9570	{
7908		- System.out.println("image: " + fullname + " (" + (GraphreeD.wav.cursor / 735 / 4) + ")");
	9571	+ System.out.println("image: " + fullname + " (wav cursor=" + (Grafreed.wav.cursor / 735 / 4) + ")");
7909	9572	}
7910	9573
7911	9574	if (!BOXMODE)
..	..	@@ -7933,7 +9596,7 @@
7933	9596	{
7934	9597	if (ACSIZE > 1)
7935	9598	{
7936		- // System.err.println("image #" + (GraphreeD.wav.cursor / 735 / 4));
	9599	+ // System.err.println("image #" + (GrafreeD.wav.cursor / 735 / 4));
7937	9600	}
7938	9601	}
7939	9602
..	..	@@ -7943,7 +9606,7 @@
7943	9606	ABORTED = false;
7944	9607	}
7945	9608	else
7946		- GraphreeD.wav.cursor += 735 * ACSIZE;
	9609	+ Grafreed.wav.cursor += 735 * ACSIZE;
7947	9610
7948	9611	if (false)
7949	9612	{
..	..	@@ -8597,13 +10260,6 @@
8597	10260	}
8598	10261	}
8599	10262
8600		- boolean IsFrozen()
8601		- {
8602		- boolean selectmode = drawMode == SELECTION \|\| CameraPane.DEBUG_SELECTION;
8603		-
8604		- return !selectmode && cameracount == 0; // != 0;
8605		- }
8606		-
8607	10263	boolean niceon = false;
8608	10264	javax.swing.Timer AAtimer = new javax.swing.Timer(750, this);
8609	10265	boolean currentlydrawing = false;
..	..	@@ -8613,16 +10269,16 @@
8613	10269
8614	10270	public void display(GLAutoDrawable drawable)
8615	10271	{
8616		- if (GraphreeD.savesound && GraphreeD.hassound)
	10272	+ if (Grafreed.savesound && Grafreed.hassound)
8617	10273	{
8618		- GraphreeD.wav.save();
8619		- GraphreeD.savesound = false;
8620		- GraphreeD.hassound = false;
	10274	+ Grafreed.wav.save();
	10275	+ Grafreed.savesound = false;
	10276	+ Grafreed.hassound = false;
8621	10277	}
8622	10278	// if (DEBUG_SELECTION)
8623	10279	// {
8624		-// if (drawMode != SELECTION)
8625		-// drawMode = SELECTION;
	10280	+// if (DrawMode() != SELECTION)
	10281	+// DrawMode() = SELECTION;
8626	10282	// }
8627	10283
8628	10284	if (!isRenderer)
..	..	@@ -8678,9 +10334,9 @@
8678	10334
8679	10335	//ANTIALIAS = 0;
8680	10336
8681		- if (drawMode == DEFAULT) // && CURRENTANTIALIAS > 0)
	10337	+ if (DrawMode() == DEFAULT) // && CURRENTANTIALIAS > 0)
8682	10338	{
8683		- if (niceon \|\| isLIVE())
	10339	+ if (niceon \|\| Globals.isLIVE())
8684	10340	{
8685	10341	//if(active == 0)
8686	10342	// antialiaser = null;
..	..	@@ -8705,7 +10361,7 @@
8705	10361	assert eyeCamera.shaper_zFar == 1E5f; // 500.0f;
8706	10362	*/
8707	10363
8708		- if (drawMode == DEFAULT)
	10364	+ if (DrawMode() == DEFAULT)
8709	10365	{
8710	10366	currentlydrawing = true;
8711	10367	}
..	..	@@ -8736,18 +10392,18 @@
8736	10392
8737	10393	// if(Applet3D.clipboard != null)
8738	10394	// System.out.println("Clipboard = " + Applet3D.clipboard); //.get(0).parent);
8739		-//drawMode = SELECTION;
	10395	+//DrawMode() = SELECTION;
8740	10396	indexcount = 0;
8741	10397
8742		- if (drawMode == OCCLUSION)
	10398	+ if (DrawMode() == OCCLUSION)
8743	10399	{
8744		- drawMode = DEFAULT;
	10400	+ Globals.drawMode = DEFAULT; // WARNING
8745	10401	ambientOcclusion = true;
8746	10402	setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
8747	10403	Object3D theobject = object;
8748	10404	Object3D theparent = object.parent;
8749	10405	object.parent = null;
8750		- object = (Object3D)GraphreeD.clone(object);
	10406	+ object = (Object3D)Grafreed.clone(object);
8751	10407	object.Stripify();
8752	10408	if (theobject.selection == null \|\| theobject.selection.Size() == 0)
8753	10409	theobject.PreprocessOcclusion(this);
..	..	@@ -8760,19 +10416,19 @@
8760	10416	ambientOcclusion = false;
8761	10417	}
8762	10418
8763		- if (lighttouched && drawMode == DEFAULT && !lightMode) // && !FROZEN)
	10419	+ if (Globals.lighttouched && DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
8764	10420	{
8765	10421	//if (RENDERSHADOW) // ?
8766	10422	if (!IsFrozen())
8767	10423	{
8768	10424	// dec 2012
8769		- if (!(!flash && !lightMode && drawMode == DEFAULT && ANTIALIAS > 0))
	10425	+ if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
8770	10426	{
8771		- framecount++;
	10427	+ Globals.framecount++;
8772	10428	shadowbuffer.display();
8773	10429	}
8774	10430	}
8775		- lighttouched = false; // ??
	10431	+ Globals.lighttouched = false; // ??
8776	10432	//drawing = true;
8777	10433	//lighttouched = true;
8778	10434	}
..	..	@@ -8793,9 +10449,9 @@
8793	10449	//eyeCamera.shaper_fovy = 1;
8794	10450	}
8795	10451
8796		- if ((RENDERPROGRAM != 0 \|\| ambientOcclusion \|\| spherical) && drawMode == DEFAULT) // SELECTION)
	10452	+ if ((RENDERPROGRAM != 0 \|\| ambientOcclusion \|\| spherical) && DrawMode() == DEFAULT) // SELECTION)
8797	10453	{
8798		- //System.out.println("drawMode = " + drawMode);
	10454	+ //System.out.println("DrawMode() = " + DrawMode());
8799	10455	vertexMode \|= VP_PASS;
8800	10456	//vertexMode \|= VP_PROJECTION;
8801	10457	if (!ambientOcclusion)
..	..	@@ -8855,7 +10511,7 @@
8855	10511	Camera cam = renderCamera; // lightMode?lightCamera:eyeCamera;
8856	10512	//Camera lightcam = new Camera(light0);
8857	10513
8858		- if (drawMode == SHADOW)
	10514	+ if (DrawMode() == SHADOW)
8859	10515	{
8860	10516	/*
8861	10517	gl.glMatrixMode(GL.GL_MODELVIEW);
..	..	@@ -8893,8 +10549,8 @@
8893	10549
8894	10550	// if (parentcam != renderCamera) // not a light
8895	10551	if (cam != lightCamera)
8896		- for (int count = parentcam.GetTransformCount(); --count>=0;)
8897		- LA.matConcat(parentcam.toParent, matrix, matrix);
	10552	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10553	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
8898	10554
8899	10555	for (int j = 0; j < 4; j++)
8900	10556	{
..	..	@@ -8908,8 +10564,8 @@
8908	10564
8909	10565	// if (parentcam != renderCamera) // not a light
8910	10566	if (cam != lightCamera)
8911		- for (int count = parentcam.GetTransformCount(); --count>=0;)
8912		- LA.matConcat(matrix, parentcam.fromParent, matrix);
	10567	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10568	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
8913	10569
8914	10570	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
8915	10571
..	..	@@ -8945,7 +10601,7 @@
8945	10601	gl.glClear(gl.GL_DEPTH_BUFFER_BIT);
8946	10602	} else
8947	10603	{
8948		- if (drawMode != DEFAULT)
	10604	+ if (DrawMode() != DEFAULT)
8949	10605	{
8950	10606	gl.glClearColor(1, 1, 1, 0);
8951	10607	} // 1);
..	..	@@ -9010,7 +10666,7 @@
9010	10666
9011	10667	fast &= !ambientOcclusion;
9012	10668
9013		- if (drawMode == DEFAULT)
	10669	+ if (DrawMode() == DEFAULT)
9014	10670	{
9015	10671	//gl.glEnable(gl.GL_ALPHA_TEST);
9016	10672	//gl.glActiveTexture(GL.GL_TEXTURE0);
..	..	@@ -9071,6 +10727,8 @@
9071	10727	//gl.glFrustum(-0.5scale, 0.5scale, -0.5scale, 0.5scale, 1, 100);
9072	10728	//glu.gluPerspective(lightshaper_fovy, 1, lightshaper_zNear, lightshaper_zFar);
9073	10729	double scale = lightCamera.SCALE / lightCamera.Distance();
	10730	+// PATCH FILLE AUX JEANS
	10731	+ //scale *= lightCamera.shaper_fovy / 25;
9074	10732	gl.glScaled(2 * scale, 2 * scale, -scale);
9075	10733	gl.glTranslated(0, 0, lightCamera.DECAL);
9076	10734
..	..	@@ -9166,7 +10824,16 @@
9166	10824	// Bump noise
9167	10825	gl.glActiveTexture(GL.GL_TEXTURE6);
9168	10826	//gl.glBindTexture(GL.GL_TEXTURE_2D, bump_noise);
9169		- BindTexture(NOISE_TEXTURE, false, 2);
	10827	+
	10828	+ try
	10829	+ {
	10830	+ BindTexture(NOISE_TEXTURE, false, 2);
	10831	+ }
	10832	+ catch (Exception e)
	10833	+ {
	10834	+ System.err.println("FAILED: " + NOISE_TEXTURE);
	10835	+ }
	10836	+
9170	10837
9171	10838	gl.glActiveTexture(GL.GL_TEXTURE0);
9172	10839	gl.glEnable(GL.GL_TEXTURE_2D);
..	..	@@ -9206,10 +10873,12 @@
9206	10873	gl.glMatrixMode(gl.GL_PROJECTION);
9207	10874	gl.glLoadIdentity();
9208	10875
9209		- if (drawMode == SHADOW \|\| cam == lightCamera) // \|\| (vertexMode&VP_PROJECTION) != 0)
	10876	+ if (DrawMode() == SHADOW \|\| cam == lightCamera) // \|\| (vertexMode&VP_PROJECTION) != 0)
9210	10877	{
9211	10878	//glu.gluPerspective(lightshaper_fovy, 1, lightshaper_zNear, lightshaper_zFar);
9212	10879	double scale = lightCamera.SCALE / lightCamera.Distance();
	10880	+// PATCH FILLE AUX JEANS
	10881	+ //scale *= lightCamera.shaper_fovy / 25;
9213	10882	gl.glScaled(2 * scale, 2 * scale, -scale);
9214	10883	gl.glTranslated(0, 0, lightCamera.DECAL);
9215	10884	//System.out.println("DECAL = " + LIGHTDECAL + "; SCALE = " + LIGHTSCALE);
..	..	@@ -9262,7 +10931,7 @@
9262	10931	//gl.glPushMatrix();
9263	10932	gl.glLoadIdentity();
9264	10933
9265		- if (!ambientOcclusion) // drawMode != OCCLUSION)
	10934	+ if (!ambientOcclusion) // DrawMode() != OCCLUSION)
9266	10935	{
9267	10936	//LA.xformPos(light0, lightCamera.fromScreen, light);
9268	10937	LA.xformDir(dirlight, lightCamera.fromScreen, lightposition);
..	..	@@ -9289,8 +10958,8 @@
9289	10958	System.err.println("parentcam != renderCamera");
9290	10959
9291	10960	// if (cam != lightCamera)
9292		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9293		- LA.xformDir(lightposition, parentcam.toParent, lightposition); // may 2013
	10961	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10962	+ LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
9294	10963	}
9295	10964
9296	10965	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -9311,8 +10980,8 @@
9311	10980	if (true) // TODO
9312	10981	{
9313	10982	if (cam != lightCamera)
9314		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9315		- LA.xformDir(light0, parentcam.toParent, light0); // may 2013
	10983	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10984	+ LA.xformDir(light0, parentcam.GlobalTransform(), light0); // may 2013
9316	10985	}
9317	10986
9318	10987	LA.xformPos(light0, cam.toScreen, light0);
..	..	@@ -9349,7 +11018,7 @@
9349	11018	}
9350	11019
9351	11020	/**/
9352		- if (true) // drawMode == SELECTION) // != DEFAULT)
	11021	+ if (true) // DrawMode() == SELECTION) // != DEFAULT)
9353	11022	gl.glDisable(gl.GL_LIGHTING);
9354	11023	else
9355	11024	gl.glEnable(gl.GL_LIGHTING);
..	..	@@ -9361,12 +11030,13 @@
9361	11030
9362	11031	gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 63, options2, 0);
9363	11032	gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 62, options3, 0);
	11033	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 61, options4, 0);
9364	11034
9365	11035	options2[0] *= renderCamera.Distance();
9366	11036
9367	11037	lightslot = 64;
9368	11038
9369		- if (!frozen && !ambientOcclusion && isRenderer && drawMode == DEFAULT)
	11039	+ if (!frozen && !ambientOcclusion && isRenderer && DrawMode() == DEFAULT)
9370	11040	{
9371	11041	DrawLights(object);
9372	11042	}
..	..	@@ -9377,7 +11047,7 @@
9377	11047	fragmentMode \|= (lightslot - 64) << 2; // 1; // first bit is available for aniso
9378	11048	//System.out.println("fragmentMode = " + fragmentMode);
9379	11049
9380		- if (drawMode == DEFAULT \|\| drawMode == SELECTION \|\| DEBUG_SELECTION)
	11050	+ if (DrawMode() == DEFAULT \|\| DrawMode() == SELECTION \|\| IsDebugSelection())
9381	11051	{
9382	11052	/*
9383	11053	if (CULLFACE \|\| (ambientOcclusion && OCCLUSION_CULLING))
..	..	@@ -9410,7 +11080,7 @@
9410	11080	}
9411	11081	}
9412	11082
9413		- if (drawMode == DEFAULT)
	11083	+ if (DrawMode() == DEFAULT)
9414	11084	{
9415	11085	if (WIREFRAME && !ambientOcclusion)
9416	11086	{
..	..	@@ -9428,7 +11098,7 @@
9428	11098	gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9429	11099	gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9430	11100
9431		- if (!fast/RENDERPROGRAM != 0/ && (drawMode == DEFAULT \|\| drawMode == SHADOW)) // && !WIREFRAME) //
	11101	+ if (!fast/RENDERPROGRAM != 0/ && (DrawMode() == DEFAULT \|\| DrawMode() == SHADOW)) // && !WIREFRAME) //
9432	11102	{
9433	11103	if (vertexMode != 0) // && !fast)
9434	11104	{
..	..	@@ -9448,7 +11118,7 @@
9448	11118	}
9449	11119	}
9450	11120
9451		- if (false) // fast && !IsFreezed() && drawMode != SELECTION && !ambientOcclusion)
	11121	+ if (false) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
9452	11122	{
9453	11123	//gl.glDepthFunc(GL.GL_LEQUAL);
9454	11124	//gl.glClear(gl.GL_COLOR_BUFFER_BIT \| gl.GL_DEPTH_BUFFER_BIT);
..	..	@@ -9476,7 +11146,7 @@
9476	11146	//gl.glDepthMask(false);
9477	11147	}
9478	11148
9479		- if (false) // drawMode == SHADOW)
	11149	+ if (false) // DrawMode() == SHADOW)
9480	11150	{
9481	11151	//SetColumnMajorData(cameraInverseTransform, view_1);
9482	11152	//System.out.println("light = " + cameraInverseTransform);
..	..	@@ -9490,16 +11160,16 @@
9490	11160	//System.out.println("object = " + object);
9491	11161	if (!frozen && !imageLocked)
9492	11162	{
9493		- if (!flash && !lightMode && drawMode == DEFAULT && ANTIALIAS > 0)
	11163	+ if (!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0)
9494	11164	{
9495	11165	displayAntiAliased(gl);
9496	11166	} else
9497	11167	{
9498	11168	programcount = 0;
9499		- int keepmode = drawMode;
	11169	+ int keepmode = DrawMode();
9500	11170	// if (DEBUG_SELECTION)
9501	11171	// {
9502		-// drawMode = SELECTION;
	11172	+// DrawMode() = SELECTION;
9503	11173	// }
9504	11174	// for point selection
9505	11175	// gl.glGetDoublev(gl.GL_MODELVIEW_MATRIX, tempmat, 0);
..	..	@@ -9509,10 +11179,10 @@
9509	11179	DrawObject(gl);
9510	11180
9511	11181	// jan 2013 System.err.println("RESET ABORT (display)");
9512		- // if (drawMode == DEFAULT)
	11182	+ // if (DrawMode() == DEFAULT)
9513	11183	// ABORTED = false;
9514	11184	fullreset = false;
9515		- drawMode = keepmode;
	11185	+ Globals.drawMode = keepmode; // WARNING
9516	11186	//System.out.println("PROGRAM SWITCH " + programcount);
9517	11187	}
9518	11188	}
..	..	@@ -9520,11 +11190,11 @@
9520	11190	gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9521	11191	gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9522	11192
9523		- if (drawMode == DEFAULT)
	11193	+ if (DrawMode() == DEFAULT)
9524	11194	{
9525	11195	ReleaseTexture(NOISE_TEXTURE, false);
9526	11196	}
9527		- //if (drawMode == DEFAULT)
	11197	+ //if (DrawMode() == DEFAULT)
9528	11198	{
9529	11199
9530	11200	gl.glActiveTexture(GL.GL_TEXTURE1);
..	..	@@ -9536,7 +11206,7 @@
9536	11206	//else
9537	11207	//gl.glDisable(gl.GL_TEXTURE_2D);
9538	11208	//gl.glPopMatrix();
9539		- if (imageCompleted && ANTIALIAS > 0 && drawMode == DEFAULT && cam != lightCamera && !ambientOcclusion)
	11209	+ if (imageCompleted && ANTIALIAS > 0 && DrawMode() == DEFAULT && cam != lightCamera && !ambientOcclusion)
9540	11210	{
9541	11211	//new Exception().printStackTrace();
9542	11212	//System.out.println("Draw image " + width + ", " + height);
..	..	@@ -9578,7 +11248,7 @@
9578	11248	//gl.glFlush();
9579	11249	}
9580	11250
9581		- if (flash && drawMode == DEFAULT)
	11251	+ if (flash && DrawMode() == DEFAULT)
9582	11252	{
9583	11253	flash = false;
9584	11254	wait = true;
..	..	@@ -9586,9 +11256,9 @@
9586	11256	}
9587	11257
9588	11258	//drawing = false;
9589		- //if(drawMode == DEFAULT)
	11259	+ //if(DrawMode() == DEFAULT)
9590	11260	// niceon = false;
9591		- if (drawMode == DEFAULT)
	11261	+ if (DrawMode() == DEFAULT)
9592	11262	{
9593	11263	currentlydrawing = false;
9594	11264	}
..	..	@@ -9608,7 +11278,7 @@
9608	11278	repaint();
9609	11279	}
9610	11280
9611		- if (isLIVE() && drawMode == DEFAULT) // may 2013
	11281	+ if (Globals.isLIVE() && DrawMode() == DEFAULT) // may 2013
9612	11282	repaint();
9613	11283
9614	11284	displaydone = true;
..	..	@@ -9627,8 +11297,14 @@
9627	11297	{
9628	11298	renderpass++;
9629	11299	// System.out.println("Draw object... ");
	11300	+ STEP = 1;
9630	11301	if (FAST) // in case there is no script
9631		- STEP = 16;
	11302	+ STEP = 8;
	11303	+
	11304	+ if (CURRENTANTIALIAS == 0 \|\| ACSIZE == 1)
	11305	+ {
	11306	+ STEP *= 4;
	11307	+ }
9632	11308
9633	11309	//object.FullInvariants();
9634	11310
..	..	@@ -9642,10 +11318,10 @@
9642	11318	e.printStackTrace();
9643	11319	}
9644	11320
9645		- if (GraphreeD.RENDERME > 0)
9646		- GraphreeD.RENDERME--; // mechante magouille
	11321	+ if (Grafreed.RENDERME > 0)
	11322	+ Grafreed.RENDERME--; // mechante magouille
9647	11323
9648		- ONESTEP = false;
	11324	+ Globals.ONESTEP = false;
9649	11325	}
9650	11326
9651	11327	static boolean zoomonce = false;
..	..	@@ -9653,11 +11329,11 @@
9653	11329	void DrawObject(GL gl, boolean draw)
9654	11330	{
9655	11331	//System.out.println("DRAW OBJECT " + mouseDown);
9656		-// drawMode = SELECTION;
	11332	+// DrawMode() = SELECTION;
9657	11333	//GL gl = getGL();
9658	11334	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
9659	11335	{
9660		- if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && drawMode == SHADOW) // && !lightMode)
	11336	+ if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
9661	11337	object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
9662	11338	pingthread.StepToTarget(true); // true);
9663	11339	// zoomonce = false;
..	..	@@ -9678,9 +11354,9 @@
9678	11354	callist = gl.glGenLists(1);
9679	11355	}
9680	11356
9681		- boolean selectmode = drawMode == SELECTION \|\| CameraPane.DEBUG_SELECTION;
	11357	+ boolean selectmode = DrawMode() == SELECTION \|\| IsDebugSelection();
9682	11358
9683		- boolean active = !selectmode; // drawMode != SELECTION; // mouseDown;
	11359	+ boolean active = !selectmode; // DrawMode() != SELECTION; // mouseDown;
9684	11360
9685	11361	if (!mainDL \|\| !active \|\| touched)
9686	11362	{
..	..	@@ -9707,21 +11383,28 @@
9707	11383	PushMatrix(ClickInfo.matbuffer);
9708	11384	}
9709	11385
9710		- if (drawMode == 0)
	11386	+ if (DrawMode() == 0)
9711	11387	{
9712	11388	// System.out.println("CLEAR +++++++++++++++ +++++++++++++++ +++++++++++++++ +++++++++++++++");
9713	11389
9714	11390	usedtextures.clear();
9715	11391
9716		- BindTextures(DEFAULT_TEXTURES, 2);
	11392	+ try
	11393	+ {
	11394	+ BindTextures(DEFAULT_TEXTURES, 2);
	11395	+ }
	11396	+ catch (Exception e)
	11397	+ {
	11398	+ System.err.println("FAILED: " + DEFAULT_TEXTURES);
	11399	+ }
9717	11400	}
9718	11401	//System.out.println("--> " + stackdepth);
9719		-// GraphreeD.traceon();
	11402	+// GrafreeD.traceon();
9720	11403
9721	11404	// DRAW
9722	11405	object.draw(this, /(Composite)/ object, false, false);
9723	11406
9724		- if (drawMode == DEFAULT)
	11407	+ if (DrawMode() == DEFAULT)
9725	11408	{
9726	11409	if (DEBUG)
9727	11410	{
..	..	@@ -9732,34 +11415,48 @@
9732	11415	selectedpoint.radius = radius;
9733	11416	selectedpoint.recalculate();
9734	11417	selectedpoint.material = new cMaterial();
9735		- selectedpoint.material.color = 0.25f;
	11418	+ selectedpoint.material.color = 0.15f; // Yellow
9736	11419	selectedpoint.material.modulation = 0.75f;
9737	11420
9738		- debugpoint.radius = radius;
9739		- debugpoint.recalculate();
9740		- debugpoint.material = new cMaterial();
9741		- debugpoint.material.color = 0.25f;
9742		- debugpoint.material.modulation = 0.75f;
	11421	+ debugpointG.radius = radius;
	11422	+ debugpointG.recalculate();
	11423	+ debugpointG.material = new cMaterial();
	11424	+ debugpointG.material.color = 0.25f; // Green
	11425	+ debugpointG.material.modulation = 0.75f;
9743	11426
9744		- debugpoint2.radius = radius;
9745		- debugpoint2.recalculate();
9746		- debugpoint2.material = new cMaterial();
9747		- debugpoint2.material.color = 0.75f;
9748		- debugpoint2.material.modulation = 0.75f;
	11427	+ debugpointP.radius = radius;
	11428	+ debugpointP.recalculate();
	11429	+ debugpointP.material = new cMaterial();
	11430	+ debugpointP.material.color = 0.75f; // Purple
	11431	+ debugpointP.material.modulation = 0.75f;
	11432	+
	11433	+ debugpointC.radius = radius;
	11434	+ debugpointC.recalculate();
	11435	+ debugpointC.material = new cMaterial();
	11436	+ debugpointC.material.color = 0.5f; // Cyan
	11437	+ debugpointC.material.modulation = 0.75f;
	11438	+
	11439	+ debugpointR.radius = radius;
	11440	+ debugpointR.recalculate();
	11441	+ debugpointR.material = new cMaterial();
	11442	+ debugpointR.material.color = 0f; // Red
	11443	+ debugpointR.material.modulation = 0.75f;
9749	11444
9750	11445	InitPoints(radius);
9751	11446	}
9752	11447	selectedpoint.draw(this, /(Composite)/ null, false, false);
9753		- //debugpoint.draw(this, /(Composite)/ null, false);
9754		- //debugpoint2.draw(this, /(Composite)/ null, false);
9755		- DrawPoints(this);
	11448	+ debugpointG.draw(this, /(Composite)/ null, false,false);
	11449	+ debugpointP.draw(this, /(Composite)/ null, false,false);
	11450	+ debugpointC.draw(this, /(Composite)/ null, false,false);
	11451	+ debugpointR.draw(this, /(Composite)/ null, false,false);
	11452	+ // DrawPoints(this);
9756	11453	}
9757	11454
9758	11455	// debugstuff.draw(this, /(Composite)/ null, false);
9759	11456	}
9760		-// GraphreeD.traceoff();
	11457	+// GrafreeD.traceoff();
9761	11458	//System.out.println(stackdepth);
9762		- if (drawMode == 0)
	11459	+ if (DrawMode() == 0)
9763	11460	{
9764	11461	ReleaseTextures(DEFAULT_TEXTURES);
9765	11462
..	..	@@ -9784,17 +11481,26 @@
9784	11481
9785	11482	checker = null;
9786	11483
9787		- if (!ambientOcclusion && !IsFrozen() && drawMode == DEFAULT)
	11484	+ if (!ambientOcclusion && !IsFrozen() && DrawMode() == DEFAULT)
9788	11485	FindChecker(object);
9789	11486
9790		- if (checker != null && drawMode == DEFAULT)
	11487	+ if (checker != null && DrawMode() == DEFAULT)
9791	11488	{
9792		- // BindTexture(IMMORTAL_TEXTURE);
	11489	+ //BindTexture(IMMORTAL_TEXTURE);
	11490	+ try
	11491	+ {
	11492	+ BindTextures(checker.GetTextures(), checker.texres);
	11493	+ }
	11494	+ catch (Exception e)
	11495	+ {
	11496	+ System.err.println("FAILED: " + checker.GetTextures());
	11497	+ }
9793	11498	// NEAREST
9794	11499	GetGL().glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST); // GL.GL_LINEAR);
9795	11500	DrawChecker(gl);
9796	11501	//checker.Draw(this, null, false);
9797	11502	// ReleaseTexture(IMMORTAL_TEXTURE);
	11503	+ ReleaseTextures(checker.GetTextures());
9798	11504	}
9799	11505
9800	11506	if (object.parent != null)
..	..	@@ -9807,7 +11513,7 @@
9807	11513	//gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9808	11514	//gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9809	11515
9810		- if (DISPLAYTEXT && drawMode == DEFAULT)
	11516	+ if (DISPLAYTEXT && DrawMode() == DEFAULT)
9811	11517	{
9812	11518	// Draw it once, then use the raster
9813	11519	Balloon(gl, balloon.createGraphics());
..	..	@@ -9863,14 +11569,14 @@
9863	11569	int[] xs = new int[3];
9864	11570	int[] ys = new int[3];
9865	11571
9866		- void DrawString(Object3D obj) // String string)
	11572	+ public void DrawString(Object3D obj) // String string) // INTERFACE
9867	11573	{
9868		- if (!DISPLAYTEXT \|\| drawMode != DEFAULT)
	11574	+ if (!DISPLAYTEXT \|\| DrawMode() != DEFAULT)
9869	11575	{
9870	11576	return;
9871	11577	}
9872	11578
9873		- String string = obj.GetToolTip();
	11579	+ String string = obj.toString(); //.GetToolTip();
9874	11580
9875	11581	GL gl = GetGL();
9876	11582
..	..	@@ -10187,8 +11893,8 @@
10187	11893	//obj.TransformToWorld(light, light);
10188	11894	for (int i = tp.size(); --i >= 0;)
10189	11895	{
10190		- for (int count = tp.get(i).GetTransformCount(); --count>=0;)
10191		- LA.xformPos(light, tp.get(i).toParent, light);
	11896	+ //for (int count = tp.get(i).GetTransformCount(); --count>=0;)
	11897	+ LA.xformPos(light, tp.get(i).GlobalTransform(), light);
10192	11898	}
10193	11899
10194	11900
..	..	@@ -10205,8 +11911,8 @@
10205	11911	parentcam = cameras[0];
10206	11912	}
10207	11913
10208		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10209		- LA.xformPos(light, parentcam.toParent, light); // may 2013
	11914	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11915	+ LA.xformPos(light, parentcam.GlobalTransform(), light); // may 2013
10210	11916
10211	11917	LA.xformPos(light, renderCamera.toScreen, light);
10212	11918
..	..	@@ -10253,7 +11959,7 @@
10253	11959	return;
10254	11960	}
10255	11961
10256		- if (obj instanceof CheckerIG)
	11962	+ if (obj instanceof Checker)
10257	11963	{
10258	11964	checker = obj;
10259	11965
..	..	@@ -10325,11 +12031,13 @@
10325	12031	"PARAM params6 = program.env[6];" + // bump, noise, borderfade, fog punchthrough
10326	12032	"PARAM params7 = program.env[7];" + // noise power, opacity power
10327	12033	"PARAM options0 = program.env[63];" + // fog density, intensity, elevation
10328		- "PARAM options1 = program.env[62];" + // fog rgb color, image intensity
	12034	+ "PARAM options1 = program.env[62];" + // fog rgb color
	12035	+ "PARAM options2 = program.env[61];" + // image intensity, subsurface, lightsheen
10329	12036	"PARAM pointlight = program.env[127];" + // ...
10330	12037	"PARAM zero = { 0.0, 0.0, 0.0, 0.0 };" +
10331	12038	"PARAM halfhalf = { 0.25, 0.25, 0.25, 1.0 };" +
10332	12039	"PARAM half = { 0.5, 0.5, 0.5, 1.0 };" +
	12040	+ "PARAM threequarter = { 0.75, 0.75, 0.75, 1.0 };" +
10333	12041	"PARAM two = { 2.0, 2.0, 2.0, 1.0 };" +
10334	12042	"PARAM ten = { 10, 10, 10, 1.0 };" +
10335	12043	"PARAM one3rd = { 0.5, 0.33333333333, 0.333333333, 1.0 };" +
..	..	@@ -10350,6 +12058,7 @@
10350	12058	"PARAM lodbias = { 10,10,10,10 };" + // 20, -2, -20, 1.0 };" +
10351	12059	"PARAM infinity = { 100000000, 100000000, 100000000, 1.0 };" +
10352	12060	"PARAM one2048th = { 0.00048828125, 0.00048828125, 0.00048828125, 1.0 };" +
	12061	+ "PARAM ninetenth = { 0.9, 0.9, 0.9, 1.0 };" +
10353	12062	"PARAM almostone = { 0.999, 0.999, 0.999, 1.0 };" +
10354	12063	"PARAM c256 = { 256, 256, 256, 1.0 };" +
10355	12064	"PARAM c256i = { 0.00390625, 0.00390625, 0.00390625, 1.0 };" +
..	..	@@ -10390,6 +12099,10 @@
10390	12099	"TEMP R1;" +
10391	12100	"TEMP R2;" +
10392	12101	"TEMP R3;" +
	12102	+ "TEMP min;" +
	12103	+ "TEMP max;" +
	12104	+ "TEMP average;" +
	12105	+ "TEMP saturation;" +
10393	12106	"TEMP keep1;" +
10394	12107	"TEMP keep2;" +
10395	12108	"TEMP keep3;" +
..	..	@@ -10813,8 +12526,8 @@
10813	12526
10814	12527	// display shadow only (bump == 0)
10815	12528	"SUB temp.x, half.x, shadow.x;" +
10816		- "MOV temp.y, -params6.x;" +
10817		- "SLT temp.z, temp.y, zero.x;" +
	12529	+ "MOV temp.y, -params5.z;" + // params6.x;" +
	12530	+ "SLT temp.z, temp.y, -one2048th.x;" +
10818	12531	"SUB temp.y, one.x, temp.z;" +
10819	12532	"MUL temp.x, temp.x, temp.y;" +
10820	12533	"KIL temp.x;" +
..	..	@@ -10920,10 +12633,42 @@
10920	12633
10921	12634	// skin?
10922	12635	// Saturation for skin
10923		- /**/ // c'est ici
10924		- (Skinshader? "DP3 temp.x, final,one;" +
	12636	+ /**/
	12637	+ (Skinshader?
	12638	+ "DP3 average.x, final,one;" +
	12639	+ "MUL average, one3rd.xxxx,average.xxxx;" +
	12640	+
	12641	+ "MIN min.x, final.x,final.y;" +
	12642	+ "MIN min.x, min.x,final.z;" +
	12643	+
	12644	+ "MAX max.x, final.x,final.y;" +
	12645	+ "MAX max.x, max.x,final.z;" +
	12646	+ "MOV max, max.xxxx;" +
	12647	+
	12648	+ "SUB saturation, max, final;" +
	12649	+
	12650	+ "ADD temp.x, max.x, one10th.x;" +
	12651	+ "RCP temp.x, temp.x;" +
	12652	+ "MUL temp.x, temp.x, half.x;" +
	12653	+ "MUL saturation, saturation, temp.xxxx;" +
	12654	+
	12655	+ "DP3 ndotl.x, normald, light;" +
	12656	+ "MAX ndotl.x, ndotl.x, -ndotl.x;" +
	12657	+
	12658	+ "SUB temp.x, one.x, ndotl.x;" +
	12659	+ // Tuning for default skin
	12660	+ //"ADD temp.x, temp.x, options2.z;" + // lightsheen
	12661	+ "MAD temp.x, options2.z, half.y, temp.x;" + // lightsheen
	12662	+ "ADD temp.y, one.y, options2.y;" + // subsurface
	12663	+ "MUL temp.x, temp.x, temp.y;" +
	12664	+
	12665	+ "MUL saturation, saturation, temp.xxxx;" +
	12666	+ "SUB_SAT temp, max, saturation;" +
	12667	+/**
	12668	+ "DP3 temp.x, final,one;" +
10925	12669	"MUL R2, one3rd.xxxx,temp.xxxx;" +
10926		- "SUB temp, final,R2;" +
	12670	+ "SUB temp, final, R2;" +
	12671	+
10927	12672	// using light angle
10928	12673	"DP3 ndotl.x, normald,light;" +
10929	12674	//"SLT ndotl.y, ndotl.x, zero.x;" +
..	..	@@ -10936,7 +12681,6 @@
10936	12681	// using light intensity
10937	12682	"MOV ndotl.z, R2.x;" +
10938	12683	"MUL ndotl.z, ndotl.z, ndotl.z;" + // tuning...
10939		-
10940	12684	// june 2014
10941	12685	"MAD R1.x, ndotl.z,slope.y,one.x;" +
10942	12686	// "SUB ndotl.x, one.x, ndotl.x;" +
..	..	@@ -10948,6 +12692,7 @@
10948	12692	//"MUL R2.y, shadow.x,R2.y;" + // avril 2014
10949	12693
10950	12694	"MAD temp.x, R2.y, ndotl.y, temp.x;" + // red shift (skin)
	12695	+/**/
10951	12696
10952	12697	// "ADD final, R2,temp;" +
10953	12698	"MOV final, temp;"
..	..	@@ -11037,7 +12782,7 @@
11037	12782	/**/
11038	12783	// HDR
11039	12784	"MOV temp.z, final.a;" +
11040		- "MUL final, final,options1.w;" +
	12785	+ "MUL final, final,options2.x;" +
11041	12786	"MOV final.a, temp.z;" +
11042	12787	/**/
11043	12788
..	..	@@ -11074,10 +12819,17 @@
11074	12819	"MOV final.z, zero.x;" +
11075	12820	"MOV final.a, one.w;":""
11076	12821	) +
	12822	+ /*
11077	12823	(NORMALdebug?"MOV final.x, normal.x;" +
11078	12824	"MOV final.y, normal.y;" +
11079	12825	"MOV final.z, normal.z;" +
11080	12826	"MOV final.a, one.w;":""
	12827	+ ) +
	12828	+ */
	12829	+ (NORMALdebug?"SUB final.x, one.x, final.x;" +
	12830	+ "SUB final.y, one.x, final.y;" +
	12831	+ "SUB final.z, one.x, final.z;" +
	12832	+ "MOV final.a, final.a;":""
11081	12833	) +
11082	12834	// "MOV final, bumpmap;" +
11083	12835	"MOV result.color, final;" +
..	..	@@ -11106,7 +12858,7 @@
11106	12858	//once = true;
11107	12859	}
11108	12860
11109		- System.out.print("Program #" + mode + "; length = " + program.length());
	12861	+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
11110	12862	System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
11111	12863	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
11112	12864
..	..	@@ -11223,6 +12975,7 @@
11223	12975	String Shadow(String depth, String shadow)
11224	12976	{
11225	12977	return "MAX temp.x, ndotl.x, one64th.x;" +
	12978	+ "MIN temp.x, temp.x, ninetenth.x;" +
11226	12979	/**/
11227	12980	// Sine
11228	12981	"MUL temp.y, temp.x, temp.x;" +
..	..	@@ -11238,12 +12991,16 @@
11238	12991
11239	12992	"ADD " + depth + ".z, " + depth + ".z, temp.x;" +
11240	12993	//"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing!
	12994	+
	12995	+ // Compare fragment depth in light space with shadowmap.
11241	12996	"SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" +
11242	12997	"SGE temp.y, temp.x, zero.x;" +
11243		- "SUB " + shadow + ".y, one.x, temp.y;" +
	12998	+ "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded
	12999	+
	13000	+ // Reverse comparison
11244	13001	"SUB temp.x, one.x, temp.x;" +
11245	13002	"MUL " + shadow + ".x, temp.x, temp.y;" +
11246		- "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded
	13003	+ "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse
11247	13004	"POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth
11248	13005
11249	13006	"SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" +
..	..	@@ -11257,6 +13014,10 @@
11257	13014	// No shadow for backface
11258	13015	"DP3 temp.x, normal, lightd;" +
11259	13016	"SLT temp.x, temp.x, zero.x;" + // shadoweps
	13017	+ "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
	13018	+
	13019	+ // No shadow when out of frustrum
	13020	+ "SGE temp.x, " + depth + ".z, one.z;" +
11260	13021	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
11261	13022	"";
11262	13023	}
..	..	@@ -11815,7 +13576,7 @@
11815	13576	public void mousePressed(MouseEvent e)
11816	13577	{
11817	13578	//System.out.println("mousePressed: " + e);
11818		- clickStart(e.getX(), e.getY(), e.getModifiersEx());
	13579	+ clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
11819	13580	}
11820	13581
11821	13582	static long prevtime = 0;
..	..	@@ -11842,14 +13603,16 @@
11842	13603
11843	13604	//System.err.println("Dtime = " + Dtime + "; units = " + e.getUnitsToScroll() + "; ratio (units/ms) = " + ratio);
11844	13605
	13606	+ if (BUTTONLESSWHEEL)
11845	13607	if (Math.abs(ratio) < 0.1 \|\| Math.abs(Dtime) == 0) // < 30)
11846	13608	{
11847	13609	return;
11848	13610	}
11849	13611
	13612	+ boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
11850	13613
11851	13614	// TIMER
11852		- if (!wheeltimer.isRunning() && e.getModifiersEx() == 0) // VR
	13615	+ if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
11853	13616	{
11854	13617	keepboxmode = BOXMODE;
11855	13618	keepsupport = SUPPORT;
..	..	@@ -11889,8 +13652,8 @@
11889	13652	// mode \|= META;
11890	13653	//}
11891	13654
11892		- SetMouseMode(WHEEL \| e.getModifiersEx());
11893		- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0);
	13655	+ SetMouseMode(e.getModifiers(), WHEEL \| e.getModifiersEx());
	13656	+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
11894	13657	anchorX = ax;
11895	13658	anchorY = ay;
11896	13659	prevX = px;
..	..	@@ -11950,6 +13713,10 @@
11950	13713	// wasliveok = true;
11951	13714	// waslive = false;
11952	13715
	13716	+ // May 2019 Forget it:
	13717	+ if (true)
	13718	+ return;
	13719	+
11953	13720	// source == timer
11954	13721	if (mouseDown)
11955	13722	{
..	..	@@ -11978,7 +13745,7 @@
11978	13745	// ObjEditor.tweenManager.update(1f / 60f);
11979	13746
11980	13747	// fev 2014???
11981		- if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && drawMode == SHADOW) // && !lightMode)
	13748	+ if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
11982	13749	object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11983	13750	pingthread.StepToTarget(true); // true);
11984	13751	}
..	..	@@ -11988,7 +13755,7 @@
11988	13755
11989	13756	javax.swing.Timer timer = new javax.swing.Timer(350, this);
11990	13757
11991		- void clickStart(int x, int y, int modifiers)
	13758	+ void clickStart(int x, int y, int modifiers, int modifiersex)
11992	13759	{
11993	13760	if (!wasliveok)
11994	13761	return;
..	..	@@ -12005,7 +13772,7 @@
12005	13772	// touched = true; // main DL
12006	13773	if (isRenderer)
12007	13774	{
12008		- SetMouseMode(modifiers);
	13775	+ SetMouseMode(modifiers, modifiersex);
12009	13776	}
12010	13777
12011	13778	selectX = anchorX = x;
..	..	@@ -12018,7 +13785,7 @@
12018	13785	clicked = true;
12019	13786	hold = false;
12020	13787
12021		- if (((modifiers & ~1024) & ~0) == 0) // Single or multiple selection
	13788	+ if (((modifiersex & ~1024) & ~0) == 0) // Single or multiple selection
12022	13789	// june 2013 means CTRL_CLICK: if (((modifiers & ~1024) & ~128) == 0) // Single or multiple selection
12023	13790	{
12024	13791	// System.out.println("RESTART II " + modifiers);
..	..	@@ -12049,7 +13816,7 @@
12049	13816	info.camera = renderCamera;
12050	13817	info.x = x;
12051	13818	info.y = y;
12052		- info.modifiers = modifiers;
	13819	+ info.modifiers = modifiersex;
12053	13820	editObj = object.doEditClick(info, 0);
12054	13821	if (!editObj)
12055	13822	{
..	..	@@ -12066,11 +13833,14 @@
12066	13833
12067	13834	public void mouseDragged(MouseEvent e)
12068	13835	{
	13836	+ Globals.MOUSEDRAGGED = true;
	13837	+
	13838	+ //System.out.println("mouseDragged: " + e);
12069	13839	if (isRenderer)
12070	13840	movingcamera = true;
	13841	+
12071	13842	//if (drawing)
12072	13843	//return;
12073		- //System.out.println("mouseDragged: " + e);
12074	13844	if ((e.getModifiersEx() & CTRL) != 0
12075	13845	\|\| (e.getModifiersEx() & COMMAND) != 0) // \|\| IsFrozen())
12076	13846	{
..	..	@@ -12078,7 +13848,7 @@
12078	13848	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
12079	13849	}
12080	13850	else
12081		- drag(e.getX(), e.getY(), e.getModifiersEx());
	13851	+ drag(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
12082	13852
12083	13853	//try { Thread.sleep(1); } catch (Exception ex) {}
12084	13854	}
..	..	@@ -12090,6 +13860,11 @@
12090	13860	cVector tmp = new cVector();
12091	13861	cVector tmp2 = new cVector();
12092	13862	boolean isMoving;
	13863	+
	13864	+ public cVector TargetLookAt()
	13865	+ {
	13866	+ return targetLookAt;
	13867	+ }
12093	13868
12094	13869	class PingThread extends Thread
12095	13870	{
..	..	@@ -12229,7 +14004,7 @@
12229	14004	//System.out.println("---------------- ---------- Paint " + tmp.length2());
12230	14005	if (lightMode)
12231	14006	{
12232		- lighttouched = true;
	14007	+ Globals.lighttouched = true;
12233	14008	}
12234	14009
12235	14010	if (OEILONCE && OEIL)
..	..	@@ -12246,6 +14021,7 @@
12246	14021
12247	14022	public void run()
12248	14023	{
	14024	+ new Exception().printStackTrace();
12249	14025	System.exit(0);
12250	14026	for (;;)
12251	14027	{
..	..	@@ -12287,7 +14063,7 @@
12287	14063	mouseDown = false;
12288	14064	if (lightMode)
12289	14065	{
12290		- lighttouched = true;
	14066	+ Globals.lighttouched = true;
12291	14067	}
12292	14068	repaint();
12293	14069	alreadypainted = true;
..	..	@@ -12295,7 +14071,7 @@
12295	14071	isMoving = false;
12296	14072	} //??
12297	14073
12298		- if (isLIVE() && !alreadypainted)
	14074	+ if (Globals.isLIVE() && !alreadypainted)
12299	14075	{
12300	14076	// FOR DEBUG BREAKPOINT USING PAUSE: while (true)
12301	14077	repaint();
..	..	@@ -12307,9 +14083,9 @@
12307	14083	{
12308	14084	if (lightMode)
12309	14085	{
12310		- lighttouched = true;
	14086	+ Globals.lighttouched = true;
12311	14087	}
12312		- drag(X, (mouseMode != 0) ? Y : anchorY, MODIFIERS);
	14088	+ drag(X, (mouseMode != 0) ? Y : anchorY, 0, MODIFIERS);
12313	14089	}
12314	14090	//else
12315	14091	}
..	..	@@ -12409,7 +14185,7 @@
12409	14185	int X, Y;
12410	14186	boolean SX, SY;
12411	14187
12412		- void drag(int x, int y, int modifiers)
	14188	+ void drag(int x, int y, int modifiers, int modifiersex)
12413	14189	{
12414	14190	if (IsFrozen())
12415	14191	{
..	..	@@ -12418,17 +14194,17 @@
12418	14194
12419	14195	drag = true; // NEW
12420	14196
12421		- boolean continuous = (modifiers & COMMAND) == COMMAND;
	14197	+ boolean continuous = (modifiersex & COMMAND) == COMMAND;
12422	14198
12423	14199	X = x;
12424	14200	Y = y;
12425	14201	// floating state for animation
12426		- MODIFIERS = modifiers;
12427		- modifiers &= ~1024;
	14202	+ MODIFIERS = modifiersex;
	14203	+ modifiersex &= ~1024;
12428	14204	if (false) // modifiers != 0)
12429	14205	{
12430	14206	//new Exception().printStackTrace();
12431		- System.out.println("mouseDragged: " + modifiers);
	14207	+ System.out.println("mouseDragged: " + modifiersex);
12432	14208	System.out.println("SHIFT = " + SHIFT);
12433	14209	System.out.println("CONTROL = " + COMMAND);
12434	14210	System.out.println("META = " + META);
..	..	@@ -12448,7 +14224,7 @@
12448	14224	info.camera = renderCamera;
12449	14225	info.x = x;
12450	14226	info.y = y;
12451		- object.editWindow.copy.doEditDrag(info);
	14227	+ object.editWindow.copy.doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
12452	14228	} else
12453	14229	{
12454	14230	if (x < startX)
..	..	@@ -12550,6 +14326,7 @@
12550	14326	{
12551	14327	manipCamera.Translate(dx, dy, getWidth());
12552	14328	}
	14329	+ else
12553	14330	if ((mouseMode & ZOOM) == 0 && (mouseMode & VR) != 0)
12554	14331	{
12555	14332	manipCamera.RotateInterest(dx, dy);
..	..	@@ -12560,7 +14337,7 @@
12560	14337
12561	14338	if (manipCamera == lightCamera)
12562	14339	{
12563		- lighttouched = true;
	14340	+ Globals.lighttouched = true;
12564	14341	}
12565	14342	/*
12566	14343	switch (mode)
..	..	@@ -12599,7 +14376,6 @@
12599	14376	public void mouseMoved(MouseEvent e)
12600	14377	{
12601	14378	//System.out.println("mouseMoved: " + e);
12602		-
12603	14379	if (isRenderer)
12604	14380	return;
12605	14381
..	..	@@ -12624,7 +14400,10 @@
12624	14400
12625	14401	public void mouseReleased(MouseEvent e)
12626	14402	{
	14403	+ Globals.MOUSEDRAGGED = false;
	14404	+
12627	14405	movingcamera = false;
	14406	+ X = Y = 0;
12628	14407	//System.out.println("mouseReleased: " + e);
12629	14408	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
12630	14409	}
..	..	@@ -12647,9 +14426,9 @@
12647	14426	boolean control = ((modifiers & CTRL) != 0); // june 2013: for point selection
12648	14427	boolean command = ((modifiers & COMMAND) != 0); // june 2013: for multiple selection
12649	14428
12650		- if (control \|\| command \|\| IsFrozen())
	14429	+// No delay if (control \|\| command \|\| IsFrozen())
12651	14430	timeout = true;
12652		- else
	14431	+// ?? May 2019 else
12653	14432	// timer.setDelay((modifiers & 128) != 0?0:350);
12654	14433	mouseDown = false;
12655	14434	if (!control && !command) // june 2013
..	..	@@ -12759,7 +14538,7 @@
12759	14538	System.out.println("keyReleased: " + e);
12760	14539	}
12761	14540
12762		- void SetMouseMode(int modifiers)
	14541	+ void SetMouseMode(int modifiers, int modifiersex)
12763	14542	{
12764	14543	//System.out.println("SetMouseMode = " + modifiers);
12765	14544	//modifiers &= ~1024;
..	..	@@ -12771,24 +14550,27 @@
12771	14550	//if (modifiers == 0) // \|\| (modifiers == (1024 \| CONTROL)))
12772	14551	// return;
12773	14552	//System.out.println("SetMode = " + modifiers);
12774		- if ((modifiers & WHEEL) == WHEEL)
	14553	+ if ((modifiersex & WHEEL) == WHEEL)
12775	14554	{
12776	14555	mouseMode \|= ZOOM;
12777	14556	}
12778		- if ((modifiers & META) == META)
	14557	+
	14558	+ boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
	14559	+ if (capsLocked) // \|\| (modifiers & META) == META)
12779	14560	{
12780	14561	mouseMode \|= VR; // BACKFORTH;
12781	14562	}
12782		- if ((modifiers & CTRLCLICK) == CTRLCLICK)
12783		- {
12784		- mouseMode \|= SELECT; // BACKFORTH;
12785		- }
12786		- if ((modifiers & COMMAND) == COMMAND)
	14563	+ if ((modifiersex & CTRLCLICK) == CTRLCLICK)
12787	14564	{
12788	14565	mouseMode \|= SELECT;
12789	14566	}
12790		- if ((modifiers & SHIFT) == SHIFT \|\| forcetranslate)
	14567	+ if ((modifiersex & COMMAND) == COMMAND)
12791	14568	{
	14569	+ mouseMode \|= SELECT;
	14570	+ }
	14571	+ if ((modifiersex & SHIFT) == SHIFT \|\| forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
	14572	+ {
	14573	+ mouseMode &= ~VR;
12792	14574	mouseMode \|= TRANSLATE;
12793	14575	}
12794	14576	// if ((modifiers & SHIFT_META) == SHIFT_META)
..	..	@@ -12815,10 +14597,10 @@
12815	14597
12816	14598	if (isRenderer) //
12817	14599	{
12818		- SetMouseMode(modifiers);
	14600	+ SetMouseMode(0, modifiers);
12819	14601	}
12820	14602
12821		- theRenderer.keyPressed(key);
	14603	+ Globals.theRenderer.keyPressed(key);
12822	14604	}
12823	14605
12824	14606	int kompactbit = 4; // power bit
..	..	@@ -12830,7 +14612,7 @@
12830	14612	float SATPOW = 1; // 2; // 0.5f;
12831	14613	float BRIPOW = 1; // 0.5f; // 0.5f;
12832	14614
12833		- void keyPressed(int key)
	14615	+ public void keyPressed(int key)
12834	14616	{
12835	14617	if (key >= '0' && key <= '5')
12836	14618	clampbit = (key-'0');
..	..	@@ -12945,7 +14727,7 @@
12945	14727	case 'B':
12946	14728	BRISMOOTH ^= true;
12947	14729	SHADOWCULLFACE ^= true;
12948		- lighttouched = true;
	14730	+ Globals.lighttouched = true;
12949	14731	repaint();
12950	14732	break;
12951	14733	case 'b':
..	..	@@ -13045,7 +14827,7 @@
13045	14827	repaint();
13046	14828	break;
13047	14829	case 'O':
13048		- drawMode = OCCLUSION;
	14830	+ Globals.drawMode = OCCLUSION; // WARNING
13049	14831	repaint();
13050	14832	break;
13051	14833	case 'o':
..	..	@@ -13136,7 +14918,7 @@
13136	14918	break;
13137	14919	case ' ':
13138	14920	lightMode ^= true;
13139		- lighttouched = true;
	14921	+ Globals.lighttouched = true;
13140	14922	manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
13141	14923	targetLookAt.set(manipCamera.lookAt);
13142	14924	repaint();
..	..	@@ -13148,11 +14930,11 @@
13148	14930	repaint();
13149	14931	break;
13150	14932	case 'Z':
13151		- RESIZETEXTURE ^= true;
13152		- break;
	14933	+ //RESIZETEXTURE ^= true;
	14934	+ //break;
13153	14935	case 'z':
13154		- RENDERSHADOW ^= true;
13155		- lighttouched = true;
	14936	+ Globals.RENDERSHADOW ^= true;
	14937	+ Globals.lighttouched = true;
13156	14938	repaint();
13157	14939	break;
13158	14940	//case UP:
..	..	@@ -13178,7 +14960,8 @@
13178	14960	FlipTransform();
13179	14961	break;
13180	14962	case ENTER:
13181		- object.editWindow.ScreenFit(); // Edit();
	14963	+ // object.editWindow.ScreenFit(); // Edit();
	14964	+ ToggleLive();
13182	14965	break;
13183	14966	case DELETE:
13184	14967	ClearSelection();
..	..	@@ -13266,6 +15049,7 @@
13266	15049	}
13267	15050	//System.out.println("shaper_fovy = " + manipCamera.shaper_fovy);
13268	15051	}
	15052	+
13269	15053	static double OCCLUSIONBOOST = 1; // 0.5;
13270	15054
13271	15055	void keyReleased(int key, int modifiers)
..	..	@@ -13273,11 +15057,11 @@
13273	15057	//mode = ROTATE;
13274	15058	if ((MODIFIERS & COMMAND) == 0) // VR??
13275	15059	{
13276		- SetMouseMode(modifiers);
	15060	+ SetMouseMode(0, modifiers);
13277	15061	}
13278	15062	}
13279	15063
13280		- protected void processKeyEvent(KeyEvent e)
	15064	+ public void processKeyEvent(KeyEvent e)
13281	15065	{
13282	15066	switch (e.getID())
13283	15067	{
..	..	@@ -13407,8 +15191,9 @@
13407	15191
13408	15192	protected void processMouseMotionEvent(MouseEvent e)
13409	15193	{
13410		- //System.out.println("processMouseMotionEvent: " + mouseMode);
13411		- if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
	15194	+ //System.out.println("processMouseMotionEvent: " + mouseMode + " " + e.getModifiers() + " " + e.getModifiersEx() + " " + e.getButton());
	15195	+ //if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
	15196	+ if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (e.getModifiers() & MouseEvent.BUTTON3_MASK) == 0 && (mouseMode & SELECT) == 0)
13412	15197	{
13413	15198	mouseMoved(e);
13414	15199	} else
..	..	@@ -13438,6 +15223,7 @@
13438	15223
13439	15224	void SelectParent()
13440	15225	{
	15226	+ new Exception().printStackTrace();
13441	15227	System.exit(0);
13442	15228	Composite group = (Composite) object;
13443	15229	java.util.Vector selectees = new java.util.Vector(group.selection);
..	..	@@ -13461,6 +15247,7 @@
13461	15247
13462	15248	void SelectChildren()
13463	15249	{
	15250	+ new Exception().printStackTrace();
13464	15251	System.exit(0);
13465	15252	/*
13466	15253	Composite group = (Composite) object;
..	..	@@ -13625,7 +15412,9 @@
13625	15412	info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
13626	15413	//Image img = CreateImage(width, height);
13627	15414	//System.out.println("width = " + width + "; height = " + height + "\n");
	15415	+
13628	15416	Graphics gr = g; // img.getGraphics();
	15417	+
13629	15418	if (!hasMarquee)
13630	15419	{
13631	15420	if (Xmin < Xmax) // !locked)
..	..	@@ -13723,14 +15512,33 @@
13723	15512	if (!isRenderer)
13724	15513	{
13725	15514	object.drawEditHandles(info, 0);
	15515	+
	15516	+ if (drag && (X != 0 \|\| Y != 0) && object.selection.Size() > 0)
	15517	+ {
	15518	+ switch (object.selection.get(0).hitSomething)
	15519	+ {
	15520	+ case Object3D.hitCenter: gr.setColor(Color.pink);
	15521	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15522	+ break;
	15523	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	15524	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15525	+ break;
	15526	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	15527	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15528	+ break;
	15529	+ }
	15530	+
	15531	+ }
13726	15532	}
13727	15533	}
	15534	+
13728	15535	if (isRenderer)
13729	15536	{
13730	15537	//gr.setColor(Color.black);
13731	15538	//gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
13732	15539	//gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
13733	15540	}
	15541	+
13734	15542	if (hasMarquee)
13735	15543	{
13736	15544	gr.setXORMode(Color.white);
..	..	@@ -13753,6 +15561,7 @@
13753	15561	//if (g != gr) g.drawImage(img, 0, 0, width, height, null);
13754	15562	}
13755	15563
	15564	+ // To avoid clear.
13756	15565	public void update(Graphics g)
13757	15566	{
13758	15567	paint(g);
..	..	@@ -13842,6 +15651,7 @@
13842	15651	public boolean mouseDown(Event evt, int x, int y)
13843	15652	{
13844	15653	System.out.println("mouseDown: " + evt);
	15654	+ System.exit(0);
13845	15655	/*
13846	15656	locked = true;
13847	15657	drag = false;
..	..	@@ -13885,7 +15695,7 @@
13885	15695	{
13886	15696	keyPressed(0, modifiers);
13887	15697	}
13888		- clickStart(x, y, modifiers);
	15698	+ // clickStart(x, y, modifiers);
13889	15699	return true;
13890	15700	}
13891	15701
..	..	@@ -14003,7 +15813,7 @@
14003	15813	{
14004	15814	keyReleased(0, 0);
14005	15815	}
14006		- drag(x, y, modifiers);
	15816	+ drag(x, y, 0, modifiers);
14007	15817	return true;
14008	15818	}
14009	15819
..	..	@@ -14135,7 +15945,7 @@
14135	15945	Object3D object;
14136	15946	static Object3D trackedobject;
14137	15947	Camera renderCamera; // Light or Eye (or Occlusion)
14138		- /static/ Camera manipCamera; // Light or Eye
	15948	+ /static/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
14139	15949	/static/ Camera eyeCamera;
14140	15950	/static/ Camera lightCamera;
14141	15951	int cameracount;
..	..	@@ -14355,7 +16165,7 @@
14355	16165	gl.glPushAttrib(GL.GL_ALL_ATTRIB_BITS);
14356	16166	gl.glPushMatrix();
14357	16167	gl.glLoadIdentity();
14358		- PushMatrix(checker.toParent);
	16168	+ //PushMatrix(checker.toParent);
14359	16169
14360	16170	gl.glMatrixMode(GL.GL_TEXTURE);
14361	16171	gl.glPushMatrix();
..	..	@@ -14378,8 +16188,8 @@
14378	16188
14379	16189	gl.glNormal3f(0.0f, 0.0f, 1.0f);
14380	16190
14381		- float step = 0.1666f; //0.25f;
14382		- float stepv = step * 1652 / 998;
	16191	+ float step = 2; // 0.1666f; //0.25f;
	16192	+ float stepv = 2; // step * 1652 / 998;
14383	16193
14384	16194	int i0 = 0;
14385	16195	/*
..	..	@@ -14415,20 +16225,21 @@
14415	16225	/**/
14416	16226	//checker.GetMaterial().opacity = 1.1f;
14417	16227	////checker.GetMaterial().ambient = 0.99f;
14418		- Object3D.materialstack[Object3D.materialdepth] = checker.material;
14419		- Object3D.selectedstack[Object3D.materialdepth] = false;
14420		- cStatic.objectstack[Object3D.materialdepth++] = checker;
	16228	+ materialstack[materialdepth] = checker.material;
	16229	+ selectedstack[materialdepth] = false;
	16230	+ cStatic.objectstack[materialdepth++] = checker;
14421	16231	//System.out.println("material " + material);
14422	16232	//Applet3D.tracein(this, selected);
14423	16233	vector2buffer = checker.projectedVertices;
14424	16234
14425		- checker.GetMaterial().Draw(this, false); // true);
	16235	+ //checker.GetMaterial().Draw(this, false); // true);
	16236	+ DrawMaterial(checker.GetMaterial(), false); // true);
14426	16237
14427		- Object3D.materialdepth -= 1;
14428		- if (Object3D.materialdepth > 0)
	16238	+ materialdepth -= 1;
	16239	+ if (materialdepth > 0)
14429	16240	{
14430		- vector2buffer = cStatic.objectstack[Object3D.materialdepth - 1].projectedVertices;
14431		- Object3D.materialstack[Object3D.materialdepth - 1].Draw(this, Object3D.selectedstack[Object3D.materialdepth - 1]);
	16241	+ vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	16242	+ DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
14432	16243	}
14433	16244	//checker.GetMaterial().opacity = 1f;
14434	16245	////checker.GetMaterial().ambient = 1f;
..	..	@@ -14449,15 +16260,27 @@
14449	16260
14450	16261	//float u = (i+1)/2;
14451	16262	//float v = (j+1)/2;
14452		- gl.glTexCoord2f((i + 1) / 2, (j + 1) / 2); // (1,0) // (i+1+step)/2,(j+1)/2);
	16263	+ if (checker.flipV)
	16264	+ gl.glTexCoord2f((i + 1) / 2, 1 - (j + 1) / 2);
	16265	+ else
	16266	+ gl.glTexCoord2f((i + 1) / 2, (j + 1) / 2); // (1,0) // (i+1+step)/2,(j+1)/2);
14453	16267	gl.glVertex3f(i, j, -0.5f);
14454	16268
	16269	+ if (checker.flipV)
	16270	+ gl.glTexCoord2f((i + 1 + step) / 2, 1 - (j + 1) / 2); // (1,1) // (i+1+step)/2,(j+1+step)/2);
	16271	+ else
14455	16272	gl.glTexCoord2f((i + 1 + step) / 2, (j + 1) / 2); // (1,1) // (i+1+step)/2,(j+1+step)/2);
14456	16273	gl.glVertex3f(i + step, j, -0.5f);
14457	16274
	16275	+ if (checker.flipV)
	16276	+ gl.glTexCoord2f((i + 1 + step) / 2, 1 - (j + 1 + stepv) / 2); // (0,1) //(i+1)/2,(j+1+step)/2);
	16277	+ else
14458	16278	gl.glTexCoord2f((i + 1 + step) / 2, (j + 1 + stepv) / 2); // (0,1) //(i+1)/2,(j+1+step)/2);
14459	16279	gl.glVertex3f(i + step, j + stepv, -0.5f);
14460	16280
	16281	+ if (checker.flipV)
	16282	+ gl.glTexCoord2f((i + 1) / 2, 1 - (j + 1 + stepv) / 2); // (0,0) //(i+1)/2,(j+1)/2);
	16283	+ else
14461	16284	gl.glTexCoord2f((i + 1) / 2, (j + 1 + stepv) / 2); // (0,0) //(i+1)/2,(j+1)/2);
14462	16285	gl.glVertex3f(i, j + stepv, -0.5f);
14463	16286	}
..	..	@@ -14469,7 +16292,7 @@
14469	16292	gl.glMatrixMode(GL.GL_PROJECTION);
14470	16293	gl.glPopMatrix();
14471	16294	gl.glMatrixMode(GL.GL_MODELVIEW);
14472		- PopMatrix(null); // checker.toParent); // null);
	16295	+ //PopMatrix(null); // checker.toParent); // null);
14473	16296	gl.glPopMatrix();
14474	16297	PopTextureMatrix(checker.toParent);
14475	16298	gl.glMatrixMode(GL.GL_TEXTURE);
..	..	@@ -14560,6 +16383,7 @@
14560	16383	{
14561	16384	if (!selection)
14562	16385	{
	16386	+ new Exception().printStackTrace();
14563	16387	System.exit(0);
14564	16388	return;
14565	16389	}
..	..	@@ -14582,14 +16406,14 @@
14582	16406
14583	16407	//int tmp = selection_view;
14584	16408	//selection_view = -1;
14585		- int temp = drawMode;
14586		- drawMode = SELECTION;
	16409	+ int temp = DrawMode();
	16410	+ Globals.drawMode = SELECTION; // WARNING
14587	16411	indexcount = 0;
14588	16412	parent.display(drawable);
14589	16413	//selection_view = tmp;
14590	16414	//if (temp == SELECTION)
14591	16415	// temp = DEFAULT; // patch for selection debug
14592		- drawMode = temp;
	16416	+ Globals.drawMode = temp; // WARNING
14593	16417
14594	16418	//gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
14595	16419
..	..	@@ -14639,6 +16463,11 @@
14639	16463	// System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
14640	16464	// System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
14641	16465
	16466	+ // Will fit the mesh !!!
	16467	+ selectedpoint.toParent[0][0] = 0.0001;
	16468	+ selectedpoint.toParent[1][1] = 0.0001;
	16469	+ selectedpoint.toParent[2][2] = 0.0001;
	16470	+
14642	16471	glu.gluUnProject(x,y,depth,view,0,tempmat2,0,viewport,0,selectedpoint.toParent[3],0);
14643	16472
14644	16473	// if (object.selection != null && object.selection.Size() > 0)
..	..	@@ -14682,16 +16511,16 @@
14682	16511	System.out.println("; fromto " + sel + " " + Trunk(previousselectedpoint.toParent[3][0]) + " " + Trunk(previousselectedpoint.toParent[3][2]) + " " + Trunk(selectedpoint.toParent[3][0]) + " " + Trunk(selectedpoint.toParent[3][2]));
14683	16512	}
14684	16513
14685		- previousselectedpoint = (Sphere) GraphreeD.clone(selectedpoint);
	16514	+ previousselectedpoint = (Sphere) Grafreed.clone(selectedpoint);
14686	16515	}
14687	16516	}
14688	16517
14689	16518	if (!movingcamera && !PAINTMODE)
14690	16519	object.editWindow.ScreenFitPoint(); // fev 2014
14691	16520
14692		- if (PAINTMODE && GraphreeD.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	16521	+ if (PAINTMODE && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
14693	16522	{
14694		- Object3D paintobj = GraphreeD.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
	16523	+ Object3D paintobj = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
14695	16524
14696	16525	Object3D group = new Object3D("inst" + paintcount++);
14697	16526
..	..	@@ -14847,7 +16676,7 @@
14847	16676	gl.glDisable(gl.GL_CULL_FACE);
14848	16677	}
14849	16678
14850		- if (!RENDERSHADOW)
	16679	+ if (!Globals.RENDERSHADOW)
14851	16680	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
14852	16681
14853	16682	// SB gl.glPolygonOffset(2.5f, 10);
..	..	@@ -14857,14 +16686,14 @@
14857	16686	//gl.glColorMask(false, false, false, false);
14858	16687
14859	16688	//render_scene_from_light_view(gl, drawable, 0, 0);
14860		- if (RENDERSHADOW && lighttouched && !movingcamera) // && !parent.IsFreezed())
	16689	+ if (Globals.RENDERSHADOW && Globals.lighttouched && (!movingcamera \|\| !Globals.FREEZEONMOVE)) // && !parent.IsFreezed())
14861	16690	{
14862	16691	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
14863	16692
14864		- int temp = drawMode;
14865		- drawMode = SHADOW;
	16693	+ int temp = DrawMode();
	16694	+ Globals.drawMode = SHADOW; // WARNING
14866	16695	parent.display(drawable);
14867		- drawMode = temp;
	16696	+ Globals.drawMode = temp; // WARNING
14868	16697	}
14869	16698
14870	16699	gl.glCullFace(gl.GL_BACK);
..	..	@@ -14917,7 +16746,6 @@
14917	16746
14918	16747	class AntialiasBuffer implements GLEventListener
14919	16748	{
14920		-
14921	16749	CameraPane parent = null;
14922	16750
14923	16751	AntialiasBuffer(CameraPane p)
..	..	@@ -15027,13 +16855,19 @@
15027	16855	gl.glFlush();
15028	16856
15029	16857	/**/
15030		- gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_BGRA, GL.GL_UNSIGNED_INT_8_8_8_8_REV, occlusionsizebuffer);
	16858	+ gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusionsizebuffer);
15031	16859
15032		- int[] pixels = occlusionsizebuffer.array();
	16860	+ float[] pixels = occlusionsizebuffer.array();
15033	16861
15034	16862	double r = 0, g = 0, b = 0;
15035	16863
15036	16864	double count = 0;
	16865	+
	16866	+ gl.glGetDoublev(gl.GL_PROJECTION_MATRIX, tempmat2, 0);
	16867	+
	16868	+ float mindepth = 1;
	16869	+
	16870	+ double FACTOR = 1;
15037	16871
15038	16872	for (int i = 0; i < pixels.length; i++)
15039	16873	{
..	..	@@ -15118,7 +16952,7 @@
15118	16952
15119	16953	double scale = ray.z; // 1; // cos
15120	16954
15121		- int p = pixels[newindex];
	16955	+ float depth = pixels[newindex];
15122	16956
15123	16957	/*
15124	16958	int newindex2 = (x + 1) * OCCLUSION_SIZE + y;
..	..	@@ -15142,10 +16976,23 @@
15142	16976	scale = (1 - modu) * modv;
15143	16977	*/
15144	16978
15145		- r += ((p >> 16) & 0xFF) * scale / 255;
15146		- g += ((p >> 8) & 0xFF) * scale / 255;
15147		- b += (p & 0xFF) * scale / 255;
	16979	+ //r += ((p >> 16) & 0xFF) * scale / 255;
	16980	+ //g += ((p >> 8) & 0xFF) * scale / 255;
	16981	+ //b += (p & 0xFF) * scale / 255;
	16982	+
	16983	+ if (mindepth > depth)
	16984	+ {
	16985	+ mindepth = depth;
	16986	+ }
15148	16987
	16988	+ double z_eye = tempmat2[34 + 2] / (depth -2.0 + 1.0 - tempmat2[2*4 + 2]);
	16989	+
	16990	+ double factor = 1 - Math.exp(-z_eye * z_eye / FACTOR);
	16991	+
	16992	+ r += factor * scale;
	16993	+ g += factor * scale;
	16994	+ b += factor * scale;
	16995	+
15149	16996	count += scale;
15150	16997	}
15151	16998
..	..	@@ -15243,12 +17090,6 @@
15243	17090	GLUT glut = new GLUT();
15244	17091
15245	17092
15246		- static final public int DEFAULT = 0;
15247		- static final public int SELECTION = 1;
15248		- static final public int SHADOW = 2;
15249		- static final public int OCCLUSION = 3;
15250		- static
15251		- public int drawMode = DEFAULT;
15252	17093	public boolean spherical = false;
15253	17094	static boolean DEBUG_OCCLUSION = false;
15254	17095	static boolean DEBUG_SELECTION = false;
..	..	@@ -15261,10 +17102,12 @@
15261	17102	int AAbuffersize = 0;
15262	17103
15263	17104	//double[] selectedpoint = new double[3];
15264		- static Sphere selectedpoint = new Sphere();
	17105	+ static Superellipsoid selectedpoint = new Superellipsoid();
15265	17106	static Sphere previousselectedpoint = null;
15266		- static Sphere debugpoint = new Sphere();
15267		- static Sphere debugpoint2 = new Sphere();
	17107	+ static Sphere debugpointG = new Sphere();
	17108	+ static Sphere debugpointP = new Sphere();
	17109	+ static Sphere debugpointC = new Sphere();
	17110	+ static Sphere debugpointR = new Sphere();
15268	17111
15269	17112	static Sphere debugpoints[] = new Sphere[8];
15270	17113
..	..	@@ -15295,7 +17138,7 @@
15295	17138	}
15296	17139	}
15297	17140
15298		- static void DrawPoints(CameraPane cpane)
	17141	+ static void DrawPoints(iCameraPane cpane)
15299	17142	{
15300	17143	for (int i=0; i<8; i++) // first and last are red
15301	17144	{
..	..	@@ -15317,7 +17160,8 @@
15317	17160	static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
15318	17161	static IntBuffer selectsizebuffer = IntBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
15319	17162	static java.nio.FloatBuffer pointselectsizebuffer = java.nio.FloatBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
15320		- static IntBuffer occlusionsizebuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17163	+ //static IntBuffer occlusionsizebuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17164	+ static java.nio.FloatBuffer occlusionsizebuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
15321	17165	static BufferedImage bufimage = new BufferedImage(TEX_SIZE, TEX_SIZE, BufferedImage.TYPE_INT_RGB);
15322	17166	static BufferedImage textest = new cBufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB);
15323	17167	static java.util.Vector<BufferedImage> billboards = new java.util.Vector<BufferedImage>();
..	..	@@ -15326,10 +17170,11 @@
15326	17170	static IntBuffer textbuffer = null; // IntBuffer.allocate(TEXT_WIDTH88 * TEXT_HEIGHT);
15327	17171	// Depth buffer format
15328	17172	//private int depth_format;
15329		- static public void NextIndex(Object3D o, GL gl)
	17173	+
	17174	+ public void NextIndex()
15330	17175	{
15331	17176	indexcount+=16;
15332		- gl.glColor3d(((indexcount >>> 16) & 255) / 255.0, ((indexcount >>> 8) & 255) / 255.0, ((indexcount) & 255) / 255.0);
	17177	+ GetGL().glColor3d(((indexcount >>> 16) & 255) / 255.0, ((indexcount >>> 8) & 255) / 255.0, ((indexcount) & 255) / 255.0);
15333	17178	//objects[indexcount] = o;
15334	17179	//System.out.println("indexcount = " + indexcount);
15335	17180	}