~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -31,9 +31,12 @@
31	31
32	32	import gleem.linalg.Mat4f;
33	33
34		-class CameraPane extends GLCanvas implements Runnable, GLEventListener, ActionListener, MouseWheelListener, MouseMotionListener, MouseListener, KeyListener
	34	+class CameraPane extends GLCanvas implements iCameraPane, Runnable, GLEventListener, ActionListener, MouseWheelListener, MouseMotionListener, MouseListener, KeyListener
35	35	{
36		- static boolean DEBUG = false;
	36	+ static cMaterial[] materialstack = new cMaterial[65536];
	37	+ static boolean[] selectedstack = new boolean[65536];
	38	+ static int materialdepth = 0;
	39	+
37	40	static boolean FRUSTUM = false; // still bogus true; // frustum culling
38	41
39	42	// camera change fix
..	..	@@ -42,25 +45,7 @@
42	45
43	46	static int STEP = 1;
44	47
45		- static boolean ONESTEP = false; // do LIVE once
46		-
47		- /**
48		- * @return the LIVE
49		- */
50		- public static boolean isLIVE()
51		- {
52		- return LIVE \|\| ONESTEP;
53		- }
54		-
55		- /**
56		- * @param aLIVE the LIVE to set
57		- */
58		- public static void setLIVE(boolean aLIVE)
59		- {
60		- LIVE = aLIVE;
61		- }
62		-
63		- /static/ boolean CULLFACE = false; // true;
	48	+ /static/ private boolean CULLFACE = false; // true;
64	49	/static/ boolean NEAREST = false; // true;
65	50	/static/ boolean WIREFRAME = false; // true;
66	51
..	..	@@ -70,8 +55,6 @@
70	55	static int CURRENTANTIALIAS = 0; // 1;
71	56	/static/ boolean RENDERSHADOW = true;
72	57	/static/ int RENDERPROGRAM = 2; // 0 == none, 1 == fast, 2 == normal
73		- static boolean ANIMATION = false;
74		- static String filename;
75	58
76	59	boolean DISPLAYTEXT = false;
77	60	//boolean REDUCETEXTURE = true;
..	..	@@ -97,10 +80,8 @@
97	80
98	81	static boolean textureon = true;
99	82	static boolean LOCALTRANSFORM = false;
100		-private static boolean LIVE = false;
101	83	static boolean FULLSCREEN = false;
102	84	static boolean SUPPORT = true;
103		-static boolean CROWD = false;
104	85	static boolean INERTIA = true;
105	86	static boolean FAST = false;
106	87	static boolean SLOWPOSE = false;
..	..	@@ -108,6 +89,8 @@
108	89
109	90	static int tickcount = 0; // slow pose issue
110	91
	92	+static boolean BUTTONLESSWHEEL = false;
	93	+static boolean ZOOMBOXMODE = false;
111	94	static boolean BOXMODE = false;
112	95	static boolean IMAGEFLIP = false;
113	96	static boolean SMOOTHFOCUS = false;
..	..	@@ -122,7 +105,7 @@
122	105	static boolean OEIL = true;
123	106	static boolean OEILONCE = false; // do oeilon then oeiloff
124	107	static boolean LOOKAT = true;
125		-static boolean RANDOM = true; // false;
	108	+static boolean SWITCH = true; // false;
126	109	static boolean HANDLES = false; // selection doesn't work!!
127	110	static boolean PAINTMODE = false;
128	111
..	..	@@ -165,12 +148,41 @@
165	148	defaultcaps.setAccumBlueBits(16);
166	149	defaultcaps.setAccumAlphaBits(16);
167	150	}
168		- static CameraPane theRenderer;
169		-
	151	+
	152	+ private File defaultDirectory = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory();
	153	+
170	154	void SetAsGLRenderer(boolean b)
171	155	{
172	156	isRenderer = b;
173		- theRenderer = this;
	157	+ Globals.theRenderer = this;
	158	+ }
	159	+
	160	+ CameraPane(Object3D o, Camera cam, boolean withcontext)
	161	+ {
	162	+ super(defaultcaps, null, withcontext?glcontext:null, null);
	163	+
	164	+ //System.out.println("AMERICA AREA = " + (9458886 + 9210755 + 8480395 + 2736391 + 1943018 + 1289475 + 1141569 + 1069350 + 911559 + 721229 + 395886 + 377972 + 246700 + 211156 + 173985 + 141133 + 118279 + 112079 + 108523));
	165	+ glcontext = getContext();
	166	+
	167	+ cameras = new Camera[2];
	168	+ targetLookAts = new cVector[2];
	169	+
	170	+ SetCamera(cam);
	171	+
	172	+ SetLight(new Camera(new cVector(10, 10, -20)));
	173	+
	174	+ object = o;
	175	+
	176	+ setBackground(Color.white);
	177	+
	178	+ addKeyListener(this);
	179	+ addMouseListener(this);
	180	+ addMouseMotionListener(this);
	181	+ addMouseWheelListener(this);
	182	+ //System.out.println("addGLEventListener: " + this);
	183	+ addGLEventListener(this);
	184	+
	185	+// pingthread.start(); // may 2013
174	186	}
175	187
176	188	static boolean AntialiasingEnabled()
..	..	@@ -178,12 +190,53 @@
178	190	return CURRENTANTIALIAS > 0;
179	191	}
180	192
181		- void ClearDepth()
	193	+ /// INTERFACE
	194	+
	195	+ public javax.media.opengl.GL GetGL0()
	196	+ {
	197	+ return null;
	198	+ }
	199	+
	200	+ public int GenList()
	201	+ {
	202	+ javax.media.opengl.GL gl = GetGL();
	203	+ return gl.glGenLists(1);
	204	+ }
	205	+
	206	+ public void NewList(int id)
	207	+ {
	208	+ javax.media.opengl.GL gl = GetGL();
	209	+ gl.glNewList(id, gl.GL_COMPILE); //_AND_EXECUTE);
	210	+ }
	211	+
	212	+ public void CallList(int id)
	213	+ {
	214	+ javax.media.opengl.GL gl = GetGL();
	215	+ gl.glCallList(id);
	216	+ }
	217	+
	218	+ public void EndList()
	219	+ {
	220	+ javax.media.opengl.GL gl = GetGL();
	221	+ gl.glEndList();
	222	+ }
	223	+
	224	+ public boolean IsBoxMode()
	225	+ {
	226	+ return BOXMODE;
	227	+ }
	228	+
	229	+ public boolean IsZoomBoxMode()
	230	+ {
	231	+ return ZOOMBOXMODE;
	232	+ }
	233	+
	234	+ public void ClearDepth()
182	235	{
183	236	GetGL().glClear(GetGL().GL_DEPTH_BUFFER_BIT);
184	237	}
185	238
186		- void DepthTest(boolean depthtest)
	239	+ public void DepthTest(boolean depthtest)
187	240	{
188	241	if (depthtest)
189	242	GetGL().glDepthFunc(GL.GL_LEQUAL);
..	..	@@ -191,7 +244,7 @@
191	244	GetGL().glDepthFunc(GL.GL_ALWAYS);
192	245	}
193	246
194		- void DepthWrite(boolean depthwrite)
	247	+ public void DepthWrite(boolean depthwrite)
195	248	{
196	249	if (depthwrite)
197	250	GetGL().glDepthMask(true);
..	..	@@ -199,12 +252,1602 @@
199	252	GetGL().glDepthMask(false);
200	253	}
201	254
202		- void BackFaceCull(boolean bfc)
	255	+ public void BackFaceCull(boolean bfc)
