~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,7 +1868,7 @@
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	1874	// GrafreeD.tracein(matrix);
..	..	@@ -254,7 +1897,7 @@
254	1897	void PushMatrix(double[][] matrix)
255	1898	{
256	1899	// GrafreeD.tracein(matrix);
257		- PushMatrix(matrix,1);
	1900	+ PushMatrix(matrix, 1);
258	1901	}
259	1902
260	1903	void PushMatrix()
..	..	@@ -270,7 +1913,7 @@
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
..	..	@@ -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		- GrafreeD.savesound = true; // wav.save();
495		- // else
496		- repaint(); // start loop // may 2013
497		- }
498		-
499		- void ToggleSupport()
500		- {
501		- SUPPORT ^= true;
502		- }
503		-
504		- void ToggleAbort()
505		- {
506		- ABORTMODE ^= true;
507	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,11 +2379,11 @@
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	{
..	..	@@ -2595,6 +4215,7 @@
2595	4215
2596	4216	com.sun.opengl.util.texture.Texture CompressTexture2(String name)
2597	4217	{
	4218	+ new Exception().printStackTrace();
2598	4219	System.exit(0);
2599	4220	com.sun.opengl.util.texture.Texture texture = null;
2600	4221
..	..	@@ -6271,7 +7892,7 @@
6271	7892	return null;
6272	7893	}
6273	7894
6274		- void ReleaseTextures(cTexture tex)
	7895	+ public void ReleaseTextures(cTexture tex) // INTERFACE
6275	7896	{
6276	7897	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
6277	7898	{
..	..	@@ -6307,9 +7928,67 @@
6307	7928	ReleaseTexture(pigment, false);
6308	7929	}
6309	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	+
6310	7989	void ReleaseTexture(String tex, boolean bump)
6311	7990	{
6312		- if (// drawMode != 0 \|\| /tex == null \|\|/
	7991	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
6313	7992	ambientOcclusion ) // \|\| !textureon)
6314	7993	{
6315	7994	return;
..	..	@@ -6410,9 +8089,9 @@
6410	8089	}
6411	8090	}
6412	8091
6413		- /boolean/ void BindTextures(cTexture tex, int resolution)
	8092	+ /boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
6414	8093	{
6415		- if (// drawMode != 0 \|\| /tex == null \|\|/
	8094	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
6416	8095	ambientOcclusion ) // \|\| !textureon)
6417	8096	{
6418	8097	return; // false;
..	..	@@ -6455,7 +8134,94 @@
6455	8134	return; // true;
6456	8135	}
6457	8136
6458		- CacheTexture GetCacheTexture(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
6459	8225	{
6460	8226	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
6461	8227
..	..	@@ -6463,12 +8229,18 @@
6463	8229	{
6464	8230	String texname = tex;
6465	8231
6466		- String[] split = tex.split("Textures");
6467		- if (split.length > 1)
6468		- texname = "/Users/nbriere/Textures" + split[split.length-1];
6469		- else
6470		- if (!texname.startsWith("/"))
6471		- texname = "/Users/nbriere/Textures/" + texname;
	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	+ }
6472	8244
6473	8245	if (CACHETEXTURE)
6474	8246	texture = textures.get(texname); // TEXTURE CACHE
..	..	@@ -6537,7 +8309,7 @@
6537	8309	}
6538	8310
6539	8311	cachename = texname.substring(0, texname.length()-4)+ext+".jpg";
6540		- if (!new File(cachename).exists())
	8312	+ if (!FileExists(cachename))
6541	8313	cachename = texname;
6542	8314	else
6543	8315	processbump = false; // don't process bump map again
..	..	@@ -6559,7 +8331,7 @@
6559	8331	}
6560	8332
6561	8333	cachename = texname.substring(0, texname.length()-4)+ext+".png";
6562		- if (!new File(cachename).exists())
	8334	+ if (!FileExists(cachename))
6563	8335	cachename = texname;
6564	8336	else
6565	8337	processbump = false; // don't process bump map again
..	..	@@ -6568,7 +8340,9 @@
6568	8340	texturedata = GetFileTexture(cachename, processbump, resolution);
6569	8341
6570	8342
6571		- if (texturedata != null)
	8343	+ if (texturedata == null)
	8344	+ throw new Exception();
	8345	+
6572	8346	texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
6573	8347	//texture = GetTexture(tex, bump);
6574	8348	}
..	..	@@ -6690,7 +8464,7 @@
6690	8464	return texture;
6691	8465	}
6692	8466
6693		- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution)
	8467	+ com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution) throws Exception
6694	8468	{
6695	8469	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
6696	8470
..	..	@@ -6708,14 +8482,14 @@
6708	8482	return texture!=null?texture.texture:null;
6709	8483	}
6710	8484
6711		- com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution)
	8485	+ public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution) throws Exception
6712	8486	{
6713	8487	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
6714	8488
6715	8489	return texture!=null?texture.texturedata:null;
6716	8490	}
6717	8491
6718		- boolean BindTexture(String tex, boolean bump, int resolution)
	8492	+ boolean BindTexture(String tex, boolean bump, int resolution) throws Exception