203	256	{
204	257	if (bfc)
205	258	GetGL().glEnable(GetGL().GL_CULL_FACE);
206	259	else
207	260	GetGL().glDisable(GetGL().GL_CULL_FACE);
	261	+ }
	262	+
	263	+ public boolean BackFaceCullMode()
	264	+ {
	265	+ return this.CULLFACE;
	266	+ }
	267	+
	268	+ public boolean IsAmbientOcclusionOn()
	269	+ {
	270	+ return this.ambientOcclusion;
	271	+ }
	272	+
	273	+ public boolean IsDebugSelection()
	274	+ {
	275	+ return DEBUG_SELECTION;
	276	+ }
	277	+
	278	+ public boolean IsFrozen()
	279	+ {
	280	+ boolean selectmode = this.DrawMode() == SELECTION \|\| this.IsDebugSelection();
	281	+
	282	+ return !selectmode && cameracount == 0; // != 0;
	283	+ }
	284	+
	285	+ // Currently in Globals
	286	+ public int DrawMode()
	287	+ {
	288	+ return Globals.DrawMode();
	289	+ }
	290	+
	291	+ public Camera EyeCamera()
	292	+ {
	293	+ return eyeCamera;
	294	+ }
	295	+
	296	+ public Camera LightCamera()
	297	+ {
	298	+ return lightCamera;
	299	+ }
	300	+
	301	+ public Camera ManipCamera()
	302	+ {
	303	+ return manipCamera;
	304	+ }
	305	+
	306	+ public Camera RenderCamera()
	307	+ {
	308	+ return renderCamera;
	309	+ }
	310	+
	311	+ public Camera[] Cameras()
	312	+ {
	313	+ return cameras;
	314	+ }
	315	+
	316	+ public void PushMaterial(Object3D obj, boolean selected)
	317	+ {
	318	+ CameraPane display = this;
	319	+ javax.media.opengl.GL gl = display.GetGL();
	320	+ cMaterial material = obj.material;
	321	+
	322	+ if (material != null)
	323	+ {
	324	+ materialstack[materialdepth] = material;
	325	+ selectedstack[materialdepth] = selected;
	326	+ cStatic.objectstack[materialdepth++] = obj;
	327	+ //System.out.println("material " + material);
	328	+ //Applet3D.tracein(this, selected);
	329	+ //display.vector2buffer = obj.projectedVertices;
	330	+ if (obj instanceof Camera)
	331	+ {
	332	+ display.options1[0] = material.shift;
	333	+ //System.out.println("shift " + material.shift);
	334	+ display.options1[1] = material.lightarea;
	335	+ display.options1[2] = material.shadowbias;
	336	+ display.options1[3] = material.aniso;
	337	+ display.options1[4] = material.anisoV;
	338	+ display.options2[0] = material.opacity;
	339	+ display.options2[1] = material.diffuse;
	340	+ display.options2[2] = material.factor;
	341	+
	342	+ cColor.HSBtoRGB(material.color, material.modulation, 1, display.options3);
	343	+ display.options4[0] = material.cameralight/0.2f;
	344	+ display.options4[1] = material.subsurface;
	345	+ display.options4[2] = material.sheen;
	346	+
	347	+ // if (display.CURRENTANTIALIAS > 0)
	348	+ // display.options3[3] /= 4;
	349	+
	350	+ /*
	351	+ System.out.println("Focus = " + display.options1[0]);
	352	+ System.out.println("Aperture = " + display.options1[1]);
	353	+ System.out.println("ShadowBlur = " + display.options1[2]);
	354	+ System.out.println("Antialiasing = " + display.options1[3]);
	355	+ System.out.println("Fog = " + display.options2[0]);
	356	+ System.out.println("Intensity = " + display.options2[1]);
	357	+ System.out.println("Elevation = " + display.options2[2]);
	358	+ /**/
	359	+ } else
	360	+ {
	361	+ DrawMaterial(material, selected, obj.projectedVertices);
	362	+ }
	363	+ } else
	364	+ {
	365	+ if (selected && CameraPane.flash)
	366	+ {
	367	+ display.modelParams4[1] = 100;
	368	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 4, display.modelParams4, 0);
	369	+ }
	370	+ }
	371	+ }
	372	+
	373	+ public void PushMaterial2(Object3D obj, boolean selected)
	374	+ {
	375	+ CameraPane display = this;
	376	+ cMaterial material = obj.material;
	377	+
	378	+ if (material != null)
	379	+ {
	380	+ materialstack[materialdepth] = material;
	381	+ selectedstack[materialdepth] = selected;
	382	+ cStatic.objectstack[materialdepth++] = obj;
	383	+ //System.out.println("material " + material);
	384	+ //Applet3D.tracein("selected ", selected);
	385	+ //display.vector2buffer = obj.projectedVertices;
	386	+ display.DrawMaterial(material, selected, obj.projectedVertices);
	387	+ }
	388	+ }
	389	+
	390	+ public void PopMaterial(Object3D obj, boolean selected)
	391	+ {
	392	+ CameraPane display = this;
	393	+ javax.media.opengl.GL gl = display.GetGL();
	394	+ cMaterial material = obj.material;
	395	+
	396	+ //if (parent != null && parent.GetMaterial() != null)
	397	+ // parent.GetMaterial().Draw(display, parent.IsSelected(this));
	398	+ if (material != null)
	399	+ {
	400	+ materialdepth -= 1;
	401	+ if (materialdepth > 0)
	402	+ {
	403	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	404	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
	405	+ }
	406	+ //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
	407	+ } else if (selected && CameraPane.flash && obj.GetMaterial() != null)
	408	+ {
	409	+ display.modelParams4[1] = obj.GetMaterial().cameralight;
	410	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 4, display.modelParams4, 0);
	411	+ }
	412	+ }
	413	+
	414	+ public void PopMaterial2(Object3D obj)
	415	+ {
	416	+ CameraPane display = this;
	417	+ cMaterial material = obj.material;
	418	+
	419	+ if (material != null)
	420	+ {
	421	+ materialdepth -= 1;
	422	+ if (materialdepth > 0)
	423	+ {
	424	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	425	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
	426	+ }
	427	+ //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
	428	+ //else
	429	+ //material.Draw(display, false);
	430	+ }
	431	+ }
	432	+
	433	+ public void DrawFace(Object3D obj, Vertex pv, Vertex qv, Vertex rv, Face face)
	434	+ {
	435	+ CameraPane display = this;
	436	+
	437	+ if (pv.y == -10000 \|\|
	438	+ qv.y == -10000 \|\|
	439	+ rv.y == -10000)
	440	+ return;
	441	+
	442	+// float b = f.nbiterations & 1;
	443	+// float g = (f.nbiterations>>1) & 1;
	444	+// float r = (f.nbiterations>>2) & 1;
	445	+//
	446	+// //if (f.weight == 10000)
	447	+// //{
	448	+// // r = 1; g = b = 0;
	449	+// //}
	450	+// //else
	451	+// //{
	452	+// // assert(f.weight < 10000);
	453	+// r = g = b = (float)bRep.FaceWeight(f)*100;
	454	+// if (r<0)
	455	+// assert(r>=0);
	456	+// //}
	457	+
	458	+ javax.media.opengl.GL gl = display.GetGL();
	459	+
	460	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
	461	+
	462	+ //System.out.println("p = " + pv + "; q = " + qv + "; r = " + rv);
	463	+ if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
	464	+ {
	465	+ //gl.glBegin(gl.GL_TRIANGLES);
	466	+ boolean hasnorm = pv.norm != null && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0)
	467	+ // TEST LIVE NORMALS && !obj.dontselect
	468	+ ;
	469	+ if (!hasnorm)
	470	+ {
	471	+ // System.out.println("Mesh normal");
	472	+ LA.vecSub(pv/.pos/, qv/.pos/, obj.v0);
	473	+ LA.vecSub(pv/.pos/, rv/.pos/, obj.v1);
	474	+ LA.vecCross(obj.v0, obj.v1, obj.v2);
	475	+ LA.vecNormalize(obj.v2);
	476	+ gl.glNormal3f((float) obj.v2.x, (float) obj.v2.y, (float) obj.v2.z);
	477	+ }
	478	+
	479	+ // P
	480	+ float x = (float)pv.x;
	481	+ float y = (float)pv.y;
	482	+ float z = (float)pv.z;
	483	+
	484	+ if (hasnorm)
	485	+ {
	486	+// if (!pv.norm.normalized())
	487	+// assert(pv.norm.normalized());
	488	+
	489	+ //System.out.println("normalp = " + pv.norm.x + ", " + pv.norm.y + ", " + pv.norm.z);
	490	+ float nx = (float)pv.norm.x;
	491	+ float ny = (float)pv.norm.y;
	492	+ float nz = (float)pv.norm.z;
	493	+
	494	+ x += nx * obj.NORMALPUSH;
	495	+ y += ny * obj.NORMALPUSH;
	496	+ z += nz * obj.NORMALPUSH;
	497	+
	498	+ gl.glNormal3f(nx, ny, nz);
	499	+ }
	500	+ gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
	501	+ SetColor(obj, pv);
	502	+ //gl.glColor4f(r, g, b, 1);
	503	+ //gl.glColor4f(pv.boundary, pv.boundary, pv.boundary, 1);
	504	+ if (obj.flipV)
	505	+ gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
	506	+ else
	507	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	508	+ //System.out.println("vertexp = " + pv.x + ", " + pv.y + ", " + pv.z);
	509	+
	510	+ gl.glVertex3f(x, y, z);
	511	+
	512	+ // Q
	513	+ x = (float)qv.x;
	514	+ y = (float)qv.y;
	515	+ z = (float)qv.z;
	516	+
	517	+// Print(pv);
	518	+ if (hasnorm)
	519	+ {
	520	+// assert(qv.norm.normalized());
	521	+ //System.out.println("normalq = " + qv.norm.x + ", " + qv.norm.y + ", " + qv.norm.z);
	522	+ float nx = (float)qv.norm.x;
	523	+ float ny = (float)qv.norm.y;
	524	+ float nz = (float)qv.norm.z;
	525	+
	526	+ x += nx * obj.NORMALPUSH;
	527	+ y += ny * obj.NORMALPUSH;
	528	+ z += nz * obj.NORMALPUSH;
	529	+
	530	+ gl.glNormal3f(nx, ny, nz);
	531	+ }
	532	+ //System.out.println("vertexq = " + qv.s + ", " + qv.t);
	533	+ // boolean locked = false;
	534	+ // float eps = 0.1f;
	535	+ // boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
	536	+
	537	+ // int dot = 0; //*/ (int)f.dot;
	538	+
	539	+ // if ((dot&1) == 0)
	540	+ // dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
	541	+
	542	+ // if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
	543	+ if (obj.flipV)
	544	+ gl.glTexCoord2f((float) qv.s, 1-(float) qv.t);
	545	+ else
	546	+ gl.glTexCoord2f((float) qv.s, (float) qv.t);
	547	+ // else
	548	+ // {
	549	+ // locked = true;
	550	+ // gl.glTexCoord2f((float) pv.s, (float) pv.t);
	551	+ // }
	552	+ gl.glColor4f(qv.AO, qv.AO, qv.AO, 1);
	553	+ SetColor(obj, qv);
	554	+
	555	+ gl.glVertex3f(x, y, z);
	556	+ //gl.glColor4f(r, g, b, 1);
	557	+ //gl.glColor4f(qv.boundary, qv.boundary, qv.boundary, 1);
	558	+ //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
	559	+// Print(qv);
	560	+
	561	+ // R
	562	+ x = (float)rv.x;
	563	+ y = (float)rv.y;
	564	+ z = (float)rv.z;
	565	+
	566	+ if (hasnorm)
	567	+ {
	568	+// assert(rv.norm.normalized());
	569	+ //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
	570	+ float nx = (float)rv.norm.x;
	571	+ float ny = (float)rv.norm.y;
	572	+ float nz = (float)rv.norm.z;
	573	+
	574	+ x += nx * obj.NORMALPUSH;
	575	+ y += ny * obj.NORMALPUSH;
	576	+ z += nz * obj.NORMALPUSH;
	577	+
	578	+ gl.glNormal3f(nx, ny, nz);
	579	+ }
	580	+
	581	+ // if ((dot&4) == 0)
	582	+ // dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
	583	+
	584	+ // if (wrap \|\| !locked && (dot&8) != 0)
	585	+ if (obj.flipV)
	586	+ gl.glTexCoord2f((float) rv.s, 1-(float) rv.t);
	587	+ else
	588	+ gl.glTexCoord2f((float) rv.s, (float) rv.t);
	589	+ // else
	590	+ // gl.glTexCoord2f((float) pv.s, (float) pv.t);
	591	+
	592	+ // f.dot = dot;
	593	+
	594	+ gl.glColor4f(rv.AO, rv.AO, rv.AO, 1);
	595	+ SetColor(obj, rv);
	596	+ //gl.glColor4f(r, g, b, 1);
	597	+ //gl.glColor4f(rv.boundary, rv.boundary, rv.boundary, 1);
	598	+ //System.out.println("vertexr = " + rv.x + ", " + rv.y + ", " + rv.z);
	599	+ gl.glVertex3f(x, y, z);
	600	+// Print(rv);
	601	+ //gl.glEnd();
	602	+ }
	603	+ else
	604	+ {
	605	+ gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
	606	+ gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
	607	+ gl.glVertex3f((float) rv.x, (float) rv.y, (float) rv.z);
	608	+
	609	+ }
	610	+
	611	+ if (false) // (attributes & WIREFRAME) != 0)
	612	+ {
	613	+ gl.glDisable(gl.GL_LIGHTING);
	614	+
	615	+ gl.glBegin(gl.GL_LINE_LOOP);
	616	+ gl.glVertex3d(pv./pos./x, pv./pos./y, pv./pos./z);
	617	+ gl.glVertex3d(qv./pos./x, qv./pos./y, qv./pos./z);
	618	+ gl.glVertex3d(rv./pos./x, rv./pos./y, rv./pos./z);
	619	+ gl.glEnd();
	620	+
	621	+ gl.glEnable(gl.GL_LIGHTING);
	622	+ }
	623	+ }
	624	+
	625	+ /**
	626	+ * <code>draw</code> renders a <code>TriMesh</code> object including
	627	+ * it's normals, colors, textures and vertices.
	628	+ *
	629	+ * @see Renderer#draw(TriMesh)
	630	+ * @param tris
	631	+ * the mesh to render.
	632	+ */
	633	+ public void DrawParticles(TriMesh geo, Object3D shape, boolean selected, boolean rotate) // TriMesh tris)
	634	+ {
	635	+ CameraPane display = this;
	636	+
	637	+ float r = display.modelParams0[0];
	638	+ float g = display.modelParams0[1];
	639	+ float b = display.modelParams0[2];
	640	+ float opacity = display.modelParams5[1];
	641	+
	642	+ //final GL gl = GLU.getCurrentGL();
	643	+ GL gl = display.GetGL(); // getGL();
	644	+
	645	+ FloatBuffer vertBuf = geo.vertBuf;
	646	+
	647	+ int v = vertBuf.capacity();
	648	+
	649	+ int count = 0;
	650	+
	651	+ boolean cf = gl.glIsEnabled(gl.GL_CULL_FACE);
	652	+ gl.glEnable(gl.GL_CULL_FACE);
	653	+ // gl.glScalef(1.0f/1024,1.0f/1024,1.0f/1024);
	654	+ for (int i=0; i<v/3; i++)
	655	+ {
	656	+ int index3 = i*3;
	657	+
	658	+ if (geo.sizeBuf.get(index3+1) == 0)
	659	+ continue;
	660	+
	661	+ count++;
	662	+
	663	+ int index4 = i*4;
	664	+
	665	+ float tx = vertBuf.get(index3);
	666	+ float ty = vertBuf.get(index3+1);
	667	+ float tz = vertBuf.get(index3+2);
	668	+
	669	+ // if (tx == 0 && ty == 0 && tz == 0)
	670	+ // continue;
	671	+
	672	+ gl.glMatrixMode(gl.GL_TEXTURE);
	673	+ gl.glPushMatrix();
	674	+
	675	+ float[] texmat = geo.texmat;
	676	+ texmat[12] = texmat[13] = texmat[14] = i;
	677	+
	678	+ gl.glMultMatrixf(texmat, 0);
	679	+
	680	+ gl.glMatrixMode(gl.GL_MODELVIEW);
	681	+ gl.glPushMatrix();
	682	+
	683	+ gl.glTranslatef(tx,ty,tz);
	684	+
	685	+ if (rotate)
	686	+ gl.glRotatef(i, 0, 1, 0);
	687	+
	688	+ float size = geo.sizeBuf.get(index3) / 100;
	689	+ gl.glScalef(size,size,size);
	690	+
	691	+ float cr = geo.colorBuf.get(index4);
	692	+ float cg = geo.colorBuf.get(index4+1);
	693	+ float cb = geo.colorBuf.get(index4+2);
	694	+ float ca = geo.colorBuf.get(index4+3);
	695	+
	696	+ display.modelParams0[0] = r * cr;
	697	+ display.modelParams0[1] = g * cg;
	698	+ display.modelParams0[2] = b * cb;
	699	+
	700	+ display.modelParams5[1] = opacity * ca;
	701	+
	702	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 0, display.modelParams0, 0);
	703	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 5, display.modelParams5, 0);
	704	+
	705	+ RandomNode.globalseed = (int)geo.sizeBuf.get(index3+2); // i;
	706	+ RandomNode.globalseed2 = RandomNode.globalseed;
	707	+
	708	+// gl.glColor4f(cr,cg,cb,ca);
	709	+ // gl.glScalef(1024/16,1024/16,1024/16);
	710	+ shape.Draw/Node/(display,null,selected,false); // blocked
	711	+ // gl.glScalef(16.0f/1024,16.0f/1024,16.0f/1024);
	712	+ //gl.glTranslatef(-tx,-ty,-tz);
	713	+ gl.glPopMatrix();
	714	+
	715	+ gl.glMatrixMode(gl.GL_TEXTURE);
	716	+ gl.glPopMatrix();
	717	+ }
	718	+ // gl.glScalef(1024,1024,1024);
	719	+ if (!cf)
	720	+ gl.glDisable(gl.GL_CULL_FACE);
	721	+
	722	+ display.modelParams0[0] = r;
	723	+ display.modelParams0[1] = g;
	724	+ display.modelParams0[2] = b;
	725	+
	726	+ display.modelParams5[1] = opacity;
	727	+
	728	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 0, display.modelParams0, 0);
	729	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 5, display.modelParams5, 0);
	730	+
	731	+ gl.glMatrixMode(gl.GL_MODELVIEW);
	732	+
	733	+// System.err.println("total = " + v/3 + "; displayed = " + count);
	734	+ if (true)
	735	+ return;
	736	+
	737	+//// if (!tris.predraw(this))
	738	+//// {
	739	+//// return;
	740	+//// }
	741	+//// if (Debug.stats)
	742	+//// {
	743	+//// StatCollector.addStat(StatType.STAT_TRIANGLE_COUNT, tris.getTriangleCount());
	744	+//// StatCollector.addStat(StatType.STAT_VERTEX_COUNT, tris.getVertexCount());
	745	+//// StatCollector.addStat(StatType.STAT_GEOM_COUNT, 1);
	746	+//// }
	747	+////
	748	+//// if (tris.getDisplayListID() != -1)
	749	+//// {
	750	+//// renderDisplayList(tris);
	751	+//// return;
	752	+//// }
	753	+////
	754	+//// if (!generatingDisplayList)
	755	+//// {
	756	+//// applyStates(tris.states, tris);
	757	+//// }
	758	+//// if (Debug.stats)
	759	+//// {
	760	+//// StatCollector.startStat(StatType.STAT_RENDER_TIMER);
	761	+//// }
	762	+//// boolean transformed = doTransforms(tris);
	763	+//
	764	+// int glMode = GL.GL_TRIANGLES;
	765	+// switch (getMode())
	766	+// {
	767	+// case Triangles:
	768	+// glMode = GL.GL_TRIANGLES;
	769	+// break;
	770	+// case Strip:
	771	+// glMode = GL.GL_TRIANGLE_STRIP;
	772	+// break;
	773	+// case Fan:
	774	+// glMode = GL.GL_TRIANGLE_FAN;
	775	+// break;
	776	+// }
	777	+//
	778	+// if (!predrawGeometry(gl))
	779	+// {
	780	+// // make sure only the necessary indices are sent through on old
	781	+// // cards.
	782	+// IntBuffer indices = this.getIndexBuffer();
	783	+// if (indices == null)
	784	+// {
	785	+// logger.severe("missing indices on geometry object: " + this.toString());
	786	+// } else
	787	+// {
	788	+// indices.rewind();
	789	+// indices.limit(this.getMaxIndex());
	790	+//
	791	+// gl.glDrawElements(glMode, indices.limit(), GL.GL_UNSIGNED_INT, indices); // TODO Check <count> and assumed <type> of GL_UNSIGNED_INT
	792	+//
	793	+// indices.clear();
	794	+// }
	795	+// } else
	796	+// {
	797	+// gl.glDrawElements(glMode, this.getIndexBuffer().limit(),
	798	+// GL.GL_UNSIGNED_INT, 0);
	799	+// }
	800	+//
	801	+//// postdrawGeometry(tris);
	802	+//// if (transformed)
	803	+//// {
	804	+//// undoTransforms(tris);
	805	+//// }
	806	+////
	807	+//// if (Debug.stats)
	808	+//// {
	809	+//// StatCollector.endStat(StatType.STAT_RENDER_TIMER);
	810	+//// }
	811	+//// tris.postdraw(this);
	812	+ }
	813	+
	814	+ static Camera localcamera = new Camera();
	815	+ static cVector from = new cVector();
	816	+ static cVector to = new cVector();
	817	+
	818	+ public void PrepOcclusion(BoundaryRep br, double[][] transform)
	819	+ {
	820	+ CameraPane cp = this;
	821	+
	822	+ Camera keep = cp.RenderCamera();
	823	+ cp.renderCamera = localcamera;
	824	+
	825	+ if (br.trimmed)
	826	+ {
	827	+ float[] colors = new float[br.positions.length / 3];
	828	+
	829	+ int i3 = 0;
	830	+ for (int i = 0; i < br.positions.length / 3; i++, i3 += 3)
	831	+ {
	832	+ if (br.normals[i3] == 0 && br.normals[i3+1] == 0 && br.normals[i3+2] == 0)
	833	+ continue;
	834	+
	835	+ from.set(br.positions[i3], br.positions[i3 + 1], br.positions[i3 + 2]);
	836	+ to.set(br.positions[i3] + br.normals[i3],
	837	+ br.positions[i3 + 1] + br.normals[i3 + 1],
	838	+ br.positions[i3 + 2] + br.normals[i3 + 2]);
	839	+ LA.xformPos(from, transform, from);
	840	+ LA.xformPos(to, transform, to); // RIGID ONLY
	841	+ localcamera.setAim(from, to);
	842	+
	843	+ CameraPane.occlusionbuffer.display();
	844	+
	845	+ if (CameraPane.DEBUG_OCCLUSION)
	846	+ cp.display(); // debug
	847	+
	848	+ colors[i] = cp.vertexOcclusion.r;
	849	+ //colors[i3 + 1] = cp.vertexOcclusion.g;
	850	+ //colors[i3 + 2] = cp.vertexOcclusion.b;
	851	+
	852	+ if ((i % 100) == 0 && i != 0)
	853	+ {
	854	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	855	+ //System.out.println("Color = " + cp.vertexOcclusion.r + ", " + cp.vertexOcclusion.g + ", " + cp.vertexOcclusion.b + "; " + (int)(100.0*i/(positions.length/3)) + "% done");
	856	+ System.out.println((int) (100.0 * i / (br.positions.length / 3)) + "% (" + i + " of " + (br.positions.length / 3) + ")");
	857	+ }
	858	+ }
	859	+
	860	+ br.colors = colors;
	861	+ }
	862	+ else
	863	+ {
	864	+ for (int i = 0; i < br.VertexCount(); i++)
	865	+ {
	866	+ Vertex v = br.GetVertex(i);
	867	+
	868	+ if (v.norm == null \|\| v.norm.x == 0 && v.norm.y == 0 && v.norm.z == 0)
	869	+ continue;
	870	+
	871	+ from.set(v.x, v.y, v.z);
	872	+ to.set(v.x+v.norm.x, v.y+v.norm.y, v.z+v.norm.z);
	873	+ LA.xformPos(from, transform, from);
	874	+ LA.xformPos(to, transform, to); // RIGID ONLY
	875	+ localcamera.setAim(from, to);
	876	+
	877	+ CameraPane.occlusionbuffer.display();
	878	+
	879	+ if (CameraPane.DEBUG_OCCLUSION)
	880	+ cp.display(); // debug
	881	+
	882	+ v.AO = cp.vertexOcclusion.r;
	883	+
	884	+ if ((i % 100) == 0 && i != 0)
	885	+ {
	886	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	887	+ //System.out.println("Color = " + cp.vertexOcclusion.r + ", " + cp.vertexOcclusion.g + ", " + cp.vertexOcclusion.b + "; " + (int)(100.0*i/(positions.length/3)) + "% done");
	888	+ System.out.println((int) (100.0 * i / br.VertexCount()) + "% (" + i + " of " + br.VertexCount() + ")");
	889	+ }
	890	+ }
	891	+ }
	892	+
	893	+ //System.out.println("done.");
	894	+
	895	+ cp.renderCamera = keep;
	896	+ }
	897	+
	898	+ void DrawPointFLow(PointFlow pointFlow, Object3D /Composite/ root, boolean selected, boolean blocked)
	899	+ {
	900	+ CameraPane display = this;
	901	+ pointFlow.CreateHT();
	902	+
	903	+ float r = display.modelParams0[0];
	904	+ float g = display.modelParams0[1];
	905	+ float b = display.modelParams0[2];
	906	+ float opacity = display.modelParams5[1];
	907	+
	908	+ //final GL gl = GLU.getCurrentGL();
	909	+ GL gl = display.GetGL(); // getGL();
	910	+
	911	+ int s = pointFlow.points.size();
	912	+
	913	+ boolean cf = gl.glIsEnabled(gl.GL_CULL_FACE);
	914	+ gl.glEnable(gl.GL_CULL_FACE);
	915	+
	916	+ for (int i=s; --i>=0;)
	917	+ //for (int i=0; i<s; i++)
	918	+ {
	919	+ cVector v = pointFlow.points.get(i);
	920	+
	921	+ double mindist = Double.MAX_VALUE;
	922	+
	923	+ double size = pointFlow.minimumSize;
	924	+
	925	+ double distancenext = 0;
	926	+
	927	+ if (i > 0)
	928	+ {
	929	+ cVector w = pointFlow.points.get(i-1);
	930	+
	931	+ double dist = w.distance(v);
	932	+
	933	+ distancenext = dist;
	934	+
	935	+ if (mindist > dist)
	936	+ {
	937	+ mindist = dist;
	938	+ size = mindist*pointFlow.resizefactor;
	939	+ }
	940	+ }
	941	+
	942	+ if (i < s-1)
	943	+ {
	944	+ cVector w = pointFlow.points.get(i+1);
	945	+
	946	+ double dist = w.distance(v);
	947	+
	948	+ if (mindist > dist)
	949	+ {
	950	+ mindist = dist;
	951	+ size = mindist*pointFlow.resizefactor;
	952	+ }
	953	+ }
	954	+
	955	+ if (size < pointFlow.minimumSize)
	956	+ size = pointFlow.minimumSize;
	957	+ if (size > pointFlow.maximumSize)
	958	+ size = pointFlow.maximumSize;
	959	+
	960	+ double tx = v.x;
	961	+ double ty = v.y;
	962	+ double tz = v.z;
	963	+
	964	+ // if (tx == 0 && ty == 0 && tz == 0)
	965	+ // continue;
	966	+
	967	+ gl.glMatrixMode(gl.GL_TEXTURE);
	968	+ gl.glPushMatrix();
	969	+ pointFlow.texmat[12] = pointFlow.texmat[13] = pointFlow.texmat[14] = i;
	970	+
	971	+ gl.glMultMatrixf(pointFlow.texmat, 0);
	972	+
	973	+ gl.glMatrixMode(gl.GL_MODELVIEW);
	974	+ gl.glPushMatrix();
	975	+
	976	+ gl.glTranslated(tx,ty,tz);
	977	+
	978	+ gl.glScaled(size,size,size);
	979	+
	980	+// float cr = colorBuf.get(index4);
	981	+// float cg = colorBuf.get(index4+1);
	982	+// float cb = colorBuf.get(index4+2);
	983	+// float ca = colorBuf.get(index4+3);
	984	+//
	985	+// display.modelParams0[0] = r * cr;
	986	+// display.modelParams0[1] = g * cg;
	987	+// display.modelParams0[2] = b * cb;
	988	+//
	989	+// display.modelParams5[1] = opacity * ca;
	990	+//
	991	+// gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 0, display.modelParams0, 0);
	992	+// gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 5, display.modelParams5, 0);
	993	+//
	994	+// RandomNode.globalseed = (int)sizeBuf.get(index3+2); // i;
	995	+// RandomNode.globalseed2 = RandomNode.globalseed;
	996	+//
	997	+//// gl.glColor4f(cr,cg,cb,ca);
	998	+// // gl.glScalef(1024/16,1024/16,1024/16);
	999	+ pointFlow.geo.Draw/Node/(display,null,selected, blocked);
	1000	+
	1001	+ gl.glPopMatrix();
	1002	+
	1003	+ double step = size/4; //
	1004	+
	1005	+ if (i == 0 \|\| size == 0 \|\| distancenext > 8*size \|\| distancenext < step)
	1006	+ continue;
	1007	+
	1008	+ int nbsteps = (int)(distancenext/step);
	1009	+
	1010	+ step = distancenext/nbsteps;
	1011	+
	1012	+ cVector next = pointFlow.points.get(i-1);
	1013	+
	1014	+ tmp.set(next);
	1015	+ tmp.sub(v);
	1016	+ tmp.normalize();
	1017	+ tmp.mul(step);
	1018	+
	1019	+ // calculate next size
	1020	+ mindist = Double.MAX_VALUE;
	1021	+
	1022	+ double nextsize = pointFlow.minimumSize;
	1023	+
	1024	+ if (i > 1)
	1025	+ {
	1026	+ cVector w = pointFlow.points.get(i-2);
	1027	+
	1028	+ double dist = w.distance(next);
	1029	+
	1030	+ if (mindist > dist)
	1031	+ {
	1032	+ mindist = dist;
	1033	+ nextsize = mindist*pointFlow.resizefactor;
	1034	+ }
	1035	+ }
	1036	+
	1037	+ double dist = v.distance(next);
	1038	+
	1039	+ if (mindist > dist)
	1040	+ {
	1041	+ mindist = dist;
	1042	+ nextsize = mindist*pointFlow.resizefactor;
	1043	+ }
	1044	+
	1045	+ if (nextsize < pointFlow.minimumSize)
	1046	+ nextsize = pointFlow.minimumSize;
	1047	+ if (nextsize > pointFlow.maximumSize)
	1048	+ nextsize = pointFlow.maximumSize;
	1049	+ //
	1050	+
	1051	+ double count = 0;
	1052	+
	1053	+ while (distancenext > 0.000000001) // step
	1054	+ {
	1055	+ gl.glPushMatrix();
	1056	+
	1057	+ gl.glTranslated(tx + tmp.xcount, ty + tmp.ycount, tz + tmp.z*count);
	1058	+
	1059	+ double K = count/nbsteps;
	1060	+
	1061	+ double intersize = Knextsize + (1-K)size;
	1062	+
	1063	+ gl.glScaled(intersize,intersize,intersize);
	1064	+
	1065	+ pointFlow.geo.Draw/Node/(display,null,selected,blocked);
	1066	+
	1067	+ count++;
	1068	+
	1069	+ distancenext -= step;
	1070	+
	1071	+ gl.glPopMatrix();
	1072	+ }
	1073	+
	1074	+ if (count != nbsteps)
	1075	+ assert(count == nbsteps);
	1076	+
	1077	+ // gl.glScalef(16.0f/1024,16.0f/1024,16.0f/1024);
	1078	+ //gl.glTranslatef(-tx,-ty,-tz);
	1079	+
	1080	+ gl.glMatrixMode(gl.GL_TEXTURE);
	1081	+ gl.glPopMatrix();
	1082	+ }
	1083	+
	1084	+ if (!cf)
	1085	+ gl.glDisable(gl.GL_CULL_FACE);
	1086	+
	1087	+// display.modelParams0[0] = r;
	1088	+// display.modelParams0[1] = g;
	1089	+// display.modelParams0[2] = b;
	1090	+//
	1091	+// display.modelParams5[1] = opacity;
	1092	+//
	1093	+// gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 0, display.modelParams0, 0);
	1094	+// gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 5, display.modelParams5, 0);
	1095	+
	1096	+ gl.glMatrixMode(gl.GL_MODELVIEW);
	1097	+ }
	1098	+
	1099	+ public void DrawBox(cVector min, cVector max)
	1100	+ {
	1101	+ javax.media.opengl.GL gl = GetGL();
	1102	+ gl.glBegin(gl.GL_LINES);
	1103	+
	1104	+ gl.glVertex3d(min.x, min.y, min.z);
	1105	+ gl.glVertex3d(min.x, min.y, max.z);
	1106	+ gl.glVertex3d(min.x, min.y, min.z);
	1107	+ gl.glVertex3d(min.x, max.y, min.z);
	1108	+ gl.glVertex3d(min.x, min.y, min.z);
	1109	+ gl.glVertex3d(max.x, min.y, min.z);
	1110	+
	1111	+ gl.glVertex3d(max.x, max.y, max.z);
	1112	+ gl.glVertex3d(min.x, max.y, max.z);
	1113	+ gl.glVertex3d(max.x, max.y, max.z);
	1114	+ gl.glVertex3d(max.x, min.y, max.z);
	1115	+ gl.glVertex3d(max.x, max.y, max.z);
	1116	+ gl.glVertex3d(max.x, max.y, min.z);
	1117	+
	1118	+ gl.glEnd();
	1119	+ }
	1120	+
	1121	+ public void DrawGeometry(BoundaryRep bRep, boolean flipV, boolean selectmode)
	1122	+ {
	1123	+ int[] strips = bRep.getRawIndices();
	1124	+
	1125	+ javax.media.opengl.GL gl = GetGL();
	1126	+
	1127	+ // TRIANGLE STRIP ARRAY
	1128	+ if (bRep.trimmed)
	1129	+ {
	1130	+ float[] v = bRep.getRawVertices();
	1131	+ float[] n = bRep.getRawNormals();
	1132	+ float[] c = bRep.getRawColors();
	1133	+ float[] uv = bRep.getRawUVMap();
	1134	+
	1135	+ int count2 = 0;
	1136	+ int count3 = 0;
	1137	+
	1138	+ if (n.length > 0)
	1139	+ {
	1140	+ for (int i = 0; i < strips.length; i++)
	1141	+ {
	1142	+ gl.glBegin(gl.GL_TRIANGLE_STRIP);
	1143	+
	1144	+ /*
	1145	+ boolean locked = false;
	1146	+ float eps = 0.1f;
	1147	+ boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
	1148	+
	1149	+ int dot = 0;
	1150	+
	1151	+ if ((dot&1) == 0)
	1152	+ dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
	1153	+
	1154	+ if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
	1155	+ gl.glTexCoord2f((float) qv.s, (float) qv.t);
	1156	+ else
	1157	+ {
	1158	+ locked = true;
	1159	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	1160	+ }
	1161	+ //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
	1162	+ gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
	1163	+ if (hasnorm)
	1164	+ {
	1165	+ //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
	1166	+ gl.glNormal3f((float) rv.norm.x, (float) rv.norm.y, (float) rv.norm.z);
	1167	+ }
	1168	+
	1169	+ if ((dot&4) == 0)
	1170	+ dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
	1171	+
	1172	+ if (wrap \|\| !locked && (dot&8) != 0)
	1173	+ gl.glTexCoord2f((float) rv.s, (float) rv.t);
	1174	+ else
	1175	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	1176	+
	1177	+ f.dot = dot;
	1178	+ */
	1179	+
	1180	+ if (!selectmode)
	1181	+ {
	1182	+ if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
	1183	+ {
	1184	+ gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1185	+ } else
	1186	+ {
	1187	+ gl.glNormal3f(0, 0, 1);
	1188	+ }
	1189	+
	1190	+ if (c != null)
	1191	+ //System.out.println("glcolor = " + c[count3] + ", " + c[count3+1] + ", " + c[count3+2]);
	1192	+ {
	1193	+ gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
	1194	+ }
	1195	+ }
	1196	+
	1197	+ if (flipV)
	1198	+ gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
	1199	+ else
	1200	+ gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1201	+
	1202	+ //System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
	1203	+ gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1204	+
	1205	+ count2 += 2;
	1206	+ count3 += 3;
	1207	+ if (!selectmode)
	1208	+ {
	1209	+ if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
	1210	+ {
	1211	+ gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1212	+ } else
	1213	+ {
	1214	+ gl.glNormal3f(0, 0, 1);
	1215	+ }
	1216	+ if (c != null)
	1217	+ {
	1218	+ gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
	1219	+ }
	1220	+ }
	1221	+
	1222	+ if (flipV)
	1223	+ gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
	1224	+ else
	1225	+ gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1226	+
	1227	+ //System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
	1228	+ gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1229	+
	1230	+ count2 += 2;
	1231	+ count3 += 3;
	1232	+ for (int j = 0; j < strips[i] - 2; j++)
	1233	+ {
	1234	+ //gl.glTexCoord2d(...);
	1235	+ if (!selectmode)
	1236	+ {
	1237	+ if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
	1238	+ {
	1239	+ gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1240	+ } else
	1241	+ {
	1242	+ gl.glNormal3f(0, 0, 1);
	1243	+ }
	1244	+ if (c != null)
	1245	+ {
	1246	+ gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
	1247	+ }
	1248	+ }
	1249	+
	1250	+ if (flipV)
	1251	+ gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
	1252	+ else
	1253	+ gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1254	+
	1255	+ //System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
	1256	+ gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1257	+
	1258	+ count2 += 2;
	1259	+ count3 += 3;
	1260	+ }
	1261	+
	1262	+ gl.glEnd();
	1263	+ }
	1264	+ }
	1265	+
	1266	+ assert count3 == v.length;
	1267	+ }
	1268	+ else // !trimmed
	1269	+ {
	1270	+ int count = 0;
	1271	+ for (int i = 0; i < strips.length; i++)
	1272	+ {
	1273	+ gl.glBegin(gl.GL_TRIANGLE_STRIP);
	1274	+
	1275	+ Vertex p = bRep.GetVertex(bRep.indices[count++]);
	1276	+ Vertex q = bRep.GetVertex(bRep.indices[count++]);
	1277	+
	1278	+ drawVertex(gl, p, flipV, selectmode);
	1279	+ drawVertex(gl, q, flipV, selectmode);
	1280	+
	1281	+ for (int j = 0; j < strips[i] - 2; j++)
	1282	+ {
	1283	+ Vertex r = bRep.GetVertex(bRep.indices[count++]);
	1284	+
	1285	+ // if (j%2 == 0)
	1286	+ // drawFace(p, q, r, display, null);
	1287	+ // else
	1288	+ // drawFace(p, r, q, display, null);
	1289	+
	1290	+ // p = q;
	1291	+ // q = r;
	1292	+ drawVertex(gl, r, flipV, selectmode);
	1293	+ }
	1294	+
	1295	+ gl.glEnd();
	1296	+ }
	1297	+ }
	1298	+ }
	1299	+
	1300	+ static cSpring.Point3D temp = new cSpring.Point3D();
	1301	+ static cSpring.Point3D temp2 = new cSpring.Point3D();
	1302	+ static cSpring.Point3D temp3 = new cSpring.Point3D();
	1303	+
	1304	+ public void DrawDynamicMesh(cMesh mesh)
	1305	+ {
	1306	+ GL gl = GetGL(); // getGL();
	1307	+
	1308	+ cSpring.PhysicsController3D Phys = mesh.Phys;
	1309	+
	1310	+ gl.glDisable(gl.GL_LIGHTING);
	1311	+
	1312	+ gl.glLineWidth(1);
	1313	+ gl.glColor3f(1,1,1);
	1314	+ gl.glBegin(gl.GL_LINES);
	1315	+ double scale = 0;
	1316	+ int count = 0;
	1317	+ for (int s=0; s<Phys.allSprings.size(); s++)
	1318	+ {
	1319	+ cSpring.Spring spring = Phys.allSprings.get(s);
	1320	+ if(s == 0)
	1321	+ {
	1322	+ //System.out.println(" spring : " + spring.a.position + "; " + spring.b.position);
	1323	+ }
	1324	+ if (mesh.showsprings)
	1325	+ {
	1326	+ temp.set(spring.a.position);
	1327	+ temp.add(spring.b.position);
	1328	+ temp.mul(0.5);
	1329	+ temp2.set(spring.a.position);
	1330	+ temp2.sub(spring.b.position);
	1331	+ temp2.mul(spring.restLength/2);
	1332	+ temp.sub(temp2);
	1333	+ gl.glVertex3f((float)temp.x, (float)temp.y, (float)temp.z);
	1334	+ temp.add(temp2);
	1335	+ temp.add(temp2);
	1336	+ gl.glVertex3f((float)temp.x, (float)temp.y, (float)temp.z);
	1337	+ }
	1338	+
	1339	+ if (spring.isHandle)
	1340	+ continue;
	1341	+
	1342	+ //if (scale < spring.restLength)
	1343	+ scale += spring.restLength;
	1344	+ count++;
	1345	+ }
	1346	+ gl.glEnd();
	1347	+
	1348	+ if (count == 0)
	1349	+ scale = 0.01;
	1350	+ else
	1351	+ scale /= count * 3;
	1352	+
	1353	+ //scale = 0.25;
	1354	+
	1355	+ if (mesh.ShowInfo())
	1356	+ {
	1357	+ gl.glLineWidth(4);
	1358	+ for (int s=0; s<Phys.allNodes.size(); s++)
	1359	+ {
	1360	+ cSpring.DynamicNode node = Phys.allNodes.get(s);
	1361	+ if (node.mass == 0)
	1362	+ continue;
	1363	+
	1364	+ int i = node.springs==null?-1:node.springs.size();
	1365	+ gl.glColor3f((i>>2)&1,(i>>1)&1,i&1);
	1366	+ //temp.set(node.springForce.x, node.springForce.y, node.springForce.z);
	1367	+ //temp.normalize();
	1368	+ //gl.glColor3d((temp.x+1)/2, (temp.y+1)/2, (temp.z+1)/2);
	1369	+ gl.glBegin(gl.GL_LINES);
	1370	+ gl.glVertex3d(node.position.x, node.position.y, node.position.z);
	1371	+ //gl.glVertex3d(node.position.x + node.normal.xscale, node.position.y + node.normal.yscale, node.position.z + node.normal.z*scale);
	1372	+ gl.glVertex3d(node.position.x + mesh.bRep.GetVertex(s).norm.x*scale,
	1373	+ node.position.y + mesh.bRep.GetVertex(s).norm.y*scale,
	1374	+ node.position.z + mesh.bRep.GetVertex(s).norm.z*scale);
	1375	+ gl.glEnd();
	1376	+ }
	1377	+
	1378	+ gl.glLineWidth(8);
	1379	+ for (int s=0; s<Phys.allNodes.size(); s++)
	1380	+ {
	1381	+ cSpring.DynamicNode node = Phys.allNodes.get(s);
	1382	+
	1383	+ if (node.springs != null)
	1384	+ {
	1385	+ for (int i=0; i<node.springs.size(); i+=1)
	1386	+ {
	1387	+ cSpring.DynamicNode f = node.springs.get(i).GetOther(node);
	1388	+
	1389	+ int c = i+1;
	1390	+ // c = node.springs.get(i).nbcopies;
	1391	+
	1392	+ gl.glColor3f((c>>2)&1,(c>>1)&1,c&1);
	1393	+ gl.glBegin(gl.GL_LINES);
	1394	+ gl.glVertex3d(node.position.x, node.position.y, node.position.z);
	1395	+ 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);
	1396	+ gl.glEnd();
	1397	+ }
	1398	+ }
	1399	+ }
	1400	+
	1401	+ gl.glLineWidth(1);
	1402	+ }
	1403	+
	1404	+ gl.glEnable(gl.GL_LIGHTING);
	1405	+ }
	1406	+
	1407	+ /// INTERFACE
	1408	+
	1409	+ public void StartTriangles()
	1410	+ {
	1411	+ javax.media.opengl.GL gl = GetGL();
	1412	+ gl.glBegin(gl.GL_TRIANGLES);
	1413	+ }
	1414	+
	1415	+ public void EndTriangles()
	1416	+ {
	1417	+ GetGL().glEnd();
	1418	+ }
	1419	+
	1420	+ void drawVertex(javax.media.opengl.GL gl, Vertex pv, boolean flipV, boolean selectmode)
	1421	+ {
	1422	+ if (!selectmode)
	1423	+ {
	1424	+ gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
	1425	+ gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
	1426	+
	1427	+ if (flipV)
	1428	+ gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
	1429	+ else
	1430	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	1431	+ }
	1432	+
	1433	+ gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
	1434	+ }
	1435	+
	1436	+ void SetColor(Object3D obj, Vertex p0)
	1437	+ {
	1438	+ CameraPane display = this;
	1439	+ BoundaryRep bRep = obj.bRep;
	1440	+
	1441	+ if (RENDERPROGRAM == 0)
	1442	+ {
	1443	+ float r = 0;
	1444	+ if (bRep != null)
	1445	+ {
	1446	+ if (bRep.stripified)
	1447	+ {
	1448	+ r = 1;
	1449	+ }
	1450	+ }
	1451	+ float g = 0;
	1452	+ if (bRep != null)
	1453	+ {
	1454	+ if (bRep.trimmed)
	1455	+ {
	1456	+ g = 1;
	1457	+ }
	1458	+ }
	1459	+ float b = 0;
	1460	+ if (obj.support != null && obj.link2master)
	1461	+ {
	1462	+ b = 1;
	1463	+ }
	1464	+ display.GetGL().glColor3f(rp0.AO, gp0.AO, b*p0.AO);
	1465	+ return;
	1466	+ }
	1467	+
	1468	+ if (display.DrawMode() != CameraPane.SHADOW)
	1469	+ return;
	1470	+
	1471	+ javax.media.opengl.GL gl = display.GetGL();
	1472	+// if (true) return;
	1473	+// float ao = p.AO;
	1474	+//
	1475	+// // if (ao == 0 && !bRep.AOdone) // transient problem!
	1476	+// // ao = 1;
	1477	+//
	1478	+// gl.glColor4f(ao, ao, ao, 1);
	1479	+
	1480	+// CameraPane.selectedpoint.
	1481	+// getAverage(cStatic.point1, true);
	1482	+ if (CameraPane.pointflow == null) // !random) // live)
	1483	+ {
	1484	+ return;
	1485	+ }
	1486	+
	1487	+ cStatic.point1.set(0,0,0);
	1488	+ LA.xformPos(cStatic.point1, CameraPane.selectedpoint.toParent, cStatic.point1);
	1489	+
	1490	+ cStatic.point1.sub(p0);
	1491	+
	1492	+
	1493	+// if (marked && (p0.vertexlinks == null \|\| support == null \|\| support.bRep == null)) // no position delta?
	1494	+// {
	1495	+// return;
	1496	+// }
	1497	+
	1498	+ //if (true)
	1499	+ if (cStatic.point1.dot(cStatic.point1) > 0.000001)
	1500	+ {
	1501	+ return;
	1502	+ }
	1503	+
	1504	+ float[] colorV = new float[3];
	1505	+
	1506	+ if (false) // marked)
	1507	+ {
	1508	+ // debug rigging weights
	1509	+ for (int object = 0; object < p0.vertexlinks.length; object++)
	1510	+ {
	1511	+ float weight = p0.weights[object] / p0.totalweight;
	1512	+
	1513	+ // if (weight < 0.1)
	1514	+ // {
	1515	+ // assert(weight == 0);
	1516	+ // continue;
	1517	+ // }
	1518	+
	1519	+ if (p0.vertexlinks[object] == -1)
	1520	+ continue;
	1521	+
	1522	+ Vertex q = obj.support.bRep.GetVertex(p0.vertexlinks[object]);
	1523	+
	1524	+ int color = //1 << object; //
	1525	+ //p.vertexlinks.length;
	1526	+ obj.support.bRep.supports[p0.closestsupport].links[object];
	1527	+ colorV[2] += (color & 1) * weight;
	1528	+ colorV[1] += ((color & 2) >> 1) * weight;
	1529	+ colorV[0] += ((color & 4) >> 2) * weight;
	1530	+ }
	1531	+ }
	1532	+ else
	1533	+ {
	1534	+ if (obj.drawingstarted)
	1535	+ {
	1536	+ // find next point
	1537	+ if (bRep.GetVertex(0).faceindices == null)
	1538	+ {
	1539	+ bRep.InitFaceIndices();
	1540	+ }
	1541	+
	1542	+ double ymin = p0.y;
	1543	+
	1544	+ Vertex newp = p0;
	1545	+
	1546	+ for (int fii = 0; fii < p0.faceindices.length; fii++)
	1547	+ {
	1548	+ int fi = p0.faceindices[fii];
	1549	+
	1550	+ if (fi == -1)
	1551	+ break;
	1552	+
	1553	+ Face f = bRep.GetFace(fi);
	1554	+
	1555	+ Vertex p = bRep.GetVertex(f.p);
	1556	+ Vertex q = bRep.GetVertex(f.q);
	1557	+ Vertex r = bRep.GetVertex(f.r);
	1558	+
	1559	+ int swap = (int)(Math.random()*3);
	1560	+
	1561	+// for (int s=swap; --s>=0;)
	1562	+// {
	1563	+// Vertex t = p;
	1564	+// p = q;
	1565	+// q = r;
	1566	+// r = t;
	1567	+// }
	1568	+ if (ymin > p.y)
	1569	+ {
	1570	+ ymin = p.y;
	1571	+ newp = p;
	1572	+// break;
	1573	+ }
	1574	+ if (ymin > q.y)
	1575	+ {
	1576	+ ymin = q.y;
	1577	+ newp = q;
	1578	+// break;
	1579	+ }
	1580	+ if (ymin > r.y)
	1581	+ {
	1582	+ ymin = r.y;
	1583	+ newp = r;
	1584	+// break;
	1585	+ }
	1586	+ }
	1587	+
	1588	+ CameraPane.selectedpoint.toParent[3][0] = newp.x;
	1589	+ CameraPane.selectedpoint.toParent[3][1] = newp.y;
	1590	+ CameraPane.selectedpoint.toParent[3][2] = newp.z;
	1591	+
	1592	+ obj.drawingstarted = false;
	1593	+
	1594	+ // return;
	1595	+ }
	1596	+
	1597	+ if (false) // CameraPane.DRAW
	1598	+ {
	1599	+ p0.AO = colorV[0] = 2;
	1600	+ colorV[1] = 2;
	1601	+ colorV[2] = 2;
	1602	+ }
	1603	+
	1604	+ CameraPane.pointflow.add(p0);
	1605	+ CameraPane.pointflow.Touch();
	1606	+ }
	1607	+
	1608	+// gl.glColor3f(colorV[0], colorV[1], colorV[2]);
	1609	+// gl.glMaterialfv(gl.GL_FRONT, gl.GL_DIFFUSE, colorV, 0);
	1610	+// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
	1611	+ }
	1612	+
	1613	+ void DrawMaterial(cMaterial material, boolean selected, Object3D.cVector2[] others)
	1614	+ {
	1615	+ CameraPane display = this;
	1616	+ //new Exception().printStackTrace();
	1617	+
	1618	+ if (display.IsFrozen() && !selected \|\| display.IsAmbientOcclusionOn()) // \|\| display.drawMode == display.SHADOW)
	1619	+ {
	1620	+ return;
	1621	+ }
	1622	+
	1623	+ javax.media.opengl.GL gl = display.GetGL();
	1624	+
	1625	+ //Color col = Color.getHSBColor(color,modulation,1);
	1626	+ //col.getColorComponents(ColorSpace.getInstance(ColorSpace.CS_LINEAR_RGB), CameraPane.modelParams0);
	1627	+ if (!material.multiply)
	1628	+ {
	1629	+ display.color = material.color;
	1630	+ display.saturation = material.modulation;
	1631	+ }
	1632	+ else
	1633	+ {
	1634	+ display.color = material.color2;
	1635	+ display.saturation = material.modulation2;
	1636	+ }
	1637	+
	1638	+ cColor.HSBtoRGB(display.color, display.saturation, 1, display.modelParams0);
	1639	+
	1640	+ float[] colorV = Grafreed.colorV;
	1641	+
	1642	+ /**/
	1643	+ if (display.DrawMode() == display.DEFAULT) // && display.RENDERPROGRAM == 0)
	1644	+ {
	1645	+ colorV[0] = display.modelParams0[0] * material.diffuse;
	1646	+ colorV[1] = display.modelParams0[1] * material.diffuse;
	1647	+ colorV[2] = display.modelParams0[2] * material.diffuse;
	1648	+ colorV[3] = 1; // material.opacity;
	1649	+
	1650	+ gl.glColor4f(colorV[0], colorV[1], colorV[2], material.opacity);
	1651	+ //System.out.println("Opacity = " + opacity);
	1652	+
	1653	+ gl.glMaterialfv(gl.GL_FRONT, gl.GL_DIFFUSE, colorV, 0);
	1654	+ //color[0] /= 2; color[1] /= 2; color[2] /= 2;
	1655	+ gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
	1656	+
	1657	+ float amb = material.ambient;
	1658	+ if (amb < material.cameralight)
	1659	+ {
	1660	+ amb = material.cameralight;
	1661	+ }
	1662	+ colorV[0] = display.modelParams0[0] * material.diffuse * amb;
	1663	+ colorV[1] = display.modelParams0[1] * material.diffuse * amb;
	1664	+ colorV[2] = display.modelParams0[2] * material.diffuse * amb;
	1665	+ gl.glMaterialfv(gl.GL_FRONT, gl.GL_AMBIENT, colorV, 0);
	1666	+ //color[0] /= 2; color[1] /= 2; color[2] /= 2;
	1667	+ gl.glMaterialfv(gl.GL_BACK, gl.GL_AMBIENT, colorV, 0);
	1668	+
	1669	+ /**/
	1670	+ colorV[0] = ((1 - material.metalness) + display.modelParams0[0] * material.metalness) * material.specular;
	1671	+ colorV[1] = ((1 - material.metalness) + display.modelParams0[1] * material.metalness) * material.specular;
	1672	+ colorV[2] = ((1 - material.metalness) + display.modelParams0[2] * material.metalness) * material.specular;
	1673	+ gl.glMaterialfv(gl.GL_FRONT, gl.GL_SPECULAR, colorV, 0);
	1674	+ //color[0] /= 2; color[1] /= 2; color[2] /= 2;
	1675	+ gl.glMaterialfv(gl.GL_BACK, gl.GL_SPECULAR, colorV, 0);
	1676	+ colorV[0] = 10 / material.shininess; // 1/0.005f;
	1677	+ //System.out.println("shininess = " + colorV[0]);
	1678	+ if (colorV[0] > 128)
	1679	+ {
	1680	+ colorV[0] = 128;
	1681	+ }
	1682	+ gl.glMaterialfv(gl.GL_FRONT, gl.GL_SHININESS, colorV, 0);
	1683	+ gl.glMaterialfv(gl.GL_BACK, gl.GL_SHININESS, colorV, 0);
	1684	+ /**/
	1685	+ }
	1686	+ /**/
	1687	+
	1688	+ //selected = false;
	1689	+ selected = selected && display.flash;
	1690	+
	1691	+ //display.modelParams0[0] = 0; // pigment.r;
	1692	+ //display.modelParams0[1] = 0; // pigment.g;
	1693	+ //display.modelParams0[2] = 0; // pigment.b;
	1694	+ if (!material.multiply)
	1695	+ {
	1696	+ display.modelParams0[3] = material.metalness;
	1697	+ display.modelParams1[0] = material.diffuse;
	1698	+ display.modelParams1[1] = material.specular;
	1699	+ display.modelParams1[2] = 1 / material.shininess;
	1700	+ display.modelParams1[3] = material.shift;
	1701	+ display.modelParams2[0] = material.ambient;
	1702	+ display.modelParams2[1] = material.lightarea;
	1703	+ //System.out.println("light area = " + lightarea);
	1704	+ display.modelParams2[2] = 1 / material.factor; // diffuseness
	1705	+ display.modelParams2[3] = material.velvet;
	1706	+ display.modelParams3[0] = material.sheen;
	1707	+ display.modelParams3[1] = material.subsurface;
	1708	+ display.modelParams3[2] = material.bump; // backlit
	1709	+ display.modelParams3[3] = material.aniso;
	1710	+ display.modelParams4[0] = material.anisoV;
	1711	+ display.modelParams4[1] = selected ? 100 : material.cameralight;
	1712	+ //System.out.println("selected = " + selected);
	1713	+ display.modelParams4[2] = material.diffuseness;
	1714	+ display.modelParams4[3] = material.shadow;
	1715	+ display.modelParams5[0] = material.texture;
	1716	+ display.modelParams5[1] = material.opacity;
	1717	+ display.modelParams5[2] = material.fakedepth;
	1718	+ display.modelParams5[3] = CameraPane.SHADOWCULLFACE ? 0f : (material.shadowbias - 0.005f) / 10;
	1719	+ }
	1720	+ else
	1721	+ {
	1722	+ display.modelParams0[3] = material.metalness2;
	1723	+ display.modelParams1[0] = material.diffuse2;
	1724	+ display.modelParams1[1] = material.specular2;
	1725	+ display.modelParams1[2] = material.shininess2;
	1726	+ display.modelParams1[3] = material.shift2;
	1727	+ display.modelParams2[0] = material.ambient2;
	1728	+ display.modelParams2[1] = material.lightarea2;
	1729	+ display.modelParams2[2] = material.factor2;
	1730	+ display.modelParams2[3] = material.velvet2;
	1731	+ display.modelParams3[0] = material.sheen2;
	1732	+ display.modelParams3[1] = material.subsurface2;
	1733	+ display.modelParams3[2] = material.bump2;
	1734	+ display.modelParams3[3] = material.aniso2;
	1735	+ display.modelParams4[0] = material.anisoV2;
	1736	+ display.modelParams4[1] = material.cameralight2;
	1737	+ //System.out.println("selected = " + selected);
	1738	+ display.modelParams4[2] = material.diffuseness2;
	1739	+ display.modelParams4[3] = material.shadow2;
	1740	+ display.modelParams5[0] = material.texture2;
	1741	+ display.modelParams5[1] = material.opacity2;
	1742	+ display.modelParams5[2] = material.fakedepth2;
	1743	+ display.modelParams5[3] = material.shadowbias2;
	1744	+ }
	1745	+
	1746	+ display.modelParams6[0] = 0;
	1747	+ display.modelParams6[1] = 0;
	1748	+ display.modelParams6[2] = 0;
	1749	+ display.modelParams6[3] = 0;
	1750	+
	1751	+ display.modelParams7[0] = 0;
	1752	+ display.modelParams7[1] = 1000;
	1753	+ display.modelParams7[2] = 0;
	1754	+ display.modelParams7[3] = 0;
	1755	+
	1756	+ //display.modelParams6[0] = 100; // criss de bug de bump
	1757	+
	1758	+ Object3D.cVector2[] extparams = others; // display.vector2buffer;
	1759	+ if (extparams != null && extparams.length > 0 && extparams[0] != null)
	1760	+ {
	1761	+ display.modelParams6[0] = extparams[0].x / 1000.0f; // bump
	1762	+ display.modelParams6[1] = extparams[0].y / 1000.0f; // noise
	1763	+ if (extparams.length > 1)
	1764	+ {
	1765	+ display.modelParams6[2] = extparams[1].x / 1000.0f; // borderfade
	1766	+ display.modelParams6[3] = extparams[1].y / 1000.0f; // (float)Math.exp(-extparams[1].y / 1000.0f); // fog punchthrough
	1767	+ if (extparams.length > 2)
	1768	+ {
	1769	+ display.modelParams7[0] = extparams[2].x / 1000.0f; // noise power
	1770	+ float x = extparams[2].y / 1000.0f;
	1771	+ //if (x == 0)
	1772	+ // x = 1f;
	1773	+ 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
	1774	+ if (extparams[2].y > 0)
	1775	+ {
	1776	+ //System.out.println("extparams[1].y = " + extparams[1].y);
	1777	+ //System.out.println("extparams[2].y = " + extparams[2].y);
	1778	+ //System.out.println("opacity power = " + display.modelParams7[1]);
	1779	+ }
	1780	+ }
	1781	+ }
	1782	+ }
	1783	+
	1784	+ //if (display.modelParams6[2] != 0)
	1785	+ /*
	1786	+ System.out.println("modelParams0[0] = " + display.modelParams0[0]);
	1787	+ System.out.println("modelParams0[1] = " + display.modelParams0[1]);
	1788	+ System.out.println("modelParams0[2] = " + display.modelParams0[2]);
	1789	+ System.out.println("modelParams0[3] = " + display.modelParams0[3]);
	1790	+ System.out.println("modelParams1[0] = " + display.modelParams1[0]);
	1791	+ System.out.println("modelParams1[1] = " + display.modelParams1[1]);
	1792	+ System.out.println("modelParams1[2] = " + display.modelParams1[2]);
	1793	+ System.out.println("modelParams1[3] = " + display.modelParams1[3]);
	1794	+ System.out.println("modelParams2[0] = " + display.modelParams2[0]);
	1795	+ System.out.println("modelParams2[1] = " + display.modelParams2[1]);
	1796	+ System.out.println("modelParams2[2] = " + display.modelParams2[2]);
	1797	+ System.out.println("modelParams2[3] = " + display.modelParams2[3]);
	1798	+ System.out.println("modelParams3[0] = " + display.modelParams3[0]);
	1799	+ System.out.println("modelParams3[1] = " + display.modelParams3[1]);
	1800	+ System.out.println("modelParams3[2] = " + display.modelParams3[2]);
	1801	+ System.out.println("modelParams3[3] = " + display.modelParams3[3]);
	1802	+ System.out.println("modelParams4[0] = " + display.modelParams4[0]);
	1803	+ System.out.println("modelParams4[1] = " + display.modelParams4[1]);
	1804	+ System.out.println("modelParams4[2] = " + display.modelParams4[2]);
	1805	+ System.out.println("modelParams4[3] = " + display.modelParams4[3]);
	1806	+ System.out.println("modelParams5[0] = " + display.modelParams5[0]);
	1807	+ System.out.println("modelParams5[1] = " + display.modelParams5[1]);
	1808	+ System.out.println("modelParams5[2] = " + display.modelParams5[2]);
	1809	+ System.out.println("modelParams5[3] = " + display.modelParams5[3]);
	1810	+ System.out.println("modelParams6[0] = " + display.modelParams6[0]);
	1811	+ System.out.println("modelParams6[1] = " + display.modelParams6[1]);
	1812	+ System.out.println("modelParams6[2] = " + display.modelParams6[2]);
	1813	+ System.out.println("modelParams6[3] = " + display.modelParams6[3]);
	1814	+ System.out.println("modelParams7[0] = " + display.modelParams7[0]);
	1815	+ System.out.println("modelParams7[1] = " + display.modelParams7[1]);
	1816	+ System.out.println("modelParams7[2] = " + display.modelParams7[2]);
	1817	+ System.out.println("modelParams7[3] = " + display.modelParams7[3]);
	1818	+ /**/
	1819	+ //assert (display.modelParams6[2] == 0);
	1820	+
	1821	+ //System.out.println("noise power = " + display.modelParams7[0]);
	1822	+ //System.out.println("shadowbias = " + shadowbias);
	1823	+
	1824	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 0, display.modelParams0, 0);
	1825	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 1, display.modelParams1, 0);
	1826	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 2, display.modelParams2, 0);
	1827	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 3, display.modelParams3, 0);
	1828	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 4, display.modelParams4, 0);
	1829	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 5, display.modelParams5, 0);
	1830	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 6, display.modelParams6, 0);
	1831	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 7, display.modelParams7, 0);
	1832	+
	1833	+ int mode = display.FP_SHADER;
	1834	+
	1835	+ if (material.aniso != material.anisoV \|\| material.aniso > 0.002)
	1836	+ {
	1837	+ mode \|= display.FP_ANISO;
	1838	+ }
	1839	+
	1840	+ display.EnableProgram(mode);
	1841	+
	1842	+ //System.out.println("opacity power = " + display.modelParams7[1]);
	1843	+
	1844	+ if (!material.multiply)
	1845	+ {
	1846	+ if (Globals.drawMode == CameraPane.SHADOW)
	1847	+ gl.glDepthMask(material.opacity >= 0.9 && display.modelParams7[1] > 0.1);
	1848	+ else
	1849	+ gl.glDepthMask(material.opacity >= 0.99);
	1850	+ }
208	1851	}
209	1852
210	1853	int matrixdepth = 0; // 10000; // CONFLICT WITH cMESH... WARNING WARNING WARNING WARNING WARNING WARNING !!!!!!!!!!!! 0;
..	..	@@ -225,10 +1868,10 @@
225	1868	currentGL.glMultMatrixd(model, 0);
226	1869	}
227	1870
228		- void PushMatrix(double[][] matrix, int count)
	1871	+ public void PushMatrix(double[][] matrix, int count) // INTERFACE
229	1872	{
230	1873	matrixdepth++;
231		- // GraphreeD.tracein(matrix);
	1874	+ // GrafreeD.tracein(matrix);
232	1875	if (matrix == null)
233	1876	return; // Identity
234	1877
..	..	@@ -253,13 +1896,13 @@
253	1896
254	1897	void PushMatrix(double[][] matrix)
255	1898	{
256		- // GraphreeD.tracein(matrix);
257		- PushMatrix(matrix,1);
	1899	+ // GrafreeD.tracein(matrix);
	1900	+ PushMatrix(matrix, 1);
258	1901	}
259	1902
260	1903	void PushMatrix()
261	1904	{
262		- // GraphreeD.tracein(null);
	1905	+ // GrafreeD.tracein(null);
263	1906	if (matrixdepth++ < MAXSTACK - 1)
264	1907	{
265	1908	currentGL.glPushMatrix();
..	..	@@ -270,11 +1913,11 @@
270	1913
271	1914	double[][] tmpmat = new double[4][4];
272	1915
273		- void PopMatrix(double[][] inverse)
	1916	+ public void PopMatrix(double[][] inverse) // INTERFACE
274	1917	{
275	1918	--matrixdepth;
276	1919
277		- // GraphreeD.traceout(inverse);
	1920	+ // GrafreeD.traceout(inverse);
278	1921	if (inverse == null)
279	1922	return; // Identity
280	1923
..	..	@@ -292,7 +1935,7 @@
292	1935
293	1936	void PopMatrix()
294	1937	{
295		- // GraphreeD.traceout(null);
	1938	+ // GrafreeD.traceout(null);
296	1939	// inverse == null??
297	1940	if (--matrixdepth < MAXSTACK - 1)
298	1941	{
..	..	@@ -310,7 +1953,7 @@
310	1953	PushTextureMatrix(matrix, 1);
311	1954	}
312	1955
313		- void PushTextureMatrix(double[][] matrix, int count)
	1956	+ public void PushTextureMatrix(double[][] matrix, int count) // INTERFACE
314	1957	{
315	1958	currentGL.glActiveTexture(GetGL().GL_TEXTURE0);
316	1959
..	..	@@ -324,7 +1967,7 @@
324	1967	currentGL.glMatrixMode(GetGL().GL_MODELVIEW);
325	1968	}
326	1969
327		- void PopTextureMatrix(double[][] inverse)
	1970	+ public void PopTextureMatrix(double[][] inverse) // INTERFACE
328	1971	{
329	1972	currentGL.glActiveTexture(GetGL().GL_TEXTURE0);
330	1973	currentGL.glMatrixMode(GetGL().GL_TEXTURE);
..	..	@@ -351,15 +1994,15 @@
351	1994
352	1995	static int camerachangeframe;
353	1996
354		- boolean SetCamera(Camera cam)
	1997	+ public boolean SetCamera(Camera cam)
355	1998	{
356	1999	// may 2014 if (cam == cameras[0] \|\| cam == cameras[1])
357	2000	// return false;
358	2001
359		- if (REFUSEMODE && isLIVE() && camerachangeframe != 0 && camerachangeframe != framecount)
	2002	+ if (REFUSEMODE && Globals.isLIVE() && camerachangeframe != 0 && camerachangeframe != Globals.framecount)
360	2003	{
361	2004	// check for last change
362		- if (framecount < camerachangeframe + 400) // 120 == 1 second
	2005	+ if (Globals.framecount < camerachangeframe + 400) // 120 == 1 second
363	2006	{
364	2007	// refuse the camera change
365	2008	System.err.println("Camera " + cam + " REFUSED");
..	..	@@ -367,7 +2010,7 @@
367	2010	}
368	2011	}
369	2012
370		- camerachangeframe = framecount;
	2013	+ camerachangeframe = Globals.framecount;
371	2014
372	2015	cam.hAspect = -1; // Read only
373	2016
..	..	@@ -398,7 +2041,7 @@
398	2041	{
399	2042	//System.err.println("Oeil on");
400	2043	TRACK = true;
401		-// JUNE 2014 if (TRACK && trackedobject != null && drawMode == SHADOW) // && !lightMode)
	2044	+// JUNE 2014 if (TRACK && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
402	2045	// object.editWindow.ScreenFit(trackedobject);
403	2046	//pingthread.StepToTarget(true);
404	2047	}
..	..	@@ -407,7 +2050,7 @@
407	2050	{
408	2051	//System.err.println("Oeil on");
409	2052	OEIL = true;
410		- if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && drawMode == SHADOW) // && !lightMode)
	2053	+ if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
411	2054	object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
412	2055	//pingthread.StepToTarget(true);
413	2056	}
..	..	@@ -471,39 +2114,12 @@
471	2114	{
472	2115	frozen ^= true;
473	2116	// Weird...
474		- lighttouched = true;
	2117	+ Globals.lighttouched = true;
475	2118	}
476	2119
477	2120	void ToggleDL()
478	2121	{
479	2122	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	2123	}
508	2124
509	2125	void ToggleFullScreen()
..	..	@@ -513,12 +2129,7 @@
513	2129
514	2130	void ToggleCrowd()
515	2131	{
516		- CROWD ^= true;
517		- }
518		-
519		- void ToggleInertia()
520		- {
521		- INERTIA ^= true;
	2132	+ Globals.CROWD ^= true;
522	2133	}
523	2134
524	2135	void ToggleLocal()
..	..	@@ -526,62 +2137,89 @@
526	2137	LOCALTRANSFORM ^= true;
527	2138	}
528	2139
529		- void ToggleFast()
	2140	+ public void ToggleTexture()
	2141	+ {
	2142	+ textureon ^= true;
	2143	+ }
	2144	+
	2145	+ public void ToggleLive()
	2146	+ {
	2147	+ Globals.setLIVE(Globals.isLIVE() ^ true);
	2148	+
	2149	+ System.err.println("LIVE = " + Globals.isLIVE());
	2150	+
	2151	+ if (!Globals.isLIVE()) // save sound
	2152	+ Grafreed.savesound = true; // wav.save();
	2153	+ // else
	2154	+ repaint(); // start loop // may 2013
	2155	+ }
	2156	+
	2157	+ public void ToggleSupport()
	2158	+ {
	2159	+ SUPPORT ^= true;
	2160	+ }
	2161	+
	2162	+ public void ToggleAbort()
	2163	+ {
	2164	+ ABORTMODE ^= true;
	2165	+ }
	2166	+
	2167	+ public void ToggleInertia()
	2168	+ {
	2169	+ INERTIA ^= true;
	2170	+ }
	2171	+
	2172	+ public void ToggleFast()
530	2173	{
531	2174	FAST ^= true;
532	2175	}
533	2176
534		- void ToggleSlowPose()
	2177	+ public void ToggleSlowPose()
535	2178	{
536	2179	SLOWPOSE ^= true;
537	2180	}
538	2181
539		- void ToggleFootContact()
540		- {
541		- FOOTCONTACT ^= true;
542		- }
543		-
544		- void ToggleBoxMode()
	2182	+ public void ToggleBoxMode()
545	2183	{
546	2184	BOXMODE ^= true;
547	2185	}
548	2186
549		- void ToggleSmoothFocus()
	2187	+ public void ToggleZoomBoxMode()
	2188	+ {
	2189	+ ZOOMBOXMODE ^= true;
	2190	+ }
	2191	+
	2192	+ public void ToggleSmoothFocus()
550	2193	{
551	2194	SMOOTHFOCUS ^= true;
552	2195	}
553	2196
554		- void ToggleImageFlip()
	2197	+ public void ToggleImageFlip()
555	2198	{
556	2199	IMAGEFLIP ^= true;
557	2200	}
558	2201
559		- void ToggleSpeakerMocap()
	2202	+ public void ToggleSpeakerMocap()
560	2203	{
561	2204	SPEAKERMOCAP ^= true;
562	2205	}
563	2206
564		- void ToggleSpeakerCamera()
	2207	+ public void ToggleSpeakerCamera()
565	2208	{
566	2209	SPEAKERCAMERA ^= true;
567	2210	}
568	2211
569		- void ToggleSpeakerFocus()
	2212	+ public void ToggleSpeakerFocus()
570	2213	{
571	2214	SPEAKERFOCUS ^= true;
572	2215	}
573	2216
574		- void ToggleDebug()
575		- {
576		- DEBUG ^= true;
577		- }
578		-
579		- void ToggleFrustum()
	2217	+ public void ToggleFrustum()
580	2218	{
581	2219	FRUSTUM ^= true;
582	2220	}
583	2221
584		- void ToggleTrack()
	2222	+ public void ToggleTrack()
585	2223	{
586	2224	TRACK ^= true;
587	2225	if (TRACK)
..	..	@@ -600,25 +2238,35 @@
600	2238	repaint();
601	2239	}
602	2240
603		- void ToggleTrackOnce()
	2241	+ public void ToggleTrackOnce()
604	2242	{
605	2243	TRACKONCE ^= true;
606	2244	}
607	2245
608		- void ToggleShadowTrack()
	2246	+ public void ToggleShadowTrack()
609	2247	{
610	2248	SHADOWTRACK ^= true;
611	2249	repaint();
612	2250	}
613	2251
614		- void ToggleOeil()
	2252	+ public void ToggleOeil()
615	2253	{
616	2254	OEIL ^= true;
617	2255	}
618	2256
619		- void ToggleOeilOnce()
	2257	+ public void ToggleOeilOnce()
620	2258	{
621	2259	OEILONCE ^= true;
	2260	+ }
	2261	+
	2262	+ void ToggleFootContact()
	2263	+ {
	2264	+ FOOTCONTACT ^= true;
	2265	+ }
	2266	+
	2267	+ void ToggleDebug()
	2268	+ {
	2269	+ Globals.DEBUG ^= true;
622	2270	}
623	2271
624	2272	void ToggleLookAt()
..	..	@@ -626,9 +2274,9 @@
626	2274	LOOKAT ^= true;
627	2275	}
628	2276
629		- void ToggleRandom()
	2277	+ void ToggleSwitch()
630	2278	{
631		- RANDOM ^= true;
	2279	+ SWITCH ^= true;
632	2280	}
633	2281
634	2282	void ToggleHandles()
..	..	@@ -672,34 +2320,6 @@
672	2320	//assert (cam.hAspect == 0);
673	2321	cam.hAspect = 0;
674	2322	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	2323	}
704	2324
705	2325	private static void ApplyTransform(GL gl, Mat4f xform)
..	..	@@ -759,15 +2379,17 @@
759	2379
760	2380	GL currentGL;
761	2381
762		- GL GetGL()
	2382	+ public GL GetGL() // INTERFACE
763	2383	{
764	2384	return currentGL;
765	2385	}
766		-
	2386	+
767	2387	/**/
768	2388	class CacheTexture
769	2389	{
770	2390	com.sun.opengl.util.texture.Texture texture;
	2391	+ com.sun.opengl.util.texture.TextureData texturedata;
	2392	+
771	2393	int resolution;
772	2394
773	2395	CacheTexture(com.sun.opengl.util.texture.Texture tex, int res)
..	..	@@ -1998,10 +3620,12 @@
1998	3620	*/
1999	3621	TextureData ReduceTexture(TextureData texturedata, int resolution) // String name)
2000	3622	{
	3623	+ int pixelformat = texturedata.getPixelFormat();
	3624	+
2001	3625	int stride = 1;
2002		- if (texturedata.getPixelFormat() == GetGL().GL_RGB \|\| texturedata.getPixelFormat() == GetGL().GL_BGR) // \|\| texturedata.getPixelFormat() == GL.GL_LUMINANCE)
	3626	+ if (pixelformat == GetGL().GL_RGB \|\| pixelformat == GetGL().GL_BGR) // \|\| texturedata.getPixelFormat() == GL.GL_LUMINANCE)
2003	3627	stride = 3;
2004		- if (texturedata.getPixelFormat() == GetGL().GL_RGBA \|\| texturedata.getPixelFormat() == GetGL().GL_BGRA) // \|\| texturedata.getPixelFormat() == GL.GL_LUMINANCE_ALPHA)
	3628	+ if (pixelformat == GetGL().GL_RGBA \|\| pixelformat == GetGL().GL_BGRA) // \|\| texturedata.getPixelFormat() == GL.GL_LUMINANCE_ALPHA)
2005	3629	stride = 4;
2006	3630
2007	3631	int width = texturedata.getWidth();
..	..	@@ -2591,6 +4215,7 @@
2591	4215
2592	4216	com.sun.opengl.util.texture.Texture CompressTexture2(String name)
2593	4217	{
	4218	+ new Exception().printStackTrace();
2594	4219	System.exit(0);
2595	4220	com.sun.opengl.util.texture.Texture texture = null;
2596	4221
..	..	@@ -6267,7 +7892,7 @@
6267	7892	return null;
6268	7893	}
6269	7894
6270		- void ReleaseTextures(cTexture tex)
	7895	+ public void ReleaseTextures(cTexture tex) // INTERFACE
6271	7896	{
6272	7897	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
6273	7898	{
..	..	@@ -6303,9 +7928,67 @@
6303	7928	ReleaseTexture(pigment, false);
6304	7929	}
6305	7930
	7931	+ public void ReleasePigmentTexture(cTexture tex) // INTERFACE
	7932	+ {
	7933	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	7934	+ {
	7935	+ return;
	7936	+ }
	7937	+
	7938	+ if (tex == null)
	7939	+ {
	7940	+ ReleaseTexture(null, false);
	7941	+ return;
	7942	+ }
	7943	+
	7944	+ String pigment = Object3D.GetPigment(tex);
	7945	+
	7946	+ if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	7947	+ {
	7948	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	7949	+ // System.out.println("; bump = " + bump);
	7950	+ }
	7951	+
	7952	+ if (pigment.equals(""))
	7953	+ {
	7954	+ pigment = null;
	7955	+ }
	7956	+
	7957	+ ReleaseTexture(pigment, false);
	7958	+ }
	7959	+
	7960	+ public void ReleaseBumpTexture(cTexture tex) // INTERFACE
	7961	+ {
	7962	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	7963	+ {
	7964	+ return;
	7965	+ }
	7966	+
	7967	+ if (tex == null)
	7968	+ {
	7969	+ ReleaseTexture(null, true);
	7970	+ return;
	7971	+ }
	7972	+
	7973	+ String bump = Object3D.GetBump(tex);
	7974	+
	7975	+ if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	7976	+ {
	7977	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	7978	+ // System.out.println("; bump = " + bump);
	7979	+ }
	7980	+
	7981	+ if (bump.equals(""))
	7982	+ {
	7983	+ bump = null;
	7984	+ }
	7985	+
	7986	+ ReleaseTexture(bump, true);
	7987	+ }
	7988	+
6306	7989	void ReleaseTexture(String tex, boolean bump)
6307	7990	{
6308		- if (// drawMode != 0 \|\| /tex == null \|\|/
	7991	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
6309	7992	ambientOcclusion ) // \|\| !textureon)
6310	7993	{
6311	7994	return;
..	..	@@ -6331,7 +8014,7 @@
6331	8014	{
6332	8015	bumpdepth--;
6333	8016
6334		- // GraphreeD.trace("POP " + tex + "(" + pigmentdepth + ")" + " : " + pigmentstack[pigmentdepth] + " vs " + texture);
	8017	+ // GrafreeD.trace("POP " + tex + "(" + pigmentdepth + ")" + " : " + pigmentstack[pigmentdepth] + " vs " + texture);
6335	8018	if (bumpstack[bumpdepth] != (texture!=null?texture.texture:null))
6336	8019	{
6337	8020	// assert (bumpstack[bumpdepth] == texture);
..	..	@@ -6361,7 +8044,7 @@
6361	8044	{
6362	8045	pigmentdepth--;
6363	8046
6364		- // GraphreeD.trace("POP " + tex + "(" + pigmentdepth + ")" + " : " + pigmentstack[pigmentdepth] + " vs " + texture);
	8047	+ // GrafreeD.trace("POP " + tex + "(" + pigmentdepth + ")" + " : " + pigmentstack[pigmentdepth] + " vs " + texture);
6365	8048	if (pigmentstack[pigmentdepth] != (texture!=null?texture.texture:null))
6366	8049	{
6367	8050	// assert (pigmentstack[pigmentdepth] == texture);
..	..	@@ -6406,9 +8089,9 @@
6406	8089	}
6407	8090	}
6408	8091
6409		- /boolean/ void BindTextures(cTexture tex, int resolution)
	8092	+ /boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
6410	8093	{
6411		- if (// drawMode != 0 \|\| /tex == null \|\|/
	8094	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
6412	8095	ambientOcclusion ) // \|\| !textureon)
6413	8096	{
6414	8097	return; // false;
..	..	@@ -6451,7 +8134,94 @@
6451	8134	return; // true;
6452	8135	}
6453	8136
6454		- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution)
	8137	+ /boolean/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8138	+ {
	8139	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8140	+ ambientOcclusion ) // \|\| !textureon)
	8141	+ {
	8142	+ return; // false;
	8143	+ }
	8144	+
	8145	+ if (tex == null)
	8146	+ {
	8147	+ BindTexture(null,false,resolution);
	8148	+ return;
	8149	+ }
	8150	+
	8151	+ String pigment = Object3D.GetPigment(tex);
	8152	+
	8153	+ usedtextures.put(pigment, pigment);
	8154	+
	8155	+ if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8156	+ {
	8157	+ // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8158	+ // System.out.println("; bump = " + bump);
	8159	+ }
	8160	+
	8161	+ if (pigment.equals(""))
	8162	+ {
	8163	+ pigment = null;
	8164	+ }
	8165	+
	8166	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8167	+ BindTexture(pigment, false, resolution);
	8168	+ }
	8169	+
	8170	+ /boolean/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8171	+ {
	8172	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8173	+ ambientOcclusion ) // \|\| !textureon)
	8174	+ {
	8175	+ return; // false;
	8176	+ }
	8177	+
	8178	+ if (tex == null)
	8179	+ {
	8180	+ BindTexture(null,true,resolution);
	8181	+ return;
	8182	+ }
	8183	+
	8184	+ String bump = Object3D.GetBump(tex);
	8185	+
	8186	+ usedtextures.put(bump, bump);
	8187	+
	8188	+ if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8189	+ {
	8190	+ // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8191	+ // System.out.println("; bump = " + bump);
	8192	+ }
	8193	+
	8194	+ if (bump.equals(""))
	8195	+ {
	8196	+ bump = null;
	8197	+ }
	8198	+
	8199	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
	8200	+ BindTexture(bump, true, resolution);
	8201	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8202	+ }
	8203	+
	8204	+ java.util.HashSet<String> missingTextures = new java.util.HashSet<String>();
	8205	+
	8206	+ private boolean FileExists(String tex)
	8207	+ {
	8208	+ if (missingTextures.contains(tex))
	8209	+ {
	8210	+ return false;
	8211	+ }
	8212	+
	8213	+ boolean fileExists = new File(tex).exists();
	8214	+
	8215	+ if (!fileExists)
	8216	+ {
	8217	+ // If file exists, the "new File()" is not executed sgain
	8218	+ missingTextures.add(tex);
	8219	+ }
	8220	+
	8221	+ return fileExists;
	8222	+ }
	8223	+
	8224	+ CacheTexture GetCacheTexture(String tex, boolean bump, int resolution) throws Exception
6455	8225	{
6456	8226	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
6457	8227
..	..	@@ -6459,12 +8229,18 @@
6459	8229	{
6460	8230	String texname = tex;
6461	8231
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;
	8232	+ String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
	8233	+
	8234	+// String[] split = tex.split("Textures");
	8235	+// if (split.length > 1)
	8236	+// texname = "/Users/nbriere/Textures" + split[split.length-1];
	8237	+// else
	8238	+// if (!texname.startsWith("/"))
	8239	+// texname = "/Users/nbriere/Textures/" + texname;
	8240	+ if (!FileExists(tex))
	8241	+ {
	8242	+ texname = fallbackTextureName;
	8243	+ }
6468	8244
6469	8245	if (CACHETEXTURE)
6470	8246	texture = textures.get(texname); // TEXTURE CACHE
..	..	@@ -6533,7 +8309,7 @@
6533	8309	}
6534	8310
6535	8311	cachename = texname.substring(0, texname.length()-4)+ext+".jpg";
6536		- if (!new File(cachename).exists())
	8312	+ if (!FileExists(cachename))
6537	8313	cachename = texname;
6538	8314	else
6539	8315	processbump = false; // don't process bump map again
..	..	@@ -6555,7 +8331,7 @@
6555	8331	}
6556	8332
6557	8333	cachename = texname.substring(0, texname.length()-4)+ext+".png";
6558		- if (!new File(cachename).exists())
	8334	+ if (!FileExists(cachename))
6559	8335	cachename = texname;
6560	8336	else
6561	8337	processbump = false; // don't process bump map again
..	..	@@ -6564,7 +8340,9 @@
6564	8340	texturedata = GetFileTexture(cachename, processbump, resolution);
6565	8341
6566	8342
6567		- if (texturedata != null)
	8343	+ if (texturedata == null)
	8344	+ throw new Exception();
	8345	+
6568	8346	texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
6569	8347	//texture = GetTexture(tex, bump);
6570	8348	}
..	..	@@ -6665,6 +8443,8 @@
6665	8443	thetex.texture.dispose();
6666	8444	textures.remove(texname);
6667	8445	}
	8446	+
	8447	+ texture.texturedata = texturedata;
6668	8448	textures.put(texname, texture);
6669	8449
6670	8450	// newtex = true;
..	..	@@ -6681,21 +8461,35 @@
6681	8461	}
6682	8462	}
6683	8463
	8464	+ return texture;
	8465	+ }
	8466	+
	8467	+ com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution) throws Exception
	8468	+ {
	8469	+ CacheTexture texture = GetCacheTexture(tex, bump, resolution);
	8470	+
6684	8471	if (bump)
6685	8472	{
6686		- // GraphreeD.trace("PUSH BUMP " + tex + "(" + bumpdepth + ")" + " : " + texture);
	8473	+ // GrafreeD.trace("PUSH BUMP " + tex + "(" + bumpdepth + ")" + " : " + texture);
6687	8474	bumpstack[bumpdepth++] = texture!=null?texture.texture:null;
6688	8475	}
6689	8476	else
6690	8477	{
6691		- // GraphreeD.trace("PUSH PIGMENT " + tex + "(" + pigmentdepth + ")" + " : " + texture);
	8478	+ // GrafreeD.trace("PUSH PIGMENT " + tex + "(" + pigmentdepth + ")" + " : " + texture);
6692	8479	pigmentstack[pigmentdepth++] = texture!=null?texture.texture:null;
6693	8480	}
6694	8481
6695	8482	return texture!=null?texture.texture:null;
6696	8483	}
6697	8484
6698		- boolean BindTexture(String tex, boolean bump, int resolution)
	8485	+ public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution) throws Exception
	8486	+ {
	8487	+ CacheTexture texture = GetCacheTexture(tex, bump, resolution);
	8488	+
	8489	+ return texture!=null?texture.texturedata:null;
	8490	+ }
	8491	+
	8492	+ boolean BindTexture(String tex, boolean bump, int resolution) throws Exception
6699	8493	{
6700	8494	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
6701	8495	{
..	..	@@ -7292,9 +9086,9 @@
7292	9086	static boolean occlusionInitialized = false;
7293	9087	boolean selection = false;
7294	9088	boolean pointselection = false;
7295		- /static/ boolean lighttouched = true;
	9089	+ ///static/ boolean lighttouched = true;
7296	9090	boolean deselect;
7297		- boolean ambientOcclusion = false;
	9091	+ private boolean ambientOcclusion = false;
7298	9092	static boolean flash = false;
7299	9093	/static/ boolean wait = false;
7300	9094	boolean displaydone = false; // after repaint() calls
..	..	@@ -7424,6 +9218,8 @@
7424	9218	//gl.glFrustum(-0.5scale, 0.5scale, -0.5scale, 0.5scale, 1, 100);
7425	9219	//glu.gluPerspective(lightshaper_fovy, 1, lightshaper_zNear, lightshaper_zFar);
7426	9220	double scale = lightCamera.SCALE / lightCamera.Distance();
	9221	+// PATCH FILLE AUX JEANS
	9222	+ //scale *= lightCamera.shaper_fovy / 25;
7427	9223	gl.glScaled(2 * scale, 2 * scale, -scale);
7428	9224	gl.glTranslated(0, 0, lightCamera.DECAL);
7429	9225
..	..	@@ -7572,15 +9368,14 @@
7572	9368
7573	9369	float[] options1 = new float[]{1000, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
7574	9370	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
	9371	+ float[] options3 = new float[]{1, 1, 1, 0}; // fog color
	9372	+ float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
7576	9373
7577	9374	static int imagecount = 0; // movie generation
7578	9375
7579	9376	static int jitter = 0;
7580	9377
7581	9378	boolean restartframe = false;
7582		-
7583		- static int framecount = 0; // general-purpose global count
7584	9379
7585	9380	void displayAntiAliased(javax.media.opengl.GL gl)
7586	9381	{
..	..	@@ -7610,14 +9405,14 @@
7610	9405
7611	9406	//System.out.println("start frame");
7612	9407	gl.glClear(gl.GL_ACCUM_BUFFER_BIT);
7613		- for (jitter = 0; jitter < ACSIZE; jitter++) //, GraphreeD.wav.cursor += LIVE ? 735 : 0)
	9408	+ for (jitter = 0; jitter < ACSIZE; jitter++) //, GrafreeD.wav.cursor += LIVE ? 735 : 0)
7614	9409	{
7615		- framecount++;
	9410	+ Globals.framecount++;
7616	9411
7617	9412	if (CameraPane.tickcount > 0)
7618	9413	CameraPane.tickcount--;
7619	9414
7620		-// GraphreeD.wav.cursor += 735; // 44100 Hz / 120 Hz * 2 (for 16 bits)
	9415	+// GrafreeD.wav.cursor += 735; // 44100 Hz / 120 Hz * 2 (for 16 bits)
7621	9416	// restartframe = true;
7622	9417	if (options1[2] > 100 && (jitter%2==0))
7623	9418	{
..	..	@@ -7650,7 +9445,7 @@
7650	9445
7651	9446	gl.glLightfv(gl.GL_LIGHT0, gl.GL_POSITION, pos, 0);
7652	9447	*/
7653		- lighttouched = true;
	9448	+ Globals.lighttouched = true;
7654	9449	//System.err.println(" shadowbuffer: " + jitter);
7655	9450	shadowbuffer.display();
7656	9451
..	..	@@ -7671,8 +9466,8 @@
7671	9466	assert (parentcam != renderCamera);
7672	9467
7673	9468	if (renderCamera != lightCamera)
7674		- for (int count = parentcam.GetTransformCount(); --count>=0;)
7675		- LA.matConcat(parentcam.toParent, matrix, matrix);
	9469	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9470	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
7676	9471
7677	9472	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
7678	9473
..	..	@@ -7687,8 +9482,8 @@
7687	9482	LA.matCopy(renderCamera.fromScreen, matrix);
7688	9483
7689	9484	if (renderCamera != lightCamera)
7690		- for (int count = parentcam.GetTransformCount(); --count>=0;)
7691		- LA.matConcat(matrix, parentcam.fromParent, matrix);
	9485	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9486	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
7692	9487
7693	9488	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
7694	9489
..	..	@@ -7760,7 +9555,7 @@
7760	9555	//gl.glFlush();
7761	9556	gl.glAccum(gl.GL_ACCUM, 1.0f / ACSIZE);
7762	9557
7763		- if (ANIMATION && ABORTED)
	9558	+ if (Globals.ANIMATION && ABORTED)
7764	9559	{
7765	9560	System.err.println(" ABORTED FRAME");
7766	9561	break;
..	..	@@ -7790,7 +9585,7 @@
7790	9585	setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
7791	9586
7792	9587	// save image
7793		- if (ANIMATION && !ABORTED)
	9588	+ if (Globals.ANIMATION && !ABORTED)
7794	9589	{
7795	9590	VPwidth = viewport[2];
7796	9591	VPheight = viewport[3];
..	..	@@ -7901,11 +9696,11 @@
7901	9696
7902	9697	// imagecount++;
7903	9698
7904		- String fullname = filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
	9699	+ String fullname = Globals.filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
7905	9700
7906	9701	if (!BOXMODE)
7907	9702	{
7908		- System.out.println("image: " + fullname + " (" + (GraphreeD.wav.cursor / 735 / 4) + ")");
	9703	+ System.out.println("image: " + fullname + " (wav cursor=" + (Grafreed.wav.cursor / 735 / 4) + ")");
7909	9704	}
7910	9705
7911	9706	if (!BOXMODE)
..	..	@@ -7933,7 +9728,7 @@
7933	9728	{
7934	9729	if (ACSIZE > 1)
7935	9730	{
7936		- // System.err.println("image #" + (GraphreeD.wav.cursor / 735 / 4));
	9731	+ // System.err.println("image #" + (GrafreeD.wav.cursor / 735 / 4));
7937	9732	}
7938	9733	}
7939	9734
..	..	@@ -7943,7 +9738,7 @@
7943	9738	ABORTED = false;
7944	9739	}
7945	9740	else
7946		- GraphreeD.wav.cursor += 735 * ACSIZE;
	9741	+ Grafreed.wav.cursor += 735 * ACSIZE;
7947	9742
7948	9743	if (false)
7949	9744	{
..	..	@@ -8597,13 +10392,6 @@
8597	10392	}
8598	10393	}
8599	10394
8600		- boolean IsFrozen()
8601		- {
8602		- boolean selectmode = drawMode == SELECTION \|\| CameraPane.DEBUG_SELECTION;
8603		-
8604		- return !selectmode && cameracount == 0; // != 0;
8605		- }
8606		-
8607	10395	boolean niceon = false;
8608	10396	javax.swing.Timer AAtimer = new javax.swing.Timer(750, this);
8609	10397	boolean currentlydrawing = false;
..	..	@@ -8613,16 +10401,16 @@
8613	10401
8614	10402	public void display(GLAutoDrawable drawable)
8615	10403	{
8616		- if (GraphreeD.savesound && GraphreeD.hassound)
	10404	+ if (Grafreed.savesound && Grafreed.hassound)
8617	10405	{
8618		- GraphreeD.wav.save();
8619		- GraphreeD.savesound = false;
8620		- GraphreeD.hassound = false;
	10406	+ Grafreed.wav.save();
	10407	+ Grafreed.savesound = false;
	10408	+ Grafreed.hassound = false;
8621	10409	}
8622	10410	// if (DEBUG_SELECTION)
8623	10411	// {
8624		-// if (drawMode != SELECTION)
8625		-// drawMode = SELECTION;
	10412	+// if (DrawMode() != SELECTION)
	10413	+// DrawMode() = SELECTION;
8626	10414	// }
8627	10415
8628	10416	if (!isRenderer)
..	..	@@ -8678,9 +10466,9 @@
8678	10466
8679	10467	//ANTIALIAS = 0;
8680	10468
8681		- if (drawMode == DEFAULT) // && CURRENTANTIALIAS > 0)
	10469	+ if (DrawMode() == DEFAULT) // && CURRENTANTIALIAS > 0)
8682	10470	{
8683		- if (niceon \|\| isLIVE())
	10471	+ if (niceon \|\| Globals.isLIVE())
8684	10472	{
8685	10473	//if(active == 0)
8686	10474	// antialiaser = null;
..	..	@@ -8693,6 +10481,7 @@
8693	10481	ANTIALIAS = 0;
8694	10482	//System.out.println("RESTART");
8695	10483	AAtimer.restart();
	10484	+ Globals.TIMERRUNNING = true;
8696	10485	}
8697	10486	}
8698	10487	}
..	..	@@ -8705,7 +10494,7 @@
8705	10494	assert eyeCamera.shaper_zFar == 1E5f; // 500.0f;
8706	10495	*/
8707	10496
8708		- if (drawMode == DEFAULT)
	10497	+ if (DrawMode() == DEFAULT)
8709	10498	{
8710	10499	currentlydrawing = true;
8711	10500	}
..	..	@@ -8736,18 +10525,18 @@
8736	10525
8737	10526	// if(Applet3D.clipboard != null)
8738	10527	// System.out.println("Clipboard = " + Applet3D.clipboard); //.get(0).parent);
8739		-//drawMode = SELECTION;
	10528	+//DrawMode() = SELECTION;
8740	10529	indexcount = 0;
8741	10530
8742		- if (drawMode == OCCLUSION)
	10531	+ if (DrawMode() == OCCLUSION)
8743	10532	{
8744		- drawMode = DEFAULT;
	10533	+ Globals.drawMode = DEFAULT; // WARNING
8745	10534	ambientOcclusion = true;
8746	10535	setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
8747	10536	Object3D theobject = object;
8748	10537	Object3D theparent = object.parent;
8749	10538	object.parent = null;
8750		- object = (Object3D)GraphreeD.clone(object);
	10539	+ object = (Object3D)Grafreed.clone(object);
8751	10540	object.Stripify();
8752	10541	if (theobject.selection == null \|\| theobject.selection.Size() == 0)
8753	10542	theobject.PreprocessOcclusion(this);
..	..	@@ -8760,19 +10549,20 @@
8760	10549	ambientOcclusion = false;
8761	10550	}
8762	10551
8763		- if (lighttouched && drawMode == DEFAULT && !lightMode) // && !FROZEN)
	10552	+ if (//Globals.lighttouched &&
	10553	+ DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
8764	10554	{
8765	10555	//if (RENDERSHADOW) // ?
8766	10556	if (!IsFrozen())
8767	10557	{
8768	10558	// dec 2012
8769		- if (!(!flash && !lightMode && drawMode == DEFAULT && ANTIALIAS > 0))
	10559	+ if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
8770	10560	{
8771		- framecount++;
	10561	+ Globals.framecount++;
8772	10562	shadowbuffer.display();
8773	10563	}
8774	10564	}
8775		- lighttouched = false; // ??
	10565	+ Globals.lighttouched = false; // ??
8776	10566	//drawing = true;
8777	10567	//lighttouched = true;
8778	10568	}
..	..	@@ -8793,9 +10583,9 @@
8793	10583	//eyeCamera.shaper_fovy = 1;
8794	10584	}
8795	10585
8796		- if ((RENDERPROGRAM != 0 \|\| ambientOcclusion \|\| spherical) && drawMode == DEFAULT) // SELECTION)
	10586	+ if ((RENDERPROGRAM != 0 \|\| ambientOcclusion \|\| spherical) && DrawMode() == DEFAULT) // SELECTION)
8797	10587	{
8798		- //System.out.println("drawMode = " + drawMode);
	10588	+ //System.out.println("DrawMode() = " + DrawMode());
8799	10589	vertexMode \|= VP_PASS;
8800	10590	//vertexMode \|= VP_PROJECTION;
8801	10591	if (!ambientOcclusion)
..	..	@@ -8855,7 +10645,7 @@
8855	10645	Camera cam = renderCamera; // lightMode?lightCamera:eyeCamera;
8856	10646	//Camera lightcam = new Camera(light0);
8857	10647
8858		- if (drawMode == SHADOW)
	10648	+ if (DrawMode() == SHADOW)
8859	10649	{
8860	10650	/*
8861	10651	gl.glMatrixMode(GL.GL_MODELVIEW);
..	..	@@ -8893,8 +10683,8 @@
8893	10683
8894	10684	// if (parentcam != renderCamera) // not a light
8895	10685	if (cam != lightCamera)
8896		- for (int count = parentcam.GetTransformCount(); --count>=0;)
8897		- LA.matConcat(parentcam.toParent, matrix, matrix);
	10686	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10687	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
8898	10688
8899	10689	for (int j = 0; j < 4; j++)
8900	10690	{
..	..	@@ -8908,8 +10698,8 @@
8908	10698
8909	10699	// if (parentcam != renderCamera) // not a light
8910	10700	if (cam != lightCamera)
8911		- for (int count = parentcam.GetTransformCount(); --count>=0;)
8912		- LA.matConcat(matrix, parentcam.fromParent, matrix);
	10701	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10702	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
8913	10703
8914	10704	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
8915	10705
..	..	@@ -8945,7 +10735,7 @@
8945	10735	gl.glClear(gl.GL_DEPTH_BUFFER_BIT);
8946	10736	} else
8947	10737	{
8948		- if (drawMode != DEFAULT)
	10738	+ if (DrawMode() != DEFAULT)
8949	10739	{
8950	10740	gl.glClearColor(1, 1, 1, 0);
8951	10741	} // 1);
..	..	@@ -9010,7 +10800,7 @@
9010	10800
9011	10801	fast &= !ambientOcclusion;
9012	10802
9013		- if (drawMode == DEFAULT)
	10803	+ if (DrawMode() == DEFAULT)
9014	10804	{
9015	10805	//gl.glEnable(gl.GL_ALPHA_TEST);
9016	10806	//gl.glActiveTexture(GL.GL_TEXTURE0);
..	..	@@ -9071,6 +10861,8 @@
9071	10861	//gl.glFrustum(-0.5scale, 0.5scale, -0.5scale, 0.5scale, 1, 100);
9072	10862	//glu.gluPerspective(lightshaper_fovy, 1, lightshaper_zNear, lightshaper_zFar);
9073	10863	double scale = lightCamera.SCALE / lightCamera.Distance();
	10864	+// PATCH FILLE AUX JEANS
	10865	+ //scale *= lightCamera.shaper_fovy / 25;
9074	10866	gl.glScaled(2 * scale, 2 * scale, -scale);
9075	10867	gl.glTranslated(0, 0, lightCamera.DECAL);
9076	10868
..	..	@@ -9166,7 +10958,16 @@
9166	10958	// Bump noise
9167	10959	gl.glActiveTexture(GL.GL_TEXTURE6);
9168	10960	//gl.glBindTexture(GL.GL_TEXTURE_2D, bump_noise);
9169		- BindTexture(NOISE_TEXTURE, false, 2);
	10961	+
	10962	+ try
	10963	+ {
	10964	+ BindTexture(NOISE_TEXTURE, false, 2);
	10965	+ }
	10966	+ catch (Exception e)
	10967	+ {
	10968	+ System.err.println("FAILED: " + NOISE_TEXTURE);
	10969	+ }
	10970	+
9170	10971
9171	10972	gl.glActiveTexture(GL.GL_TEXTURE0);
9172	10973	gl.glEnable(GL.GL_TEXTURE_2D);
..	..	@@ -9206,10 +11007,12 @@
9206	11007	gl.glMatrixMode(gl.GL_PROJECTION);
9207	11008	gl.glLoadIdentity();
9208	11009
9209		- if (drawMode == SHADOW \|\| cam == lightCamera) // \|\| (vertexMode&VP_PROJECTION) != 0)
	11010	+ if (DrawMode() == SHADOW \|\| cam == lightCamera) // \|\| (vertexMode&VP_PROJECTION) != 0)
9210	11011	{
9211	11012	//glu.gluPerspective(lightshaper_fovy, 1, lightshaper_zNear, lightshaper_zFar);
9212	11013	double scale = lightCamera.SCALE / lightCamera.Distance();
	11014	+// PATCH FILLE AUX JEANS
	11015	+ //scale *= lightCamera.shaper_fovy / 25;
9213	11016	gl.glScaled(2 * scale, 2 * scale, -scale);
9214	11017	gl.glTranslated(0, 0, lightCamera.DECAL);
9215	11018	//System.out.println("DECAL = " + LIGHTDECAL + "; SCALE = " + LIGHTSCALE);
..	..	@@ -9262,7 +11065,7 @@
9262	11065	//gl.glPushMatrix();
9263	11066	gl.glLoadIdentity();
9264	11067
9265		- if (!ambientOcclusion) // drawMode != OCCLUSION)
	11068	+ if (!ambientOcclusion) // DrawMode() != OCCLUSION)
9266	11069	{
9267	11070	//LA.xformPos(light0, lightCamera.fromScreen, light);
9268	11071	LA.xformDir(dirlight, lightCamera.fromScreen, lightposition);
..	..	@@ -9289,8 +11092,8 @@
9289	11092	System.err.println("parentcam != renderCamera");
9290	11093
9291	11094	// if (cam != lightCamera)
9292		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9293		- LA.xformDir(lightposition, parentcam.toParent, lightposition); // may 2013
	11095	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11096	+ LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
9294	11097	}
9295	11098
9296	11099	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -9311,8 +11114,8 @@
9311	11114	if (true) // TODO
9312	11115	{
9313	11116	if (cam != lightCamera)
9314		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9315		- LA.xformDir(light0, parentcam.toParent, light0); // may 2013
	11117	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11118	+ LA.xformDir(light0, parentcam.GlobalTransform(), light0); // may 2013
9316	11119	}
9317	11120
9318	11121	LA.xformPos(light0, cam.toScreen, light0);
..	..	@@ -9349,7 +11152,7 @@
9349	11152	}
9350	11153
9351	11154	/**/
9352		- if (true) // drawMode == SELECTION) // != DEFAULT)
	11155	+ if (true) // DrawMode() == SELECTION) // != DEFAULT)
9353	11156	gl.glDisable(gl.GL_LIGHTING);
9354	11157	else
9355	11158	gl.glEnable(gl.GL_LIGHTING);
..	..	@@ -9361,12 +11164,13 @@
9361	11164
9362	11165	gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 63, options2, 0);
9363	11166	gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 62, options3, 0);
	11167	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 61, options4, 0);
9364	11168
9365	11169	options2[0] *= renderCamera.Distance();
9366	11170
9367	11171	lightslot = 64;
9368	11172
9369		- if (!frozen && !ambientOcclusion && isRenderer && drawMode == DEFAULT)
	11173	+ if (!frozen && !ambientOcclusion && isRenderer && DrawMode() == DEFAULT)
9370	11174	{
9371	11175	DrawLights(object);
9372	11176	}
..	..	@@ -9377,7 +11181,7 @@
9377	11181	fragmentMode \|= (lightslot - 64) << 2; // 1; // first bit is available for aniso
9378	11182	//System.out.println("fragmentMode = " + fragmentMode);
9379	11183
9380		- if (drawMode == DEFAULT \|\| drawMode == SELECTION \|\| DEBUG_SELECTION)
	11184	+ if (DrawMode() == DEFAULT \|\| DrawMode() == SELECTION \|\| IsDebugSelection())
9381	11185	{
9382	11186	/*
9383	11187	if (CULLFACE \|\| (ambientOcclusion && OCCLUSION_CULLING))
..	..	@@ -9410,7 +11214,7 @@
9410	11214	}
9411	11215	}
9412	11216
9413		- if (drawMode == DEFAULT)
	11217	+ if (DrawMode() == DEFAULT)
9414	11218	{
9415	11219	if (WIREFRAME && !ambientOcclusion)
9416	11220	{
..	..	@@ -9428,7 +11232,7 @@
9428	11232	gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9429	11233	gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9430	11234
9431		- if (!fast/RENDERPROGRAM != 0/ && (drawMode == DEFAULT \|\| drawMode == SHADOW)) // && !WIREFRAME) //
	11235	+ if (!fast/RENDERPROGRAM != 0/ && (DrawMode() == DEFAULT \|\| DrawMode() == SHADOW)) // && !WIREFRAME) //
9432	11236	{
9433	11237	if (vertexMode != 0) // && !fast)
9434	11238	{
..	..	@@ -9448,7 +11252,7 @@
9448	11252	}
9449	11253	}
9450	11254
9451		- if (false) // fast && !IsFreezed() && drawMode != SELECTION && !ambientOcclusion)
	11255	+ if (false) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
9452	11256	{
9453	11257	//gl.glDepthFunc(GL.GL_LEQUAL);
9454	11258	//gl.glClear(gl.GL_COLOR_BUFFER_BIT \| gl.GL_DEPTH_BUFFER_BIT);
..	..	@@ -9476,7 +11280,7 @@
9476	11280	//gl.glDepthMask(false);
9477	11281	}
9478	11282
9479		- if (false) // drawMode == SHADOW)
	11283	+ if (false) // DrawMode() == SHADOW)
9480	11284	{
9481	11285	//SetColumnMajorData(cameraInverseTransform, view_1);
9482	11286	//System.out.println("light = " + cameraInverseTransform);
..	..	@@ -9490,16 +11294,16 @@
9490	11294	//System.out.println("object = " + object);
9491	11295	if (!frozen && !imageLocked)
9492	11296	{
9493		- if (!flash && !lightMode && drawMode == DEFAULT && ANTIALIAS > 0)
	11297	+ if (!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0)
9494	11298	{
9495	11299	displayAntiAliased(gl);
9496	11300	} else
9497	11301	{
9498	11302	programcount = 0;
9499		- int keepmode = drawMode;
	11303	+ int keepmode = DrawMode();
9500	11304	// if (DEBUG_SELECTION)
9501	11305	// {
9502		-// drawMode = SELECTION;
	11306	+// DrawMode() = SELECTION;
9503	11307	// }
9504	11308	// for point selection
9505	11309	// gl.glGetDoublev(gl.GL_MODELVIEW_MATRIX, tempmat, 0);
..	..	@@ -9509,10 +11313,10 @@
9509	11313	DrawObject(gl);
9510	11314
9511	11315	// jan 2013 System.err.println("RESET ABORT (display)");
9512		- // if (drawMode == DEFAULT)
	11316	+ // if (DrawMode() == DEFAULT)
9513	11317	// ABORTED = false;
9514	11318	fullreset = false;
9515		- drawMode = keepmode;
	11319	+ Globals.drawMode = keepmode; // WARNING
9516	11320	//System.out.println("PROGRAM SWITCH " + programcount);
9517	11321	}
9518	11322	}
..	..	@@ -9520,11 +11324,11 @@
9520	11324	gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9521	11325	gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9522	11326
9523		- if (drawMode == DEFAULT)
	11327	+ if (DrawMode() == DEFAULT)
9524	11328	{
9525	11329	ReleaseTexture(NOISE_TEXTURE, false);
9526	11330	}
9527		- //if (drawMode == DEFAULT)
	11331	+ //if (DrawMode() == DEFAULT)
9528	11332	{
9529	11333
9530	11334	gl.glActiveTexture(GL.GL_TEXTURE1);
..	..	@@ -9536,7 +11340,7 @@
9536	11340	//else
9537	11341	//gl.glDisable(gl.GL_TEXTURE_2D);
9538	11342	//gl.glPopMatrix();
9539		- if (imageCompleted && ANTIALIAS > 0 && drawMode == DEFAULT && cam != lightCamera && !ambientOcclusion)
	11343	+ if (imageCompleted && ANTIALIAS > 0 && DrawMode() == DEFAULT && cam != lightCamera && !ambientOcclusion)
9540	11344	{
9541	11345	//new Exception().printStackTrace();
9542	11346	//System.out.println("Draw image " + width + ", " + height);
..	..	@@ -9578,7 +11382,7 @@
9578	11382	//gl.glFlush();
9579	11383	}
9580	11384
9581		- if (flash && drawMode == DEFAULT)
	11385	+ if (flash && DrawMode() == DEFAULT)
9582	11386	{
9583	11387	flash = false;
9584	11388	wait = true;
..	..	@@ -9586,9 +11390,9 @@
9586	11390	}
9587	11391
9588	11392	//drawing = false;
9589		- //if(drawMode == DEFAULT)
	11393	+ //if(DrawMode() == DEFAULT)
9590	11394	// niceon = false;
9591		- if (drawMode == DEFAULT)
	11395	+ if (DrawMode() == DEFAULT)
9592	11396	{
9593	11397	currentlydrawing = false;
9594	11398	}
..	..	@@ -9608,7 +11412,7 @@
9608	11412	repaint();
9609	11413	}
9610	11414
9611		- if (isLIVE() && drawMode == DEFAULT) // may 2013
	11415	+ if (Globals.isLIVE() && DrawMode() == DEFAULT) // may 2013
9612	11416	repaint();
9613	11417
9614	11418	displaydone = true;
..	..	@@ -9627,8 +11431,14 @@
9627	11431	{
9628	11432	renderpass++;
9629	11433	// System.out.println("Draw object... ");
	11434	+ STEP = 1;
9630	11435	if (FAST) // in case there is no script
9631		- STEP = 16;
	11436	+ STEP = 8;
	11437	+
	11438	+ if (CURRENTANTIALIAS == 0 \|\| ACSIZE == 1)
	11439	+ {
	11440	+ STEP *= 4;
	11441	+ }
9632	11442
9633	11443	//object.FullInvariants();
9634	11444
..	..	@@ -9642,22 +11452,40 @@
9642	11452	e.printStackTrace();
9643	11453	}
9644	11454
9645		- if (GraphreeD.RENDERME > 0)
9646		- GraphreeD.RENDERME--; // mechante magouille
	11455	+ if (Grafreed.RENDERME > 0)
	11456	+ Grafreed.RENDERME--; // mechante magouille
9647	11457
9648		- ONESTEP = false;
	11458	+ Globals.ONESTEP = false;
9649	11459	}
9650	11460
9651	11461	static boolean zoomonce = false;
9652	11462
	11463	+ static void CreateSelectedPoint()
	11464	+ {
	11465	+ if (selectedpoint == null)
	11466	+ {
	11467	+ debugpointG = new Sphere();
	11468	+ debugpointP = new Sphere();
	11469	+ debugpointC = new Sphere();
	11470	+ debugpointR = new Sphere();
	11471	+
	11472	+ selectedpoint = new Superellipsoid();
	11473	+
	11474	+ for (int i=0; i<8; i++)
	11475	+ {
	11476	+ debugpoints[i] = new Sphere();
	11477	+ }
	11478	+ }
	11479	+ }
	11480	+
9653	11481	void DrawObject(GL gl, boolean draw)
9654	11482	{
9655	11483	//System.out.println("DRAW OBJECT " + mouseDown);
9656		-// drawMode = SELECTION;
	11484	+// DrawMode() = SELECTION;
9657	11485	//GL gl = getGL();
9658	11486	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
9659	11487	{
9660		- if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && drawMode == SHADOW) // && !lightMode)
	11488	+ if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
9661	11489	object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
9662	11490	pingthread.StepToTarget(true); // true);
9663	11491	// zoomonce = false;
..	..	@@ -9678,9 +11506,9 @@
9678	11506	callist = gl.glGenLists(1);
9679	11507	}
9680	11508
9681		- boolean selectmode = drawMode == SELECTION \|\| CameraPane.DEBUG_SELECTION;
	11509	+ boolean selectmode = DrawMode() == SELECTION \|\| IsDebugSelection();
9682	11510
9683		- boolean active = !selectmode; // drawMode != SELECTION; // mouseDown;
	11511	+ boolean active = !selectmode; // DrawMode() != SELECTION; // mouseDown;
9684	11512
9685	11513	if (!mainDL \|\| !active \|\| touched)
9686	11514	{
..	..	@@ -9707,24 +11535,32 @@
9707	11535	PushMatrix(ClickInfo.matbuffer);
9708	11536	}
9709	11537
9710		- if (drawMode == 0)
	11538	+ if (DrawMode() == 0)
9711	11539	{
9712	11540	// System.out.println("CLEAR +++++++++++++++ +++++++++++++++ +++++++++++++++ +++++++++++++++");
9713	11541
9714	11542	usedtextures.clear();
9715	11543
9716		- BindTextures(DEFAULT_TEXTURES, 2);
	11544	+ try
	11545	+ {
	11546	+ BindTextures(DEFAULT_TEXTURES, 2);
	11547	+ }
	11548	+ catch (Exception e)
	11549	+ {
	11550	+ System.err.println("FAILED: " + DEFAULT_TEXTURES);
	11551	+ }
9717	11552	}
9718	11553	//System.out.println("--> " + stackdepth);
9719		-// GraphreeD.traceon();
	11554	+// GrafreeD.traceon();
9720	11555
9721	11556	// DRAW
9722	11557	object.draw(this, /(Composite)/ object, false, false);
9723	11558
9724		- if (drawMode == DEFAULT)
	11559	+ if (DrawMode() == DEFAULT)
9725	11560	{
9726		- if (DEBUG)
	11561	+ if (Globals.DEBUG)
9727	11562	{
	11563	+ CreateSelectedPoint();
9728	11564	float radius = 0.05f;
9729	11565	if (selectedpoint.radius != radius)
9730	11566	{
..	..	@@ -9732,34 +11568,48 @@
9732	11568	selectedpoint.radius = radius;
9733	11569	selectedpoint.recalculate();
9734	11570	selectedpoint.material = new cMaterial();
9735		- selectedpoint.material.color = 0.25f;
	11571	+ selectedpoint.material.color = 0.15f; // Yellow
9736	11572	selectedpoint.material.modulation = 0.75f;
9737	11573
9738		- debugpoint.radius = radius;
9739		- debugpoint.recalculate();
9740		- debugpoint.material = new cMaterial();
9741		- debugpoint.material.color = 0.25f;
9742		- debugpoint.material.modulation = 0.75f;
	11574	+ debugpointG.radius = radius;
	11575	+ debugpointG.recalculate();
	11576	+ debugpointG.material = new cMaterial();
	11577	+ debugpointG.material.color = 0.25f; // Green
	11578	+ debugpointG.material.modulation = 0.75f;
9743	11579
9744		- debugpoint2.radius = radius;
9745		- debugpoint2.recalculate();
9746		- debugpoint2.material = new cMaterial();
9747		- debugpoint2.material.color = 0.75f;
9748		- debugpoint2.material.modulation = 0.75f;
	11580	+ debugpointP.radius = radius;
	11581	+ debugpointP.recalculate();
	11582	+ debugpointP.material = new cMaterial();
	11583	+ debugpointP.material.color = 0.75f; // Purple
	11584	+ debugpointP.material.modulation = 0.75f;
	11585	+
	11586	+ debugpointC.radius = radius;
	11587	+ debugpointC.recalculate();
	11588	+ debugpointC.material = new cMaterial();
	11589	+ debugpointC.material.color = 0.5f; // Cyan
	11590	+ debugpointC.material.modulation = 0.75f;
	11591	+
	11592	+ debugpointR.radius = radius;
	11593	+ debugpointR.recalculate();
	11594	+ debugpointR.material = new cMaterial();
	11595	+ debugpointR.material.color = 0f; // Red
	11596	+ debugpointR.material.modulation = 0.75f;
9749	11597
9750	11598	InitPoints(radius);
9751	11599	}
9752	11600	selectedpoint.draw(this, /(Composite)/ null, false, false);
9753		- //debugpoint.draw(this, /(Composite)/ null, false);
9754		- //debugpoint2.draw(this, /(Composite)/ null, false);
9755		- DrawPoints(this);
	11601	+ debugpointG.draw(this, /(Composite)/ null, false,false);
	11602	+ debugpointP.draw(this, /(Composite)/ null, false,false);
	11603	+ debugpointC.draw(this, /(Composite)/ null, false,false);
	11604	+ debugpointR.draw(this, /(Composite)/ null, false,false);
	11605	+ // DrawPoints(this);
9756	11606	}
9757	11607
9758	11608	// debugstuff.draw(this, /(Composite)/ null, false);
9759	11609	}
9760		-// GraphreeD.traceoff();
	11610	+// GrafreeD.traceoff();
9761	11611	//System.out.println(stackdepth);
9762		- if (drawMode == 0)
	11612	+ if (DrawMode() == 0)
9763	11613	{
9764	11614	ReleaseTextures(DEFAULT_TEXTURES);
9765	11615
..	..	@@ -9784,17 +11634,26 @@
9784	11634
9785	11635	checker = null;
9786	11636
9787		- if (!ambientOcclusion && !IsFrozen() && drawMode == DEFAULT)
	11637	+ if (!ambientOcclusion && !IsFrozen() && DrawMode() == DEFAULT)
9788	11638	FindChecker(object);
9789	11639
9790		- if (checker != null && drawMode == DEFAULT)
	11640	+ if (checker != null && DrawMode() == DEFAULT)
9791	11641	{
9792		- // BindTexture(IMMORTAL_TEXTURE);
	11642	+ //BindTexture(IMMORTAL_TEXTURE);
	11643	+ try
	11644	+ {
	11645	+ BindTextures(checker.GetTextures(), checker.texres);
	11646	+ }
	11647	+ catch (Exception e)
	11648	+ {
	11649	+ System.err.println("FAILED: " + checker.GetTextures());
	11650	+ }
9793	11651	// NEAREST
9794	11652	GetGL().glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST); // GL.GL_LINEAR);
9795	11653	DrawChecker(gl);
9796	11654	//checker.Draw(this, null, false);
9797	11655	// ReleaseTexture(IMMORTAL_TEXTURE);
	11656	+ ReleaseTextures(checker.GetTextures());
9798	11657	}
9799	11658
9800	11659	if (object.parent != null)
..	..	@@ -9807,7 +11666,7 @@
9807	11666	//gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9808	11667	//gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9809	11668
9810		- if (DISPLAYTEXT && drawMode == DEFAULT)
	11669	+ if (DISPLAYTEXT && DrawMode() == DEFAULT)
9811	11670	{
9812	11671	// Draw it once, then use the raster
9813	11672	Balloon(gl, balloon.createGraphics());
..	..	@@ -9863,14 +11722,14 @@
9863	11722	int[] xs = new int[3];
9864	11723	int[] ys = new int[3];
9865	11724
9866		- void DrawString(Object3D obj) // String string)
	11725	+ public void DrawString(Object3D obj) // String string) // INTERFACE
9867	11726	{
9868		- if (!DISPLAYTEXT \|\| drawMode != DEFAULT)
	11727	+ if (!DISPLAYTEXT \|\| DrawMode() != DEFAULT)
9869	11728	{
9870	11729	return;
9871	11730	}
9872	11731
9873		- String string = obj.GetToolTip();
	11732	+ String string = obj.toString(); //.GetToolTip();
9874	11733
9875	11734	GL gl = GetGL();
9876	11735
..	..	@@ -10187,8 +12046,8 @@
10187	12046	//obj.TransformToWorld(light, light);
10188	12047	for (int i = tp.size(); --i >= 0;)
10189	12048	{
10190		- for (int count = tp.get(i).GetTransformCount(); --count>=0;)
10191		- LA.xformPos(light, tp.get(i).toParent, light);
	12049	+ //for (int count = tp.get(i).GetTransformCount(); --count>=0;)
	12050	+ LA.xformPos(light, tp.get(i).GlobalTransform(), light);
10192	12051	}
10193	12052
10194	12053
..	..	@@ -10205,8 +12064,8 @@
10205	12064	parentcam = cameras[0];
10206	12065	}
10207	12066
10208		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10209		- LA.xformPos(light, parentcam.toParent, light); // may 2013
	12067	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	12068	+ LA.xformPos(light, parentcam.GlobalTransform(), light); // may 2013
10210	12069
10211	12070	LA.xformPos(light, renderCamera.toScreen, light);
10212	12071
..	..	@@ -10253,7 +12112,7 @@
10253	12112	return;
10254	12113	}
10255	12114
10256		- if (obj instanceof CheckerIG)
	12115	+ if (obj instanceof Checker)
10257	12116	{
10258	12117	checker = obj;
10259	12118
..	..	@@ -10325,11 +12184,13 @@
10325	12184	"PARAM params6 = program.env[6];" + // bump, noise, borderfade, fog punchthrough
10326	12185	"PARAM params7 = program.env[7];" + // noise power, opacity power
10327	12186	"PARAM options0 = program.env[63];" + // fog density, intensity, elevation
10328		- "PARAM options1 = program.env[62];" + // fog rgb color, image intensity
	12187	+ "PARAM options1 = program.env[62];" + // fog rgb color
	12188	+ "PARAM options2 = program.env[61];" + // image intensity, subsurface, lightsheen
10329	12189	"PARAM pointlight = program.env[127];" + // ...
10330	12190	"PARAM zero = { 0.0, 0.0, 0.0, 0.0 };" +
10331	12191	"PARAM halfhalf = { 0.25, 0.25, 0.25, 1.0 };" +
10332	12192	"PARAM half = { 0.5, 0.5, 0.5, 1.0 };" +
	12193	+ "PARAM threequarter = { 0.75, 0.75, 0.75, 1.0 };" +
10333	12194	"PARAM two = { 2.0, 2.0, 2.0, 1.0 };" +
10334	12195	"PARAM ten = { 10, 10, 10, 1.0 };" +
10335	12196	"PARAM one3rd = { 0.5, 0.33333333333, 0.333333333, 1.0 };" +
..	..	@@ -10350,6 +12211,7 @@
10350	12211	"PARAM lodbias = { 10,10,10,10 };" + // 20, -2, -20, 1.0 };" +
10351	12212	"PARAM infinity = { 100000000, 100000000, 100000000, 1.0 };" +
10352	12213	"PARAM one2048th = { 0.00048828125, 0.00048828125, 0.00048828125, 1.0 };" +
	12214	+ "PARAM ninetenth = { 0.9, 0.9, 0.9, 1.0 };" +
10353	12215	"PARAM almostone = { 0.999, 0.999, 0.999, 1.0 };" +
10354	12216	"PARAM c256 = { 256, 256, 256, 1.0 };" +
10355	12217	"PARAM c256i = { 0.00390625, 0.00390625, 0.00390625, 1.0 };" +
..	..	@@ -10390,6 +12252,10 @@
10390	12252	"TEMP R1;" +
10391	12253	"TEMP R2;" +
10392	12254	"TEMP R3;" +
	12255	+ "TEMP min;" +
	12256	+ "TEMP max;" +
	12257	+ "TEMP average;" +
	12258	+ "TEMP saturation;" +
10393	12259	"TEMP keep1;" +
10394	12260	"TEMP keep2;" +
10395	12261	"TEMP keep3;" +
..	..	@@ -10813,8 +12679,8 @@
10813	12679
10814	12680	// display shadow only (bump == 0)
10815	12681	"SUB temp.x, half.x, shadow.x;" +
10816		- "MOV temp.y, -params6.x;" +
10817		- "SLT temp.z, temp.y, zero.x;" +
	12682	+ "MOV temp.y, -params5.z;" + // params6.x;" +
	12683	+ "SLT temp.z, temp.y, -one2048th.x;" +
10818	12684	"SUB temp.y, one.x, temp.z;" +
10819	12685	"MUL temp.x, temp.x, temp.y;" +
10820	12686	"KIL temp.x;" +
..	..	@@ -10920,10 +12786,42 @@
10920	12786
10921	12787	// skin?
10922	12788	// Saturation for skin
10923		- /**/ // c'est ici
10924		- (Skinshader? "DP3 temp.x, final,one;" +
	12789	+ /**/
	12790	+ (Skinshader?
	12791	+ "DP3 average.x, final,one;" +
	12792	+ "MUL average, one3rd.xxxx,average.xxxx;" +
	12793	+
	12794	+ "MIN min.x, final.x,final.y;" +
	12795	+ "MIN min.x, min.x,final.z;" +
	12796	+
	12797	+ "MAX max.x, final.x,final.y;" +
	12798	+ "MAX max.x, max.x,final.z;" +
	12799	+ "MOV max, max.xxxx;" +
	12800	+
	12801	+ "SUB saturation, max, final;" +
	12802	+
	12803	+ "ADD temp.x, max.x, one10th.x;" +
	12804	+ "RCP temp.x, temp.x;" +
	12805	+ "MUL temp.x, temp.x, half.x;" +
	12806	+ "MUL saturation, saturation, temp.xxxx;" +
	12807	+
	12808	+ "DP3 ndotl.x, normald, light;" +
	12809	+ "MAX ndotl.x, ndotl.x, -ndotl.x;" +
	12810	+
	12811	+ "SUB temp.x, one.x, ndotl.x;" +
	12812	+ // Tuning for default skin
	12813	+ //"ADD temp.x, temp.x, options2.z;" + // lightsheen
	12814	+ "MAD temp.x, options2.z, half.y, temp.x;" + // lightsheen
	12815	+ "ADD temp.y, one.y, options2.y;" + // subsurface
	12816	+ "MUL temp.x, temp.x, temp.y;" +
	12817	+
	12818	+ "MUL saturation, saturation, temp.xxxx;" +
	12819	+ "SUB_SAT temp, max, saturation;" +
	12820	+/**
	12821	+ "DP3 temp.x, final,one;" +
10925	12822	"MUL R2, one3rd.xxxx,temp.xxxx;" +
10926		- "SUB temp, final,R2;" +
	12823	+ "SUB temp, final, R2;" +
	12824	+
10927	12825	// using light angle
10928	12826	"DP3 ndotl.x, normald,light;" +
10929	12827	//"SLT ndotl.y, ndotl.x, zero.x;" +
..	..	@@ -10936,7 +12834,6 @@
10936	12834	// using light intensity
10937	12835	"MOV ndotl.z, R2.x;" +
10938	12836	"MUL ndotl.z, ndotl.z, ndotl.z;" + // tuning...
10939		-
10940	12837	// june 2014
10941	12838	"MAD R1.x, ndotl.z,slope.y,one.x;" +
10942	12839	// "SUB ndotl.x, one.x, ndotl.x;" +
..	..	@@ -10948,6 +12845,7 @@
10948	12845	//"MUL R2.y, shadow.x,R2.y;" + // avril 2014
10949	12846
10950	12847	"MAD temp.x, R2.y, ndotl.y, temp.x;" + // red shift (skin)
	12848	+/**/
10951	12849
10952	12850	// "ADD final, R2,temp;" +
10953	12851	"MOV final, temp;"
..	..	@@ -11037,7 +12935,7 @@
11037	12935	/**/
11038	12936	// HDR
11039	12937	"MOV temp.z, final.a;" +
11040		- "MUL final, final,options1.w;" +
	12938	+ "MUL final, final,options2.x;" +
11041	12939	"MOV final.a, temp.z;" +
11042	12940	/**/
11043	12941
..	..	@@ -11074,10 +12972,17 @@
11074	12972	"MOV final.z, zero.x;" +
11075	12973	"MOV final.a, one.w;":""
11076	12974	) +
	12975	+ /*
11077	12976	(NORMALdebug?"MOV final.x, normal.x;" +
11078	12977	"MOV final.y, normal.y;" +
11079	12978	"MOV final.z, normal.z;" +
11080	12979	"MOV final.a, one.w;":""
	12980	+ ) +
	12981	+ */
	12982	+ (NORMALdebug?"SUB final.x, one.x, final.x;" +
	12983	+ "SUB final.y, one.x, final.y;" +
	12984	+ "SUB final.z, one.x, final.z;" +
	12985	+ "MOV final.a, final.a;":""
11081	12986	) +
11082	12987	// "MOV final, bumpmap;" +
11083	12988	"MOV result.color, final;" +
..	..	@@ -11106,7 +13011,7 @@
11106	13011	//once = true;
11107	13012	}
11108	13013
11109		- System.out.print("Program #" + mode + "; length = " + program.length());
	13014	+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
11110	13015	System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
11111	13016	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
11112	13017
..	..	@@ -11223,6 +13128,7 @@
11223	13128	String Shadow(String depth, String shadow)
11224	13129	{
11225	13130	return "MAX temp.x, ndotl.x, one64th.x;" +
	13131	+ "MIN temp.x, temp.x, ninetenth.x;" +
11226	13132	/**/
11227	13133	// Sine
11228	13134	"MUL temp.y, temp.x, temp.x;" +
..	..	@@ -11238,12 +13144,16 @@
11238	13144
11239	13145	"ADD " + depth + ".z, " + depth + ".z, temp.x;" +
11240	13146	//"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing!
	13147	+
	13148	+ // Compare fragment depth in light space with shadowmap.
11241	13149	"SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" +
11242	13150	"SGE temp.y, temp.x, zero.x;" +
11243		- "SUB " + shadow + ".y, one.x, temp.y;" +
	13151	+ "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded
	13152	+
	13153	+ // Reverse comparison
11244	13154	"SUB temp.x, one.x, temp.x;" +
11245	13155	"MUL " + shadow + ".x, temp.x, temp.y;" +
11246		- "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded
	13156	+ "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse
11247	13157	"POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth
11248	13158
11249	13159	"SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" +
..	..	@@ -11257,6 +13167,10 @@
11257	13167	// No shadow for backface
11258	13168	"DP3 temp.x, normal, lightd;" +
11259	13169	"SLT temp.x, temp.x, zero.x;" + // shadoweps
	13170	+ "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
	13171	+
	13172	+ // No shadow when out of frustrum
	13173	+ "SGE temp.x, " + depth + ".z, one.z;" +
11260	13174	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
11261	13175	"";
11262	13176	}
..	..	@@ -11403,7 +13317,8 @@
11403	13317	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
11404	13318	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
11405	13319	/static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
11406		- Object3D.cVector2[] vector2buffer;
	13320	+
	13321	+ //Object3D.cVector2[] vector2buffer;
11407	13322
11408	13323	// IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
11409	13324	// OUT : diff, spec
..	..	@@ -11815,7 +13730,7 @@
11815	13730	public void mousePressed(MouseEvent e)
11816	13731	{
11817	13732	//System.out.println("mousePressed: " + e);
11818		- clickStart(e.getX(), e.getY(), e.getModifiersEx());
	13733	+ clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
11819	13734	}
11820	13735
11821	13736	static long prevtime = 0;
..	..	@@ -11842,14 +13757,16 @@
11842	13757
11843	13758	//System.err.println("Dtime = " + Dtime + "; units = " + e.getUnitsToScroll() + "; ratio (units/ms) = " + ratio);
11844	13759
	13760	+ if (BUTTONLESSWHEEL)
11845	13761	if (Math.abs(ratio) < 0.1 \|\| Math.abs(Dtime) == 0) // < 30)
11846	13762	{
11847	13763	return;
11848	13764	}
11849	13765
	13766	+ boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
11850	13767
11851	13768	// TIMER
11852		- if (!wheeltimer.isRunning() && e.getModifiersEx() == 0) // VR
	13769	+ if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
11853	13770	{
11854	13771	keepboxmode = BOXMODE;
11855	13772	keepsupport = SUPPORT;
..	..	@@ -11889,8 +13806,8 @@
11889	13806	// mode \|= META;
11890	13807	//}
11891	13808
11892		- SetMouseMode(WHEEL \| e.getModifiersEx());
11893		- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0);
	13809	+ SetMouseMode(e.getModifiers(), WHEEL \| e.getModifiersEx());
	13810	+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
11894	13811	anchorX = ax;
11895	13812	anchorY = ay;
11896	13813	prevX = px;
..	..	@@ -11924,6 +13841,7 @@
11924	13841	else
11925	13842	if (evt.getSource() == AAtimer)
11926	13843	{
	13844	+ Globals.TIMERRUNNING = false;
11927	13845	if (mouseDown)
11928	13846	{
11929	13847	//new Exception().printStackTrace();
..	..	@@ -11949,6 +13867,10 @@
11949	13867	// LIVE = waslive;
11950	13868	// wasliveok = true;
11951	13869	// waslive = false;
	13870	+
	13871	+ // May 2019 Forget it:
	13872	+ if (true)
	13873	+ return;
11952	13874
11953	13875	// source == timer
11954	13876	if (mouseDown)
..	..	@@ -11978,7 +13900,7 @@
11978	13900	// ObjEditor.tweenManager.update(1f / 60f);
11979	13901
11980	13902	// fev 2014???
11981		- if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && drawMode == SHADOW) // && !lightMode)
	13903	+ if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
11982	13904	object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11983	13905	pingthread.StepToTarget(true); // true);
11984	13906	}
..	..	@@ -11988,12 +13910,13 @@
11988	13910
11989	13911	javax.swing.Timer timer = new javax.swing.Timer(350, this);
11990	13912
11991		- void clickStart(int x, int y, int modifiers)
	13913	+ void clickStart(int x, int y, int modifiers, int modifiersex)
11992	13914	{
11993	13915	if (!wasliveok)
11994	13916	return;
11995	13917
11996	13918	AAtimer.restart(); //
	13919	+ Globals.TIMERRUNNING = true;
11997	13920
11998	13921	// waslive = LIVE;
11999	13922	// LIVE = false;
..	..	@@ -12005,7 +13928,7 @@
12005	13928	// touched = true; // main DL
12006	13929	if (isRenderer)
12007	13930	{
12008		- SetMouseMode(modifiers);
	13931	+ SetMouseMode(modifiers, modifiersex);
12009	13932	}
12010	13933
12011	13934	selectX = anchorX = x;
..	..	@@ -12018,7 +13941,7 @@
12018	13941	clicked = true;
12019	13942	hold = false;
12020	13943
12021		- if (((modifiers & ~1024) & ~0) == 0) // Single or multiple selection
	13944	+ if (((modifiersex & ~1024) & ~0) == 0) // Single or multiple selection
12022	13945	// june 2013 means CTRL_CLICK: if (((modifiers & ~1024) & ~128) == 0) // Single or multiple selection
12023	13946	{
12024	13947	// System.out.println("RESTART II " + modifiers);
..	..	@@ -12049,7 +13972,7 @@
12049	13972	info.camera = renderCamera;
12050	13973	info.x = x;
12051	13974	info.y = y;
12052		- info.modifiers = modifiers;
	13975	+ info.modifiers = modifiersex;
12053	13976	editObj = object.doEditClick(info, 0);
12054	13977	if (!editObj)
12055	13978	{
..	..	@@ -12066,11 +13989,14 @@
12066	13989
12067	13990	public void mouseDragged(MouseEvent e)
12068	13991	{
	13992	+ Globals.MOUSEDRAGGED = true;
	13993	+
	13994	+ //System.out.println("mouseDragged: " + e);
12069	13995	if (isRenderer)
12070	13996	movingcamera = true;
	13997	+
12071	13998	//if (drawing)
12072	13999	//return;
12073		- //System.out.println("mouseDragged: " + e);
12074	14000	if ((e.getModifiersEx() & CTRL) != 0
12075	14001	\|\| (e.getModifiersEx() & COMMAND) != 0) // \|\| IsFrozen())
12076	14002	{
..	..	@@ -12078,7 +14004,7 @@
12078	14004	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
12079	14005	}
12080	14006	else
12081		- drag(e.getX(), e.getY(), e.getModifiersEx());
	14007	+ drag(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
12082	14008
12083	14009	//try { Thread.sleep(1); } catch (Exception ex) {}
12084	14010	}
..	..	@@ -12090,6 +14016,11 @@
12090	14016	cVector tmp = new cVector();
12091	14017	cVector tmp2 = new cVector();
12092	14018	boolean isMoving;
	14019	+
	14020	+ public cVector TargetLookAt()
	14021	+ {
	14022	+ return targetLookAt;
	14023	+ }
12093	14024
12094	14025	class PingThread extends Thread
12095	14026	{
..	..	@@ -12229,7 +14160,7 @@
12229	14160	//System.out.println("---------------- ---------- Paint " + tmp.length2());
12230	14161	if (lightMode)
12231	14162	{
12232		- lighttouched = true;
	14163	+ Globals.lighttouched = true;
12233	14164	}
12234	14165
12235	14166	if (OEILONCE && OEIL)
..	..	@@ -12246,6 +14177,7 @@
12246	14177
12247	14178	public void run()
12248	14179	{
	14180	+ new Exception().printStackTrace();
12249	14181	System.exit(0);
12250	14182	for (;;)
12251	14183	{
..	..	@@ -12287,7 +14219,7 @@
12287	14219	mouseDown = false;
12288	14220	if (lightMode)
12289	14221	{
12290		- lighttouched = true;
	14222	+ Globals.lighttouched = true;
12291	14223	}
12292	14224	repaint();
12293	14225	alreadypainted = true;
..	..	@@ -12295,7 +14227,7 @@
12295	14227	isMoving = false;
12296	14228	} //??
12297	14229
12298		- if (isLIVE() && !alreadypainted)
	14230	+ if (Globals.isLIVE() && !alreadypainted)
12299	14231	{
12300	14232	// FOR DEBUG BREAKPOINT USING PAUSE: while (true)
12301	14233	repaint();
..	..	@@ -12307,9 +14239,9 @@
12307	14239	{
12308	14240	if (lightMode)
12309	14241	{
12310		- lighttouched = true;
	14242	+ Globals.lighttouched = true;
12311	14243	}
12312		- drag(X, (mouseMode != 0) ? Y : anchorY, MODIFIERS);
	14244	+ drag(X, (mouseMode != 0) ? Y : anchorY, 0, MODIFIERS);
12313	14245	}
12314	14246	//else
12315	14247	}
..	..	@@ -12409,7 +14341,7 @@
12409	14341	int X, Y;
12410	14342	boolean SX, SY;
12411	14343
12412		- void drag(int x, int y, int modifiers)
	14344	+ void drag(int x, int y, int modifiers, int modifiersex)
12413	14345	{
12414	14346	if (IsFrozen())
12415	14347	{
..	..	@@ -12418,17 +14350,17 @@
12418	14350
12419	14351	drag = true; // NEW
12420	14352
12421		- boolean continuous = (modifiers & COMMAND) == COMMAND;
	14353	+ boolean continuous = (modifiersex & COMMAND) == COMMAND;
12422	14354
12423	14355	X = x;
12424	14356	Y = y;
12425	14357	// floating state for animation
12426		- MODIFIERS = modifiers;
12427		- modifiers &= ~1024;
	14358	+ MODIFIERS = modifiersex;
	14359	+ modifiersex &= ~1024;
12428	14360	if (false) // modifiers != 0)
12429	14361	{
12430	14362	//new Exception().printStackTrace();
12431		- System.out.println("mouseDragged: " + modifiers);
	14363	+ System.out.println("mouseDragged: " + modifiersex);
12432	14364	System.out.println("SHIFT = " + SHIFT);
12433	14365	System.out.println("CONTROL = " + COMMAND);
12434	14366	System.out.println("META = " + META);
..	..	@@ -12448,7 +14380,8 @@
12448	14380	info.camera = renderCamera;
12449	14381	info.x = x;
12450	14382	info.y = y;
12451		- object.editWindow.copy.doEditDrag(info);
	14383	+ object.GetWindow().copy
	14384	+ .doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
12452	14385	} else
12453	14386	{
12454	14387	if (x < startX)
..	..	@@ -12550,6 +14483,7 @@
12550	14483	{
12551	14484	manipCamera.Translate(dx, dy, getWidth());
12552	14485	}
	14486	+ else
12553	14487	if ((mouseMode & ZOOM) == 0 && (mouseMode & VR) != 0)
12554	14488	{
12555	14489	manipCamera.RotateInterest(dx, dy);
..	..	@@ -12560,7 +14494,7 @@
12560	14494
12561	14495	if (manipCamera == lightCamera)
12562	14496	{
12563		- lighttouched = true;
	14497	+ Globals.lighttouched = true;
12564	14498	}
12565	14499	/*
12566	14500	switch (mode)
..	..	@@ -12599,7 +14533,6 @@
12599	14533	public void mouseMoved(MouseEvent e)
12600	14534	{
12601	14535	//System.out.println("mouseMoved: " + e);
12602		-
12603	14536	if (isRenderer)
12604	14537	return;
12605	14538
..	..	@@ -12612,7 +14545,9 @@
12612	14545	ci.camera = renderCamera;
12613	14546	if (!isRenderer)
12614	14547	{
12615		- if (object.editWindow.copy.doEditClick(ci, 0))
	14548	+ //ObjEditor editWindow = object.editWindow;
	14549	+ //Object3D copy = editWindow.copy;
	14550	+ if (object.doEditClick(ci, 0))
12616	14551	{
12617	14552	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
12618	14553	} else
..	..	@@ -12624,7 +14559,10 @@
12624	14559
12625	14560	public void mouseReleased(MouseEvent e)
12626	14561	{
	14562	+ Globals.MOUSEDRAGGED = false;
	14563	+
12627	14564	movingcamera = false;
	14565	+ X = Y = 0;
12628	14566	//System.out.println("mouseReleased: " + e);
12629	14567	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
12630	14568	}
..	..	@@ -12647,9 +14585,9 @@
12647	14585	boolean control = ((modifiers & CTRL) != 0); // june 2013: for point selection
12648	14586	boolean command = ((modifiers & COMMAND) != 0); // june 2013: for multiple selection
12649	14587
12650		- if (control \|\| command \|\| IsFrozen())
	14588	+// No delay if (control \|\| command \|\| IsFrozen())
12651	14589	timeout = true;
12652		- else
	14590	+// ?? May 2019 else
12653	14591	// timer.setDelay((modifiers & 128) != 0?0:350);
12654	14592	mouseDown = false;
12655	14593	if (!control && !command) // june 2013
..	..	@@ -12759,7 +14697,7 @@
12759	14697	System.out.println("keyReleased: " + e);
12760	14698	}
12761	14699
12762		- void SetMouseMode(int modifiers)
	14700	+ void SetMouseMode(int modifiers, int modifiersex)
12763	14701	{
12764	14702	//System.out.println("SetMouseMode = " + modifiers);
12765	14703	//modifiers &= ~1024;
..	..	@@ -12771,24 +14709,27 @@
12771	14709	//if (modifiers == 0) // \|\| (modifiers == (1024 \| CONTROL)))
12772	14710	// return;
12773	14711	//System.out.println("SetMode = " + modifiers);
12774		- if ((modifiers & WHEEL) == WHEEL)
	14712	+ if ((modifiersex & WHEEL) == WHEEL)
12775	14713	{
12776	14714	mouseMode \|= ZOOM;
12777	14715	}
12778		- if ((modifiers & META) == META)
	14716	+
	14717	+ boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
	14718	+ if (capsLocked) // \|\| (modifiers & META) == META)
12779	14719	{
12780	14720	mouseMode \|= VR; // BACKFORTH;
12781	14721	}
12782		- if ((modifiers & CTRLCLICK) == CTRLCLICK)
12783		- {
12784		- mouseMode \|= SELECT; // BACKFORTH;
12785		- }
12786		- if ((modifiers & COMMAND) == COMMAND)
	14722	+ if ((modifiersex & CTRLCLICK) == CTRLCLICK)
12787	14723	{
12788	14724	mouseMode \|= SELECT;
12789	14725	}
12790		- if ((modifiers & SHIFT) == SHIFT \|\| forcetranslate)
	14726	+ if ((modifiersex & COMMAND) == COMMAND)
12791	14727	{
	14728	+ mouseMode \|= SELECT;
	14729	+ }
	14730	+ if ((modifiersex & SHIFT) == SHIFT \|\| forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
	14731	+ {
	14732	+ mouseMode &= ~VR;
12792	14733	mouseMode \|= TRANSLATE;
12793	14734	}
12794	14735	// if ((modifiers & SHIFT_META) == SHIFT_META)
..	..	@@ -12815,10 +14756,10 @@
12815	14756
12816	14757	if (isRenderer) //
12817	14758	{
12818		- SetMouseMode(modifiers);
	14759	+ SetMouseMode(0, modifiers);
12819	14760	}
12820	14761
12821		- theRenderer.keyPressed(key);
	14762	+ Globals.theRenderer.keyPressed(key);
12822	14763	}
12823	14764
12824	14765	int kompactbit = 4; // power bit
..	..	@@ -12830,7 +14771,7 @@
12830	14771	float SATPOW = 1; // 2; // 0.5f;
12831	14772	float BRIPOW = 1; // 0.5f; // 0.5f;
12832	14773
12833		- void keyPressed(int key)
	14774	+ public void keyPressed(int key)
12834	14775	{
12835	14776	if (key >= '0' && key <= '5')
12836	14777	clampbit = (key-'0');
..	..	@@ -12945,7 +14886,7 @@
12945	14886	case 'B':
12946	14887	BRISMOOTH ^= true;
12947	14888	SHADOWCULLFACE ^= true;
12948		- lighttouched = true;
	14889	+ Globals.lighttouched = true;
12949	14890	repaint();
12950	14891	break;
12951	14892	case 'b':
..	..	@@ -12987,8 +14928,14 @@
12987	14928	RevertCamera();
12988	14929	repaint();
12989	14930	break;
12990		- case 'L':
12991	14931	case 'l':
	14932	+ lightMode ^= true;
	14933	+ Globals.lighttouched = true;
	14934	+ manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
	14935	+ targetLookAt.set(manipCamera.lookAt);
	14936	+ repaint();
	14937	+ break;
	14938	+ case 'L':
12992	14939	if (lightMode)
12993	14940	{
12994	14941	lightMode = false;
..	..	@@ -13045,7 +14992,7 @@
13045	14992	repaint();
13046	14993	break;
13047	14994	case 'O':
13048		- drawMode = OCCLUSION;
	14995	+ Globals.drawMode = OCCLUSION; // WARNING
13049	14996	repaint();
13050	14997	break;
13051	14998	case 'o':
..	..	@@ -13135,24 +15082,22 @@
13135	15082	kompactbit = 6;
13136	15083	break;
13137	15084	case ' ':
13138		- lightMode ^= true;
13139		- lighttouched = true;
13140		- manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
13141		- targetLookAt.set(manipCamera.lookAt);
	15085	+ ObjEditor.theFrame.ToggleFullScreen();
13142	15086	repaint();
13143	15087	break;
13144	15088	//case '`' :
13145	15089	case ESC:
13146	15090	RENDERPROGRAM += 1;
13147	15091	RENDERPROGRAM %= 3;
	15092	+
13148	15093	repaint();
13149	15094	break;
13150	15095	case 'Z':
13151		- RESIZETEXTURE ^= true;
13152		- break;
	15096	+ //RESIZETEXTURE ^= true;
	15097	+ //break;
13153	15098	case 'z':
13154		- RENDERSHADOW ^= true;
13155		- lighttouched = true;
	15099	+ Globals.RENDERSHADOW ^= true;
	15100	+ Globals.lighttouched = true;
13156	15101	repaint();
13157	15102	break;
13158	15103	//case UP:
..	..	@@ -13178,7 +15123,8 @@
13178	15123	FlipTransform();
13179	15124	break;
13180	15125	case ENTER:
13181		- object.editWindow.ScreenFit(); // Edit();
	15126	+ // object.editWindow.ScreenFit(); // Edit();
	15127	+ ToggleLive();
13182	15128	break;
13183	15129	case DELETE:
13184	15130	ClearSelection();
..	..	@@ -13266,6 +15212,7 @@
13266	15212	}
13267	15213	//System.out.println("shaper_fovy = " + manipCamera.shaper_fovy);
13268	15214	}
	15215	+
13269	15216	static double OCCLUSIONBOOST = 1; // 0.5;
13270	15217
13271	15218	void keyReleased(int key, int modifiers)
..	..	@@ -13273,11 +15220,11 @@
13273	15220	//mode = ROTATE;
13274	15221	if ((MODIFIERS & COMMAND) == 0) // VR??
13275	15222	{
13276		- SetMouseMode(modifiers);
	15223	+ SetMouseMode(0, modifiers);
13277	15224	}
13278	15225	}
13279	15226
13280		- protected void processKeyEvent(KeyEvent e)
	15227	+ public void processKeyEvent(KeyEvent e)
13281	15228	{
13282	15229	switch (e.getID())
13283	15230	{
..	..	@@ -13407,8 +15354,9 @@
13407	15354
13408	15355	protected void processMouseMotionEvent(MouseEvent e)
13409	15356	{
13410		- //System.out.println("processMouseMotionEvent: " + mouseMode);
13411		- if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
	15357	+ //System.out.println("processMouseMotionEvent: " + mouseMode + " " + e.getModifiers() + " " + e.getModifiersEx() + " " + e.getButton());
	15358	+ //if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
	15359	+ if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (e.getModifiers() & MouseEvent.BUTTON3_MASK) == 0 && (mouseMode & SELECT) == 0)
13412	15360	{
13413	15361	mouseMoved(e);
13414	15362	} else
..	..	@@ -13433,11 +15381,12 @@
13433	15381	}
13434	15382	*/
13435	15383
13436		- object.editWindow.EditSelection();
	15384	+ object.editWindow.EditSelection(false);
13437	15385	}
13438	15386
13439	15387	void SelectParent()
13440	15388	{
	15389	+ new Exception().printStackTrace();
13441	15390	System.exit(0);
13442	15391	Composite group = (Composite) object;
13443	15392	java.util.Vector selectees = new java.util.Vector(group.selection);
..	..	@@ -13461,6 +15410,7 @@
13461	15410
13462	15411	void SelectChildren()
13463	15412	{
	15413	+ new Exception().printStackTrace();
13464	15414	System.exit(0);
13465	15415	/*
13466	15416	Composite group = (Composite) object;
..	..	@@ -13625,7 +15575,9 @@
13625	15575	info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
13626	15576	//Image img = CreateImage(width, height);
13627	15577	//System.out.println("width = " + width + "; height = " + height + "\n");
	15578	+
13628	15579	Graphics gr = g; // img.getGraphics();
	15580	+
13629	15581	if (!hasMarquee)
13630	15582	{
13631	15583	if (Xmin < Xmax) // !locked)
..	..	@@ -13723,14 +15675,33 @@
13723	15675	if (!isRenderer)
13724	15676	{
13725	15677	object.drawEditHandles(info, 0);
	15678	+
	15679	+ if (drag && (X != 0 \|\| Y != 0) && object.selection.Size() > 0)
	15680	+ {
	15681	+ switch (object.selection.get(0).hitSomething)
	15682	+ {
	15683	+ case Object3D.hitCenter: gr.setColor(Color.pink);
	15684	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15685	+ break;
	15686	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	15687	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15688	+ break;
	15689	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	15690	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15691	+ break;
	15692	+ }
	15693	+
	15694	+ }
13726	15695	}
13727	15696	}
	15697	+
13728	15698	if (isRenderer)
13729	15699	{
13730	15700	//gr.setColor(Color.black);
13731	15701	//gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
13732	15702	//gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
13733	15703	}
	15704	+
13734	15705	if (hasMarquee)
13735	15706	{
13736	15707	gr.setXORMode(Color.white);
..	..	@@ -13753,6 +15724,7 @@
13753	15724	//if (g != gr) g.drawImage(img, 0, 0, width, height, null);
13754	15725	}
13755	15726
	15727	+ // To avoid clear.
13756	15728	public void update(Graphics g)
13757	15729	{
13758	15730	paint(g);
..	..	@@ -13842,6 +15814,7 @@
13842	15814	public boolean mouseDown(Event evt, int x, int y)
13843	15815	{
13844	15816	System.out.println("mouseDown: " + evt);
	15817	+ System.exit(0);
13845	15818	/*
13846	15819	locked = true;
13847	15820	drag = false;
..	..	@@ -13885,7 +15858,7 @@
13885	15858	{
13886	15859	keyPressed(0, modifiers);
13887	15860	}
13888		- clickStart(x, y, modifiers);
	15861	+ // clickStart(x, y, modifiers);
13889	15862	return true;
13890	15863	}
13891	15864
..	..	@@ -14003,7 +15976,7 @@
14003	15976	{
14004	15977	keyReleased(0, 0);
14005	15978	}
14006		- drag(x, y, modifiers);
	15979	+ drag(x, y, 0, modifiers);
14007	15980	return true;
14008	15981	}
14009	15982
..	..	@@ -14135,7 +16108,7 @@
14135	16108	Object3D object;
14136	16109	static Object3D trackedobject;
14137	16110	Camera renderCamera; // Light or Eye (or Occlusion)
14138		- /static/ Camera manipCamera; // Light or Eye
	16111	+ /static/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
14139	16112	/static/ Camera eyeCamera;
14140	16113	/static/ Camera lightCamera;
14141	16114	int cameracount;
..	..	@@ -14355,7 +16328,7 @@
14355	16328	gl.glPushAttrib(GL.GL_ALL_ATTRIB_BITS);
14356	16329	gl.glPushMatrix();
14357	16330	gl.glLoadIdentity();
14358		- PushMatrix(checker.toParent);
	16331	+ //PushMatrix(checker.toParent);
14359	16332
14360	16333	gl.glMatrixMode(GL.GL_TEXTURE);
14361	16334	gl.glPushMatrix();
..	..	@@ -14378,8 +16351,8 @@
14378	16351
14379	16352	gl.glNormal3f(0.0f, 0.0f, 1.0f);
14380	16353
14381		- float step = 0.1666f; //0.25f;
14382		- float stepv = step * 1652 / 998;
	16354	+ float step = 2; // 0.1666f; //0.25f;
	16355	+ float stepv = 2; // step * 1652 / 998;
14383	16356
14384	16357	int i0 = 0;
14385	16358	/*
..	..	@@ -14415,20 +16388,21 @@
14415	16388	/**/
14416	16389	//checker.GetMaterial().opacity = 1.1f;
14417	16390	////checker.GetMaterial().ambient = 0.99f;
14418		- Object3D.materialstack[Object3D.materialdepth] = checker.material;
14419		- Object3D.selectedstack[Object3D.materialdepth] = false;
14420		- cStatic.objectstack[Object3D.materialdepth++] = checker;
	16391	+ materialstack[materialdepth] = checker.material;
	16392	+ selectedstack[materialdepth] = false;
	16393	+ cStatic.objectstack[materialdepth++] = checker;
14421	16394	//System.out.println("material " + material);
14422	16395	//Applet3D.tracein(this, selected);
14423		- vector2buffer = checker.projectedVertices;
	16396	+ //vector2buffer = checker.projectedVertices;
14424	16397
14425		- checker.GetMaterial().Draw(this, false); // true);
	16398	+ //checker.GetMaterial().Draw(this, false); // true);
	16399	+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
14426	16400
14427		- Object3D.materialdepth -= 1;
14428		- if (Object3D.materialdepth > 0)
	16401	+ materialdepth -= 1;
	16402	+ if (materialdepth > 0)
14429	16403	{
14430		- vector2buffer = cStatic.objectstack[Object3D.materialdepth - 1].projectedVertices;
14431		- Object3D.materialstack[Object3D.materialdepth - 1].Draw(this, Object3D.selectedstack[Object3D.materialdepth - 1]);
	16404	+ //vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	16405	+ DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
14432	16406	}
14433	16407	//checker.GetMaterial().opacity = 1f;
14434	16408	////checker.GetMaterial().ambient = 1f;
..	..	@@ -14449,15 +16423,27 @@
14449	16423
14450	16424	//float u = (i+1)/2;
14451	16425	//float v = (j+1)/2;
14452		- gl.glTexCoord2f((i + 1) / 2, (j + 1) / 2); // (1,0) // (i+1+step)/2,(j+1)/2);
	16426	+ if (checker.flipV)
	16427	+ gl.glTexCoord2f((i + 1) / 2, 1 - (j + 1) / 2);
	16428	+ else
	16429	+ gl.glTexCoord2f((i + 1) / 2, (j + 1) / 2); // (1,0) // (i+1+step)/2,(j+1)/2);
14453	16430	gl.glVertex3f(i, j, -0.5f);
14454	16431
	16432	+ if (checker.flipV)
	16433	+ gl.glTexCoord2f((i + 1 + step) / 2, 1 - (j + 1) / 2); // (1,1) // (i+1+step)/2,(j+1+step)/2);
	16434	+ else
14455	16435	gl.glTexCoord2f((i + 1 + step) / 2, (j + 1) / 2); // (1,1) // (i+1+step)/2,(j+1+step)/2);
14456	16436	gl.glVertex3f(i + step, j, -0.5f);
14457	16437
	16438	+ if (checker.flipV)
	16439	+ gl.glTexCoord2f((i + 1 + step) / 2, 1 - (j + 1 + stepv) / 2); // (0,1) //(i+1)/2,(j+1+step)/2);
	16440	+ else
14458	16441	gl.glTexCoord2f((i + 1 + step) / 2, (j + 1 + stepv) / 2); // (0,1) //(i+1)/2,(j+1+step)/2);
14459	16442	gl.glVertex3f(i + step, j + stepv, -0.5f);
14460	16443
	16444	+ if (checker.flipV)
	16445	+ gl.glTexCoord2f((i + 1) / 2, 1 - (j + 1 + stepv) / 2); // (0,0) //(i+1)/2,(j+1)/2);
	16446	+ else
14461	16447	gl.glTexCoord2f((i + 1) / 2, (j + 1 + stepv) / 2); // (0,0) //(i+1)/2,(j+1)/2);
14462	16448	gl.glVertex3f(i, j + stepv, -0.5f);
14463	16449	}
..	..	@@ -14469,7 +16455,7 @@
14469	16455	gl.glMatrixMode(GL.GL_PROJECTION);
14470	16456	gl.glPopMatrix();
14471	16457	gl.glMatrixMode(GL.GL_MODELVIEW);
14472		- PopMatrix(null); // checker.toParent); // null);
	16458	+ //PopMatrix(null); // checker.toParent); // null);
14473	16459	gl.glPopMatrix();
14474	16460	PopTextureMatrix(checker.toParent);
14475	16461	gl.glMatrixMode(GL.GL_TEXTURE);
..	..	@@ -14560,6 +16546,7 @@
14560	16546	{
14561	16547	if (!selection)
14562	16548	{
	16549	+ new Exception().printStackTrace();
14563	16550	System.exit(0);
14564	16551	return;
14565	16552	}
..	..	@@ -14582,14 +16569,14 @@
14582	16569
14583	16570	//int tmp = selection_view;
14584	16571	//selection_view = -1;
14585		- int temp = drawMode;
14586		- drawMode = SELECTION;
	16572	+ int temp = DrawMode();
	16573	+ Globals.drawMode = SELECTION; // WARNING
14587	16574	indexcount = 0;
14588	16575	parent.display(drawable);
14589	16576	//selection_view = tmp;
14590	16577	//if (temp == SELECTION)
14591	16578	// temp = DEFAULT; // patch for selection debug
14592		- drawMode = temp;
	16579	+ Globals.drawMode = temp; // WARNING
14593	16580
14594	16581	//gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
14595	16582
..	..	@@ -14639,6 +16626,13 @@
14639	16626	// System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
14640	16627	// System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
14641	16628
	16629	+ CreateSelectedPoint();
	16630	+
	16631	+ // Will fit the mesh !!!
	16632	+ selectedpoint.toParent[0][0] = 0.0001;
	16633	+ selectedpoint.toParent[1][1] = 0.0001;
	16634	+ selectedpoint.toParent[2][2] = 0.0001;
	16635	+
14642	16636	glu.gluUnProject(x,y,depth,view,0,tempmat2,0,viewport,0,selectedpoint.toParent[3],0);
14643	16637
14644	16638	// if (object.selection != null && object.selection.Size() > 0)
..	..	@@ -14682,16 +16676,16 @@
14682	16676	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	16677	}
14684	16678
14685		- previousselectedpoint = (Sphere) GraphreeD.clone(selectedpoint);
	16679	+ previousselectedpoint = (Sphere) Grafreed.clone(selectedpoint);
14686	16680	}
14687	16681	}
14688	16682
14689	16683	if (!movingcamera && !PAINTMODE)
14690	16684	object.editWindow.ScreenFitPoint(); // fev 2014
14691	16685
14692		- if (PAINTMODE && GraphreeD.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	16686	+ if (PAINTMODE && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
14693	16687	{
14694		- Object3D paintobj = GraphreeD.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
	16688	+ Object3D paintobj = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
14695	16689
14696	16690	Object3D group = new Object3D("inst" + paintcount++);
14697	16691
..	..	@@ -14847,7 +16841,7 @@
14847	16841	gl.glDisable(gl.GL_CULL_FACE);
14848	16842	}
14849	16843
14850		- if (!RENDERSHADOW)
	16844	+ if (!Globals.RENDERSHADOW)
14851	16845	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
14852	16846
14853	16847	// SB gl.glPolygonOffset(2.5f, 10);
..	..	@@ -14857,14 +16851,14 @@
14857	16851	//gl.glColorMask(false, false, false, false);
14858	16852
14859	16853	//render_scene_from_light_view(gl, drawable, 0, 0);
14860		- if (RENDERSHADOW && lighttouched && !movingcamera) // && !parent.IsFreezed())
	16854	+ if (Globals.RENDERSHADOW && Globals.lighttouched && (!movingcamera \|\| !Globals.FREEZEONMOVE)) // && !parent.IsFreezed())
14861	16855	{
14862	16856	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
14863	16857
14864		- int temp = drawMode;
14865		- drawMode = SHADOW;
	16858	+ int temp = DrawMode();
	16859	+ Globals.drawMode = SHADOW; // WARNING
14866	16860	parent.display(drawable);
14867		- drawMode = temp;
	16861	+ Globals.drawMode = temp; // WARNING
14868	16862	}
14869	16863
14870	16864	gl.glCullFace(gl.GL_BACK);
..	..	@@ -14917,7 +16911,6 @@
14917	16911
14918	16912	class AntialiasBuffer implements GLEventListener
14919	16913	{
14920		-
14921	16914	CameraPane parent = null;
14922	16915
14923	16916	AntialiasBuffer(CameraPane p)
..	..	@@ -15027,13 +17020,19 @@
15027	17020	gl.glFlush();
15028	17021
15029	17022	/**/
15030		- gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_BGRA, GL.GL_UNSIGNED_INT_8_8_8_8_REV, occlusionsizebuffer);
	17023	+ gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusionsizebuffer);
15031	17024
15032		- int[] pixels = occlusionsizebuffer.array();
	17025	+ float[] pixels = occlusionsizebuffer.array();
15033	17026
15034	17027	double r = 0, g = 0, b = 0;
15035	17028
15036	17029	double count = 0;
	17030	+
	17031	+ gl.glGetDoublev(gl.GL_PROJECTION_MATRIX, tempmat2, 0);
	17032	+
	17033	+ float mindepth = 1;
	17034	+
	17035	+ double FACTOR = 1;
15037	17036
15038	17037	for (int i = 0; i < pixels.length; i++)
15039	17038	{
..	..	@@ -15118,7 +17117,7 @@
15118	17117
15119	17118	double scale = ray.z; // 1; // cos
15120	17119
15121		- int p = pixels[newindex];
	17120	+ float depth = pixels[newindex];
15122	17121
15123	17122	/*
15124	17123	int newindex2 = (x + 1) * OCCLUSION_SIZE + y;
..	..	@@ -15142,10 +17141,23 @@
15142	17141	scale = (1 - modu) * modv;
15143	17142	*/
15144	17143
15145		- r += ((p >> 16) & 0xFF) * scale / 255;
15146		- g += ((p >> 8) & 0xFF) * scale / 255;
15147		- b += (p & 0xFF) * scale / 255;
	17144	+ //r += ((p >> 16) & 0xFF) * scale / 255;
	17145	+ //g += ((p >> 8) & 0xFF) * scale / 255;
	17146	+ //b += (p & 0xFF) * scale / 255;
	17147	+
	17148	+ if (mindepth > depth)
	17149	+ {
	17150	+ mindepth = depth;
	17151	+ }
15148	17152
	17153	+ double z_eye = tempmat2[34 + 2] / (depth -2.0 + 1.0 - tempmat2[2*4 + 2]);
	17154	+
	17155	+ double factor = 1 - Math.exp(-z_eye * z_eye / FACTOR);
	17156	+
	17157	+ r += factor * scale;
	17158	+ g += factor * scale;
	17159	+ b += factor * scale;
	17160	+
15149	17161	count += scale;
15150	17162	}
15151	17163
..	..	@@ -15243,12 +17255,6 @@
15243	17255	GLUT glut = new GLUT();
15244	17256
15245	17257
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	17258	public boolean spherical = false;
15253	17259	static boolean DEBUG_OCCLUSION = false;
15254	17260	static boolean DEBUG_SELECTION = false;
..	..	@@ -15261,21 +17267,15 @@
15261	17267	int AAbuffersize = 0;
15262	17268
15263	17269	//double[] selectedpoint = new double[3];
15264		- static Sphere selectedpoint = new Sphere();
	17270	+ static Superellipsoid selectedpoint;
15265	17271	static Sphere previousselectedpoint = null;
15266		- static Sphere debugpoint = new Sphere();
15267		- static Sphere debugpoint2 = new Sphere();
	17272	+ static Sphere debugpointG;
	17273	+ static Sphere debugpointP;
	17274	+ static Sphere debugpointC;
	17275	+ static Sphere debugpointR;
15268	17276
15269	17277	static Sphere debugpoints[] = new Sphere[8];
15270	17278
15271		- static
15272		- {
15273		- for (int i=0; i<8; i++)
15274		- {
15275		- debugpoints[i] = new Sphere();
15276		- }
15277		- }
15278		-
15279	17279	static void InitPoints(float radius)
15280	17280	{
15281	17281	for (int i=0; i<8; i++)
..	..	@@ -15295,7 +17295,7 @@
15295	17295	}
15296	17296	}
15297	17297
15298		- static void DrawPoints(CameraPane cpane)
	17298	+ static void DrawPoints(iCameraPane cpane)
15299	17299	{
15300	17300	for (int i=0; i<8; i++) // first and last are red
15301	17301	{
..	..	@@ -15317,7 +17317,8 @@
15317	17317	static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
15318	17318	static IntBuffer selectsizebuffer = IntBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
15319	17319	static java.nio.FloatBuffer pointselectsizebuffer = java.nio.FloatBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
15320		- static IntBuffer occlusionsizebuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17320	+ //static IntBuffer occlusionsizebuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17321	+ static java.nio.FloatBuffer occlusionsizebuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
15321	17322	static BufferedImage bufimage = new BufferedImage(TEX_SIZE, TEX_SIZE, BufferedImage.TYPE_INT_RGB);
15322	17323	static BufferedImage textest = new cBufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB);
15323	17324	static java.util.Vector<BufferedImage> billboards = new java.util.Vector<BufferedImage>();
..	..	@@ -15326,10 +17327,11 @@
15326	17327	static IntBuffer textbuffer = null; // IntBuffer.allocate(TEXT_WIDTH88 * TEXT_HEIGHT);
15327	17328	// Depth buffer format
15328	17329	//private int depth_format;
15329		- static public void NextIndex(Object3D o, GL gl)
	17330	+
	17331	+ public void NextIndex()
15330	17332	{
15331	17333	indexcount+=16;
15332		- gl.glColor3d(((indexcount >>> 16) & 255) / 255.0, ((indexcount >>> 8) & 255) / 255.0, ((indexcount) & 255) / 255.0);
	17334	+ GetGL().glColor3d(((indexcount >>> 16) & 255) / 255.0, ((indexcount >>> 8) & 255) / 255.0, ((indexcount) & 255) / 255.0);
15333	17335	//objects[indexcount] = o;
15334	17336	//System.out.println("indexcount = " + indexcount);
15335	17337	}