6719	8493	{
6720	8494	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
6721	8495	{
..	..	@@ -7312,9 +9086,9 @@
7312	9086	static boolean occlusionInitialized = false;
7313	9087	boolean selection = false;
7314	9088	boolean pointselection = false;
7315		- /static/ boolean lighttouched = true;
	9089	+ ///static/ boolean lighttouched = true;
7316	9090	boolean deselect;
7317		- boolean ambientOcclusion = false;
	9091	+ private boolean ambientOcclusion = false;
7318	9092	static boolean flash = false;
7319	9093	/static/ boolean wait = false;
7320	9094	boolean displaydone = false; // after repaint() calls
..	..	@@ -7444,6 +9218,8 @@
7444	9218	//gl.glFrustum(-0.5scale, 0.5scale, -0.5scale, 0.5scale, 1, 100);
7445	9219	//glu.gluPerspective(lightshaper_fovy, 1, lightshaper_zNear, lightshaper_zFar);
7446	9220	double scale = lightCamera.SCALE / lightCamera.Distance();
	9221	+// PATCH FILLE AUX JEANS
	9222	+ //scale *= lightCamera.shaper_fovy / 25;
7447	9223	gl.glScaled(2 * scale, 2 * scale, -scale);
7448	9224	gl.glTranslated(0, 0, lightCamera.DECAL);
7449	9225
..	..	@@ -7601,8 +9377,6 @@
7601	9377
7602	9378	boolean restartframe = false;
7603	9379
7604		- static int framecount = 0; // general-purpose global count
7605		-
7606	9380	void displayAntiAliased(javax.media.opengl.GL gl)
7607	9381	{
7608	9382	//gl.glGetIntegerv(gl.GL_ACCUM_RED_BITS, viewport, 0);
..	..	@@ -7633,7 +9407,7 @@
7633	9407	gl.glClear(gl.GL_ACCUM_BUFFER_BIT);
7634	9408	for (jitter = 0; jitter < ACSIZE; jitter++) //, GrafreeD.wav.cursor += LIVE ? 735 : 0)
7635	9409	{
7636		- framecount++;
	9410	+ Globals.framecount++;
7637	9411
7638	9412	if (CameraPane.tickcount > 0)
7639	9413	CameraPane.tickcount--;
..	..	@@ -7671,7 +9445,7 @@
7671	9445
7672	9446	gl.glLightfv(gl.GL_LIGHT0, gl.GL_POSITION, pos, 0);
7673	9447	*/
7674		- lighttouched = true;
	9448	+ Globals.lighttouched = true;
7675	9449	//System.err.println(" shadowbuffer: " + jitter);
7676	9450	shadowbuffer.display();
7677	9451
..	..	@@ -7692,8 +9466,8 @@
7692	9466	assert (parentcam != renderCamera);
7693	9467
7694	9468	if (renderCamera != lightCamera)
7695		- for (int count = parentcam.GetTransformCount(); --count>=0;)
7696		- LA.matConcat(parentcam.toParent, matrix, matrix);
	9469	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9470	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
7697	9471
7698	9472	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
7699	9473
..	..	@@ -7708,8 +9482,8 @@
7708	9482	LA.matCopy(renderCamera.fromScreen, matrix);
7709	9483
7710	9484	if (renderCamera != lightCamera)
7711		- for (int count = parentcam.GetTransformCount(); --count>=0;)
7712		- LA.matConcat(matrix, parentcam.fromParent, matrix);
	9485	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9486	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
7713	9487
7714	9488	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
7715	9489
..	..	@@ -7781,7 +9555,7 @@
7781	9555	//gl.glFlush();
7782	9556	gl.glAccum(gl.GL_ACCUM, 1.0f / ACSIZE);
7783	9557
7784		- if (ANIMATION && ABORTED)
	9558	+ if (Globals.ANIMATION && ABORTED)
7785	9559	{
7786	9560	System.err.println(" ABORTED FRAME");
7787	9561	break;
..	..	@@ -7811,7 +9585,7 @@
7811	9585	setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
7812	9586
7813	9587	// save image
7814		- if (ANIMATION && !ABORTED)
	9588	+ if (Globals.ANIMATION && !ABORTED)
7815	9589	{
7816	9590	VPwidth = viewport[2];
7817	9591	VPheight = viewport[3];
..	..	@@ -7922,11 +9696,11 @@
7922	9696
7923	9697	// imagecount++;
7924	9698
7925		- 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;
7926	9700
7927	9701	if (!BOXMODE)
7928	9702	{
7929		- System.out.println("image: " + fullname + " (wav cursor=" + (GrafreeD.wav.cursor / 735 / 4) + ")");
	9703	+ System.out.println("image: " + fullname + " (wav cursor=" + (Grafreed.wav.cursor / 735 / 4) + ")");
7930	9704	}
7931	9705
7932	9706	if (!BOXMODE)
..	..	@@ -7964,7 +9738,7 @@
7964	9738	ABORTED = false;
7965	9739	}
7966	9740	else
7967		- GrafreeD.wav.cursor += 735 * ACSIZE;
	9741	+ Grafreed.wav.cursor += 735 * ACSIZE;
7968	9742
7969	9743	if (false)
7970	9744	{
..	..	@@ -8618,13 +10392,6 @@
8618	10392	}
8619	10393	}
8620	10394
8621		- boolean IsFrozen()
8622		- {
8623		- boolean selectmode = drawMode == SELECTION \|\| CameraPane.DEBUG_SELECTION;
8624		-
8625		- return !selectmode && cameracount == 0; // != 0;
8626		- }
8627		-
8628	10395	boolean niceon = false;
8629	10396	javax.swing.Timer AAtimer = new javax.swing.Timer(750, this);
8630	10397	boolean currentlydrawing = false;
..	..	@@ -8634,16 +10401,16 @@
8634	10401
8635	10402	public void display(GLAutoDrawable drawable)
8636	10403	{
8637		- if (GrafreeD.savesound && GrafreeD.hassound)
	10404	+ if (Grafreed.savesound && Grafreed.hassound)
8638	10405	{
8639		- GrafreeD.wav.save();
8640		- GrafreeD.savesound = false;
8641		- GrafreeD.hassound = false;
	10406	+ Grafreed.wav.save();
	10407	+ Grafreed.savesound = false;
	10408	+ Grafreed.hassound = false;
8642	10409	}
8643	10410	// if (DEBUG_SELECTION)
8644	10411	// {
8645		-// if (drawMode != SELECTION)
8646		-// drawMode = SELECTION;
	10412	+// if (DrawMode() != SELECTION)
	10413	+// DrawMode() = SELECTION;
8647	10414	// }
8648	10415
8649	10416	if (!isRenderer)
..	..	@@ -8699,9 +10466,9 @@
8699	10466
8700	10467	//ANTIALIAS = 0;
8701	10468
8702		- if (drawMode == DEFAULT) // && CURRENTANTIALIAS > 0)
	10469	+ if (DrawMode() == DEFAULT) // && CURRENTANTIALIAS > 0)
8703	10470	{
8704		- if (niceon \|\| isLIVE())
	10471	+ if (niceon \|\| Globals.isLIVE())
8705	10472	{
8706	10473	//if(active == 0)
8707	10474	// antialiaser = null;
..	..	@@ -8726,7 +10493,7 @@
8726	10493	assert eyeCamera.shaper_zFar == 1E5f; // 500.0f;
8727	10494	*/
8728	10495
8729		- if (drawMode == DEFAULT)
	10496	+ if (DrawMode() == DEFAULT)
8730	10497	{
8731	10498	currentlydrawing = true;
8732	10499	}
..	..	@@ -8757,18 +10524,18 @@
8757	10524
8758	10525	// if(Applet3D.clipboard != null)
8759	10526	// System.out.println("Clipboard = " + Applet3D.clipboard); //.get(0).parent);
8760		-//drawMode = SELECTION;
	10527	+//DrawMode() = SELECTION;
8761	10528	indexcount = 0;
8762	10529
8763		- if (drawMode == OCCLUSION)
	10530	+ if (DrawMode() == OCCLUSION)
8764	10531	{
8765		- drawMode = DEFAULT;
	10532	+ Globals.drawMode = DEFAULT; // WARNING
8766	10533	ambientOcclusion = true;
8767	10534	setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
8768	10535	Object3D theobject = object;
8769	10536	Object3D theparent = object.parent;
8770	10537	object.parent = null;
8771		- object = (Object3D)GrafreeD.clone(object);
	10538	+ object = (Object3D)Grafreed.clone(object);
8772	10539	object.Stripify();
8773	10540	if (theobject.selection == null \|\| theobject.selection.Size() == 0)
8774	10541	theobject.PreprocessOcclusion(this);
..	..	@@ -8781,19 +10548,20 @@
8781	10548	ambientOcclusion = false;
8782	10549	}
8783	10550
8784		- if (lighttouched && drawMode == DEFAULT && !lightMode) // && !FROZEN)
	10551	+ if (//Globals.lighttouched &&
	10552	+ DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
8785	10553	{
8786	10554	//if (RENDERSHADOW) // ?
8787	10555	if (!IsFrozen())
8788	10556	{
8789	10557	// dec 2012
8790		- if (!ambientOcclusion && !(!flash && !lightMode && drawMode == DEFAULT && ANTIALIAS > 0))
	10558	+ if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
8791	10559	{
8792		- framecount++;
	10560	+ Globals.framecount++;
8793	10561	shadowbuffer.display();
8794	10562	}
8795	10563	}
8796		- lighttouched = false; // ??
	10564	+ Globals.lighttouched = false; // ??
8797	10565	//drawing = true;
8798	10566	//lighttouched = true;
8799	10567	}
..	..	@@ -8814,9 +10582,9 @@
8814	10582	//eyeCamera.shaper_fovy = 1;
8815	10583	}
8816	10584
8817		- if ((RENDERPROGRAM != 0 \|\| ambientOcclusion \|\| spherical) && drawMode == DEFAULT) // SELECTION)
	10585	+ if ((RENDERPROGRAM != 0 \|\| ambientOcclusion \|\| spherical) && DrawMode() == DEFAULT) // SELECTION)
8818	10586	{
8819		- //System.out.println("drawMode = " + drawMode);
	10587	+ //System.out.println("DrawMode() = " + DrawMode());
8820	10588	vertexMode \|= VP_PASS;
8821	10589	//vertexMode \|= VP_PROJECTION;
8822	10590	if (!ambientOcclusion)
..	..	@@ -8876,7 +10644,7 @@
8876	10644	Camera cam = renderCamera; // lightMode?lightCamera:eyeCamera;
8877	10645	//Camera lightcam = new Camera(light0);
8878	10646
8879		- if (drawMode == SHADOW)
	10647	+ if (DrawMode() == SHADOW)
8880	10648	{
8881	10649	/*
8882	10650	gl.glMatrixMode(GL.GL_MODELVIEW);
..	..	@@ -8914,8 +10682,8 @@
8914	10682
8915	10683	// if (parentcam != renderCamera) // not a light
8916	10684	if (cam != lightCamera)
8917		- for (int count = parentcam.GetTransformCount(); --count>=0;)
8918		- LA.matConcat(parentcam.toParent, matrix, matrix);
	10685	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10686	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
8919	10687
8920	10688	for (int j = 0; j < 4; j++)
8921	10689	{
..	..	@@ -8929,8 +10697,8 @@
8929	10697
8930	10698	// if (parentcam != renderCamera) // not a light
8931	10699	if (cam != lightCamera)
8932		- for (int count = parentcam.GetTransformCount(); --count>=0;)
8933		- LA.matConcat(matrix, parentcam.fromParent, matrix);
	10700	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10701	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
8934	10702
8935	10703	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
8936	10704
..	..	@@ -8966,7 +10734,7 @@
8966	10734	gl.glClear(gl.GL_DEPTH_BUFFER_BIT);
8967	10735	} else
8968	10736	{
8969		- if (drawMode != DEFAULT)
	10737	+ if (DrawMode() != DEFAULT)
8970	10738	{
8971	10739	gl.glClearColor(1, 1, 1, 0);
8972	10740	} // 1);
..	..	@@ -9031,7 +10799,7 @@
9031	10799
9032	10800	fast &= !ambientOcclusion;
9033	10801
9034		- if (drawMode == DEFAULT)
	10802	+ if (DrawMode() == DEFAULT)
9035	10803	{
9036	10804	//gl.glEnable(gl.GL_ALPHA_TEST);
9037	10805	//gl.glActiveTexture(GL.GL_TEXTURE0);
..	..	@@ -9092,6 +10860,8 @@
9092	10860	//gl.glFrustum(-0.5scale, 0.5scale, -0.5scale, 0.5scale, 1, 100);
9093	10861	//glu.gluPerspective(lightshaper_fovy, 1, lightshaper_zNear, lightshaper_zFar);
9094	10862	double scale = lightCamera.SCALE / lightCamera.Distance();
	10863	+// PATCH FILLE AUX JEANS
	10864	+ //scale *= lightCamera.shaper_fovy / 25;
9095	10865	gl.glScaled(2 * scale, 2 * scale, -scale);
9096	10866	gl.glTranslated(0, 0, lightCamera.DECAL);
9097	10867
..	..	@@ -9187,7 +10957,16 @@
9187	10957	// Bump noise
9188	10958	gl.glActiveTexture(GL.GL_TEXTURE6);
9189	10959	//gl.glBindTexture(GL.GL_TEXTURE_2D, bump_noise);
9190		- BindTexture(NOISE_TEXTURE, false, 2);
	10960	+
	10961	+ try
	10962	+ {
	10963	+ BindTexture(NOISE_TEXTURE, false, 2);
	10964	+ }
	10965	+ catch (Exception e)
	10966	+ {
	10967	+ System.err.println("FAILED: " + NOISE_TEXTURE);
	10968	+ }
	10969	+
9191	10970
9192	10971	gl.glActiveTexture(GL.GL_TEXTURE0);
9193	10972	gl.glEnable(GL.GL_TEXTURE_2D);
..	..	@@ -9227,10 +11006,12 @@
9227	11006	gl.glMatrixMode(gl.GL_PROJECTION);
9228	11007	gl.glLoadIdentity();
9229	11008
9230		- if (drawMode == SHADOW \|\| cam == lightCamera) // \|\| (vertexMode&VP_PROJECTION) != 0)
	11009	+ if (DrawMode() == SHADOW \|\| cam == lightCamera) // \|\| (vertexMode&VP_PROJECTION) != 0)
9231	11010	{
9232	11011	//glu.gluPerspective(lightshaper_fovy, 1, lightshaper_zNear, lightshaper_zFar);
9233	11012	double scale = lightCamera.SCALE / lightCamera.Distance();
	11013	+// PATCH FILLE AUX JEANS
	11014	+ //scale *= lightCamera.shaper_fovy / 25;
9234	11015	gl.glScaled(2 * scale, 2 * scale, -scale);
9235	11016	gl.glTranslated(0, 0, lightCamera.DECAL);
9236	11017	//System.out.println("DECAL = " + LIGHTDECAL + "; SCALE = " + LIGHTSCALE);
..	..	@@ -9283,7 +11064,7 @@
9283	11064	//gl.glPushMatrix();
9284	11065	gl.glLoadIdentity();
9285	11066
9286		- if (!ambientOcclusion) // drawMode != OCCLUSION)
	11067	+ if (!ambientOcclusion) // DrawMode() != OCCLUSION)
9287	11068	{
9288	11069	//LA.xformPos(light0, lightCamera.fromScreen, light);
9289	11070	LA.xformDir(dirlight, lightCamera.fromScreen, lightposition);
..	..	@@ -9310,8 +11091,8 @@
9310	11091	System.err.println("parentcam != renderCamera");
9311	11092
9312	11093	// if (cam != lightCamera)
9313		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9314		- LA.xformDir(lightposition, parentcam.toParent, lightposition); // may 2013
	11094	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11095	+ LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
9315	11096	}
9316	11097
9317	11098	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -9332,8 +11113,8 @@
9332	11113	if (true) // TODO
9333	11114	{
9334	11115	if (cam != lightCamera)
9335		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9336		- LA.xformDir(light0, parentcam.toParent, light0); // may 2013
	11116	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11117	+ LA.xformDir(light0, parentcam.GlobalTransform(), light0); // may 2013
9337	11118	}
9338	11119
9339	11120	LA.xformPos(light0, cam.toScreen, light0);
..	..	@@ -9370,7 +11151,7 @@
9370	11151	}
9371	11152
9372	11153	/**/
9373		- if (true) // drawMode == SELECTION) // != DEFAULT)
	11154	+ if (true) // DrawMode() == SELECTION) // != DEFAULT)
9374	11155	gl.glDisable(gl.GL_LIGHTING);
9375	11156	else
9376	11157	gl.glEnable(gl.GL_LIGHTING);
..	..	@@ -9388,7 +11169,7 @@
9388	11169
9389	11170	lightslot = 64;
9390	11171
9391		- if (!frozen && !ambientOcclusion && isRenderer && drawMode == DEFAULT)
	11172	+ if (!frozen && !ambientOcclusion && isRenderer && DrawMode() == DEFAULT)
9392	11173	{
9393	11174	DrawLights(object);
9394	11175	}
..	..	@@ -9399,7 +11180,7 @@
9399	11180	fragmentMode \|= (lightslot - 64) << 2; // 1; // first bit is available for aniso
9400	11181	//System.out.println("fragmentMode = " + fragmentMode);
9401	11182
9402		- if (drawMode == DEFAULT \|\| drawMode == SELECTION \|\| DEBUG_SELECTION)
	11183	+ if (DrawMode() == DEFAULT \|\| DrawMode() == SELECTION \|\| IsDebugSelection())
9403	11184	{
9404	11185	/*
9405	11186	if (CULLFACE \|\| (ambientOcclusion && OCCLUSION_CULLING))
..	..	@@ -9432,7 +11213,7 @@
9432	11213	}
9433	11214	}
9434	11215
9435		- if (drawMode == DEFAULT)
	11216	+ if (DrawMode() == DEFAULT)
9436	11217	{
9437	11218	if (WIREFRAME && !ambientOcclusion)
9438	11219	{
..	..	@@ -9450,7 +11231,7 @@
9450	11231	gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9451	11232	gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9452	11233
9453		- if (!fast/RENDERPROGRAM != 0/ && (drawMode == DEFAULT \|\| drawMode == SHADOW)) // && !WIREFRAME) //
	11234	+ if (!fast/RENDERPROGRAM != 0/ && (DrawMode() == DEFAULT \|\| DrawMode() == SHADOW)) // && !WIREFRAME) //
9454	11235	{
9455	11236	if (vertexMode != 0) // && !fast)
9456	11237	{
..	..	@@ -9470,7 +11251,7 @@
9470	11251	}
9471	11252	}
9472	11253
9473		- if (false) // fast && !IsFreezed() && drawMode != SELECTION && !ambientOcclusion)
	11254	+ if (false) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
9474	11255	{
9475	11256	//gl.glDepthFunc(GL.GL_LEQUAL);
9476	11257	//gl.glClear(gl.GL_COLOR_BUFFER_BIT \| gl.GL_DEPTH_BUFFER_BIT);
..	..	@@ -9498,7 +11279,7 @@
9498	11279	//gl.glDepthMask(false);
9499	11280	}
9500	11281
9501		- if (false) // drawMode == SHADOW)
	11282	+ if (false) // DrawMode() == SHADOW)
9502	11283	{
9503	11284	//SetColumnMajorData(cameraInverseTransform, view_1);
9504	11285	//System.out.println("light = " + cameraInverseTransform);
..	..	@@ -9512,16 +11293,16 @@
9512	11293	//System.out.println("object = " + object);
9513	11294	if (!frozen && !imageLocked)
9514	11295	{
9515		- if (!flash && !lightMode && drawMode == DEFAULT && ANTIALIAS > 0)
	11296	+ if (!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0)
9516	11297	{
9517	11298	displayAntiAliased(gl);
9518	11299	} else
9519	11300	{
9520	11301	programcount = 0;
9521		- int keepmode = drawMode;
	11302	+ int keepmode = DrawMode();
9522	11303	// if (DEBUG_SELECTION)
9523	11304	// {
9524		-// drawMode = SELECTION;
	11305	+// DrawMode() = SELECTION;
9525	11306	// }
9526	11307	// for point selection
9527	11308	// gl.glGetDoublev(gl.GL_MODELVIEW_MATRIX, tempmat, 0);
..	..	@@ -9531,10 +11312,10 @@
9531	11312	DrawObject(gl);
9532	11313
9533	11314	// jan 2013 System.err.println("RESET ABORT (display)");
9534		- // if (drawMode == DEFAULT)
	11315	+ // if (DrawMode() == DEFAULT)
9535	11316	// ABORTED = false;
9536	11317	fullreset = false;
9537		- drawMode = keepmode;
	11318	+ Globals.drawMode = keepmode; // WARNING
9538	11319	//System.out.println("PROGRAM SWITCH " + programcount);
9539	11320	}
9540	11321	}
..	..	@@ -9542,11 +11323,11 @@
9542	11323	gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9543	11324	gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9544	11325
9545		- if (drawMode == DEFAULT)
	11326	+ if (DrawMode() == DEFAULT)
9546	11327	{
9547	11328	ReleaseTexture(NOISE_TEXTURE, false);
9548	11329	}
9549		- //if (drawMode == DEFAULT)
	11330	+ //if (DrawMode() == DEFAULT)
9550	11331	{
9551	11332
9552	11333	gl.glActiveTexture(GL.GL_TEXTURE1);
..	..	@@ -9558,7 +11339,7 @@
9558	11339	//else
9559	11340	//gl.glDisable(gl.GL_TEXTURE_2D);
9560	11341	//gl.glPopMatrix();
9561		- if (imageCompleted && ANTIALIAS > 0 && drawMode == DEFAULT && cam != lightCamera && !ambientOcclusion)
	11342	+ if (imageCompleted && ANTIALIAS > 0 && DrawMode() == DEFAULT && cam != lightCamera && !ambientOcclusion)
9562	11343	{
9563	11344	//new Exception().printStackTrace();
9564	11345	//System.out.println("Draw image " + width + ", " + height);
..	..	@@ -9600,7 +11381,7 @@
9600	11381	//gl.glFlush();
9601	11382	}
9602	11383
9603		- if (flash && drawMode == DEFAULT)
	11384	+ if (flash && DrawMode() == DEFAULT)
9604	11385	{
9605	11386	flash = false;
9606	11387	wait = true;
..	..	@@ -9608,9 +11389,9 @@
9608	11389	}
9609	11390
9610	11391	//drawing = false;
9611		- //if(drawMode == DEFAULT)
	11392	+ //if(DrawMode() == DEFAULT)
9612	11393	// niceon = false;
9613		- if (drawMode == DEFAULT)
	11394	+ if (DrawMode() == DEFAULT)
9614	11395	{
9615	11396	currentlydrawing = false;
9616	11397	}
..	..	@@ -9630,7 +11411,7 @@
9630	11411	repaint();
9631	11412	}
9632	11413
9633		- if (isLIVE() && drawMode == DEFAULT) // may 2013
	11414	+ if (Globals.isLIVE() && DrawMode() == DEFAULT) // may 2013
9634	11415	repaint();
9635	11416
9636	11417	displaydone = true;
..	..	@@ -9649,8 +11430,14 @@
9649	11430	{
9650	11431	renderpass++;
9651	11432	// System.out.println("Draw object... ");
	11433	+ STEP = 1;
9652	11434	if (FAST) // in case there is no script
9653		- STEP = 16;
	11435	+ STEP = 8;
	11436	+
	11437	+ if (CURRENTANTIALIAS == 0 \|\| ACSIZE == 1)
	11438	+ {
	11439	+ STEP *= 4;
	11440	+ }
9654	11441
9655	11442	//object.FullInvariants();
9656	11443
..	..	@@ -9664,22 +11451,40 @@
9664	11451	e.printStackTrace();
9665	11452	}
9666	11453
9667		- if (GrafreeD.RENDERME > 0)
9668		- GrafreeD.RENDERME--; // mechante magouille
	11454	+ if (Grafreed.RENDERME > 0)
	11455	+ Grafreed.RENDERME--; // mechante magouille
9669	11456
9670		- ONESTEP = false;
	11457	+ Globals.ONESTEP = false;
9671	11458	}
9672	11459
9673	11460	static boolean zoomonce = false;
9674	11461
	11462	+ void CreateSelectedPoint()
	11463	+ {
	11464	+ if (selectedpoint == null)
	11465	+ {
	11466	+ debugpointG = new Sphere();
	11467	+ debugpointP = new Sphere();
	11468	+ debugpointC = new Sphere();
	11469	+ debugpointR = new Sphere();
	11470	+
	11471	+ selectedpoint = new Superellipsoid();
	11472	+
	11473	+ for (int i=0; i<8; i++)
	11474	+ {
	11475	+ debugpoints[i] = new Sphere();
	11476	+ }
	11477	+ }
	11478	+ }
	11479	+
9675	11480	void DrawObject(GL gl, boolean draw)
9676	11481	{
9677	11482	//System.out.println("DRAW OBJECT " + mouseDown);
9678		-// drawMode = SELECTION;
	11483	+// DrawMode() = SELECTION;
9679	11484	//GL gl = getGL();
9680	11485	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
9681	11486	{
9682		- if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && drawMode == SHADOW) // && !lightMode)
	11487	+ if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
9683	11488	object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
9684	11489	pingthread.StepToTarget(true); // true);
9685	11490	// zoomonce = false;
..	..	@@ -9700,9 +11505,9 @@
9700	11505	callist = gl.glGenLists(1);
9701	11506	}
9702	11507
9703		- boolean selectmode = drawMode == SELECTION \|\| CameraPane.DEBUG_SELECTION;
	11508	+ boolean selectmode = DrawMode() == SELECTION \|\| IsDebugSelection();
9704	11509
9705		- boolean active = !selectmode; // drawMode != SELECTION; // mouseDown;
	11510	+ boolean active = !selectmode; // DrawMode() != SELECTION; // mouseDown;
9706	11511
9707	11512	if (!mainDL \|\| !active \|\| touched)
9708	11513	{
..	..	@@ -9729,13 +11534,20 @@
9729	11534	PushMatrix(ClickInfo.matbuffer);
9730	11535	}
9731	11536
9732		- if (drawMode == 0)
	11537	+ if (DrawMode() == 0)
9733	11538	{
9734	11539	// System.out.println("CLEAR +++++++++++++++ +++++++++++++++ +++++++++++++++ +++++++++++++++");
9735	11540
9736	11541	usedtextures.clear();
9737	11542
9738		- BindTextures(DEFAULT_TEXTURES, 2);
	11543	+ try
	11544	+ {
	11545	+ BindTextures(DEFAULT_TEXTURES, 2);
	11546	+ }
	11547	+ catch (Exception e)
	11548	+ {
	11549	+ System.err.println("FAILED: " + DEFAULT_TEXTURES);
	11550	+ }
9739	11551	}
9740	11552	//System.out.println("--> " + stackdepth);
9741	11553	// GrafreeD.traceon();
..	..	@@ -9743,10 +11555,11 @@
9743	11555	// DRAW
9744	11556	object.draw(this, /(Composite)/ object, false, false);
9745	11557
9746		- if (drawMode == DEFAULT)
	11558	+ if (DrawMode() == DEFAULT)
9747	11559	{
9748		- if (DEBUG)
	11560	+ if (Globals.DEBUG)
9749	11561	{
	11562	+ CreateSelectedPoint();
9750	11563	float radius = 0.05f;
9751	11564	if (selectedpoint.radius != radius)
9752	11565	{
..	..	@@ -9754,40 +11567,40 @@
9754	11567	selectedpoint.radius = radius;
9755	11568	selectedpoint.recalculate();
9756	11569	selectedpoint.material = new cMaterial();
9757		- selectedpoint.material.color = 0.25f;
	11570	+ selectedpoint.material.color = 0.15f; // Yellow
9758	11571	selectedpoint.material.modulation = 0.75f;
9759	11572
9760		- debugpoint.radius = radius;
9761		- debugpoint.recalculate();
9762		- debugpoint.material = new cMaterial();
9763		- debugpoint.material.color = 0.25f;
9764		- debugpoint.material.modulation = 0.75f;
	11573	+ debugpointG.radius = radius;
	11574	+ debugpointG.recalculate();
	11575	+ debugpointG.material = new cMaterial();
	11576	+ debugpointG.material.color = 0.25f; // Green
	11577	+ debugpointG.material.modulation = 0.75f;
9765	11578
9766		- debugpoint2.radius = radius;
9767		- debugpoint2.recalculate();
9768		- debugpoint2.material = new cMaterial();
9769		- debugpoint2.material.color = 0.75f;
9770		- debugpoint2.material.modulation = 0.75f;
	11579	+ debugpointP.radius = radius;
	11580	+ debugpointP.recalculate();
	11581	+ debugpointP.material = new cMaterial();
	11582	+ debugpointP.material.color = 0.75f; // Purple
	11583	+ debugpointP.material.modulation = 0.75f;
9771	11584
9772		- debugpoint3.radius = radius;
9773		- debugpoint3.recalculate();
9774		- debugpoint3.material = new cMaterial();
9775		- debugpoint3.material.color = 0.5f;
9776		- debugpoint3.material.modulation = 0.75f;
	11585	+ debugpointC.radius = radius;
	11586	+ debugpointC.recalculate();
	11587	+ debugpointC.material = new cMaterial();
	11588	+ debugpointC.material.color = 0.5f; // Cyan
	11589	+ debugpointC.material.modulation = 0.75f;
9777	11590
9778		- debugpoint4.radius = radius;
9779		- debugpoint4.recalculate();
9780		- debugpoint4.material = new cMaterial();
9781		- debugpoint4.material.color = 0f;
9782		- debugpoint4.material.modulation = 0.75f;
	11591	+ debugpointR.radius = radius;
	11592	+ debugpointR.recalculate();
	11593	+ debugpointR.material = new cMaterial();
	11594	+ debugpointR.material.color = 0f; // Red
	11595	+ debugpointR.material.modulation = 0.75f;
9783	11596
9784	11597	InitPoints(radius);
9785	11598	}
9786	11599	selectedpoint.draw(this, /(Composite)/ null, false, false);
9787		- debugpoint.draw(this, /(Composite)/ null, false,false);
9788		- debugpoint2.draw(this, /(Composite)/ null, false,false);
9789		- debugpoint3.draw(this, /(Composite)/ null, false,false);
9790		- debugpoint4.draw(this, /(Composite)/ null, false,false);
	11600	+ debugpointG.draw(this, /(Composite)/ null, false,false);
	11601	+ debugpointP.draw(this, /(Composite)/ null, false,false);
	11602	+ debugpointC.draw(this, /(Composite)/ null, false,false);
	11603	+ debugpointR.draw(this, /(Composite)/ null, false,false);
9791	11604	// DrawPoints(this);
9792	11605	}
9793	11606
..	..	@@ -9795,7 +11608,7 @@
9795	11608	}
9796	11609	// GrafreeD.traceoff();
9797	11610	//System.out.println(stackdepth);
9798		- if (drawMode == 0)
	11611	+ if (DrawMode() == 0)
9799	11612	{
9800	11613	ReleaseTextures(DEFAULT_TEXTURES);
9801	11614
..	..	@@ -9820,17 +11633,26 @@
9820	11633
9821	11634	checker = null;
9822	11635
9823		- if (!ambientOcclusion && !IsFrozen() && drawMode == DEFAULT)
	11636	+ if (!ambientOcclusion && !IsFrozen() && DrawMode() == DEFAULT)
9824	11637	FindChecker(object);
9825	11638
9826		- if (checker != null && drawMode == DEFAULT)
	11639	+ if (checker != null && DrawMode() == DEFAULT)
9827	11640	{
9828		- // BindTexture(IMMORTAL_TEXTURE);
	11641	+ //BindTexture(IMMORTAL_TEXTURE);
	11642	+ try
	11643	+ {
	11644	+ BindTextures(checker.GetTextures(), checker.texres);
	11645	+ }
	11646	+ catch (Exception e)
	11647	+ {
	11648	+ System.err.println("FAILED: " + checker.GetTextures());
	11649	+ }
9829	11650	// NEAREST
9830	11651	GetGL().glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST); // GL.GL_LINEAR);
9831	11652	DrawChecker(gl);
9832	11653	//checker.Draw(this, null, false);
9833	11654	// ReleaseTexture(IMMORTAL_TEXTURE);
	11655	+ ReleaseTextures(checker.GetTextures());
9834	11656	}
9835	11657
9836	11658	if (object.parent != null)
..	..	@@ -9843,7 +11665,7 @@
9843	11665	//gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9844	11666	//gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9845	11667
9846		- if (DISPLAYTEXT && drawMode == DEFAULT)
	11668	+ if (DISPLAYTEXT && DrawMode() == DEFAULT)
9847	11669	{
9848	11670	// Draw it once, then use the raster
9849	11671	Balloon(gl, balloon.createGraphics());
..	..	@@ -9899,14 +11721,14 @@
9899	11721	int[] xs = new int[3];
9900	11722	int[] ys = new int[3];
9901	11723
9902		- void DrawString(Object3D obj) // String string)
	11724	+ public void DrawString(Object3D obj) // String string) // INTERFACE
9903	11725	{
9904		- if (!DISPLAYTEXT \|\| drawMode != DEFAULT)
	11726	+ if (!DISPLAYTEXT \|\| DrawMode() != DEFAULT)
9905	11727	{
9906	11728	return;
9907	11729	}
9908	11730
9909		- String string = obj.GetToolTip();
	11731	+ String string = obj.toString(); //.GetToolTip();
9910	11732
9911	11733	GL gl = GetGL();
9912	11734
..	..	@@ -10223,8 +12045,8 @@
10223	12045	//obj.TransformToWorld(light, light);
10224	12046	for (int i = tp.size(); --i >= 0;)
10225	12047	{
10226		- for (int count = tp.get(i).GetTransformCount(); --count>=0;)
10227		- LA.xformPos(light, tp.get(i).toParent, light);
	12048	+ //for (int count = tp.get(i).GetTransformCount(); --count>=0;)
	12049	+ LA.xformPos(light, tp.get(i).GlobalTransform(), light);
10228	12050	}
10229	12051
10230	12052
..	..	@@ -10241,8 +12063,8 @@
10241	12063	parentcam = cameras[0];
10242	12064	}
10243	12065
10244		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10245		- LA.xformPos(light, parentcam.toParent, light); // may 2013
	12066	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	12067	+ LA.xformPos(light, parentcam.GlobalTransform(), light); // may 2013
10246	12068
10247	12069	LA.xformPos(light, renderCamera.toScreen, light);
10248	12070
..	..	@@ -10388,6 +12210,7 @@
10388	12210	"PARAM lodbias = { 10,10,10,10 };" + // 20, -2, -20, 1.0 };" +
10389	12211	"PARAM infinity = { 100000000, 100000000, 100000000, 1.0 };" +
10390	12212	"PARAM one2048th = { 0.00048828125, 0.00048828125, 0.00048828125, 1.0 };" +
	12213	+ "PARAM ninetenth = { 0.9, 0.9, 0.9, 1.0 };" +
10391	12214	"PARAM almostone = { 0.999, 0.999, 0.999, 1.0 };" +
10392	12215	"PARAM c256 = { 256, 256, 256, 1.0 };" +
10393	12216	"PARAM c256i = { 0.00390625, 0.00390625, 0.00390625, 1.0 };" +
..	..	@@ -10855,8 +12678,8 @@
10855	12678
10856	12679	// display shadow only (bump == 0)
10857	12680	"SUB temp.x, half.x, shadow.x;" +
10858		- "MOV temp.y, -params6.x;" +
10859		- "SLT temp.z, temp.y, zero.x;" +
	12681	+ "MOV temp.y, -params5.z;" + // params6.x;" +
	12682	+ "SLT temp.z, temp.y, -one2048th.x;" +
10860	12683	"SUB temp.y, one.x, temp.z;" +
10861	12684	"MUL temp.x, temp.x, temp.y;" +
10862	12685	"KIL temp.x;" +
..	..	@@ -10985,8 +12808,10 @@
10985	12808	"MAX ndotl.x, ndotl.x, -ndotl.x;" +
10986	12809
10987	12810	"SUB temp.x, one.x, ndotl.x;" +
10988		- "ADD temp.x, temp.x, options2.z;" + // lightsheen
10989		- "ADD temp.y, one.y, options2.y;" + // sursurface
	12811	+ // Tuning for default skin
	12812	+ //"ADD temp.x, temp.x, options2.z;" + // lightsheen
	12813	+ "MAD temp.x, options2.z, half.y, temp.x;" + // lightsheen
	12814	+ "ADD temp.y, one.y, options2.y;" + // subsurface
10990	12815	"MUL temp.x, temp.x, temp.y;" +
10991	12816
10992	12817	"MUL saturation, saturation, temp.xxxx;" +
..	..	@@ -11185,7 +13010,7 @@
11185	13010	//once = true;
11186	13011	}
11187	13012
11188		- System.out.print("Program #" + mode + "; length = " + program.length());
	13013	+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
11189	13014	System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
11190	13015	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
11191	13016
..	..	@@ -11302,6 +13127,7 @@
11302	13127	String Shadow(String depth, String shadow)
11303	13128	{
11304	13129	return "MAX temp.x, ndotl.x, one64th.x;" +
	13130	+ "MIN temp.x, temp.x, ninetenth.x;" +
11305	13131	/**/
11306	13132	// Sine
11307	13133	"MUL temp.y, temp.x, temp.x;" +
..	..	@@ -11317,12 +13143,16 @@
11317	13143
11318	13144	"ADD " + depth + ".z, " + depth + ".z, temp.x;" +
11319	13145	//"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing!
	13146	+
	13147	+ // Compare fragment depth in light space with shadowmap.
11320	13148	"SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" +
11321	13149	"SGE temp.y, temp.x, zero.x;" +
11322		- "SUB " + shadow + ".y, one.x, temp.y;" +
	13150	+ "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded
	13151	+
	13152	+ // Reverse comparison
11323	13153	"SUB temp.x, one.x, temp.x;" +
11324	13154	"MUL " + shadow + ".x, temp.x, temp.y;" +
11325		- "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded
	13155	+ "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse
11326	13156	"POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth
11327	13157
11328	13158	"SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" +
..	..	@@ -11336,6 +13166,10 @@
11336	13166	// No shadow for backface
11337	13167	"DP3 temp.x, normal, lightd;" +
11338	13168	"SLT temp.x, temp.x, zero.x;" + // shadoweps
	13169	+ "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
	13170	+
	13171	+ // No shadow when out of frustrum
	13172	+ "SGE temp.x, " + depth + ".z, one.z;" +
11339	13173	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
11340	13174	"";
11341	13175	}
..	..	@@ -11482,7 +13316,8 @@
11482	13316	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
11483	13317	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
11484	13318	/static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
11485		- Object3D.cVector2[] vector2buffer;
	13319	+
	13320	+ //Object3D.cVector2[] vector2buffer;
11486	13321
11487	13322	// IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
11488	13323	// OUT : diff, spec
..	..	@@ -11894,7 +13729,7 @@
11894	13729	public void mousePressed(MouseEvent e)
11895	13730	{
11896	13731	//System.out.println("mousePressed: " + e);
11897		- clickStart(e.getX(), e.getY(), e.getModifiersEx());
	13732	+ clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
11898	13733	}
11899	13734
11900	13735	static long prevtime = 0;
..	..	@@ -11921,14 +13756,16 @@
11921	13756
11922	13757	//System.err.println("Dtime = " + Dtime + "; units = " + e.getUnitsToScroll() + "; ratio (units/ms) = " + ratio);
11923	13758
	13759	+ if (BUTTONLESSWHEEL)
11924	13760	if (Math.abs(ratio) < 0.1 \|\| Math.abs(Dtime) == 0) // < 30)
11925	13761	{
11926	13762	return;
11927	13763	}
11928	13764
	13765	+ boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
11929	13766
11930	13767	// TIMER
11931		- if (!wheeltimer.isRunning() && e.getModifiersEx() == 0) // VR
	13768	+ if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
11932	13769	{
11933	13770	keepboxmode = BOXMODE;
11934	13771	keepsupport = SUPPORT;
..	..	@@ -11968,8 +13805,8 @@
11968	13805	// mode \|= META;
11969	13806	//}
11970	13807
11971		- SetMouseMode(WHEEL \| e.getModifiersEx());
11972		- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0);
	13808	+ SetMouseMode(e.getModifiers(), WHEEL \| e.getModifiersEx());
	13809	+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
11973	13810	anchorX = ax;
11974	13811	anchorY = ay;
11975	13812	prevX = px;
..	..	@@ -12029,6 +13866,10 @@
12029	13866	// wasliveok = true;
12030	13867	// waslive = false;
12031	13868
	13869	+ // May 2019 Forget it:
	13870	+ if (true)
	13871	+ return;
	13872	+
12032	13873	// source == timer
12033	13874	if (mouseDown)
12034	13875	{
..	..	@@ -12057,7 +13898,7 @@
12057	13898	// ObjEditor.tweenManager.update(1f / 60f);
12058	13899
12059	13900	// fev 2014???
12060		- if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && drawMode == SHADOW) // && !lightMode)
	13901	+ if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
12061	13902	object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
12062	13903	pingthread.StepToTarget(true); // true);
12063	13904	}
..	..	@@ -12067,7 +13908,7 @@
12067	13908
12068	13909	javax.swing.Timer timer = new javax.swing.Timer(350, this);
12069	13910
12070		- void clickStart(int x, int y, int modifiers)
	13911	+ void clickStart(int x, int y, int modifiers, int modifiersex)
12071	13912	{
12072	13913	if (!wasliveok)
12073	13914	return;
..	..	@@ -12084,7 +13925,7 @@
12084	13925	// touched = true; // main DL
12085	13926	if (isRenderer)
12086	13927	{
12087		- SetMouseMode(modifiers);
	13928	+ SetMouseMode(modifiers, modifiersex);
12088	13929	}
12089	13930
12090	13931	selectX = anchorX = x;
..	..	@@ -12097,7 +13938,7 @@
12097	13938	clicked = true;
12098	13939	hold = false;
12099	13940
12100		- if (((modifiers & ~1024) & ~0) == 0) // Single or multiple selection
	13941	+ if (((modifiersex & ~1024) & ~0) == 0) // Single or multiple selection
12101	13942	// june 2013 means CTRL_CLICK: if (((modifiers & ~1024) & ~128) == 0) // Single or multiple selection
12102	13943	{
12103	13944	// System.out.println("RESTART II " + modifiers);
..	..	@@ -12128,7 +13969,7 @@
12128	13969	info.camera = renderCamera;
12129	13970	info.x = x;
12130	13971	info.y = y;
12131		- info.modifiers = modifiers;
	13972	+ info.modifiers = modifiersex;
12132	13973	editObj = object.doEditClick(info, 0);
12133	13974	if (!editObj)
12134	13975	{
..	..	@@ -12145,11 +13986,14 @@
12145	13986
12146	13987	public void mouseDragged(MouseEvent e)
12147	13988	{
	13989	+ Globals.MOUSEDRAGGED = true;
	13990	+
	13991	+ //System.out.println("mouseDragged: " + e);
12148	13992	if (isRenderer)
12149	13993	movingcamera = true;
	13994	+
12150	13995	//if (drawing)
12151	13996	//return;
12152		- //System.out.println("mouseDragged: " + e);
12153	13997	if ((e.getModifiersEx() & CTRL) != 0
12154	13998	\|\| (e.getModifiersEx() & COMMAND) != 0) // \|\| IsFrozen())
12155	13999	{
..	..	@@ -12157,7 +14001,7 @@
12157	14001	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
12158	14002	}
12159	14003	else
12160		- drag(e.getX(), e.getY(), e.getModifiersEx());
	14004	+ drag(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
12161	14005
12162	14006	//try { Thread.sleep(1); } catch (Exception ex) {}
12163	14007	}
..	..	@@ -12169,6 +14013,11 @@
12169	14013	cVector tmp = new cVector();
12170	14014	cVector tmp2 = new cVector();
12171	14015	boolean isMoving;
	14016	+
	14017	+ public cVector TargetLookAt()
	14018	+ {
	14019	+ return targetLookAt;
	14020	+ }
12172	14021
12173	14022	class PingThread extends Thread
12174	14023	{
..	..	@@ -12308,7 +14157,7 @@
12308	14157	//System.out.println("---------------- ---------- Paint " + tmp.length2());
12309	14158	if (lightMode)
12310	14159	{
12311		- lighttouched = true;
	14160	+ Globals.lighttouched = true;
12312	14161	}
12313	14162
12314	14163	if (OEILONCE && OEIL)
..	..	@@ -12325,6 +14174,7 @@
12325	14174
12326	14175	public void run()
12327	14176	{
	14177	+ new Exception().printStackTrace();
12328	14178	System.exit(0);
12329	14179	for (;;)
12330	14180	{
..	..	@@ -12366,7 +14216,7 @@
12366	14216	mouseDown = false;
12367	14217	if (lightMode)
12368	14218	{
12369		- lighttouched = true;
	14219	+ Globals.lighttouched = true;
12370	14220	}
12371	14221	repaint();
12372	14222	alreadypainted = true;
..	..	@@ -12374,7 +14224,7 @@
12374	14224	isMoving = false;
12375	14225	} //??
12376	14226
12377		- if (isLIVE() && !alreadypainted)
	14227	+ if (Globals.isLIVE() && !alreadypainted)
12378	14228	{
12379	14229	// FOR DEBUG BREAKPOINT USING PAUSE: while (true)
12380	14230	repaint();
..	..	@@ -12386,9 +14236,9 @@
12386	14236	{
12387	14237	if (lightMode)
12388	14238	{
12389		- lighttouched = true;
	14239	+ Globals.lighttouched = true;
12390	14240	}
12391		- drag(X, (mouseMode != 0) ? Y : anchorY, MODIFIERS);
	14241	+ drag(X, (mouseMode != 0) ? Y : anchorY, 0, MODIFIERS);
12392	14242	}
12393	14243	//else
12394	14244	}
..	..	@@ -12488,7 +14338,7 @@
12488	14338	int X, Y;
12489	14339	boolean SX, SY;
12490	14340
12491		- void drag(int x, int y, int modifiers)
	14341	+ void drag(int x, int y, int modifiers, int modifiersex)
12492	14342	{
12493	14343	if (IsFrozen())
12494	14344	{
..	..	@@ -12497,17 +14347,17 @@
12497	14347
12498	14348	drag = true; // NEW
12499	14349
12500		- boolean continuous = (modifiers & COMMAND) == COMMAND;
	14350	+ boolean continuous = (modifiersex & COMMAND) == COMMAND;
12501	14351
12502	14352	X = x;
12503	14353	Y = y;
12504	14354	// floating state for animation
12505		- MODIFIERS = modifiers;
12506		- modifiers &= ~1024;
	14355	+ MODIFIERS = modifiersex;
	14356	+ modifiersex &= ~1024;
12507	14357	if (false) // modifiers != 0)
12508	14358	{
12509	14359	//new Exception().printStackTrace();
12510		- System.out.println("mouseDragged: " + modifiers);
	14360	+ System.out.println("mouseDragged: " + modifiersex);
12511	14361	System.out.println("SHIFT = " + SHIFT);
12512	14362	System.out.println("CONTROL = " + COMMAND);
12513	14363	System.out.println("META = " + META);
..	..	@@ -12527,7 +14377,7 @@
12527	14377	info.camera = renderCamera;
12528	14378	info.x = x;
12529	14379	info.y = y;
12530		- object.editWindow.copy.doEditDrag(info);
	14380	+ object.editWindow.copy.doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
12531	14381	} else
12532	14382	{
12533	14383	if (x < startX)
..	..	@@ -12629,6 +14479,7 @@
12629	14479	{
12630	14480	manipCamera.Translate(dx, dy, getWidth());
12631	14481	}
	14482	+ else
12632	14483	if ((mouseMode & ZOOM) == 0 && (mouseMode & VR) != 0)
12633	14484	{
12634	14485	manipCamera.RotateInterest(dx, dy);
..	..	@@ -12639,7 +14490,7 @@
12639	14490
12640	14491	if (manipCamera == lightCamera)
12641	14492	{
12642		- lighttouched = true;
	14493	+ Globals.lighttouched = true;
12643	14494	}
12644	14495	/*
12645	14496	switch (mode)
..	..	@@ -12678,7 +14529,6 @@
12678	14529	public void mouseMoved(MouseEvent e)
12679	14530	{
12680	14531	//System.out.println("mouseMoved: " + e);
12681		-
12682	14532	if (isRenderer)
12683	14533	return;
12684	14534
..	..	@@ -12691,7 +14541,9 @@
12691	14541	ci.camera = renderCamera;
12692	14542	if (!isRenderer)
12693	14543	{
12694		- if (object.editWindow.copy.doEditClick(ci, 0))
	14544	+ ObjEditor editWindow = object.editWindow;
	14545	+ Object3D copy = editWindow.copy;
	14546	+ if (copy.doEditClick(ci, 0))
12695	14547	{
12696	14548	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
12697	14549	} else
..	..	@@ -12703,7 +14555,10 @@
12703	14555
12704	14556	public void mouseReleased(MouseEvent e)
12705	14557	{
	14558	+ Globals.MOUSEDRAGGED = false;
	14559	+
12706	14560	movingcamera = false;
	14561	+ X = Y = 0;
12707	14562	//System.out.println("mouseReleased: " + e);
12708	14563	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
12709	14564	}
..	..	@@ -12726,9 +14581,9 @@
12726	14581	boolean control = ((modifiers & CTRL) != 0); // june 2013: for point selection
12727	14582	boolean command = ((modifiers & COMMAND) != 0); // june 2013: for multiple selection
12728	14583
12729		- if (control \|\| command \|\| IsFrozen())
	14584	+// No delay if (control \|\| command \|\| IsFrozen())
12730	14585	timeout = true;
12731		- else
	14586	+// ?? May 2019 else
12732	14587	// timer.setDelay((modifiers & 128) != 0?0:350);
12733	14588	mouseDown = false;
12734	14589	if (!control && !command) // june 2013
..	..	@@ -12838,7 +14693,7 @@
12838	14693	System.out.println("keyReleased: " + e);
12839	14694	}
12840	14695
12841		- void SetMouseMode(int modifiers)
	14696	+ void SetMouseMode(int modifiers, int modifiersex)
12842	14697	{
12843	14698	//System.out.println("SetMouseMode = " + modifiers);
12844	14699	//modifiers &= ~1024;
..	..	@@ -12850,24 +14705,27 @@
12850	14705	//if (modifiers == 0) // \|\| (modifiers == (1024 \| CONTROL)))
12851	14706	// return;
12852	14707	//System.out.println("SetMode = " + modifiers);
12853		- if ((modifiers & WHEEL) == WHEEL)
	14708	+ if ((modifiersex & WHEEL) == WHEEL)
12854	14709	{
12855	14710	mouseMode \|= ZOOM;
12856	14711	}
12857		- if ((modifiers & META) == META)
	14712	+
	14713	+ boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
	14714	+ if (capsLocked) // \|\| (modifiers & META) == META)
12858	14715	{
12859	14716	mouseMode \|= VR; // BACKFORTH;
12860	14717	}
12861		- if ((modifiers & CTRLCLICK) == CTRLCLICK)
12862		- {
12863		- mouseMode \|= SELECT; // BACKFORTH;
12864		- }
12865		- if ((modifiers & COMMAND) == COMMAND)
	14718	+ if ((modifiersex & CTRLCLICK) == CTRLCLICK)
12866	14719	{
12867	14720	mouseMode \|= SELECT;
12868	14721	}
12869		- if ((modifiers & SHIFT) == SHIFT \|\| forcetranslate)
	14722	+ if ((modifiersex & COMMAND) == COMMAND)
12870	14723	{
	14724	+ mouseMode \|= SELECT;
	14725	+ }
	14726	+ if ((modifiersex & SHIFT) == SHIFT \|\| forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
	14727	+ {
	14728	+ mouseMode &= ~VR;
12871	14729	mouseMode \|= TRANSLATE;
12872	14730	}
12873	14731	// if ((modifiers & SHIFT_META) == SHIFT_META)
..	..	@@ -12894,10 +14752,10 @@
12894	14752
12895	14753	if (isRenderer) //
12896	14754	{
12897		- SetMouseMode(modifiers);
	14755	+ SetMouseMode(0, modifiers);
12898	14756	}
12899	14757
12900		- theRenderer.keyPressed(key);
	14758	+ Globals.theRenderer.keyPressed(key);
12901	14759	}
12902	14760
12903	14761	int kompactbit = 4; // power bit
..	..	@@ -12909,7 +14767,7 @@
12909	14767	float SATPOW = 1; // 2; // 0.5f;
12910	14768	float BRIPOW = 1; // 0.5f; // 0.5f;
12911	14769
12912		- void keyPressed(int key)
	14770	+ public void keyPressed(int key)
12913	14771	{
12914	14772	if (key >= '0' && key <= '5')
12915	14773	clampbit = (key-'0');
..	..	@@ -13024,7 +14882,7 @@
13024	14882	case 'B':
13025	14883	BRISMOOTH ^= true;
13026	14884	SHADOWCULLFACE ^= true;
13027		- lighttouched = true;
	14885	+ Globals.lighttouched = true;
13028	14886	repaint();
13029	14887	break;
13030	14888	case 'b':
..	..	@@ -13066,8 +14924,14 @@
13066	14924	RevertCamera();
13067	14925	repaint();
13068	14926	break;
13069		- case 'L':
13070	14927	case 'l':
	14928	+ lightMode ^= true;
	14929	+ Globals.lighttouched = true;
	14930	+ manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
	14931	+ targetLookAt.set(manipCamera.lookAt);
	14932	+ repaint();
	14933	+ break;
	14934	+ case 'L':
13071	14935	if (lightMode)
13072	14936	{
13073	14937	lightMode = false;
..	..	@@ -13124,7 +14988,7 @@
13124	14988	repaint();
13125	14989	break;
13126	14990	case 'O':
13127		- drawMode = OCCLUSION;
	14991	+ Globals.drawMode = OCCLUSION; // WARNING
13128	14992	repaint();
13129	14993	break;
13130	14994	case 'o':
..	..	@@ -13214,24 +15078,22 @@
13214	15078	kompactbit = 6;
13215	15079	break;
13216	15080	case ' ':
13217		- lightMode ^= true;
13218		- lighttouched = true;
13219		- manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
13220		- targetLookAt.set(manipCamera.lookAt);
	15081	+ ObjEditor.theFrame.ToggleFullScreen();
13221	15082	repaint();
13222	15083	break;
13223	15084	//case '`' :
13224	15085	case ESC:
13225	15086	RENDERPROGRAM += 1;
13226	15087	RENDERPROGRAM %= 3;
	15088	+
13227	15089	repaint();
13228	15090	break;
13229	15091	case 'Z':
13230		- RESIZETEXTURE ^= true;
13231		- break;
	15092	+ //RESIZETEXTURE ^= true;
	15093	+ //break;
13232	15094	case 'z':
13233		- RENDERSHADOW ^= true;
13234		- lighttouched = true;
	15095	+ Globals.RENDERSHADOW ^= true;
	15096	+ Globals.lighttouched = true;
13235	15097	repaint();
13236	15098	break;
13237	15099	//case UP:
..	..	@@ -13257,7 +15119,8 @@
13257	15119	FlipTransform();
13258	15120	break;
13259	15121	case ENTER:
13260		- object.editWindow.ScreenFit(); // Edit();
	15122	+ // object.editWindow.ScreenFit(); // Edit();
	15123	+ ToggleLive();
13261	15124	break;
13262	15125	case DELETE:
13263	15126	ClearSelection();
..	..	@@ -13345,6 +15208,7 @@
13345	15208	}
13346	15209	//System.out.println("shaper_fovy = " + manipCamera.shaper_fovy);
13347	15210	}
	15211	+
13348	15212	static double OCCLUSIONBOOST = 1; // 0.5;
13349	15213
13350	15214	void keyReleased(int key, int modifiers)
..	..	@@ -13352,11 +15216,11 @@
13352	15216	//mode = ROTATE;
13353	15217	if ((MODIFIERS & COMMAND) == 0) // VR??
13354	15218	{
13355		- SetMouseMode(modifiers);
	15219	+ SetMouseMode(0, modifiers);
13356	15220	}
13357	15221	}
13358	15222
13359		- protected void processKeyEvent(KeyEvent e)
	15223	+ public void processKeyEvent(KeyEvent e)
13360	15224	{
13361	15225	switch (e.getID())
13362	15226	{
..	..	@@ -13486,8 +15350,9 @@
13486	15350
13487	15351	protected void processMouseMotionEvent(MouseEvent e)
13488	15352	{
13489		- //System.out.println("processMouseMotionEvent: " + mouseMode);
13490		- if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
	15353	+ //System.out.println("processMouseMotionEvent: " + mouseMode + " " + e.getModifiers() + " " + e.getModifiersEx() + " " + e.getButton());
	15354	+ //if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
	15355	+ if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (e.getModifiers() & MouseEvent.BUTTON3_MASK) == 0 && (mouseMode & SELECT) == 0)
13491	15356	{
13492	15357	mouseMoved(e);
13493	15358	} else
..	..	@@ -13517,6 +15382,7 @@
13517	15382
13518	15383	void SelectParent()
13519	15384	{
	15385	+ new Exception().printStackTrace();
13520	15386	System.exit(0);
13521	15387	Composite group = (Composite) object;
13522	15388	java.util.Vector selectees = new java.util.Vector(group.selection);
..	..	@@ -13540,6 +15406,7 @@
13540	15406
13541	15407	void SelectChildren()
13542	15408	{
	15409	+ new Exception().printStackTrace();
13543	15410	System.exit(0);
13544	15411	/*
13545	15412	Composite group = (Composite) object;
..	..	@@ -13704,7 +15571,9 @@
13704	15571	info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
13705	15572	//Image img = CreateImage(width, height);
13706	15573	//System.out.println("width = " + width + "; height = " + height + "\n");
	15574	+
13707	15575	Graphics gr = g; // img.getGraphics();
	15576	+
13708	15577	if (!hasMarquee)
13709	15578	{
13710	15579	if (Xmin < Xmax) // !locked)
..	..	@@ -13802,14 +15671,33 @@
13802	15671	if (!isRenderer)
13803	15672	{
13804	15673	object.drawEditHandles(info, 0);
	15674	+
	15675	+ if (drag && (X != 0 \|\| Y != 0) && object.selection.Size() > 0)
	15676	+ {
	15677	+ switch (object.selection.get(0).hitSomething)
	15678	+ {
	15679	+ case Object3D.hitCenter: gr.setColor(Color.pink);
	15680	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15681	+ break;
	15682	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	15683	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15684	+ break;
	15685	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	15686	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15687	+ break;
	15688	+ }
	15689	+
	15690	+ }
13805	15691	}
13806	15692	}
	15693	+
13807	15694	if (isRenderer)
13808	15695	{
13809	15696	//gr.setColor(Color.black);
13810	15697	//gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
13811	15698	//gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
13812	15699	}
	15700	+
13813	15701	if (hasMarquee)
13814	15702	{
13815	15703	gr.setXORMode(Color.white);
..	..	@@ -13832,6 +15720,7 @@
13832	15720	//if (g != gr) g.drawImage(img, 0, 0, width, height, null);
13833	15721	}
13834	15722
	15723	+ // To avoid clear.
13835	15724	public void update(Graphics g)
13836	15725	{
13837	15726	paint(g);
..	..	@@ -13921,6 +15810,7 @@
13921	15810	public boolean mouseDown(Event evt, int x, int y)
13922	15811	{
13923	15812	System.out.println("mouseDown: " + evt);
	15813	+ System.exit(0);
13924	15814	/*
13925	15815	locked = true;
13926	15816	drag = false;
..	..	@@ -13964,7 +15854,7 @@
13964	15854	{
13965	15855	keyPressed(0, modifiers);
13966	15856	}
13967		- clickStart(x, y, modifiers);
	15857	+ // clickStart(x, y, modifiers);
13968	15858	return true;
13969	15859	}
13970	15860
..	..	@@ -14082,7 +15972,7 @@
14082	15972	{
14083	15973	keyReleased(0, 0);
14084	15974	}
14085		- drag(x, y, modifiers);
	15975	+ drag(x, y, 0, modifiers);
14086	15976	return true;
14087	15977	}
14088	15978
..	..	@@ -14214,7 +16104,7 @@
14214	16104	Object3D object;
14215	16105	static Object3D trackedobject;
14216	16106	Camera renderCamera; // Light or Eye (or Occlusion)
14217		- /static/ Camera manipCamera; // Light or Eye
	16107	+ /static/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
14218	16108	/static/ Camera eyeCamera;
14219	16109	/static/ Camera lightCamera;
14220	16110	int cameracount;
..	..	@@ -14434,7 +16324,7 @@
14434	16324	gl.glPushAttrib(GL.GL_ALL_ATTRIB_BITS);
14435	16325	gl.glPushMatrix();
14436	16326	gl.glLoadIdentity();
14437		- PushMatrix(checker.toParent);
	16327	+ //PushMatrix(checker.toParent);
14438	16328
14439	16329	gl.glMatrixMode(GL.GL_TEXTURE);
14440	16330	gl.glPushMatrix();
..	..	@@ -14457,8 +16347,8 @@
14457	16347
14458	16348	gl.glNormal3f(0.0f, 0.0f, 1.0f);
14459	16349
14460		- float step = 0.1666f; //0.25f;
14461		- float stepv = step * 1652 / 998;
	16350	+ float step = 2; // 0.1666f; //0.25f;
	16351	+ float stepv = 2; // step * 1652 / 998;
14462	16352
14463	16353	int i0 = 0;
14464	16354	/*
..	..	@@ -14494,20 +16384,21 @@
14494	16384	/**/
14495	16385	//checker.GetMaterial().opacity = 1.1f;
14496	16386	////checker.GetMaterial().ambient = 0.99f;
14497		- Object3D.materialstack[Object3D.materialdepth] = checker.material;
14498		- Object3D.selectedstack[Object3D.materialdepth] = false;
14499		- cStatic.objectstack[Object3D.materialdepth++] = checker;
	16387	+ materialstack[materialdepth] = checker.material;
	16388	+ selectedstack[materialdepth] = false;
	16389	+ cStatic.objectstack[materialdepth++] = checker;
14500	16390	//System.out.println("material " + material);
14501	16391	//Applet3D.tracein(this, selected);
14502		- vector2buffer = checker.projectedVertices;
	16392	+ //vector2buffer = checker.projectedVertices;
14503	16393
14504		- checker.GetMaterial().Draw(this, false); // true);
	16394	+ //checker.GetMaterial().Draw(this, false); // true);
	16395	+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
14505	16396
14506		- Object3D.materialdepth -= 1;
14507		- if (Object3D.materialdepth > 0)
	16397	+ materialdepth -= 1;
	16398	+ if (materialdepth > 0)
14508	16399	{
14509		- vector2buffer = cStatic.objectstack[Object3D.materialdepth - 1].projectedVertices;
14510		- Object3D.materialstack[Object3D.materialdepth - 1].Draw(this, Object3D.selectedstack[Object3D.materialdepth - 1]);
	16400	+ //vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	16401	+ DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
14511	16402	}
14512	16403	//checker.GetMaterial().opacity = 1f;
14513	16404	////checker.GetMaterial().ambient = 1f;
..	..	@@ -14528,15 +16419,27 @@
14528	16419
14529	16420	//float u = (i+1)/2;
14530	16421	//float v = (j+1)/2;
14531		- gl.glTexCoord2f((i + 1) / 2, (j + 1) / 2); // (1,0) // (i+1+step)/2,(j+1)/2);
	16422	+ if (checker.flipV)
	16423	+ gl.glTexCoord2f((i + 1) / 2, 1 - (j + 1) / 2);
	16424	+ else
	16425	+ gl.glTexCoord2f((i + 1) / 2, (j + 1) / 2); // (1,0) // (i+1+step)/2,(j+1)/2);
14532	16426	gl.glVertex3f(i, j, -0.5f);
14533	16427
	16428	+ if (checker.flipV)
	16429	+ gl.glTexCoord2f((i + 1 + step) / 2, 1 - (j + 1) / 2); // (1,1) // (i+1+step)/2,(j+1+step)/2);
	16430	+ else
14534	16431	gl.glTexCoord2f((i + 1 + step) / 2, (j + 1) / 2); // (1,1) // (i+1+step)/2,(j+1+step)/2);
14535	16432	gl.glVertex3f(i + step, j, -0.5f);
14536	16433
	16434	+ if (checker.flipV)
	16435	+ gl.glTexCoord2f((i + 1 + step) / 2, 1 - (j + 1 + stepv) / 2); // (0,1) //(i+1)/2,(j+1+step)/2);
	16436	+ else
14537	16437	gl.glTexCoord2f((i + 1 + step) / 2, (j + 1 + stepv) / 2); // (0,1) //(i+1)/2,(j+1+step)/2);
14538	16438	gl.glVertex3f(i + step, j + stepv, -0.5f);
14539	16439
	16440	+ if (checker.flipV)
	16441	+ gl.glTexCoord2f((i + 1) / 2, 1 - (j + 1 + stepv) / 2); // (0,0) //(i+1)/2,(j+1)/2);
	16442	+ else
14540	16443	gl.glTexCoord2f((i + 1) / 2, (j + 1 + stepv) / 2); // (0,0) //(i+1)/2,(j+1)/2);
14541	16444	gl.glVertex3f(i, j + stepv, -0.5f);
14542	16445	}
..	..	@@ -14548,7 +16451,7 @@
14548	16451	gl.glMatrixMode(GL.GL_PROJECTION);
14549	16452	gl.glPopMatrix();
14550	16453	gl.glMatrixMode(GL.GL_MODELVIEW);
14551		- PopMatrix(null); // checker.toParent); // null);
	16454	+ //PopMatrix(null); // checker.toParent); // null);
14552	16455	gl.glPopMatrix();
14553	16456	PopTextureMatrix(checker.toParent);
14554	16457	gl.glMatrixMode(GL.GL_TEXTURE);
..	..	@@ -14639,6 +16542,7 @@
14639	16542	{
14640	16543	if (!selection)
14641	16544	{
	16545	+ new Exception().printStackTrace();
14642	16546	System.exit(0);
14643	16547	return;
14644	16548	}
..	..	@@ -14661,14 +16565,14 @@
14661	16565
14662	16566	//int tmp = selection_view;
14663	16567	//selection_view = -1;
14664		- int temp = drawMode;
14665		- drawMode = SELECTION;
	16568	+ int temp = DrawMode();
	16569	+ Globals.drawMode = SELECTION; // WARNING
14666	16570	indexcount = 0;
14667	16571	parent.display(drawable);
14668	16572	//selection_view = tmp;
14669	16573	//if (temp == SELECTION)
14670	16574	// temp = DEFAULT; // patch for selection debug
14671		- drawMode = temp;
	16575	+ Globals.drawMode = temp; // WARNING
14672	16576
14673	16577	//gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
14674	16578
..	..	@@ -14718,6 +16622,11 @@
14718	16622	// System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
14719	16623	// System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
14720	16624
	16625	+ // Will fit the mesh !!!
	16626	+ selectedpoint.toParent[0][0] = 0.0001;
	16627	+ selectedpoint.toParent[1][1] = 0.0001;
	16628	+ selectedpoint.toParent[2][2] = 0.0001;
	16629	+
14721	16630	glu.gluUnProject(x,y,depth,view,0,tempmat2,0,viewport,0,selectedpoint.toParent[3],0);
14722	16631
14723	16632	// if (object.selection != null && object.selection.Size() > 0)
..	..	@@ -14761,16 +16670,16 @@
14761	16670	System.out.println("; fromto " + sel + " " + Trunk(previousselectedpoint.toParent[3][0]) + " " + Trunk(previousselectedpoint.toParent[3][2]) + " " + Trunk(selectedpoint.toParent[3][0]) + " " + Trunk(selectedpoint.toParent[3][2]));
14762	16671	}
14763	16672
14764		- previousselectedpoint = (Sphere) GrafreeD.clone(selectedpoint);
	16673	+ previousselectedpoint = (Sphere) Grafreed.clone(selectedpoint);
14765	16674	}
14766	16675	}
14767	16676
14768	16677	if (!movingcamera && !PAINTMODE)
14769	16678	object.editWindow.ScreenFitPoint(); // fev 2014
14770	16679
14771		- if (PAINTMODE && GrafreeD.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	16680	+ if (PAINTMODE && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
14772	16681	{
14773		- Object3D paintobj = GrafreeD.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
	16682	+ Object3D paintobj = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
14774	16683
14775	16684	Object3D group = new Object3D("inst" + paintcount++);
14776	16685
..	..	@@ -14926,7 +16835,7 @@
14926	16835	gl.glDisable(gl.GL_CULL_FACE);
14927	16836	}
14928	16837
14929		- if (!RENDERSHADOW)
	16838	+ if (!Globals.RENDERSHADOW)
14930	16839	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
14931	16840
14932	16841	// SB gl.glPolygonOffset(2.5f, 10);
..	..	@@ -14936,14 +16845,14 @@
14936	16845	//gl.glColorMask(false, false, false, false);
14937	16846
14938	16847	//render_scene_from_light_view(gl, drawable, 0, 0);
14939		- if (RENDERSHADOW && lighttouched && !movingcamera) // && !parent.IsFreezed())
	16848	+ if (Globals.RENDERSHADOW && Globals.lighttouched && (!movingcamera \|\| !Globals.FREEZEONMOVE)) // && !parent.IsFreezed())
14940	16849	{
14941	16850	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
14942	16851
14943		- int temp = drawMode;
14944		- drawMode = SHADOW;
	16852	+ int temp = DrawMode();
	16853	+ Globals.drawMode = SHADOW; // WARNING
14945	16854	parent.display(drawable);
14946		- drawMode = temp;
	16855	+ Globals.drawMode = temp; // WARNING
14947	16856	}
14948	16857
14949	16858	gl.glCullFace(gl.GL_BACK);
..	..	@@ -14996,7 +16905,6 @@
14996	16905
14997	16906	class AntialiasBuffer implements GLEventListener
14998	16907	{
14999		-
15000	16908	CameraPane parent = null;
15001	16909
15002	16910	AntialiasBuffer(CameraPane p)
..	..	@@ -15106,13 +17014,19 @@
15106	17014	gl.glFlush();
15107	17015
15108	17016	/**/
15109		- gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_BGRA, GL.GL_UNSIGNED_INT_8_8_8_8_REV, occlusionsizebuffer);
	17017	+ gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusionsizebuffer);
15110	17018
15111		- int[] pixels = occlusionsizebuffer.array();
	17019	+ float[] pixels = occlusionsizebuffer.array();
15112	17020
15113	17021	double r = 0, g = 0, b = 0;
15114	17022
15115	17023	double count = 0;
	17024	+
	17025	+ gl.glGetDoublev(gl.GL_PROJECTION_MATRIX, tempmat2, 0);
	17026	+
	17027	+ float mindepth = 1;
	17028	+
	17029	+ double FACTOR = 1;
15116	17030
15117	17031	for (int i = 0; i < pixels.length; i++)
15118	17032	{
..	..	@@ -15197,7 +17111,7 @@
15197	17111
15198	17112	double scale = ray.z; // 1; // cos
15199	17113
15200		- int p = pixels[newindex];
	17114	+ float depth = pixels[newindex];
15201	17115
15202	17116	/*
15203	17117	int newindex2 = (x + 1) * OCCLUSION_SIZE + y;
..	..	@@ -15221,10 +17135,23 @@
15221	17135	scale = (1 - modu) * modv;
15222	17136	*/
15223	17137
15224		- r += ((p >> 16) & 0xFF) * scale / 255;
15225		- g += ((p >> 8) & 0xFF) * scale / 255;
15226		- b += (p & 0xFF) * scale / 255;
	17138	+ //r += ((p >> 16) & 0xFF) * scale / 255;
	17139	+ //g += ((p >> 8) & 0xFF) * scale / 255;
	17140	+ //b += (p & 0xFF) * scale / 255;
	17141	+
	17142	+ if (mindepth > depth)
	17143	+ {
	17144	+ mindepth = depth;
	17145	+ }
15227	17146
	17147	+ double z_eye = tempmat2[34 + 2] / (depth -2.0 + 1.0 - tempmat2[2*4 + 2]);
	17148	+
	17149	+ double factor = 1 - Math.exp(-z_eye * z_eye / FACTOR);
	17150	+
	17151	+ r += factor * scale;
	17152	+ g += factor * scale;
	17153	+ b += factor * scale;
	17154	+
15228	17155	count += scale;
15229	17156	}
15230	17157
..	..	@@ -15322,12 +17249,6 @@
15322	17249	GLUT glut = new GLUT();
15323	17250
15324	17251
15325		- static final public int DEFAULT = 0;
15326		- static final public int SELECTION = 1;
15327		- static final public int SHADOW = 2;
15328		- static final public int OCCLUSION = 3;
15329		- static
15330		- public int drawMode = DEFAULT;
15331	17252	public boolean spherical = false;
15332	17253	static boolean DEBUG_OCCLUSION = false;
15333	17254	static boolean DEBUG_SELECTION = false;
..	..	@@ -15340,23 +17261,15 @@
15340	17261	int AAbuffersize = 0;
15341	17262
15342	17263	//double[] selectedpoint = new double[3];
15343		- static Sphere selectedpoint = new Sphere();
	17264	+ static Superellipsoid selectedpoint;
15344	17265	static Sphere previousselectedpoint = null;
15345		- static Sphere debugpoint = new Sphere();
15346		- static Sphere debugpoint2 = new Sphere();
15347		- static Sphere debugpoint3 = new Sphere();
15348		- static Sphere debugpoint4 = new Sphere();
	17266	+ static Sphere debugpointG;
	17267	+ static Sphere debugpointP;
	17268	+ static Sphere debugpointC;
	17269	+ static Sphere debugpointR;
15349	17270
15350	17271	static Sphere debugpoints[] = new Sphere[8];
15351	17272
15352		- static
15353		- {
15354		- for (int i=0; i<8; i++)
15355		- {
15356		- debugpoints[i] = new Sphere();
15357		- }
15358		- }
15359		-
15360	17273	static void InitPoints(float radius)
15361	17274	{
15362	17275	for (int i=0; i<8; i++)
..	..	@@ -15376,7 +17289,7 @@
15376	17289	}
15377	17290	}
15378	17291
15379		- static void DrawPoints(CameraPane cpane)
	17292	+ static void DrawPoints(iCameraPane cpane)
15380	17293	{
15381	17294	for (int i=0; i<8; i++) // first and last are red
15382	17295	{
..	..	@@ -15398,7 +17311,8 @@
15398	17311	static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
15399	17312	static IntBuffer selectsizebuffer = IntBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
15400	17313	static java.nio.FloatBuffer pointselectsizebuffer = java.nio.FloatBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
15401		- static IntBuffer occlusionsizebuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17314	+ //static IntBuffer occlusionsizebuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17315	+ static java.nio.FloatBuffer occlusionsizebuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
15402	17316	static BufferedImage bufimage = new BufferedImage(TEX_SIZE, TEX_SIZE, BufferedImage.TYPE_INT_RGB);
15403	17317	static BufferedImage textest = new cBufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB);
15404	17318	static java.util.Vector<BufferedImage> billboards = new java.util.Vector<BufferedImage>();
..	..	@@ -15407,10 +17321,11 @@
15407	17321	static IntBuffer textbuffer = null; // IntBuffer.allocate(TEXT_WIDTH88 * TEXT_HEIGHT);
15408	17322	// Depth buffer format
15409	17323	//private int depth_format;
15410		- static public void NextIndex(Object3D o, GL gl)
	17324	+
	17325	+ public void NextIndex()
15411	17326	{
15412	17327	indexcount+=16;
15413		- gl.glColor3d(((indexcount >>> 16) & 255) / 255.0, ((indexcount >>> 8) & 255) / 255.0, ((indexcount) & 255) / 255.0);
	17328	+ GetGL().glColor3d(((indexcount >>> 16) & 255) / 255.0, ((indexcount >>> 8) & 255) / 255.0, ((indexcount) & 255) / 255.0);
15414	17329	//objects[indexcount] = o;
15415	17330	//System.out.println("indexcount = " + indexcount);
15416	17331	}