~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -31,9 +31,12 @@
31	31
32	32	import gleem.linalg.Mat4f;
33	33
34		-class CameraPane extends GLCanvas implements Runnable, GLEventListener, ActionListener, MouseWheelListener, MouseMotionListener, MouseListener, KeyListener
	34	+class CameraPane extends GLCanvas implements iCameraPane, Runnable, GLEventListener, ActionListener, MouseWheelListener, MouseMotionListener, MouseListener, KeyListener
35	35	{
36		- static boolean DEBUG = false;
	36	+ static cMaterial[] materialstack = new cMaterial[65536];
	37	+ static boolean[] selectedstack = new boolean[65536];
	38	+ static int materialdepth = 0;
	39	+
37	40	static boolean FRUSTUM = false; // still bogus true; // frustum culling
38	41
39	42	// camera change fix
..	..	@@ -42,25 +45,7 @@
42	45
43	46	static int STEP = 1;
44	47
45		- static boolean ONESTEP = false; // do LIVE once
46		-
47		- /**
48		- * @return the LIVE
49		- */
50		- public static boolean isLIVE()
51		- {
52		- return LIVE \|\| ONESTEP;
53		- }
54		-
55		- /**
56		- * @param aLIVE the LIVE to set
57		- */
58		- public static void setLIVE(boolean aLIVE)
59		- {
60		- LIVE = aLIVE;
61		- }
62		-
63		- /static/ boolean CULLFACE = false; // true;
	48	+ /static/ private boolean CULLFACE = false; // true;
64	49	/static/ boolean NEAREST = false; // true;
65	50	/static/ boolean WIREFRAME = false; // true;
66	51
..	..	@@ -70,8 +55,6 @@
70	55	static int CURRENTANTIALIAS = 0; // 1;
71	56	/static/ boolean RENDERSHADOW = true;
72	57	/static/ int RENDERPROGRAM = 2; // 0 == none, 1 == fast, 2 == normal
73		- static boolean ANIMATION = false;
74		- static String filename;
75	58
76	59	boolean DISPLAYTEXT = false;
77	60	//boolean REDUCETEXTURE = true;
..	..	@@ -97,10 +80,8 @@
97	80
98	81	static boolean textureon = true;
99	82	static boolean LOCALTRANSFORM = false;
100		-private static boolean LIVE = false;
101	83	static boolean FULLSCREEN = false;
102	84	static boolean SUPPORT = true;
103		-static boolean CROWD = false;
104	85	static boolean INERTIA = true;
105	86	static boolean FAST = false;
106	87	static boolean SLOWPOSE = false;
..	..	@@ -108,6 +89,8 @@
108	89
109	90	static int tickcount = 0; // slow pose issue
110	91
	92	+static boolean BUTTONLESSWHEEL = false;
	93	+static boolean ZOOMBOXMODE = false;
111	94	static boolean BOXMODE = false;
112	95	static boolean IMAGEFLIP = false;
113	96	static boolean SMOOTHFOCUS = false;
..	..	@@ -122,7 +105,7 @@
122	105	static boolean OEIL = true;
123	106	static boolean OEILONCE = false; // do oeilon then oeiloff
124	107	static boolean LOOKAT = true;
125		-static boolean RANDOM = true; // false;
	108	+static boolean SWITCH = true; // false;
126	109	static boolean HANDLES = false; // selection doesn't work!!
127	110	static boolean PAINTMODE = false;
128	111
..	..	@@ -165,12 +148,41 @@
165	148	defaultcaps.setAccumBlueBits(16);
166	149	defaultcaps.setAccumAlphaBits(16);
167	150	}
168		- static CameraPane theRenderer;
169		-
	151	+
	152	+ private File defaultDirectory = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory();
	153	+
170	154	void SetAsGLRenderer(boolean b)
171	155	{
172	156	isRenderer = b;
173		- theRenderer = this;
	157	+ Globals.theRenderer = this;
	158	+ }
	159	+
	160	+ CameraPane(Object3D o, Camera cam, boolean withcontext)
	161	+ {
	162	+ super(defaultcaps, null, withcontext?glcontext:null, null);
	163	+
	164	+ //System.out.println("AMERICA AREA = " + (9458886 + 9210755 + 8480395 + 2736391 + 1943018 + 1289475 + 1141569 + 1069350 + 911559 + 721229 + 395886 + 377972 + 246700 + 211156 + 173985 + 141133 + 118279 + 112079 + 108523));
	165	+ glcontext = getContext();
	166	+
	167	+ cameras = new Camera[2];
	168	+ targetLookAts = new cVector[2];
	169	+
	170	+ SetCamera(cam);
	171	+
	172	+ SetLight(new Camera(new cVector(10, 10, -20)));
	173	+
	174	+ object = o;
	175	+
	176	+ setBackground(Color.white);
	177	+
	178	+ addKeyListener(this);
	179	+ addMouseListener(this);
	180	+ addMouseMotionListener(this);
	181	+ addMouseWheelListener(this);
	182	+ //System.out.println("addGLEventListener: " + this);
	183	+ addGLEventListener(this);
	184	+
	185	+// pingthread.start(); // may 2013
174	186	}
175	187
176	188	static boolean AntialiasingEnabled()
..	..	@@ -178,12 +190,53 @@
178	190	return CURRENTANTIALIAS > 0;
179	191	}
180	192
181		- void ClearDepth()
	193	+ /// INTERFACE
	194	+
	195	+ public javax.media.opengl.GL GetGL0()
	196	+ {
	197	+ return null;
	198	+ }
	199	+
	200	+ public int GenList()
	201	+ {
	202	+ javax.media.opengl.GL gl = GetGL();
	203	+ return gl.glGenLists(1);
	204	+ }
	205	+
	206	+ public void NewList(int id)
	207	+ {
	208	+ javax.media.opengl.GL gl = GetGL();
	209	+ gl.glNewList(id, gl.GL_COMPILE); //_AND_EXECUTE);
	210	+ }
	211	+
	212	+ public void CallList(int id)
	213	+ {
	214	+ javax.media.opengl.GL gl = GetGL();
	215	+ gl.glCallList(id);
	216	+ }
	217	+
	218	+ public void EndList()
	219	+ {
	220	+ javax.media.opengl.GL gl = GetGL();
	221	+ gl.glEndList();
	222	+ }
	223	+
	224	+ public boolean IsBoxMode()
	225	+ {
	226	+ return BOXMODE;
	227	+ }
	228	+
	229	+ public boolean IsZoomBoxMode()
	230	+ {
	231	+ return ZOOMBOXMODE;
	232	+ }
	233	+
	234	+ public void ClearDepth()
182	235	{
183	236	GetGL().glClear(GetGL().GL_DEPTH_BUFFER_BIT);
184	237	}
185	238
186		- void DepthTest(boolean depthtest)
	239	+ public void DepthTest(boolean depthtest)
187	240	{
188	241	if (depthtest)
189	242	GetGL().glDepthFunc(GL.GL_LEQUAL);
..	..	@@ -191,7 +244,7 @@
191	244	GetGL().glDepthFunc(GL.GL_ALWAYS);
192	245	}
193	246
194		- void DepthWrite(boolean depthwrite)
	247	+ public void DepthWrite(boolean depthwrite)
195	248	{
196	249	if (depthwrite)
197	250	GetGL().glDepthMask(true);
..	..	@@ -199,12 +252,1616 @@
199	252	GetGL().glDepthMask(false);
200	253	}
201	254
202		- void BackFaceCull(boolean bfc)
	255	+ public void BackFaceCull(boolean bfc)
203	256	{
204	257	if (bfc)
205	258	GetGL().glEnable(GetGL().GL_CULL_FACE);
206	259	else
207	260	GetGL().glDisable(GetGL().GL_CULL_FACE);
	261	+ }
	262	+
	263	+ public boolean BackFaceCullMode()
	264	+ {
	265	+ return this.CULLFACE;
	266	+ }
	267	+
	268	+ public boolean IsAmbientOcclusionOn()
	269	+ {
	270	+ return this.ambientOcclusion;
	271	+ }
	272	+
	273	+ public boolean IsDebugSelection()
	274	+ {
	275	+ return DEBUG_SELECTION;
	276	+ }
	277	+
	278	+ public boolean IsFrozen()
	279	+ {
	280	+ boolean selectmode = this.DrawMode() == SELECTION \|\| this.IsDebugSelection();
	281	+
	282	+ return !selectmode && cameracount == 0; // != 0;
	283	+ }
	284	+
	285	+ // Currently in Globals
	286	+ public int DrawMode()
	287	+ {
	288	+ return Globals.DrawMode();
	289	+ }
	290	+
	291	+ public Camera EyeCamera()
	292	+ {
	293	+ return eyeCamera;
	294	+ }
	295	+
	296	+ public Camera LightCamera()
	297	+ {
	298	+ return lightCamera;
	299	+ }
	300	+
	301	+ public Camera ManipCamera()
	302	+ {
	303	+ return manipCamera;
	304	+ }
	305	+
	306	+ public Camera RenderCamera()
	307	+ {
	308	+ return renderCamera;
	309	+ }
	310	+
	311	+ public Camera[] Cameras()
	312	+ {
	313	+ return cameras;
	314	+ }
	315	+
	316	+ public void PushMaterial(Object3D obj, boolean selected)
	317	+ {
	318	+ CameraPane display = this;
	319	+ javax.media.opengl.GL gl = display.GetGL();
	320	+ cMaterial material = obj.material;
	321	+
	322	+ if (material != null)
	323	+ {
	324	+ materialstack[materialdepth] = material;
	325	+ selectedstack[materialdepth] = selected;
	326	+ cStatic.objectstack[materialdepth++] = obj;
	327	+ //System.out.println("material " + material);
	328	+ //Applet3D.tracein(this, selected);
	329	+ //display.vector2buffer = obj.projectedVertices;
	330	+ if (obj instanceof Camera)
	331	+ {
	332	+ display.options1[0] = material.shift;
	333	+ //System.out.println("shift " + material.shift);
	334	+ display.options1[1] = material.lightarea;
	335	+ display.options1[2] = material.shadowbias;
	336	+ display.options1[3] = material.aniso;
	337	+ display.options1[4] = material.anisoV;
	338	+// System.out.println("display.options1[0] " + display.options1[0]);
	339	+// System.out.println("display.options1[1] " + display.options1[1]);
	340	+// System.out.println("display.options1[2] " + display.options1[2]);
	341	+// System.out.println("display.options1[3] " + display.options1[3]);
	342	+// System.out.println("display.options1[4] " + display.options1[4]);
	343	+ display.options2[0] = material.opacity;
	344	+ display.options2[1] = material.diffuse;
	345	+ display.options2[2] = material.factor;
	346	+// System.out.println("display.options2[0] " + display.options2[0]);
	347	+// System.out.println("display.options2[1] " + display.options2[1]);
	348	+// System.out.println("display.options2[2] " + display.options2[2]);
	349	+
	350	+ cColor.HSBtoRGB(material.color, material.modulation, 1, display.options3);
	351	+// System.out.println("display.options3[0] " + display.options3[0]);
	352	+// System.out.println("display.options3[1] " + display.options3[1]);
	353	+// System.out.println("display.options3[2] " + display.options3[2]);
	354	+ display.options4[0] = material.cameralight/0.2f;
	355	+ display.options4[1] = material.subsurface;
	356	+ display.options4[2] = material.sheen;
	357	+// System.out.println("display.options4[0] " + display.options4[0]);
	358	+// System.out.println("display.options4[1] " + display.options4[1]);
	359	+// System.out.println("display.options4[2] " + display.options4[2]);
	360	+
	361	+ // if (display.CURRENTANTIALIAS > 0)
	362	+ // display.options3[3] /= 4;
	363	+
	364	+ /*
	365	+ System.out.println("Focus = " + display.options1[0]);
	366	+ System.out.println("Aperture = " + display.options1[1]);
	367	+ System.out.println("ShadowBlur = " + display.options1[2]);
	368	+ System.out.println("Antialiasing = " + display.options1[3]);
	369	+ System.out.println("Fog = " + display.options2[0]);
	370	+ System.out.println("Intensity = " + display.options2[1]);
	371	+ System.out.println("Elevation = " + display.options2[2]);
	372	+ /**/
	373	+ } else
	374	+ {
	375	+ DrawMaterial(material, selected, obj.projectedVertices);
	376	+ }
	377	+ } else
	378	+ {
	379	+ if (selected && CameraPane.flash)
	380	+ {
	381	+ display.modelParams4[1] = 100;
	382	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 4, display.modelParams4, 0);
	383	+ }
	384	+ }
	385	+ }
	386	+
	387	+ public void PushMaterial2(Object3D obj, boolean selected)
	388	+ {
	389	+ CameraPane display = this;
	390	+ cMaterial material = obj.material;
	391	+
	392	+ if (material != null)
	393	+ {
	394	+ materialstack[materialdepth] = material;
	395	+ selectedstack[materialdepth] = selected;
	396	+ cStatic.objectstack[materialdepth++] = obj;
	397	+ //System.out.println("material " + material);
	398	+ //Applet3D.tracein("selected ", selected);
	399	+ //display.vector2buffer = obj.projectedVertices;
	400	+ display.DrawMaterial(material, selected, obj.projectedVertices);
	401	+ }
	402	+ }
	403	+
	404	+ public void PopMaterial(Object3D obj, boolean selected)
	405	+ {
	406	+ CameraPane display = this;
	407	+ javax.media.opengl.GL gl = display.GetGL();
	408	+ cMaterial material = obj.material;
	409	+
	410	+ //if (parent != null && parent.GetMaterial() != null)
	411	+ // parent.GetMaterial().Draw(display, parent.IsSelected(this));
	412	+ if (material != null)
	413	+ {
	414	+ materialdepth -= 1;
	415	+ if (materialdepth > 0)
	416	+ {
	417	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	418	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
	419	+ }
	420	+ //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
	421	+ } else if (selected && CameraPane.flash && obj.GetMaterial() != null)
	422	+ {
	423	+ display.modelParams4[1] = obj.GetMaterial().cameralight;
	424	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 4, display.modelParams4, 0);
	425	+ }
	426	+ }
	427	+
	428	+ public void PopMaterial2(Object3D obj)
	429	+ {
	430	+ CameraPane display = this;
	431	+ cMaterial material = obj.material;
	432	+
	433	+ if (material != null)
	434	+ {
	435	+ materialdepth -= 1;
	436	+ if (materialdepth > 0)
	437	+ {
	438	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	439	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
	440	+ }
	441	+ //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
	442	+ //else
	443	+ //material.Draw(display, false);
	444	+ }
	445	+ }
	446	+
	447	+ public void DrawFace(Object3D obj, Vertex pv, Vertex qv, Vertex rv, Face face)
	448	+ {
	449	+ CameraPane display = this;
	450	+
	451	+ if (pv.y == -10000 \|\|
	452	+ qv.y == -10000 \|\|
	453	+ rv.y == -10000)
	454	+ return;
	455	+
	456	+// float b = f.nbiterations & 1;
	457	+// float g = (f.nbiterations>>1) & 1;
	458	+// float r = (f.nbiterations>>2) & 1;
	459	+//
	460	+// //if (f.weight == 10000)
	461	+// //{
	462	+// // r = 1; g = b = 0;
	463	+// //}
	464	+// //else
	465	+// //{
	466	+// // assert(f.weight < 10000);
	467	+// r = g = b = (float)bRep.FaceWeight(f)*100;
	468	+// if (r<0)
	469	+// assert(r>=0);
	470	+// //}
	471	+
	472	+ javax.media.opengl.GL gl = display.GetGL();
	473	+
	474	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
	475	+
	476	+ //System.out.println("p = " + pv + "; q = " + qv + "; r = " + rv);
	477	+ if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
	478	+ {
	479	+ //gl.glBegin(gl.GL_TRIANGLES);
	480	+ boolean hasnorm = pv.norm != null && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0)
	481	+ // TEST LIVE NORMALS && !obj.dontselect
	482	+ ;
	483	+ if (!hasnorm)
	484	+ {
	485	+ // System.out.println("Mesh normal");
	486	+ LA.vecSub(pv/.pos/, qv/.pos/, obj.v0);
	487	+ LA.vecSub(pv/.pos/, rv/.pos/, obj.v1);
	488	+ LA.vecCross(obj.v0, obj.v1, obj.v2);
	489	+ LA.vecNormalize(obj.v2);
	490	+ gl.glNormal3f((float) obj.v2.x, (float) obj.v2.y, (float) obj.v2.z);
	491	+ }
	492	+
	493	+ // P
	494	+ float x = (float)pv.x;
	495	+ float y = (float)pv.y;
	496	+ float z = (float)pv.z;
	497	+
	498	+ if (hasnorm)
	499	+ {
	500	+// if (!pv.norm.normalized())
	501	+// assert(pv.norm.normalized());
	502	+
	503	+ //System.out.println("normalp = " + pv.norm.x + ", " + pv.norm.y + ", " + pv.norm.z);
	504	+ float nx = (float)pv.norm.x;
	505	+ float ny = (float)pv.norm.y;
	506	+ float nz = (float)pv.norm.z;
	507	+
	508	+ x += nx * obj.NORMALPUSH;
	509	+ y += ny * obj.NORMALPUSH;
	510	+ z += nz * obj.NORMALPUSH;
	511	+
	512	+ gl.glNormal3f(nx, ny, nz);
	513	+ }
	514	+ gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
	515	+ SetColor(obj, pv);
	516	+ //gl.glColor4f(r, g, b, 1);
	517	+ //gl.glColor4f(pv.boundary, pv.boundary, pv.boundary, 1);
	518	+ if (obj.flipV)
	519	+ gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
	520	+ else
	521	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	522	+ //System.out.println("vertexp = " + pv.x + ", " + pv.y + ", " + pv.z);
	523	+
	524	+ gl.glVertex3f(x, y, z);
	525	+
	526	+ // Q
	527	+ x = (float)qv.x;
	528	+ y = (float)qv.y;
	529	+ z = (float)qv.z;
	530	+
	531	+// Print(pv);
	532	+ if (hasnorm)
	533	+ {
	534	+// assert(qv.norm.normalized());
	535	+ //System.out.println("normalq = " + qv.norm.x + ", " + qv.norm.y + ", " + qv.norm.z);
	536	+ float nx = (float)qv.norm.x;
	537	+ float ny = (float)qv.norm.y;
	538	+ float nz = (float)qv.norm.z;
	539	+
	540	+ x += nx * obj.NORMALPUSH;
	541	+ y += ny * obj.NORMALPUSH;
	542	+ z += nz * obj.NORMALPUSH;
	543	+
	544	+ gl.glNormal3f(nx, ny, nz);
	545	+ }
	546	+ //System.out.println("vertexq = " + qv.s + ", " + qv.t);
	547	+ // boolean locked = false;
	548	+ // float eps = 0.1f;
	549	+ // boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
	550	+
	551	+ // int dot = 0; //*/ (int)f.dot;
	552	+
	553	+ // if ((dot&1) == 0)
	554	+ // dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
	555	+
	556	+ // if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
	557	+ if (obj.flipV)
	558	+ gl.glTexCoord2f((float) qv.s, 1-(float) qv.t);
	559	+ else
	560	+ gl.glTexCoord2f((float) qv.s, (float) qv.t);
	561	+ // else
	562	+ // {
	563	+ // locked = true;
	564	+ // gl.glTexCoord2f((float) pv.s, (float) pv.t);
	565	+ // }
	566	+ gl.glColor4f(qv.AO, qv.AO, qv.AO, 1);
	567	+ SetColor(obj, qv);
	568	+
	569	+ gl.glVertex3f(x, y, z);
	570	+ //gl.glColor4f(r, g, b, 1);
	571	+ //gl.glColor4f(qv.boundary, qv.boundary, qv.boundary, 1);
	572	+ //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
	573	+// Print(qv);
	574	+
	575	+ // R
	576	+ x = (float)rv.x;
	577	+ y = (float)rv.y;
	578	+ z = (float)rv.z;
	579	+
	580	+ if (hasnorm)
	581	+ {
	582	+// assert(rv.norm.normalized());
	583	+ //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
	584	+ float nx = (float)rv.norm.x;
	585	+ float ny = (float)rv.norm.y;
	586	+ float nz = (float)rv.norm.z;
	587	+
	588	+ x += nx * obj.NORMALPUSH;
	589	+ y += ny * obj.NORMALPUSH;
	590	+ z += nz * obj.NORMALPUSH;
	591	+
	592	+ gl.glNormal3f(nx, ny, nz);
	593	+ }
	594	+
	595	+ // if ((dot&4) == 0)
	596	+ // dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
	597	+
	598	+ // if (wrap \|\| !locked && (dot&8) != 0)
	599	+ if (obj.flipV)
	600	+ gl.glTexCoord2f((float) rv.s, 1-(float) rv.t);
	601	+ else
	602	+ gl.glTexCoord2f((float) rv.s, (float) rv.t);
	603	+ // else
	604	+ // gl.glTexCoord2f((float) pv.s, (float) pv.t);
	605	+
	606	+ // f.dot = dot;
	607	+
	608	+ gl.glColor4f(rv.AO, rv.AO, rv.AO, 1);
	609	+ SetColor(obj, rv);
	610	+ //gl.glColor4f(r, g, b, 1);
	611	+ //gl.glColor4f(rv.boundary, rv.boundary, rv.boundary, 1);
	612	+ //System.out.println("vertexr = " + rv.x + ", " + rv.y + ", " + rv.z);
	613	+ gl.glVertex3f(x, y, z);
	614	+// Print(rv);
	615	+ //gl.glEnd();
	616	+ }
	617	+ else
	618	+ {
	619	+ gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
	620	+ gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
	621	+ gl.glVertex3f((float) rv.x, (float) rv.y, (float) rv.z);
	622	+
	623	+ }
	624	+
	625	+ if (false) // (attributes & WIREFRAME) != 0)
	626	+ {
	627	+ gl.glDisable(gl.GL_LIGHTING);
	628	+
	629	+ gl.glBegin(gl.GL_LINE_LOOP);
	630	+ gl.glVertex3d(pv./pos./x, pv./pos./y, pv./pos./z);
	631	+ gl.glVertex3d(qv./pos./x, qv./pos./y, qv./pos./z);
	632	+ gl.glVertex3d(rv./pos./x, rv./pos./y, rv./pos./z);
	633	+ gl.glEnd();
	634	+
	635	+ gl.glEnable(gl.GL_LIGHTING);
	636	+ }
	637	+ }
	638	+
	639	+ /**
	640	+ * <code>draw</code> renders a <code>TriMesh</code> object including
	641	+ * it's normals, colors, textures and vertices.
	642	+ *
	643	+ * @see Renderer#draw(TriMesh)
	644	+ * @param tris
	645	+ * the mesh to render.
	646	+ */
	647	+ public void DrawParticles(TriMesh geo, Object3D shape, boolean selected, boolean rotate) // TriMesh tris)
	648	+ {
	649	+ CameraPane display = this;
	650	+
	651	+ float r = display.modelParams0[0];
	652	+ float g = display.modelParams0[1];
	653	+ float b = display.modelParams0[2];
	654	+ float opacity = display.modelParams5[1];
	655	+
	656	+ //final GL gl = GLU.getCurrentGL();
	657	+ GL gl = display.GetGL(); // getGL();
	658	+
	659	+ FloatBuffer vertBuf = geo.vertBuf;
	660	+
	661	+ int v = vertBuf.capacity();
	662	+
	663	+ int count = 0;
	664	+
	665	+ boolean cf = gl.glIsEnabled(gl.GL_CULL_FACE);
	666	+ gl.glEnable(gl.GL_CULL_FACE);
	667	+ // gl.glScalef(1.0f/1024,1.0f/1024,1.0f/1024);
	668	+ for (int i=0; i<v/3; i++)
	669	+ {
	670	+ int index3 = i*3;
	671	+
	672	+ if (geo.sizeBuf.get(index3+1) == 0)
	673	+ continue;
	674	+
	675	+ count++;
	676	+
	677	+ int index4 = i*4;
	678	+
	679	+ float tx = vertBuf.get(index3);
	680	+ float ty = vertBuf.get(index3+1);
	681	+ float tz = vertBuf.get(index3+2);
	682	+
	683	+ // if (tx == 0 && ty == 0 && tz == 0)
	684	+ // continue;
	685	+
	686	+ gl.glMatrixMode(gl.GL_TEXTURE);
	687	+ gl.glPushMatrix();
	688	+
	689	+ float[] texmat = geo.texmat;
	690	+ texmat[12] = texmat[13] = texmat[14] = i;
	691	+
	692	+ gl.glMultMatrixf(texmat, 0);
	693	+
	694	+ gl.glMatrixMode(gl.GL_MODELVIEW);
	695	+ gl.glPushMatrix();
	696	+
	697	+ gl.glTranslatef(tx,ty,tz);
	698	+
	699	+ if (rotate)
	700	+ gl.glRotatef(i, 0, 1, 0);
	701	+
	702	+ float size = geo.sizeBuf.get(index3) / 100;
	703	+ gl.glScalef(size,size,size);
	704	+
	705	+ float cr = geo.colorBuf.get(index4);
	706	+ float cg = geo.colorBuf.get(index4+1);
	707	+ float cb = geo.colorBuf.get(index4+2);
	708	+ float ca = geo.colorBuf.get(index4+3);
	709	+
	710	+ display.modelParams0[0] = r * cr;
	711	+ display.modelParams0[1] = g * cg;
	712	+ display.modelParams0[2] = b * cb;
	713	+
	714	+ display.modelParams5[1] = opacity * ca;
	715	+
	716	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 0, display.modelParams0, 0);
	717	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 5, display.modelParams5, 0);
	718	+
	719	+ RandomNode.globalseed = (int)geo.sizeBuf.get(index3+2); // i;
	720	+ RandomNode.globalseed2 = RandomNode.globalseed;
	721	+
	722	+// gl.glColor4f(cr,cg,cb,ca);
	723	+ // gl.glScalef(1024/16,1024/16,1024/16);
	724	+ shape.Draw/Node/(display,null,selected,false); // blocked
	725	+ // gl.glScalef(16.0f/1024,16.0f/1024,16.0f/1024);
	726	+ //gl.glTranslatef(-tx,-ty,-tz);
	727	+ gl.glPopMatrix();
	728	+
	729	+ gl.glMatrixMode(gl.GL_TEXTURE);
	730	+ gl.glPopMatrix();
	731	+ }
	732	+ // gl.glScalef(1024,1024,1024);
	733	+ if (!cf)
	734	+ gl.glDisable(gl.GL_CULL_FACE);
	735	+
	736	+ display.modelParams0[0] = r;
	737	+ display.modelParams0[1] = g;
	738	+ display.modelParams0[2] = b;
	739	+
	740	+ display.modelParams5[1] = opacity;
	741	+
	742	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 0, display.modelParams0, 0);
	743	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 5, display.modelParams5, 0);
	744	+
	745	+ gl.glMatrixMode(gl.GL_MODELVIEW);
	746	+
	747	+// System.err.println("total = " + v/3 + "; displayed = " + count);
	748	+ if (true)
	749	+ return;
	750	+
	751	+//// if (!tris.predraw(this))
	752	+//// {
	753	+//// return;
	754	+//// }
	755	+//// if (Debug.stats)
	756	+//// {
	757	+//// StatCollector.addStat(StatType.STAT_TRIANGLE_COUNT, tris.getTriangleCount());
	758	+//// StatCollector.addStat(StatType.STAT_VERTEX_COUNT, tris.getVertexCount());
	759	+//// StatCollector.addStat(StatType.STAT_GEOM_COUNT, 1);
	760	+//// }
	761	+////
	762	+//// if (tris.getDisplayListID() != -1)
	763	+//// {
	764	+//// renderDisplayList(tris);
	765	+//// return;
	766	+//// }
	767	+////
	768	+//// if (!generatingDisplayList)
	769	+//// {
	770	+//// applyStates(tris.states, tris);
	771	+//// }
	772	+//// if (Debug.stats)
	773	+//// {
	774	+//// StatCollector.startStat(StatType.STAT_RENDER_TIMER);
	775	+//// }
	776	+//// boolean transformed = doTransforms(tris);
	777	+//
	778	+// int glMode = GL.GL_TRIANGLES;
	779	+// switch (getMode())
	780	+// {
	781	+// case Triangles:
	782	+// glMode = GL.GL_TRIANGLES;
	783	+// break;
	784	+// case Strip:
	785	+// glMode = GL.GL_TRIANGLE_STRIP;
	786	+// break;
	787	+// case Fan:
	788	+// glMode = GL.GL_TRIANGLE_FAN;
	789	+// break;
	790	+// }
	791	+//
	792	+// if (!predrawGeometry(gl))
	793	+// {
	794	+// // make sure only the necessary indices are sent through on old
	795	+// // cards.
	796	+// IntBuffer indices = this.getIndexBuffer();
	797	+// if (indices == null)
	798	+// {
	799	+// logger.severe("missing indices on geometry object: " + this.toString());
	800	+// } else
	801	+// {
	802	+// indices.rewind();
	803	+// indices.limit(this.getMaxIndex());
	804	+//
	805	+// gl.glDrawElements(glMode, indices.limit(), GL.GL_UNSIGNED_INT, indices); // TODO Check <count> and assumed <type> of GL_UNSIGNED_INT
	806	+//
	807	+// indices.clear();
	808	+// }
	809	+// } else
	810	+// {
	811	+// gl.glDrawElements(glMode, this.getIndexBuffer().limit(),
	812	+// GL.GL_UNSIGNED_INT, 0);
	813	+// }
	814	+//
	815	+//// postdrawGeometry(tris);
	816	+//// if (transformed)
	817	+//// {
	818	+//// undoTransforms(tris);
	819	+//// }
	820	+////
	821	+//// if (Debug.stats)
	822	+//// {
	823	+//// StatCollector.endStat(StatType.STAT_RENDER_TIMER);
	824	+//// }
	825	+//// tris.postdraw(this);
	826	+ }
	827	+
	828	+ static Camera localcamera = new Camera();
	829	+ static cVector from = new cVector();
	830	+ static cVector to = new cVector();
	831	+
	832	+ public void PrepOcclusion(BoundaryRep br, double[][] transform)
	833	+ {
	834	+ CameraPane cp = this;
	835	+
	836	+ Camera keep = cp.RenderCamera();
	837	+ cp.renderCamera = localcamera;
	838	+
	839	+ if (br.trimmed)
	840	+ {
	841	+ float[] colors = new float[br.positions.length / 3];
	842	+
	843	+ int i3 = 0;
	844	+ for (int i = 0; i < br.positions.length / 3; i++, i3 += 3)
	845	+ {
	846	+ if (br.normals[i3] == 0 && br.normals[i3+1] == 0 && br.normals[i3+2] == 0)
	847	+ continue;
	848	+
	849	+ from.set(br.positions[i3], br.positions[i3 + 1], br.positions[i3 + 2]);
	850	+ to.set(br.positions[i3] + br.normals[i3],
	851	+ br.positions[i3 + 1] + br.normals[i3 + 1],
	852	+ br.positions[i3 + 2] + br.normals[i3 + 2]);
	853	+ LA.xformPos(from, transform, from);
	854	+ LA.xformPos(to, transform, to); // RIGID ONLY
	855	+ localcamera.setAim(from, to);
	856	+
	857	+ CameraPane.occlusionbuffer.display();
	858	+
	859	+ if (CameraPane.DEBUG_OCCLUSION)
	860	+ cp.display(); // debug
	861	+
	862	+ colors[i] = cp.vertexOcclusion.r;
	863	+ //colors[i3 + 1] = cp.vertexOcclusion.g;
	864	+ //colors[i3 + 2] = cp.vertexOcclusion.b;
	865	+
	866	+ if ((i % 100) == 0 && i != 0)
	867	+ {
	868	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	869	+ //System.out.println("Color = " + cp.vertexOcclusion.r + ", " + cp.vertexOcclusion.g + ", " + cp.vertexOcclusion.b + "; " + (int)(100.0*i/(positions.length/3)) + "% done");
	870	+ System.out.println((int) (100.0 * i / (br.positions.length / 3)) + "% (" + i + " of " + (br.positions.length / 3) + ")");
	871	+ }
	872	+ }
	873	+
	874	+ br.colors = colors;
	875	+ }
	876	+ else
	877	+ {
	878	+ for (int i = 0; i < br.VertexCount(); i++)
	879	+ {
	880	+ Vertex v = br.GetVertex(i);
	881	+
	882	+ if (v.norm == null \|\| v.norm.x == 0 && v.norm.y == 0 && v.norm.z == 0)
	883	+ continue;
	884	+
	885	+ from.set(v.x, v.y, v.z);
	886	+ to.set(v.x+v.norm.x, v.y+v.norm.y, v.z+v.norm.z);
	887	+ LA.xformPos(from, transform, from);
	888	+ LA.xformPos(to, transform, to); // RIGID ONLY
	889	+ localcamera.setAim(from, to);
	890	+
	891	+ CameraPane.occlusionbuffer.display();
	892	+
	893	+ if (CameraPane.DEBUG_OCCLUSION)
	894	+ cp.display(); // debug
	895	+
	896	+ v.AO = cp.vertexOcclusion.r;
	897	+
	898	+ if ((i % 100) == 0 && i != 0)
	899	+ {
	900	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	901	+ //System.out.println("Color = " + cp.vertexOcclusion.r + ", " + cp.vertexOcclusion.g + ", " + cp.vertexOcclusion.b + "; " + (int)(100.0*i/(positions.length/3)) + "% done");
	902	+ System.out.println((int) (100.0 * i / br.VertexCount()) + "% (" + i + " of " + br.VertexCount() + ")");
	903	+ }
	904	+ }
	905	+ }
	906	+
	907	+ //System.out.println("done.");
	908	+
	909	+ cp.renderCamera = keep;
	910	+ }
	911	+
	912	+ void DrawPointFLow(PointFlow pointFlow, Object3D /Composite/ root, boolean selected, boolean blocked)
	913	+ {
	914	+ CameraPane display = this;
	915	+ pointFlow.CreateHT();
	916	+
	917	+ float r = display.modelParams0[0];
	918	+ float g = display.modelParams0[1];
	919	+ float b = display.modelParams0[2];
	920	+ float opacity = display.modelParams5[1];
	921	+
	922	+ //final GL gl = GLU.getCurrentGL();
	923	+ GL gl = display.GetGL(); // getGL();
	924	+
	925	+ int s = pointFlow.points.size();
	926	+
	927	+ boolean cf = gl.glIsEnabled(gl.GL_CULL_FACE);
	928	+ gl.glEnable(gl.GL_CULL_FACE);
	929	+
	930	+ for (int i=s; --i>=0;)
	931	+ //for (int i=0; i<s; i++)
	932	+ {
	933	+ cVector v = pointFlow.points.get(i);
	934	+
	935	+ double mindist = Double.MAX_VALUE;
	936	+
	937	+ double size = pointFlow.minimumSize;
	938	+
	939	+ double distancenext = 0;
	940	+
	941	+ if (i > 0)
	942	+ {
	943	+ cVector w = pointFlow.points.get(i-1);
	944	+
	945	+ double dist = w.distance(v);
	946	+
	947	+ distancenext = dist;
	948	+
	949	+ if (mindist > dist)
	950	+ {
	951	+ mindist = dist;
	952	+ size = mindist*pointFlow.resizefactor;
	953	+ }
	954	+ }
	955	+
	956	+ if (i < s-1)
	957	+ {
	958	+ cVector w = pointFlow.points.get(i+1);
	959	+
	960	+ double dist = w.distance(v);
	961	+
	962	+ if (mindist > dist)
	963	+ {
	964	+ mindist = dist;
	965	+ size = mindist*pointFlow.resizefactor;
	966	+ }
	967	+ }
	968	+
	969	+ if (size < pointFlow.minimumSize)
	970	+ size = pointFlow.minimumSize;
	971	+ if (size > pointFlow.maximumSize)
	972	+ size = pointFlow.maximumSize;
	973	+
	974	+ double tx = v.x;
	975	+ double ty = v.y;
	976	+ double tz = v.z;
	977	+
	978	+ // if (tx == 0 && ty == 0 && tz == 0)
	979	+ // continue;
	980	+
	981	+ gl.glMatrixMode(gl.GL_TEXTURE);
	982	+ gl.glPushMatrix();
	983	+ pointFlow.texmat[12] = pointFlow.texmat[13] = pointFlow.texmat[14] = i;
	984	+
	985	+ gl.glMultMatrixf(pointFlow.texmat, 0);
	986	+
	987	+ gl.glMatrixMode(gl.GL_MODELVIEW);
	988	+ gl.glPushMatrix();
	989	+
	990	+ gl.glTranslated(tx,ty,tz);
	991	+
	992	+ gl.glScaled(size,size,size);
	993	+
	994	+// float cr = colorBuf.get(index4);
	995	+// float cg = colorBuf.get(index4+1);
	996	+// float cb = colorBuf.get(index4+2);
	997	+// float ca = colorBuf.get(index4+3);
	998	+//
	999	+// display.modelParams0[0] = r * cr;
	1000	+// display.modelParams0[1] = g * cg;
	1001	+// display.modelParams0[2] = b * cb;
	1002	+//
	1003	+// display.modelParams5[1] = opacity * ca;
	1004	+//
	1005	+// gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 0, display.modelParams0, 0);
	1006	+// gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 5, display.modelParams5, 0);
	1007	+//
	1008	+// RandomNode.globalseed = (int)sizeBuf.get(index3+2); // i;
	1009	+// RandomNode.globalseed2 = RandomNode.globalseed;
	1010	+//
	1011	+//// gl.glColor4f(cr,cg,cb,ca);
	1012	+// // gl.glScalef(1024/16,1024/16,1024/16);
	1013	+ pointFlow.geo.Draw/Node/(display,null,selected, blocked);
	1014	+
	1015	+ gl.glPopMatrix();
	1016	+
	1017	+ double step = size/4; //
	1018	+
	1019	+ if (i == 0 \|\| size == 0 \|\| distancenext > 8*size \|\| distancenext < step)
	1020	+ continue;
	1021	+
	1022	+ int nbsteps = (int)(distancenext/step);
	1023	+
	1024	+ step = distancenext/nbsteps;
	1025	+
	1026	+ cVector next = pointFlow.points.get(i-1);
	1027	+
	1028	+ tmp.set(next);
	1029	+ tmp.sub(v);
	1030	+ tmp.normalize();
	1031	+ tmp.mul(step);
	1032	+
	1033	+ // calculate next size
	1034	+ mindist = Double.MAX_VALUE;
	1035	+
	1036	+ double nextsize = pointFlow.minimumSize;
	1037	+
	1038	+ if (i > 1)
	1039	+ {
	1040	+ cVector w = pointFlow.points.get(i-2);
	1041	+
	1042	+ double dist = w.distance(next);
	1043	+
	1044	+ if (mindist > dist)
	1045	+ {
	1046	+ mindist = dist;
	1047	+ nextsize = mindist*pointFlow.resizefactor;
	1048	+ }
	1049	+ }
	1050	+
	1051	+ double dist = v.distance(next);
	1052	+
	1053	+ if (mindist > dist)
	1054	+ {
	1055	+ mindist = dist;
	1056	+ nextsize = mindist*pointFlow.resizefactor;
	1057	+ }
	1058	+
	1059	+ if (nextsize < pointFlow.minimumSize)
	1060	+ nextsize = pointFlow.minimumSize;
	1061	+ if (nextsize > pointFlow.maximumSize)
	1062	+ nextsize = pointFlow.maximumSize;
	1063	+ //
	1064	+
	1065	+ double count = 0;
	1066	+
	1067	+ while (distancenext > 0.000000001) // step
	1068	+ {
	1069	+ gl.glPushMatrix();
	1070	+
	1071	+ gl.glTranslated(tx + tmp.xcount, ty + tmp.ycount, tz + tmp.z*count);
	1072	+
	1073	+ double K = count/nbsteps;
	1074	+
	1075	+ double intersize = Knextsize + (1-K)size;
	1076	+
	1077	+ gl.glScaled(intersize,intersize,intersize);
	1078	+
	1079	+ pointFlow.geo.Draw/Node/(display,null,selected,blocked);
	1080	+
	1081	+ count++;
	1082	+
	1083	+ distancenext -= step;
	1084	+
	1085	+ gl.glPopMatrix();
	1086	+ }
	1087	+
	1088	+ if (count != nbsteps)
	1089	+ assert(count == nbsteps);
	1090	+
	1091	+ // gl.glScalef(16.0f/1024,16.0f/1024,16.0f/1024);
	1092	+ //gl.glTranslatef(-tx,-ty,-tz);
	1093	+
	1094	+ gl.glMatrixMode(gl.GL_TEXTURE);
	1095	+ gl.glPopMatrix();
	1096	+ }
	1097	+
	1098	+ if (!cf)
	1099	+ gl.glDisable(gl.GL_CULL_FACE);
	1100	+
	1101	+// display.modelParams0[0] = r;
	1102	+// display.modelParams0[1] = g;
	1103	+// display.modelParams0[2] = b;
	1104	+//
	1105	+// display.modelParams5[1] = opacity;
	1106	+//
	1107	+// gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 0, display.modelParams0, 0);
	1108	+// gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 5, display.modelParams5, 0);
	1109	+
	1110	+ gl.glMatrixMode(gl.GL_MODELVIEW);
	1111	+ }
	1112	+
	1113	+ public void DrawBox(cVector min, cVector max)
	1114	+ {
	1115	+ javax.media.opengl.GL gl = GetGL();
	1116	+ gl.glBegin(gl.GL_LINES);
	1117	+
	1118	+ gl.glVertex3d(min.x, min.y, min.z);
	1119	+ gl.glVertex3d(min.x, min.y, max.z);
	1120	+ gl.glVertex3d(min.x, min.y, min.z);
	1121	+ gl.glVertex3d(min.x, max.y, min.z);
	1122	+ gl.glVertex3d(min.x, min.y, min.z);
	1123	+ gl.glVertex3d(max.x, min.y, min.z);
	1124	+
	1125	+ gl.glVertex3d(max.x, max.y, max.z);
	1126	+ gl.glVertex3d(min.x, max.y, max.z);
	1127	+ gl.glVertex3d(max.x, max.y, max.z);
	1128	+ gl.glVertex3d(max.x, min.y, max.z);
	1129	+ gl.glVertex3d(max.x, max.y, max.z);
	1130	+ gl.glVertex3d(max.x, max.y, min.z);
	1131	+
	1132	+ gl.glEnd();
	1133	+ }
	1134	+
	1135	+ public void DrawGeometry(BoundaryRep bRep, boolean flipV, boolean selectmode)
	1136	+ {
	1137	+ int[] strips = bRep.getRawIndices();
	1138	+
	1139	+ javax.media.opengl.GL gl = GetGL();
	1140	+
	1141	+ // TRIANGLE STRIP ARRAY
	1142	+ if (bRep.trimmed)
	1143	+ {
	1144	+ float[] v = bRep.getRawVertices();
	1145	+ float[] n = bRep.getRawNormals();
	1146	+ float[] c = bRep.getRawColors();
	1147	+ float[] uv = bRep.getRawUVMap();
	1148	+
	1149	+ int count2 = 0;
	1150	+ int count3 = 0;
	1151	+
	1152	+ if (n.length > 0)
	1153	+ {
	1154	+ for (int i = 0; i < strips.length; i++)
	1155	+ {
	1156	+ gl.glBegin(gl.GL_TRIANGLE_STRIP);
	1157	+
	1158	+ /*
	1159	+ boolean locked = false;
	1160	+ float eps = 0.1f;
	1161	+ boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
	1162	+
	1163	+ int dot = 0;
	1164	+
	1165	+ if ((dot&1) == 0)
	1166	+ dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
	1167	+
	1168	+ if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
	1169	+ gl.glTexCoord2f((float) qv.s, (float) qv.t);
	1170	+ else
	1171	+ {
	1172	+ locked = true;
	1173	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	1174	+ }
	1175	+ //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
	1176	+ gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
	1177	+ if (hasnorm)
	1178	+ {
	1179	+ //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
	1180	+ gl.glNormal3f((float) rv.norm.x, (float) rv.norm.y, (float) rv.norm.z);
	1181	+ }
	1182	+
	1183	+ if ((dot&4) == 0)
	1184	+ dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
	1185	+
	1186	+ if (wrap \|\| !locked && (dot&8) != 0)
	1187	+ gl.glTexCoord2f((float) rv.s, (float) rv.t);
	1188	+ else
	1189	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	1190	+
	1191	+ f.dot = dot;
	1192	+ */
	1193	+
	1194	+ if (!selectmode)
	1195	+ {
	1196	+ if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
	1197	+ {
	1198	+ gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1199	+ } else
	1200	+ {
	1201	+ gl.glNormal3f(0, 0, 1);
	1202	+ }
	1203	+
	1204	+ if (c != null)
	1205	+ //System.out.println("glcolor = " + c[count3] + ", " + c[count3+1] + ", " + c[count3+2]);
	1206	+ {
	1207	+ gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
	1208	+ }
	1209	+ }
	1210	+
	1211	+ if (flipV)
	1212	+ gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
	1213	+ else
	1214	+ gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1215	+
	1216	+ //System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
	1217	+ gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1218	+
	1219	+ count2 += 2;
	1220	+ count3 += 3;
	1221	+ if (!selectmode)
	1222	+ {
	1223	+ if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
	1224	+ {
	1225	+ gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1226	+ } else
	1227	+ {
	1228	+ gl.glNormal3f(0, 0, 1);
	1229	+ }
	1230	+ if (c != null)
	1231	+ {
	1232	+ gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
	1233	+ }
	1234	+ }
	1235	+
	1236	+ if (flipV)
	1237	+ gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
	1238	+ else
	1239	+ gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1240	+
	1241	+ //System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
	1242	+ gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1243	+
	1244	+ count2 += 2;
	1245	+ count3 += 3;
	1246	+ for (int j = 0; j < strips[i] - 2; j++)
	1247	+ {
	1248	+ //gl.glTexCoord2d(...);
	1249	+ if (!selectmode)
	1250	+ {
	1251	+ if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
	1252	+ {
	1253	+ gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1254	+ } else
	1255	+ {
	1256	+ gl.glNormal3f(0, 0, 1);
	1257	+ }
	1258	+ if (c != null)
	1259	+ {
	1260	+ gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
	1261	+ }
	1262	+ }
	1263	+
	1264	+ if (flipV)
	1265	+ gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
	1266	+ else
	1267	+ gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1268	+
	1269	+ //System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
	1270	+ gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1271	+
	1272	+ count2 += 2;
	1273	+ count3 += 3;
	1274	+ }
	1275	+
	1276	+ gl.glEnd();
	1277	+ }
	1278	+ }
	1279	+
	1280	+ assert count3 == v.length;
	1281	+ }
	1282	+ else // !trimmed
	1283	+ {
	1284	+ int count = 0;
	1285	+ for (int i = 0; i < strips.length; i++)
	1286	+ {
	1287	+ gl.glBegin(gl.GL_TRIANGLE_STRIP);
	1288	+
	1289	+ Vertex p = bRep.GetVertex(bRep.indices[count++]);
	1290	+ Vertex q = bRep.GetVertex(bRep.indices[count++]);
	1291	+
	1292	+ drawVertex(gl, p, flipV, selectmode);
	1293	+ drawVertex(gl, q, flipV, selectmode);
	1294	+
	1295	+ for (int j = 0; j < strips[i] - 2; j++)
	1296	+ {
	1297	+ Vertex r = bRep.GetVertex(bRep.indices[count++]);
	1298	+
	1299	+ // if (j%2 == 0)
	1300	+ // drawFace(p, q, r, display, null);
	1301	+ // else
	1302	+ // drawFace(p, r, q, display, null);
	1303	+
	1304	+ // p = q;
	1305	+ // q = r;
	1306	+ drawVertex(gl, r, flipV, selectmode);
	1307	+ }
	1308	+
	1309	+ gl.glEnd();
	1310	+ }
	1311	+ }
	1312	+ }
	1313	+
	1314	+ static cSpring.Point3D temp = new cSpring.Point3D();
	1315	+ static cSpring.Point3D temp2 = new cSpring.Point3D();
	1316	+ static cSpring.Point3D temp3 = new cSpring.Point3D();
	1317	+
	1318	+ public void DrawDynamicMesh(cMesh mesh)
	1319	+ {
	1320	+ GL gl = GetGL(); // getGL();
	1321	+
	1322	+ cSpring.PhysicsController3D Phys = mesh.Phys;
	1323	+
	1324	+ gl.glDisable(gl.GL_LIGHTING);
	1325	+
	1326	+ gl.glLineWidth(1);
	1327	+ gl.glColor3f(1,1,1);
	1328	+ gl.glBegin(gl.GL_LINES);
	1329	+ double scale = 0;
	1330	+ int count = 0;
	1331	+ for (int s=0; s<Phys.allSprings.size(); s++)
	1332	+ {
	1333	+ cSpring.Spring spring = Phys.allSprings.get(s);
	1334	+ if(s == 0)
	1335	+ {
	1336	+ //System.out.println(" spring : " + spring.a.position + "; " + spring.b.position);
	1337	+ }
	1338	+ if (mesh.showsprings)
	1339	+ {
	1340	+ temp.set(spring.a.position);
	1341	+ temp.add(spring.b.position);
	1342	+ temp.mul(0.5);
	1343	+ temp2.set(spring.a.position);
	1344	+ temp2.sub(spring.b.position);
	1345	+ temp2.mul(spring.restLength/2);
	1346	+ temp.sub(temp2);
	1347	+ gl.glVertex3f((float)temp.x, (float)temp.y, (float)temp.z);
	1348	+ temp.add(temp2);
	1349	+ temp.add(temp2);
	1350	+ gl.glVertex3f((float)temp.x, (float)temp.y, (float)temp.z);
	1351	+ }
	1352	+
	1353	+ if (spring.isHandle)
	1354	+ continue;
	1355	+
	1356	+ //if (scale < spring.restLength)
	1357	+ scale += spring.restLength;
	1358	+ count++;
	1359	+ }
	1360	+ gl.glEnd();
	1361	+
	1362	+ if (count == 0)
	1363	+ scale = 0.01;
	1364	+ else
	1365	+ scale /= count * 3;
	1366	+
	1367	+ //scale = 0.25;
	1368	+
	1369	+ if (mesh.ShowInfo())
	1370	+ {
	1371	+ gl.glLineWidth(4);
	1372	+ for (int s=0; s<Phys.allNodes.size(); s++)
	1373	+ {
	1374	+ cSpring.DynamicNode node = Phys.allNodes.get(s);
	1375	+ if (node.mass == 0)
	1376	+ continue;
	1377	+
	1378	+ int i = node.springs==null?-1:node.springs.size();
	1379	+ gl.glColor3f((i>>2)&1,(i>>1)&1,i&1);
	1380	+ //temp.set(node.springForce.x, node.springForce.y, node.springForce.z);
	1381	+ //temp.normalize();
	1382	+ //gl.glColor3d((temp.x+1)/2, (temp.y+1)/2, (temp.z+1)/2);
	1383	+ gl.glBegin(gl.GL_LINES);
	1384	+ gl.glVertex3d(node.position.x, node.position.y, node.position.z);
	1385	+ //gl.glVertex3d(node.position.x + node.normal.xscale, node.position.y + node.normal.yscale, node.position.z + node.normal.z*scale);
	1386	+ gl.glVertex3d(node.position.x + mesh.bRep.GetVertex(s).norm.x*scale,
	1387	+ node.position.y + mesh.bRep.GetVertex(s).norm.y*scale,
	1388	+ node.position.z + mesh.bRep.GetVertex(s).norm.z*scale);
	1389	+ gl.glEnd();
	1390	+ }
	1391	+
	1392	+ gl.glLineWidth(8);
	1393	+ for (int s=0; s<Phys.allNodes.size(); s++)
	1394	+ {
	1395	+ cSpring.DynamicNode node = Phys.allNodes.get(s);
	1396	+
	1397	+ if (node.springs != null)
	1398	+ {
	1399	+ for (int i=0; i<node.springs.size(); i+=1)
	1400	+ {
	1401	+ cSpring.DynamicNode f = node.springs.get(i).GetOther(node);
	1402	+
	1403	+ int c = i+1;
	1404	+ // c = node.springs.get(i).nbcopies;
	1405	+
	1406	+ gl.glColor3f((c>>2)&1,(c>>1)&1,c&1);
	1407	+ gl.glBegin(gl.GL_LINES);
	1408	+ gl.glVertex3d(node.position.x, node.position.y, node.position.z);
	1409	+ gl.glVertex3d(f.position.x/3+node.position.x2/3, f.position.y/3+node.position.y2/3, f.position.z/3+node.position.z*2/3);
	1410	+ gl.glEnd();
	1411	+ }
	1412	+ }
	1413	+ }
	1414	+
	1415	+ gl.glLineWidth(1);
	1416	+ }
	1417	+
	1418	+ gl.glEnable(gl.GL_LIGHTING);
	1419	+ }
	1420	+
	1421	+ /// INTERFACE
	1422	+
	1423	+ public void StartTriangles()
	1424	+ {
	1425	+ javax.media.opengl.GL gl = GetGL();
	1426	+ gl.glBegin(gl.GL_TRIANGLES);
	1427	+ }
	1428	+
	1429	+ public void EndTriangles()
	1430	+ {
	1431	+ GetGL().glEnd();
	1432	+ }
	1433	+
	1434	+ void drawVertex(javax.media.opengl.GL gl, Vertex pv, boolean flipV, boolean selectmode)
	1435	+ {
	1436	+ if (!selectmode)
	1437	+ {
	1438	+ gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
	1439	+ gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
	1440	+
	1441	+ if (flipV)
	1442	+ gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
	1443	+ else
	1444	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	1445	+ }
	1446	+
	1447	+ gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
	1448	+ }
	1449	+
	1450	+ void SetColor(Object3D obj, Vertex p0)
	1451	+ {
	1452	+ CameraPane display = this;
	1453	+ BoundaryRep bRep = obj.bRep;
	1454	+
	1455	+ if (RENDERPROGRAM == 0)
	1456	+ {
	1457	+ float r = 0;
	1458	+ if (bRep != null)
	1459	+ {
	1460	+ if (bRep.stripified)
	1461	+ {
	1462	+ r = 1;
	1463	+ }
	1464	+ }
	1465	+ float g = 0;
	1466	+ if (bRep != null)
	1467	+ {
	1468	+ if (bRep.trimmed)
	1469	+ {
	1470	+ g = 1;
	1471	+ }
	1472	+ }
	1473	+ float b = 0;
	1474	+ if (obj.support != null && obj.link2master)
	1475	+ {
	1476	+ b = 1;
	1477	+ }
	1478	+ display.GetGL().glColor3f(rp0.AO, gp0.AO, b*p0.AO);
	1479	+ return;
	1480	+ }
	1481	+
	1482	+ if (display.DrawMode() != CameraPane.SHADOW)
	1483	+ return;
	1484	+
	1485	+ javax.media.opengl.GL gl = display.GetGL();
	1486	+// if (true) return;
	1487	+// float ao = p.AO;
	1488	+//
	1489	+// // if (ao == 0 && !bRep.AOdone) // transient problem!
	1490	+// // ao = 1;
	1491	+//
	1492	+// gl.glColor4f(ao, ao, ao, 1);
	1493	+
	1494	+// CameraPane.selectedpoint.
	1495	+// getAverage(cStatic.point1, true);
	1496	+ if (CameraPane.pointflow == null) // !random) // live)
	1497	+ {
	1498	+ return;
	1499	+ }
	1500	+
	1501	+ cStatic.point1.set(0,0,0);
	1502	+ LA.xformPos(cStatic.point1, CameraPane.selectedpoint.toParent, cStatic.point1);
	1503	+
	1504	+ cStatic.point1.sub(p0);
	1505	+
	1506	+
	1507	+// if (marked && (p0.vertexlinks == null \|\| support == null \|\| support.bRep == null)) // no position delta?
	1508	+// {
	1509	+// return;
	1510	+// }
	1511	+
	1512	+ //if (true)
	1513	+ if (cStatic.point1.dot(cStatic.point1) > 0.000001)
	1514	+ {
	1515	+ return;
	1516	+ }
	1517	+
	1518	+ float[] colorV = new float[3];
	1519	+
	1520	+ if (false) // marked)
	1521	+ {
	1522	+ // debug rigging weights
	1523	+ for (int object = 0; object < p0.vertexlinks.length; object++)
	1524	+ {
	1525	+ float weight = p0.weights[object] / p0.totalweight;
	1526	+
	1527	+ // if (weight < 0.1)
	1528	+ // {
	1529	+ // assert(weight == 0);
	1530	+ // continue;
	1531	+ // }
	1532	+
	1533	+ if (p0.vertexlinks[object] == -1)
	1534	+ continue;
	1535	+
	1536	+ Vertex q = obj.support.bRep.GetVertex(p0.vertexlinks[object]);
	1537	+
	1538	+ int color = //1 << object; //
	1539	+ //p.vertexlinks.length;
	1540	+ obj.support.bRep.supports[p0.closestsupport].links[object];
	1541	+ colorV[2] += (color & 1) * weight;
	1542	+ colorV[1] += ((color & 2) >> 1) * weight;
	1543	+ colorV[0] += ((color & 4) >> 2) * weight;
	1544	+ }
	1545	+ }
	1546	+ else
	1547	+ {
	1548	+ if (obj.drawingstarted)
	1549	+ {
	1550	+ // find next point
	1551	+ if (bRep.GetVertex(0).faceindices == null)
	1552	+ {
	1553	+ bRep.InitFaceIndices();
	1554	+ }
	1555	+
	1556	+ double ymin = p0.y;
	1557	+
	1558	+ Vertex newp = p0;
	1559	+
	1560	+ for (int fii = 0; fii < p0.faceindices.length; fii++)
	1561	+ {
	1562	+ int fi = p0.faceindices[fii];
	1563	+
	1564	+ if (fi == -1)
	1565	+ break;
	1566	+
	1567	+ Face f = bRep.GetFace(fi);
	1568	+
	1569	+ Vertex p = bRep.GetVertex(f.p);
	1570	+ Vertex q = bRep.GetVertex(f.q);
	1571	+ Vertex r = bRep.GetVertex(f.r);
	1572	+
	1573	+ int swap = (int)(Math.random()*3);
	1574	+
	1575	+// for (int s=swap; --s>=0;)
	1576	+// {
	1577	+// Vertex t = p;
	1578	+// p = q;
	1579	+// q = r;
	1580	+// r = t;
	1581	+// }
	1582	+ if (ymin > p.y)
	1583	+ {
	1584	+ ymin = p.y;
	1585	+ newp = p;
	1586	+// break;
	1587	+ }
	1588	+ if (ymin > q.y)
	1589	+ {
	1590	+ ymin = q.y;
	1591	+ newp = q;
	1592	+// break;
	1593	+ }
	1594	+ if (ymin > r.y)
	1595	+ {
	1596	+ ymin = r.y;
	1597	+ newp = r;
	1598	+// break;
	1599	+ }
	1600	+ }
	1601	+
	1602	+ CameraPane.selectedpoint.toParent[3][0] = newp.x;
	1603	+ CameraPane.selectedpoint.toParent[3][1] = newp.y;
	1604	+ CameraPane.selectedpoint.toParent[3][2] = newp.z;
	1605	+
	1606	+ obj.drawingstarted = false;
	1607	+
	1608	+ // return;
	1609	+ }
	1610	+
	1611	+ if (false) // CameraPane.DRAW
	1612	+ {
	1613	+ p0.AO = colorV[0] = 2;
	1614	+ colorV[1] = 2;
	1615	+ colorV[2] = 2;
	1616	+ }
	1617	+
	1618	+ CameraPane.pointflow.add(p0);
	1619	+ CameraPane.pointflow.Touch();
	1620	+ }
	1621	+
	1622	+// gl.glColor3f(colorV[0], colorV[1], colorV[2]);
	1623	+// gl.glMaterialfv(gl.GL_FRONT, gl.GL_DIFFUSE, colorV, 0);
	1624	+// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
	1625	+ }
	1626	+
	1627	+ void DrawMaterial(cMaterial material, boolean selected, Object3D.cVector2[] others)
	1628	+ {
	1629	+ CameraPane display = this;
	1630	+ //new Exception().printStackTrace();
	1631	+
	1632	+ if (display.IsFrozen() && !selected \|\| display.IsAmbientOcclusionOn()) // \|\| display.drawMode == display.SHADOW)
	1633	+ {
	1634	+ return;
	1635	+ }
	1636	+
	1637	+ javax.media.opengl.GL gl = display.GetGL();
	1638	+
	1639	+ //Color col = Color.getHSBColor(color,modulation,1);
	1640	+ //col.getColorComponents(ColorSpace.getInstance(ColorSpace.CS_LINEAR_RGB), CameraPane.modelParams0);
	1641	+ if (!material.multiply)
	1642	+ {
	1643	+ display.color = material.color;
	1644	+ display.saturation = material.modulation;
	1645	+ }
	1646	+ else
	1647	+ {
	1648	+ display.color = material.color2;
	1649	+ display.saturation = material.modulation2;
	1650	+ }
	1651	+
	1652	+ cColor.HSBtoRGB(display.color, display.saturation, 1, display.modelParams0);
	1653	+
	1654	+ float[] colorV = Grafreed.colorV;
	1655	+
	1656	+ /**/
	1657	+ if (display.DrawMode() == display.DEFAULT) // && display.RENDERPROGRAM == 0)
	1658	+ {
	1659	+ colorV[0] = display.modelParams0[0] * material.diffuse;
	1660	+ colorV[1] = display.modelParams0[1] * material.diffuse;
	1661	+ colorV[2] = display.modelParams0[2] * material.diffuse;
	1662	+ colorV[3] = 1; // material.opacity;
	1663	+
	1664	+ gl.glColor4f(colorV[0], colorV[1], colorV[2], material.opacity);
	1665	+ //System.out.println("Opacity = " + opacity);
	1666	+
	1667	+ gl.glMaterialfv(gl.GL_FRONT, gl.GL_DIFFUSE, colorV, 0);
	1668	+ //color[0] /= 2; color[1] /= 2; color[2] /= 2;
	1669	+ gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
	1670	+
	1671	+ float amb = material.ambient;
	1672	+ if (amb < material.cameralight)
	1673	+ {
	1674	+ amb = material.cameralight;
	1675	+ }
	1676	+ colorV[0] = display.modelParams0[0] * material.diffuse * amb;
	1677	+ colorV[1] = display.modelParams0[1] * material.diffuse * amb;
	1678	+ colorV[2] = display.modelParams0[2] * material.diffuse * amb;
	1679	+ gl.glMaterialfv(gl.GL_FRONT, gl.GL_AMBIENT, colorV, 0);
	1680	+ //color[0] /= 2; color[1] /= 2; color[2] /= 2;
	1681	+ gl.glMaterialfv(gl.GL_BACK, gl.GL_AMBIENT, colorV, 0);
	1682	+
	1683	+ /**/
	1684	+ colorV[0] = ((1 - material.metalness) + display.modelParams0[0] * material.metalness) * material.specular;
	1685	+ colorV[1] = ((1 - material.metalness) + display.modelParams0[1] * material.metalness) * material.specular;
	1686	+ colorV[2] = ((1 - material.metalness) + display.modelParams0[2] * material.metalness) * material.specular;
	1687	+ gl.glMaterialfv(gl.GL_FRONT, gl.GL_SPECULAR, colorV, 0);
	1688	+ //color[0] /= 2; color[1] /= 2; color[2] /= 2;
	1689	+ gl.glMaterialfv(gl.GL_BACK, gl.GL_SPECULAR, colorV, 0);
	1690	+ colorV[0] = 10 / material.shininess; // 1/0.005f;
	1691	+ //System.out.println("shininess = " + colorV[0]);
	1692	+ if (colorV[0] > 128)
	1693	+ {
	1694	+ colorV[0] = 128;
	1695	+ }
	1696	+ gl.glMaterialfv(gl.GL_FRONT, gl.GL_SHININESS, colorV, 0);
	1697	+ gl.glMaterialfv(gl.GL_BACK, gl.GL_SHININESS, colorV, 0);
	1698	+ /**/
	1699	+ }
	1700	+ /**/
	1701	+
	1702	+ //selected = false;
	1703	+ selected = selected && display.flash;
	1704	+
	1705	+ //display.modelParams0[0] = 0; // pigment.r;
	1706	+ //display.modelParams0[1] = 0; // pigment.g;
	1707	+ //display.modelParams0[2] = 0; // pigment.b;
	1708	+ if (!material.multiply)
	1709	+ {
	1710	+ display.modelParams0[3] = material.metalness;
	1711	+ display.modelParams1[0] = material.diffuse;
	1712	+ display.modelParams1[1] = material.specular;
	1713	+ display.modelParams1[2] = 1 / material.shininess;
	1714	+ display.modelParams1[3] = material.shift;
	1715	+ display.modelParams2[0] = material.ambient;
	1716	+ display.modelParams2[1] = material.lightarea;
	1717	+ //System.out.println("light area = " + lightarea);
	1718	+ display.modelParams2[2] = 1 / material.factor; // diffuseness
	1719	+ display.modelParams2[3] = material.velvet;
	1720	+ display.modelParams3[0] = material.sheen;
	1721	+ display.modelParams3[1] = material.subsurface;
	1722	+ display.modelParams3[2] = material.bump; // backlit
	1723	+ display.modelParams3[3] = material.aniso;
	1724	+ display.modelParams4[0] = material.anisoV;
	1725	+ display.modelParams4[1] = selected ? 100 : material.cameralight;
	1726	+ //System.out.println("selected = " + selected);
	1727	+ display.modelParams4[2] = material.diffuseness;
	1728	+ display.modelParams4[3] = material.shadow;
	1729	+ display.modelParams5[0] = material.texture;
	1730	+ display.modelParams5[1] = material.opacity;
	1731	+ display.modelParams5[2] = material.fakedepth;
	1732	+ display.modelParams5[3] = CameraPane.SHADOWCULLFACE ? 0f : (material.shadowbias - 0.005f) / 10;
	1733	+ }
	1734	+ else
	1735	+ {
	1736	+ display.modelParams0[3] = material.metalness2;
	1737	+ display.modelParams1[0] = material.diffuse2;
	1738	+ display.modelParams1[1] = material.specular2;
	1739	+ display.modelParams1[2] = material.shininess2;
	1740	+ display.modelParams1[3] = material.shift2;
	1741	+ display.modelParams2[0] = material.ambient2;
	1742	+ display.modelParams2[1] = material.lightarea2;
	1743	+ display.modelParams2[2] = material.factor2;
	1744	+ display.modelParams2[3] = material.velvet2;
	1745	+ display.modelParams3[0] = material.sheen2;
	1746	+ display.modelParams3[1] = material.subsurface2;
	1747	+ display.modelParams3[2] = material.bump2;
	1748	+ display.modelParams3[3] = material.aniso2;
	1749	+ display.modelParams4[0] = material.anisoV2;
	1750	+ display.modelParams4[1] = material.cameralight2;
	1751	+ //System.out.println("selected = " + selected);
	1752	+ display.modelParams4[2] = material.diffuseness2;
	1753	+ display.modelParams4[3] = material.shadow2;
	1754	+ display.modelParams5[0] = material.texture2;
	1755	+ display.modelParams5[1] = material.opacity2;
	1756	+ display.modelParams5[2] = material.fakedepth2;
	1757	+ display.modelParams5[3] = material.shadowbias2;
	1758	+ }
	1759	+
	1760	+ display.modelParams6[0] = 0;
	1761	+ display.modelParams6[1] = 0;
	1762	+ display.modelParams6[2] = 0;
	1763	+ display.modelParams6[3] = 0;
	1764	+
	1765	+ display.modelParams7[0] = 0;
	1766	+ display.modelParams7[1] = 1000;
	1767	+ display.modelParams7[2] = 0;
	1768	+ display.modelParams7[3] = 0;
	1769	+
	1770	+ //display.modelParams6[0] = 100; // criss de bug de bump
	1771	+
	1772	+ Object3D.cVector2[] extparams = others; // display.vector2buffer;
	1773	+ if (extparams != null && extparams.length > 0 && extparams[0] != null)
	1774	+ {
	1775	+ display.modelParams6[0] = extparams[0].x / 1000.0f; // bump
	1776	+ display.modelParams6[1] = extparams[0].y / 1000.0f; // noise
	1777	+ if (extparams.length > 1)
	1778	+ {
	1779	+ display.modelParams6[2] = extparams[1].x / 1000.0f; // borderfade
	1780	+ display.modelParams6[3] = extparams[1].y / 1000.0f; // (float)Math.exp(-extparams[1].y / 1000.0f); // fog punchthrough
	1781	+ if (extparams.length > 2)
	1782	+ {
	1783	+ display.modelParams7[0] = extparams[2].x / 1000.0f; // noise power
	1784	+ float x = extparams[2].y / 1000.0f;
	1785	+ //if (x == 0)
	1786	+ // x = 1f;
	1787	+ display.modelParams7[1] = 1 / x / x / x / x / x / x / x / x / x / x / x / x / x; // (float)Math.pow(-Math.log((extparams[2].y+0.00) / 1000.0f), 1); // opacity power
	1788	+ if (extparams[2].y > 0)
	1789	+ {
	1790	+ //System.out.println("extparams[1].y = " + extparams[1].y);
	1791	+ //System.out.println("extparams[2].y = " + extparams[2].y);
	1792	+ //System.out.println("opacity power = " + display.modelParams7[1]);
	1793	+ }
	1794	+ }
	1795	+ }
	1796	+ }
	1797	+
	1798	+ //if (display.modelParams6[2] != 0)
	1799	+ /*
	1800	+ System.out.println("modelParams0[0] = " + display.modelParams0[0]);
	1801	+ System.out.println("modelParams0[1] = " + display.modelParams0[1]);
	1802	+ System.out.println("modelParams0[2] = " + display.modelParams0[2]);
	1803	+ System.out.println("modelParams0[3] = " + display.modelParams0[3]);
	1804	+ System.out.println("modelParams1[0] = " + display.modelParams1[0]);
	1805	+ System.out.println("modelParams1[1] = " + display.modelParams1[1]);
	1806	+ System.out.println("modelParams1[2] = " + display.modelParams1[2]);
	1807	+ System.out.println("modelParams1[3] = " + display.modelParams1[3]);
	1808	+ System.out.println("modelParams2[0] = " + display.modelParams2[0]);
	1809	+ System.out.println("modelParams2[1] = " + display.modelParams2[1]);
	1810	+ System.out.println("modelParams2[2] = " + display.modelParams2[2]);
	1811	+ System.out.println("modelParams2[3] = " + display.modelParams2[3]);
	1812	+ System.out.println("modelParams3[0] = " + display.modelParams3[0]);
	1813	+ System.out.println("modelParams3[1] = " + display.modelParams3[1]);
	1814	+ System.out.println("modelParams3[2] = " + display.modelParams3[2]);
	1815	+ System.out.println("modelParams3[3] = " + display.modelParams3[3]);
	1816	+ System.out.println("modelParams4[0] = " + display.modelParams4[0]);
	1817	+ System.out.println("modelParams4[1] = " + display.modelParams4[1]);
	1818	+ System.out.println("modelParams4[2] = " + display.modelParams4[2]);
	1819	+ System.out.println("modelParams4[3] = " + display.modelParams4[3]);
	1820	+ System.out.println("modelParams5[0] = " + display.modelParams5[0]);
	1821	+ System.out.println("modelParams5[1] = " + display.modelParams5[1]);
	1822	+ System.out.println("modelParams5[2] = " + display.modelParams5[2]);
	1823	+ System.out.println("modelParams5[3] = " + display.modelParams5[3]);
	1824	+ System.out.println("modelParams6[0] = " + display.modelParams6[0]);
	1825	+ System.out.println("modelParams6[1] = " + display.modelParams6[1]);
	1826	+ System.out.println("modelParams6[2] = " + display.modelParams6[2]);
	1827	+ System.out.println("modelParams6[3] = " + display.modelParams6[3]);
	1828	+ System.out.println("modelParams7[0] = " + display.modelParams7[0]);
	1829	+ System.out.println("modelParams7[1] = " + display.modelParams7[1]);
	1830	+ System.out.println("modelParams7[2] = " + display.modelParams7[2]);
	1831	+ System.out.println("modelParams7[3] = " + display.modelParams7[3]);
	1832	+ /**/
	1833	+ //assert (display.modelParams6[2] == 0);
	1834	+
	1835	+ //System.out.println("noise power = " + display.modelParams7[0]);
	1836	+ //System.out.println("shadowbias = " + shadowbias);
	1837	+
	1838	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 0, display.modelParams0, 0);
	1839	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 1, display.modelParams1, 0);
	1840	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 2, display.modelParams2, 0);
	1841	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 3, display.modelParams3, 0);
	1842	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 4, display.modelParams4, 0);
	1843	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 5, display.modelParams5, 0);
	1844	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 6, display.modelParams6, 0);
	1845	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 7, display.modelParams7, 0);
	1846	+
	1847	+ int mode = display.FP_SHADER;
	1848	+
	1849	+ if (material.aniso != material.anisoV \|\| material.aniso > 0.002)
	1850	+ {
	1851	+ mode \|= display.FP_ANISO;
	1852	+ }
	1853	+
	1854	+ display.EnableProgram(mode);
	1855	+
	1856	+ //System.out.println("opacity power = " + display.modelParams7[1]);
	1857	+
	1858	+ if (!material.multiply)
	1859	+ {
	1860	+ if (Globals.drawMode == CameraPane.SHADOW)
	1861	+ gl.glDepthMask(material.opacity >= 0.9 && display.modelParams7[1] > 0.1);
	1862	+ else
	1863	+ gl.glDepthMask(material.opacity >= 0.99);
	1864	+ }
208	1865	}
209	1866
210	1867	int matrixdepth = 0; // 10000; // CONFLICT WITH cMESH... WARNING WARNING WARNING WARNING WARNING WARNING !!!!!!!!!!!! 0;
..	..	@@ -225,10 +1882,10 @@
225	1882	currentGL.glMultMatrixd(model, 0);
226	1883	}
227	1884
228		- void PushMatrix(double[][] matrix, int count)
	1885	+ public void PushMatrix(double[][] matrix, int count) // INTERFACE
229	1886	{
230	1887	matrixdepth++;
231		- // GraphreeD.tracein(matrix);
	1888	+ // GrafreeD.tracein(matrix);
232	1889	if (matrix == null)
233	1890	return; // Identity
234	1891
..	..	@@ -253,13 +1910,13 @@
253	1910
254	1911	void PushMatrix(double[][] matrix)
255	1912	{
256		- // GraphreeD.tracein(matrix);
257		- PushMatrix(matrix,1);
	1913	+ // GrafreeD.tracein(matrix);
	1914	+ PushMatrix(matrix, 1);
258	1915	}
259	1916
260	1917	void PushMatrix()
261	1918	{
262		- // GraphreeD.tracein(null);
	1919	+ // GrafreeD.tracein(null);
263	1920	if (matrixdepth++ < MAXSTACK - 1)
264	1921	{
265	1922	currentGL.glPushMatrix();
..	..	@@ -270,11 +1927,11 @@
270	1927
271	1928	double[][] tmpmat = new double[4][4];
272	1929
273		- void PopMatrix(double[][] inverse)
	1930	+ public void PopMatrix(double[][] inverse) // INTERFACE
274	1931	{
275	1932	--matrixdepth;
276	1933
277		- // GraphreeD.traceout(inverse);
	1934	+ // GrafreeD.traceout(inverse);
278	1935	if (inverse == null)
279	1936	return; // Identity
280	1937
..	..	@@ -292,7 +1949,7 @@
292	1949
293	1950	void PopMatrix()
294	1951	{
295		- // GraphreeD.traceout(null);
	1952	+ // GrafreeD.traceout(null);
296	1953	// inverse == null??
297	1954	if (--matrixdepth < MAXSTACK - 1)
298	1955	{
..	..	@@ -310,7 +1967,7 @@
310	1967	PushTextureMatrix(matrix, 1);
311	1968	}
312	1969
313		- void PushTextureMatrix(double[][] matrix, int count)
	1970	+ public void PushTextureMatrix(double[][] matrix, int count) // INTERFACE
314	1971	{
315	1972	currentGL.glActiveTexture(GetGL().GL_TEXTURE0);
316	1973
..	..	@@ -324,7 +1981,7 @@
324	1981	currentGL.glMatrixMode(GetGL().GL_MODELVIEW);
325	1982	}
326	1983
327		- void PopTextureMatrix(double[][] inverse)
	1984	+ public void PopTextureMatrix(double[][] inverse) // INTERFACE
328	1985	{
329	1986	currentGL.glActiveTexture(GetGL().GL_TEXTURE0);
330	1987	currentGL.glMatrixMode(GetGL().GL_TEXTURE);
..	..	@@ -351,15 +2008,15 @@
351	2008
352	2009	static int camerachangeframe;
353	2010
354		- boolean SetCamera(Camera cam)
	2011	+ public boolean SetCamera(Camera cam)
355	2012	{
356	2013	// may 2014 if (cam == cameras[0] \|\| cam == cameras[1])
357	2014	// return false;
358	2015
359		- if (REFUSEMODE && isLIVE() && camerachangeframe != 0 && camerachangeframe != framecount)
	2016	+ if (REFUSEMODE && Globals.isLIVE() && camerachangeframe != 0 && camerachangeframe != Globals.framecount)
360	2017	{
361	2018	// check for last change
362		- if (framecount < camerachangeframe + 400) // 120 == 1 second
	2019	+ if (Globals.framecount < camerachangeframe + 400) // 120 == 1 second
363	2020	{
364	2021	// refuse the camera change
365	2022	System.err.println("Camera " + cam + " REFUSED");
..	..	@@ -367,7 +2024,7 @@
367	2024	}
368	2025	}
369	2026
370		- camerachangeframe = framecount;
	2027	+ camerachangeframe = Globals.framecount;
371	2028
372	2029	cam.hAspect = -1; // Read only
373	2030
..	..	@@ -398,7 +2055,7 @@
398	2055	{
399	2056	//System.err.println("Oeil on");
400	2057	TRACK = true;
401		-// JUNE 2014 if (TRACK && trackedobject != null && drawMode == SHADOW) // && !lightMode)
	2058	+// JUNE 2014 if (TRACK && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
402	2059	// object.editWindow.ScreenFit(trackedobject);
403	2060	//pingthread.StepToTarget(true);
404	2061	}
..	..	@@ -407,8 +2064,8 @@
407	2064	{
408	2065	//System.err.println("Oeil on");
409	2066	OEIL = true;
410		- if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && drawMode == SHADOW) // && !lightMode)
411		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	2067	+ if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
	2068	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
412	2069	//pingthread.StepToTarget(true);
413	2070	}
414	2071
..	..	@@ -471,39 +2128,12 @@
471	2128	{
472	2129	frozen ^= true;
473	2130	// Weird...
474		- lighttouched = true;
	2131	+ Globals.lighttouched = true;
475	2132	}
476	2133
477	2134	void ToggleDL()
478	2135	{
479	2136	mainDL ^= true;
480		- }
481		-
482		- void ToggleTexture()
483		- {
484		- textureon ^= true;
485		- }
486		-
487		- void ToggleLive()
488		- {
489		- setLIVE(isLIVE() ^ true);
490		-
491		- System.err.println("LIVE = " + isLIVE());
492		-
493		- if (!isLIVE()) // save sound
494		- GraphreeD.savesound = true; // wav.save();
495		- // else
496		- repaint(); // start loop // may 2013
497		- }
498		-
499		- void ToggleSupport()
500		- {
501		- SUPPORT ^= true;
502		- }
503		-
504		- void ToggleAbort()
505		- {
506		- ABORTMODE ^= true;
507	2137	}
508	2138
509	2139	void ToggleFullScreen()
..	..	@@ -513,12 +2143,7 @@
513	2143
514	2144	void ToggleCrowd()
515	2145	{
516		- CROWD ^= true;
517		- }
518		-
519		- void ToggleInertia()
520		- {
521		- INERTIA ^= true;
	2146	+ Globals.CROWD ^= true;
522	2147	}
523	2148
524	2149	void ToggleLocal()
..	..	@@ -526,62 +2151,89 @@
526	2151	LOCALTRANSFORM ^= true;
527	2152	}
528	2153
529		- void ToggleFast()
	2154	+ public void ToggleTexture()
	2155	+ {
	2156	+ textureon ^= true;
	2157	+ }
	2158	+
	2159	+ public void ToggleLive()
	2160	+ {
	2161	+ Globals.setLIVE(Globals.isLIVE() ^ true);
	2162	+
	2163	+ System.err.println("LIVE = " + Globals.isLIVE());
	2164	+
	2165	+ if (!Globals.isLIVE()) // save sound
	2166	+ Grafreed.savesound = true; // wav.save();
	2167	+ // else
	2168	+ repaint(); // start loop // may 2013
	2169	+ }
	2170	+
	2171	+ public void ToggleSupport()
	2172	+ {
	2173	+ SUPPORT ^= true;
	2174	+ }
	2175	+
	2176	+ public void ToggleAbort()
	2177	+ {
	2178	+ ABORTMODE ^= true;
	2179	+ }
	2180	+
	2181	+ public void ToggleInertia()
	2182	+ {
	2183	+ INERTIA ^= true;
	2184	+ }
	2185	+
	2186	+ public void ToggleFast()
530	2187	{
531	2188	FAST ^= true;
532	2189	}
533	2190
534		- void ToggleSlowPose()
	2191	+ public void ToggleSlowPose()
535	2192	{
536	2193	SLOWPOSE ^= true;
537	2194	}
538	2195
539		- void ToggleFootContact()
540		- {
541		- FOOTCONTACT ^= true;
542		- }
543		-
544		- void ToggleBoxMode()
	2196	+ public void ToggleBoxMode()
545	2197	{
546	2198	BOXMODE ^= true;
547	2199	}
548	2200
549		- void ToggleSmoothFocus()
	2201	+ public void ToggleZoomBoxMode()
	2202	+ {
	2203	+ ZOOMBOXMODE ^= true;
	2204	+ }
	2205	+
	2206	+ public void ToggleSmoothFocus()
550	2207	{
551	2208	SMOOTHFOCUS ^= true;
552	2209	}
553	2210
554		- void ToggleImageFlip()
	2211	+ public void ToggleImageFlip()
555	2212	{
556	2213	IMAGEFLIP ^= true;
557	2214	}
558	2215
559		- void ToggleSpeakerMocap()
	2216	+ public void ToggleSpeakerMocap()
560	2217	{
561	2218	SPEAKERMOCAP ^= true;
562	2219	}
563	2220
564		- void ToggleSpeakerCamera()
	2221	+ public void ToggleSpeakerCamera()
565	2222	{
566	2223	SPEAKERCAMERA ^= true;
567	2224	}
568	2225
569		- void ToggleSpeakerFocus()
	2226	+ public void ToggleSpeakerFocus()
570	2227	{
571	2228	SPEAKERFOCUS ^= true;
572	2229	}
573	2230
574		- void ToggleDebug()
575		- {
576		- DEBUG ^= true;
577		- }
578		-
579		- void ToggleFrustum()
	2231	+ public void ToggleFrustum()
580	2232	{
581	2233	FRUSTUM ^= true;
582	2234	}
583	2235
584		- void ToggleTrack()
	2236	+ public void ToggleTrack()
585	2237	{
586	2238	TRACK ^= true;
587	2239	if (TRACK)
..	..	@@ -600,25 +2252,35 @@
600	2252	repaint();
601	2253	}
602	2254
603		- void ToggleTrackOnce()
	2255	+ public void ToggleTrackOnce()
604	2256	{
605	2257	TRACKONCE ^= true;
606	2258	}
607	2259
608		- void ToggleShadowTrack()
	2260	+ public void ToggleShadowTrack()
609	2261	{
610	2262	SHADOWTRACK ^= true;
611	2263	repaint();
612	2264	}
613	2265
614		- void ToggleOeil()
	2266	+ public void ToggleOeil()
615	2267	{
616	2268	OEIL ^= true;
617	2269	}
618	2270
619		- void ToggleOeilOnce()
	2271	+ public void ToggleOeilOnce()
620	2272	{
621	2273	OEILONCE ^= true;
	2274	+ }
	2275	+
	2276	+ void ToggleFootContact()
	2277	+ {
	2278	+ FOOTCONTACT ^= true;
	2279	+ }
	2280	+
	2281	+ void ToggleDebug()
	2282	+ {
	2283	+ Globals.DEBUG ^= true;
622	2284	}
623	2285
624	2286	void ToggleLookAt()
..	..	@@ -626,9 +2288,9 @@
626	2288	LOOKAT ^= true;
627	2289	}
628	2290
629		- void ToggleRandom()
	2291	+ void ToggleSwitch()
630	2292	{
631		- RANDOM ^= true;
	2293	+ SWITCH ^= true;
632	2294	}
633	2295
634	2296	void ToggleHandles()
..	..	@@ -636,10 +2298,17 @@
636	2298	HANDLES ^= true;
637	2299	}
638	2300
	2301	+ Object3D paintFolder;
	2302	+
639	2303	void TogglePaint()
640	2304	{
641	2305	PAINTMODE ^= true;
642	2306	paintcount = 0;
	2307	+
	2308	+ if (PAINTMODE)
	2309	+ {
	2310	+ paintFolder = GetFolder();
	2311	+ }
643	2312	}
644	2313
645	2314	void SwapCamera(int a, int b)
..	..	@@ -672,34 +2341,6 @@
672	2341	//assert (cam.hAspect == 0);
673	2342	cam.hAspect = 0;
674	2343	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	2344	}
704	2345
705	2346	private static void ApplyTransform(GL gl, Mat4f xform)
..	..	@@ -759,11 +2400,11 @@
759	2400
760	2401	GL currentGL;
761	2402
762		- GL GetGL()
	2403	+ public GL GetGL() // INTERFACE
763	2404	{
764	2405	return currentGL;
765	2406	}
766		-
	2407	+
767	2408	/**/
768	2409	class CacheTexture
769	2410	{
..	..	@@ -2000,10 +3641,12 @@
2000	3641	*/
2001	3642	TextureData ReduceTexture(TextureData texturedata, int resolution) // String name)
2002	3643	{
	3644	+ int pixelformat = texturedata.getPixelFormat();
	3645	+
2003	3646	int stride = 1;
2004		- if (texturedata.getPixelFormat() == GetGL().GL_RGB \|\| texturedata.getPixelFormat() == GetGL().GL_BGR) // \|\| texturedata.getPixelFormat() == GL.GL_LUMINANCE)
	3647	+ if (pixelformat == GetGL().GL_RGB \|\| pixelformat == GetGL().GL_BGR) // \|\| texturedata.getPixelFormat() == GL.GL_LUMINANCE)
2005	3648	stride = 3;
2006		- if (texturedata.getPixelFormat() == GetGL().GL_RGBA \|\| texturedata.getPixelFormat() == GetGL().GL_BGRA) // \|\| texturedata.getPixelFormat() == GL.GL_LUMINANCE_ALPHA)
	3649	+ if (pixelformat == GetGL().GL_RGBA \|\| pixelformat == GetGL().GL_BGRA) // \|\| texturedata.getPixelFormat() == GL.GL_LUMINANCE_ALPHA)
2007	3650	stride = 4;
2008	3651
2009	3652	int width = texturedata.getWidth();
..	..	@@ -2593,6 +4236,7 @@
2593	4236
2594	4237	com.sun.opengl.util.texture.Texture CompressTexture2(String name)
2595	4238	{
	4239	+ new Exception().printStackTrace();
2596	4240	System.exit(0);
2597	4241	com.sun.opengl.util.texture.Texture texture = null;
2598	4242
..	..	@@ -6269,7 +7913,7 @@
6269	7913	return null;
6270	7914	}
6271	7915
6272		- void ReleaseTextures(cTexture tex)
	7916	+ public void ReleaseTextures(cTexture tex) // INTERFACE
6273	7917	{
6274	7918	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
6275	7919	{
..	..	@@ -6305,9 +7949,67 @@
6305	7949	ReleaseTexture(pigment, false);
6306	7950	}
6307	7951
	7952	+ public void ReleasePigmentTexture(cTexture tex) // INTERFACE
	7953	+ {
	7954	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	7955	+ {
	7956	+ return;
	7957	+ }
	7958	+
	7959	+ if (tex == null)
	7960	+ {
	7961	+ ReleaseTexture(null, false);
	7962	+ return;
	7963	+ }
	7964	+
	7965	+ String pigment = Object3D.GetPigment(tex);
	7966	+
	7967	+ if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	7968	+ {
	7969	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	7970	+ // System.out.println("; bump = " + bump);
	7971	+ }
	7972	+
	7973	+ if (pigment.equals(""))
	7974	+ {
	7975	+ pigment = null;
	7976	+ }
	7977	+
	7978	+ ReleaseTexture(pigment, false);
	7979	+ }
	7980	+
	7981	+ public void ReleaseBumpTexture(cTexture tex) // INTERFACE
	7982	+ {
	7983	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	7984	+ {
	7985	+ return;
	7986	+ }
	7987	+
	7988	+ if (tex == null)
	7989	+ {
	7990	+ ReleaseTexture(null, true);
	7991	+ return;
	7992	+ }
	7993	+
	7994	+ String bump = Object3D.GetBump(tex);
	7995	+
	7996	+ if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	7997	+ {
	7998	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	7999	+ // System.out.println("; bump = " + bump);
	8000	+ }
	8001	+
	8002	+ if (bump.equals(""))
	8003	+ {
	8004	+ bump = null;
	8005	+ }
	8006	+
	8007	+ ReleaseTexture(bump, true);
	8008	+ }
	8009	+
6308	8010	void ReleaseTexture(String tex, boolean bump)
6309	8011	{
6310		- if (// drawMode != 0 \|\| /tex == null \|\|/
	8012	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
6311	8013	ambientOcclusion ) // \|\| !textureon)
6312	8014	{
6313	8015	return;
..	..	@@ -6333,7 +8035,7 @@
6333	8035	{
6334	8036	bumpdepth--;
6335	8037
6336		- // GraphreeD.trace("POP " + tex + "(" + pigmentdepth + ")" + " : " + pigmentstack[pigmentdepth] + " vs " + texture);
	8038	+ // GrafreeD.trace("POP " + tex + "(" + pigmentdepth + ")" + " : " + pigmentstack[pigmentdepth] + " vs " + texture);
6337	8039	if (bumpstack[bumpdepth] != (texture!=null?texture.texture:null))
6338	8040	{
6339	8041	// assert (bumpstack[bumpdepth] == texture);
..	..	@@ -6363,7 +8065,7 @@
6363	8065	{
6364	8066	pigmentdepth--;
6365	8067
6366		- // GraphreeD.trace("POP " + tex + "(" + pigmentdepth + ")" + " : " + pigmentstack[pigmentdepth] + " vs " + texture);
	8068	+ // GrafreeD.trace("POP " + tex + "(" + pigmentdepth + ")" + " : " + pigmentstack[pigmentdepth] + " vs " + texture);
6367	8069	if (pigmentstack[pigmentdepth] != (texture!=null?texture.texture:null))
6368	8070	{
6369	8071	// assert (pigmentstack[pigmentdepth] == texture);
..	..	@@ -6408,9 +8110,9 @@
6408	8110	}
6409	8111	}
6410	8112
6411		- /boolean/ void BindTextures(cTexture tex, int resolution)
	8113	+ /boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
6412	8114	{
6413		- if (// drawMode != 0 \|\| /tex == null \|\|/
	8115	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
6414	8116	ambientOcclusion ) // \|\| !textureon)
6415	8117	{
6416	8118	return; // false;
..	..	@@ -6453,7 +8155,94 @@
6453	8155	return; // true;
6454	8156	}
6455	8157
6456		- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution)
	8158	+ /boolean/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8159	+ {
	8160	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8161	+ ambientOcclusion ) // \|\| !textureon)
	8162	+ {
	8163	+ return; // false;
	8164	+ }
	8165	+
	8166	+ if (tex == null)
	8167	+ {
	8168	+ BindTexture(null,false,resolution);
	8169	+ return;
	8170	+ }
	8171	+
	8172	+ String pigment = Object3D.GetPigment(tex);
	8173	+
	8174	+ usedtextures.put(pigment, pigment);
	8175	+
	8176	+ if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8177	+ {
	8178	+ // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8179	+ // System.out.println("; bump = " + bump);
	8180	+ }
	8181	+
	8182	+ if (pigment.equals(""))
	8183	+ {
	8184	+ pigment = null;
	8185	+ }
	8186	+
	8187	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8188	+ BindTexture(pigment, false, resolution);
	8189	+ }
	8190	+
	8191	+ /boolean/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8192	+ {
	8193	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8194	+ ambientOcclusion ) // \|\| !textureon)
	8195	+ {
	8196	+ return; // false;
	8197	+ }
	8198	+
	8199	+ if (tex == null)
	8200	+ {
	8201	+ BindTexture(null,true,resolution);
	8202	+ return;
	8203	+ }
	8204	+
	8205	+ String bump = Object3D.GetBump(tex);
	8206	+
	8207	+ usedtextures.put(bump, bump);
	8208	+
	8209	+ if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8210	+ {
	8211	+ // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8212	+ // System.out.println("; bump = " + bump);
	8213	+ }
	8214	+
	8215	+ if (bump.equals(""))
	8216	+ {
	8217	+ bump = null;
	8218	+ }
	8219	+
	8220	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
	8221	+ BindTexture(bump, true, resolution);
	8222	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8223	+ }
	8224	+
	8225	+ java.util.HashSet<String> missingTextures = new java.util.HashSet<String>();
	8226	+
	8227	+ private boolean FileExists(String tex)
	8228	+ {
	8229	+ if (missingTextures.contains(tex))
	8230	+ {
	8231	+ return false;
	8232	+ }
	8233	+
	8234	+ boolean fileExists = new File(tex).exists();
	8235	+
	8236	+ if (!fileExists)
	8237	+ {
	8238	+ // If file exists, the "new File()" is not executed sgain
	8239	+ missingTextures.add(tex);
	8240	+ }
	8241	+
	8242	+ return fileExists;
	8243	+ }
	8244	+
	8245	+ CacheTexture GetCacheTexture(String tex, boolean bump, int resolution) throws Exception
6457	8246	{
6458	8247	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
6459	8248
..	..	@@ -6461,12 +8250,18 @@
6461	8250	{
6462	8251	String texname = tex;
6463	8252
6464		- String[] split = tex.split("Textures");
6465		- if (split.length > 1)
6466		- texname = "/Users/nbriere/Textures" + split[split.length-1];
6467		- else
6468		- if (!texname.startsWith("/"))
6469		- texname = "/Users/nbriere/Textures/" + texname;
	8253	+ String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
	8254	+
	8255	+// String[] split = tex.split("Textures");
	8256	+// if (split.length > 1)
	8257	+// texname = "/Users/nbriere/Textures" + split[split.length-1];
	8258	+// else
	8259	+// if (!texname.startsWith("/"))
	8260	+// texname = "/Users/nbriere/Textures/" + texname;
	8261	+ if (!FileExists(tex))
	8262	+ {
	8263	+ texname = fallbackTextureName;
	8264	+ }
6470	8265
6471	8266	if (CACHETEXTURE)
6472	8267	texture = textures.get(texname); // TEXTURE CACHE
..	..	@@ -6535,7 +8330,7 @@
6535	8330	}
6536	8331
6537	8332	cachename = texname.substring(0, texname.length()-4)+ext+".jpg";
6538		- if (!new File(cachename).exists())
	8333	+ if (!FileExists(cachename))
6539	8334	cachename = texname;
6540	8335	else
6541	8336	processbump = false; // don't process bump map again
..	..	@@ -6557,7 +8352,7 @@
6557	8352	}
6558	8353
6559	8354	cachename = texname.substring(0, texname.length()-4)+ext+".png";
6560		- if (!new File(cachename).exists())
	8355	+ if (!FileExists(cachename))
6561	8356	cachename = texname;
6562	8357	else
6563	8358	processbump = false; // don't process bump map again
..	..	@@ -6566,7 +8361,9 @@
6566	8361	texturedata = GetFileTexture(cachename, processbump, resolution);
6567	8362
6568	8363
6569		- if (texturedata != null)
	8364	+ if (texturedata == null)
	8365	+ throw new Exception();
	8366	+
6570	8367	texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
6571	8368	//texture = GetTexture(tex, bump);
6572	8369	}
..	..	@@ -6688,32 +8485,32 @@
6688	8485	return texture;
6689	8486	}
6690	8487
6691		- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution)
	8488	+ com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution) throws Exception
6692	8489	{
6693	8490	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
6694	8491
6695	8492	if (bump)
6696	8493	{
6697		- // GraphreeD.trace("PUSH BUMP " + tex + "(" + bumpdepth + ")" + " : " + texture);
	8494	+ // GrafreeD.trace("PUSH BUMP " + tex + "(" + bumpdepth + ")" + " : " + texture);
6698	8495	bumpstack[bumpdepth++] = texture!=null?texture.texture:null;
6699	8496	}
6700	8497	else
6701	8498	{
6702		- // GraphreeD.trace("PUSH PIGMENT " + tex + "(" + pigmentdepth + ")" + " : " + texture);
	8499	+ // GrafreeD.trace("PUSH PIGMENT " + tex + "(" + pigmentdepth + ")" + " : " + texture);
6703	8500	pigmentstack[pigmentdepth++] = texture!=null?texture.texture:null;
6704	8501	}
6705	8502
6706	8503	return texture!=null?texture.texture:null;
6707	8504	}
6708	8505
6709		- com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution)
	8506	+ public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution) throws Exception
6710	8507	{
6711	8508	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
6712	8509
6713	8510	return texture!=null?texture.texturedata:null;
6714	8511	}
6715	8512
6716		- boolean BindTexture(String tex, boolean bump, int resolution)
	8513	+ com.sun.opengl.util.texture.Texture BindTexture(String tex, boolean bump, int resolution) throws Exception
6717	8514	{
6718	8515	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
6719	8516	{
..	..	@@ -6725,7 +8522,7 @@
6725	8522	com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
6726	8523
6727	8524	if (texture == null)
6728		- return false;
	8525	+ return texture;
6729	8526	/**/
6730	8527
6731	8528	if (textureon \|\| tex.equals("DEFAULT_TEXTURE") \|\| tex.equals("DEFAULT_TEXTURE_BUMP") \|\| tex.equals("WHITE_NOISE")) // \|\| tex.equals("IMMORTAL"))
..	..	@@ -7310,9 +9107,9 @@
7310	9107	static boolean occlusionInitialized = false;
7311	9108	boolean selection = false;
7312	9109	boolean pointselection = false;
7313		- /static/ boolean lighttouched = true;
	9110	+ ///static/ boolean lighttouched = true;
7314	9111	boolean deselect;
7315		- boolean ambientOcclusion = false;
	9112	+ private boolean ambientOcclusion = false;
7316	9113	static boolean flash = false;
7317	9114	/static/ boolean wait = false;
7318	9115	boolean displaydone = false; // after repaint() calls
..	..	@@ -7442,6 +9239,8 @@
7442	9239	//gl.glFrustum(-0.5scale, 0.5scale, -0.5scale, 0.5scale, 1, 100);
7443	9240	//glu.gluPerspective(lightshaper_fovy, 1, lightshaper_zNear, lightshaper_zFar);
7444	9241	double scale = lightCamera.SCALE / lightCamera.Distance();
	9242	+// PATCH FILLE AUX JEANS
	9243	+ //scale *= lightCamera.shaper_fovy / 25;
7445	9244	gl.glScaled(2 * scale, 2 * scale, -scale);
7446	9245	gl.glTranslated(0, 0, lightCamera.DECAL);
7447	9246
..	..	@@ -7588,17 +9387,40 @@
7588	9387	jy8[3] = 0.5f;
7589	9388	}
7590	9389
7591		- float[] options1 = new float[]{1000, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
	9390	+ float[] options1 = new float[]{100, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
7592	9391	float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
7593		- float[] options3 = new float[]{1, 1, 1, 1}; // fog color. image intensity
	9392	+ float[] options3 = new float[]{1, 1, 1, 0}; // fog color
	9393	+ float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
7594	9394
	9395	+ void ResetOptions()
	9396	+ {
	9397	+ options1[0] = 100;
	9398	+ options1[1] = 0.025f;
	9399	+ options1[2] = 0.01f;
	9400	+ options1[3] = 0;
	9401	+ options1[4] = 0;
	9402	+
	9403	+ options2[0] = 0;
	9404	+ options2[1] = 0.75f;
	9405	+ options2[2] = 0;
	9406	+ options2[3] = 0;
	9407	+
	9408	+ options3[0] = 1;
	9409	+ options3[1] = 1;
	9410	+ options3[2] = 1;
	9411	+ options3[3] = 0;
	9412	+
	9413	+ options4[0] = 1;
	9414	+ options4[1] = 0;
	9415	+ options4[2] = 1;
	9416	+ options4[3] = 0;
	9417	+ }
	9418	+
7595	9419	static int imagecount = 0; // movie generation
7596	9420
7597	9421	static int jitter = 0;
7598	9422
7599	9423	boolean restartframe = false;
7600		-
7601		- static int framecount = 0; // general-purpose global count
7602	9424
7603	9425	void displayAntiAliased(javax.media.opengl.GL gl)
7604	9426	{
..	..	@@ -7628,14 +9450,14 @@
7628	9450
7629	9451	//System.out.println("start frame");
7630	9452	gl.glClear(gl.GL_ACCUM_BUFFER_BIT);
7631		- for (jitter = 0; jitter < ACSIZE; jitter++) //, GraphreeD.wav.cursor += LIVE ? 735 : 0)
	9453	+ for (jitter = 0; jitter < ACSIZE; jitter++) //, GrafreeD.wav.cursor += LIVE ? 735 : 0)
7632	9454	{
7633		- framecount++;
	9455	+ Globals.framecount++;
7634	9456
7635	9457	if (CameraPane.tickcount > 0)
7636	9458	CameraPane.tickcount--;
7637	9459
7638		-// GraphreeD.wav.cursor += 735; // 44100 Hz / 120 Hz * 2 (for 16 bits)
	9460	+// GrafreeD.wav.cursor += 735; // 44100 Hz / 120 Hz * 2 (for 16 bits)
7639	9461	// restartframe = true;
7640	9462	if (options1[2] > 100 && (jitter%2==0))
7641	9463	{
..	..	@@ -7668,7 +9490,7 @@
7668	9490
7669	9491	gl.glLightfv(gl.GL_LIGHT0, gl.GL_POSITION, pos, 0);
7670	9492	*/
7671		- lighttouched = true;
	9493	+ Globals.lighttouched = true;
7672	9494	//System.err.println(" shadowbuffer: " + jitter);
7673	9495	shadowbuffer.display();
7674	9496
..	..	@@ -7689,8 +9511,8 @@
7689	9511	assert (parentcam != renderCamera);
7690	9512
7691	9513	if (renderCamera != lightCamera)
7692		- for (int count = parentcam.GetTransformCount(); --count>=0;)
7693		- LA.matConcat(parentcam.toParent, matrix, matrix);
	9514	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9515	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
7694	9516
7695	9517	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
7696	9518
..	..	@@ -7705,8 +9527,8 @@
7705	9527	LA.matCopy(renderCamera.fromScreen, matrix);
7706	9528
7707	9529	if (renderCamera != lightCamera)
7708		- for (int count = parentcam.GetTransformCount(); --count>=0;)
7709		- LA.matConcat(matrix, parentcam.fromParent, matrix);
	9530	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9531	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
7710	9532
7711	9533	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
7712	9534
..	..	@@ -7778,7 +9600,7 @@
7778	9600	//gl.glFlush();
7779	9601	gl.glAccum(gl.GL_ACCUM, 1.0f / ACSIZE);
7780	9602
7781		- if (ANIMATION && ABORTED)
	9603	+ if (Globals.ANIMATION && ABORTED)
7782	9604	{
7783	9605	System.err.println(" ABORTED FRAME");
7784	9606	break;
..	..	@@ -7808,7 +9630,7 @@
7808	9630	setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
7809	9631
7810	9632	// save image
7811		- if (ANIMATION && !ABORTED)
	9633	+ if (Globals.ANIMATION && !ABORTED)
7812	9634	{
7813	9635	VPwidth = viewport[2];
7814	9636	VPheight = viewport[3];
..	..	@@ -7919,11 +9741,11 @@
7919	9741
7920	9742	// imagecount++;
7921	9743
7922		- String fullname = filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
	9744	+ String fullname = Globals.filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
7923	9745
7924	9746	if (!BOXMODE)
7925	9747	{
7926		- System.out.println("image: " + fullname + " (" + (GraphreeD.wav.cursor / 735 / 4) + ")");
	9748	+ System.out.println("image: " + fullname + " (wav cursor=" + (Grafreed.wav.cursor / 735 / 4) + ")");
7927	9749	}
7928	9750
7929	9751	if (!BOXMODE)
..	..	@@ -7951,7 +9773,7 @@
7951	9773	{
7952	9774	if (ACSIZE > 1)
7953	9775	{
7954		- // System.err.println("image #" + (GraphreeD.wav.cursor / 735 / 4));
	9776	+ // System.err.println("image #" + (GrafreeD.wav.cursor / 735 / 4));
7955	9777	}
7956	9778	}
7957	9779
..	..	@@ -7961,7 +9783,7 @@
7961	9783	ABORTED = false;
7962	9784	}
7963	9785	else
7964		- GraphreeD.wav.cursor += 735 * ACSIZE;
	9786	+ Grafreed.wav.cursor += 735 * ACSIZE;
7965	9787
7966	9788	if (false)
7967	9789	{
..	..	@@ -8615,13 +10437,6 @@
8615	10437	}
8616	10438	}
8617	10439
8618		- boolean IsFrozen()
8619		- {
8620		- boolean selectmode = drawMode == SELECTION \|\| CameraPane.DEBUG_SELECTION;
8621		-
8622		- return !selectmode && cameracount == 0; // != 0;
8623		- }
8624		-
8625	10440	boolean niceon = false;
8626	10441	javax.swing.Timer AAtimer = new javax.swing.Timer(750, this);
8627	10442	boolean currentlydrawing = false;
..	..	@@ -8631,16 +10446,16 @@
8631	10446
8632	10447	public void display(GLAutoDrawable drawable)
8633	10448	{
8634		- if (GraphreeD.savesound && GraphreeD.hassound)
	10449	+ if (Grafreed.savesound && Grafreed.hassound)
8635	10450	{
8636		- GraphreeD.wav.save();
8637		- GraphreeD.savesound = false;
8638		- GraphreeD.hassound = false;
	10451	+ Grafreed.wav.save();
	10452	+ Grafreed.savesound = false;
	10453	+ Grafreed.hassound = false;
8639	10454	}
8640	10455	// if (DEBUG_SELECTION)
8641	10456	// {
8642		-// if (drawMode != SELECTION)
8643		-// drawMode = SELECTION;
	10457	+// if (DrawMode() != SELECTION)
	10458	+// DrawMode() = SELECTION;
8644	10459	// }
8645	10460
8646	10461	if (!isRenderer)
..	..	@@ -8696,9 +10511,9 @@
8696	10511
8697	10512	//ANTIALIAS = 0;
8698	10513
8699		- if (drawMode == DEFAULT) // && CURRENTANTIALIAS > 0)
	10514	+ if (DrawMode() == DEFAULT) // && CURRENTANTIALIAS > 0)
8700	10515	{
8701		- if (niceon \|\| isLIVE())
	10516	+ if (niceon \|\| Globals.isLIVE())
8702	10517	{
8703	10518	//if(active == 0)
8704	10519	// antialiaser = null;
..	..	@@ -8711,6 +10526,7 @@
8711	10526	ANTIALIAS = 0;
8712	10527	//System.out.println("RESTART");
8713	10528	AAtimer.restart();
	10529	+ Globals.TIMERRUNNING = true;
8714	10530	}
8715	10531	}
8716	10532	}
..	..	@@ -8723,7 +10539,7 @@
8723	10539	assert eyeCamera.shaper_zFar == 1E5f; // 500.0f;
8724	10540	*/
8725	10541
8726		- if (drawMode == DEFAULT)
	10542	+ if (DrawMode() == DEFAULT)
8727	10543	{
8728	10544	currentlydrawing = true;
8729	10545	}
..	..	@@ -8754,18 +10570,18 @@
8754	10570
8755	10571	// if(Applet3D.clipboard != null)
8756	10572	// System.out.println("Clipboard = " + Applet3D.clipboard); //.get(0).parent);
8757		-//drawMode = SELECTION;
	10573	+//DrawMode() = SELECTION;
8758	10574	indexcount = 0;
8759	10575
8760		- if (drawMode == OCCLUSION)
	10576	+ if (DrawMode() == OCCLUSION)
8761	10577	{
8762		- drawMode = DEFAULT;
	10578	+ Globals.drawMode = DEFAULT; // WARNING
8763	10579	ambientOcclusion = true;
8764	10580	setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
8765	10581	Object3D theobject = object;
8766	10582	Object3D theparent = object.parent;
8767	10583	object.parent = null;
8768		- object = (Object3D)GraphreeD.clone(object);
	10584	+ object = (Object3D)Grafreed.clone(object);
8769	10585	object.Stripify();
8770	10586	if (theobject.selection == null \|\| theobject.selection.Size() == 0)
8771	10587	theobject.PreprocessOcclusion(this);
..	..	@@ -8778,19 +10594,20 @@
8778	10594	ambientOcclusion = false;
8779	10595	}
8780	10596
8781		- if (lighttouched && drawMode == DEFAULT && !lightMode) // && !FROZEN)
	10597	+ if (//Globals.lighttouched &&
	10598	+ DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
8782	10599	{
8783	10600	//if (RENDERSHADOW) // ?
8784	10601	if (!IsFrozen())
8785	10602	{
8786	10603	// dec 2012
8787		- if (!(!flash && !lightMode && drawMode == DEFAULT && ANTIALIAS > 0))
	10604	+ if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
8788	10605	{
8789		- framecount++;
	10606	+ Globals.framecount++;
8790	10607	shadowbuffer.display();
8791	10608	}
8792	10609	}
8793		- lighttouched = false; // ??
	10610	+ Globals.lighttouched = false; // ??
8794	10611	//drawing = true;
8795	10612	//lighttouched = true;
8796	10613	}
..	..	@@ -8811,9 +10628,9 @@
8811	10628	//eyeCamera.shaper_fovy = 1;
8812	10629	}
8813	10630
8814		- if ((RENDERPROGRAM != 0 \|\| ambientOcclusion \|\| spherical) && drawMode == DEFAULT) // SELECTION)
	10631	+ if ((RENDERPROGRAM != 0 \|\| ambientOcclusion \|\| spherical) && DrawMode() == DEFAULT) // SELECTION)
8815	10632	{
8816		- //System.out.println("drawMode = " + drawMode);
	10633	+ //System.out.println("DrawMode() = " + DrawMode());
8817	10634	vertexMode \|= VP_PASS;
8818	10635	//vertexMode \|= VP_PROJECTION;
8819	10636	if (!ambientOcclusion)
..	..	@@ -8873,7 +10690,7 @@
8873	10690	Camera cam = renderCamera; // lightMode?lightCamera:eyeCamera;
8874	10691	//Camera lightcam = new Camera(light0);
8875	10692
8876		- if (drawMode == SHADOW)
	10693	+ if (DrawMode() == SHADOW)
8877	10694	{
8878	10695	/*
8879	10696	gl.glMatrixMode(GL.GL_MODELVIEW);
..	..	@@ -8911,8 +10728,8 @@
8911	10728
8912	10729	// if (parentcam != renderCamera) // not a light
8913	10730	if (cam != lightCamera)
8914		- for (int count = parentcam.GetTransformCount(); --count>=0;)
8915		- LA.matConcat(parentcam.toParent, matrix, matrix);
	10731	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10732	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
8916	10733
8917	10734	for (int j = 0; j < 4; j++)
8918	10735	{
..	..	@@ -8926,8 +10743,8 @@
8926	10743
8927	10744	// if (parentcam != renderCamera) // not a light
8928	10745	if (cam != lightCamera)
8929		- for (int count = parentcam.GetTransformCount(); --count>=0;)
8930		- LA.matConcat(matrix, parentcam.fromParent, matrix);
	10746	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10747	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
8931	10748
8932	10749	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
8933	10750
..	..	@@ -8963,7 +10780,7 @@
8963	10780	gl.glClear(gl.GL_DEPTH_BUFFER_BIT);
8964	10781	} else
8965	10782	{
8966		- if (drawMode != DEFAULT)
	10783	+ if (DrawMode() != DEFAULT)
8967	10784	{
8968	10785	gl.glClearColor(1, 1, 1, 0);
8969	10786	} // 1);
..	..	@@ -9028,7 +10845,7 @@
9028	10845
9029	10846	fast &= !ambientOcclusion;
9030	10847
9031		- if (drawMode == DEFAULT)
	10848	+ if (DrawMode() == DEFAULT)
9032	10849	{
9033	10850	//gl.glEnable(gl.GL_ALPHA_TEST);
9034	10851	//gl.glActiveTexture(GL.GL_TEXTURE0);
..	..	@@ -9089,6 +10906,8 @@
9089	10906	//gl.glFrustum(-0.5scale, 0.5scale, -0.5scale, 0.5scale, 1, 100);
9090	10907	//glu.gluPerspective(lightshaper_fovy, 1, lightshaper_zNear, lightshaper_zFar);
9091	10908	double scale = lightCamera.SCALE / lightCamera.Distance();
	10909	+// PATCH FILLE AUX JEANS
	10910	+ //scale *= lightCamera.shaper_fovy / 25;
9092	10911	gl.glScaled(2 * scale, 2 * scale, -scale);
9093	10912	gl.glTranslated(0, 0, lightCamera.DECAL);
9094	10913
..	..	@@ -9184,7 +11003,16 @@
9184	11003	// Bump noise
9185	11004	gl.glActiveTexture(GL.GL_TEXTURE6);
9186	11005	//gl.glBindTexture(GL.GL_TEXTURE_2D, bump_noise);
9187		- BindTexture(NOISE_TEXTURE, false, 2);
	11006	+
	11007	+ try
	11008	+ {
	11009	+ BindTexture(NOISE_TEXTURE, false, 2);
	11010	+ }
	11011	+ catch (Exception e)
	11012	+ {
	11013	+ System.err.println("FAILED: " + NOISE_TEXTURE);
	11014	+ }
	11015	+
9188	11016
9189	11017	gl.glActiveTexture(GL.GL_TEXTURE0);
9190	11018	gl.glEnable(GL.GL_TEXTURE_2D);
..	..	@@ -9207,9 +11035,9 @@
9207	11035
9208	11036	gl.glMatrixMode(GL.GL_MODELVIEW);
9209	11037
9210		-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
9211		-//gl.glEnable(gl.GL_POLYGON_SMOOTH);
9212		-//gl.glEnable(gl.GL_MULTISAMPLE);
	11038	+gl.glEnable(gl.GL_POLYGON_SMOOTH);
	11039	+gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
	11040	+gl.glEnable(gl.GL_MULTISAMPLE);
9213	11041	} else
9214	11042	{
9215	11043	//gl.glDisable(GL.GL_TEXTURE_2D);
..	..	@@ -9220,14 +11048,16 @@
9220	11048	//System.out.println("BLENDING ON");
9221	11049	gl.glEnable(GL.GL_BLEND);
9222	11050	gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
9223		-
	11051	+// gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
9224	11052	gl.glMatrixMode(gl.GL_PROJECTION);
9225	11053	gl.glLoadIdentity();
9226	11054
9227		- if (drawMode == SHADOW \|\| cam == lightCamera) // \|\| (vertexMode&VP_PROJECTION) != 0)
	11055	+ if (DrawMode() == SHADOW \|\| cam == lightCamera) // \|\| (vertexMode&VP_PROJECTION) != 0)
9228	11056	{
9229	11057	//glu.gluPerspective(lightshaper_fovy, 1, lightshaper_zNear, lightshaper_zFar);
9230	11058	double scale = lightCamera.SCALE / lightCamera.Distance();
	11059	+// PATCH FILLE AUX JEANS
	11060	+ //scale *= lightCamera.shaper_fovy / 25;
9231	11061	gl.glScaled(2 * scale, 2 * scale, -scale);
9232	11062	gl.glTranslated(0, 0, lightCamera.DECAL);
9233	11063	//System.out.println("DECAL = " + LIGHTDECAL + "; SCALE = " + LIGHTSCALE);
..	..	@@ -9280,7 +11110,7 @@
9280	11110	//gl.glPushMatrix();
9281	11111	gl.glLoadIdentity();
9282	11112
9283		- if (!ambientOcclusion) // drawMode != OCCLUSION)
	11113	+ if (!ambientOcclusion) // DrawMode() != OCCLUSION)
9284	11114	{
9285	11115	//LA.xformPos(light0, lightCamera.fromScreen, light);
9286	11116	LA.xformDir(dirlight, lightCamera.fromScreen, lightposition);
..	..	@@ -9307,8 +11137,8 @@
9307	11137	System.err.println("parentcam != renderCamera");
9308	11138
9309	11139	// if (cam != lightCamera)
9310		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9311		- LA.xformDir(lightposition, parentcam.toParent, lightposition); // may 2013
	11140	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11141	+ LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
9312	11142	}
9313	11143
9314	11144	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -9329,8 +11159,8 @@
9329	11159	if (true) // TODO
9330	11160	{
9331	11161	if (cam != lightCamera)
9332		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9333		- LA.xformDir(light0, parentcam.toParent, light0); // may 2013
	11162	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11163	+ LA.xformDir(light0, parentcam.GlobalTransform(), light0); // may 2013
9334	11164	}
9335	11165
9336	11166	LA.xformPos(light0, cam.toScreen, light0);
..	..	@@ -9367,7 +11197,7 @@
9367	11197	}
9368	11198
9369	11199	/**/
9370		- if (true) // drawMode == SELECTION) // != DEFAULT)
	11200	+ if (true) // DrawMode() == SELECTION) // != DEFAULT)
9371	11201	gl.glDisable(gl.GL_LIGHTING);
9372	11202	else
9373	11203	gl.glEnable(gl.GL_LIGHTING);
..	..	@@ -9379,12 +11209,13 @@
9379	11209
9380	11210	gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 63, options2, 0);
9381	11211	gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 62, options3, 0);
	11212	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 61, options4, 0);
9382	11213
9383	11214	options2[0] *= renderCamera.Distance();
9384	11215
9385	11216	lightslot = 64;
9386	11217
9387		- if (!frozen && !ambientOcclusion && isRenderer && drawMode == DEFAULT)
	11218	+ if (!frozen && !ambientOcclusion && isRenderer && DrawMode() == DEFAULT)
9388	11219	{
9389	11220	DrawLights(object);
9390	11221	}
..	..	@@ -9395,7 +11226,7 @@
9395	11226	fragmentMode \|= (lightslot - 64) << 2; // 1; // first bit is available for aniso
9396	11227	//System.out.println("fragmentMode = " + fragmentMode);
9397	11228
9398		- if (drawMode == DEFAULT \|\| drawMode == SELECTION \|\| DEBUG_SELECTION)
	11229	+ if (DrawMode() == DEFAULT \|\| DrawMode() == SELECTION \|\| IsDebugSelection())
9399	11230	{
9400	11231	/*
9401	11232	if (CULLFACE \|\| (ambientOcclusion && OCCLUSION_CULLING))
..	..	@@ -9428,7 +11259,7 @@
9428	11259	}
9429	11260	}
9430	11261
9431		- if (drawMode == DEFAULT)
	11262	+ if (DrawMode() == DEFAULT)
9432	11263	{
9433	11264	if (WIREFRAME && !ambientOcclusion)
9434	11265	{
..	..	@@ -9446,7 +11277,7 @@
9446	11277	gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9447	11278	gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9448	11279
9449		- if (!fast/RENDERPROGRAM != 0/ && (drawMode == DEFAULT \|\| drawMode == SHADOW)) // && !WIREFRAME) //
	11280	+ if (!fast/RENDERPROGRAM != 0/ && (DrawMode() == DEFAULT \|\| DrawMode() == SHADOW)) // && !WIREFRAME) //
9450	11281	{
9451	11282	if (vertexMode != 0) // && !fast)
9452	11283	{
..	..	@@ -9466,7 +11297,7 @@
9466	11297	}
9467	11298	}
9468	11299
9469		- if (false) // fast && !IsFreezed() && drawMode != SELECTION && !ambientOcclusion)
	11300	+ if (false) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
9470	11301	{
9471	11302	//gl.glDepthFunc(GL.GL_LEQUAL);
9472	11303	//gl.glClear(gl.GL_COLOR_BUFFER_BIT \| gl.GL_DEPTH_BUFFER_BIT);
..	..	@@ -9494,7 +11325,7 @@
9494	11325	//gl.glDepthMask(false);
9495	11326	}
9496	11327
9497		- if (false) // drawMode == SHADOW)
	11328	+ if (false) // DrawMode() == SHADOW)
9498	11329	{
9499	11330	//SetColumnMajorData(cameraInverseTransform, view_1);
9500	11331	//System.out.println("light = " + cameraInverseTransform);
..	..	@@ -9508,16 +11339,16 @@
9508	11339	//System.out.println("object = " + object);
9509	11340	if (!frozen && !imageLocked)
9510	11341	{
9511		- if (!flash && !lightMode && drawMode == DEFAULT && ANTIALIAS > 0)
	11342	+ if (!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0)
9512	11343	{
9513	11344	displayAntiAliased(gl);
9514	11345	} else
9515	11346	{
9516	11347	programcount = 0;
9517		- int keepmode = drawMode;
	11348	+ int keepmode = DrawMode();
9518	11349	// if (DEBUG_SELECTION)
9519	11350	// {
9520		-// drawMode = SELECTION;
	11351	+// DrawMode() = SELECTION;
9521	11352	// }
9522	11353	// for point selection
9523	11354	// gl.glGetDoublev(gl.GL_MODELVIEW_MATRIX, tempmat, 0);
..	..	@@ -9527,10 +11358,10 @@
9527	11358	DrawObject(gl);
9528	11359
9529	11360	// jan 2013 System.err.println("RESET ABORT (display)");
9530		- // if (drawMode == DEFAULT)
	11361	+ // if (DrawMode() == DEFAULT)
9531	11362	// ABORTED = false;
9532	11363	fullreset = false;
9533		- drawMode = keepmode;
	11364	+ Globals.drawMode = keepmode; // WARNING
9534	11365	//System.out.println("PROGRAM SWITCH " + programcount);
9535	11366	}
9536	11367	}
..	..	@@ -9538,11 +11369,11 @@
9538	11369	gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9539	11370	gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9540	11371
9541		- if (drawMode == DEFAULT)
	11372	+ if (DrawMode() == DEFAULT)
9542	11373	{
9543	11374	ReleaseTexture(NOISE_TEXTURE, false);
9544	11375	}
9545		- //if (drawMode == DEFAULT)
	11376	+ //if (DrawMode() == DEFAULT)
9546	11377	{
9547	11378
9548	11379	gl.glActiveTexture(GL.GL_TEXTURE1);
..	..	@@ -9554,7 +11385,7 @@
9554	11385	//else
9555	11386	//gl.glDisable(gl.GL_TEXTURE_2D);
9556	11387	//gl.glPopMatrix();
9557		- if (imageCompleted && ANTIALIAS > 0 && drawMode == DEFAULT && cam != lightCamera && !ambientOcclusion)
	11388	+ if (imageCompleted && ANTIALIAS > 0 && DrawMode() == DEFAULT && cam != lightCamera && !ambientOcclusion)
9558	11389	{
9559	11390	//new Exception().printStackTrace();
9560	11391	//System.out.println("Draw image " + width + ", " + height);
..	..	@@ -9596,7 +11427,7 @@
9596	11427	//gl.glFlush();
9597	11428	}
9598	11429
9599		- if (flash && drawMode == DEFAULT)
	11430	+ if (flash && DrawMode() == DEFAULT)
9600	11431	{
9601	11432	flash = false;
9602	11433	wait = true;
..	..	@@ -9604,9 +11435,9 @@
9604	11435	}
9605	11436
9606	11437	//drawing = false;
9607		- //if(drawMode == DEFAULT)
	11438	+ //if(DrawMode() == DEFAULT)
9608	11439	// niceon = false;
9609		- if (drawMode == DEFAULT)
	11440	+ if (DrawMode() == DEFAULT)
9610	11441	{
9611	11442	currentlydrawing = false;
9612	11443	}
..	..	@@ -9626,7 +11457,7 @@
9626	11457	repaint();
9627	11458	}
9628	11459
9629		- if (isLIVE() && drawMode == DEFAULT) // may 2013
	11460	+ if (Globals.isLIVE() && DrawMode() == DEFAULT) // may 2013
9630	11461	repaint();
9631	11462
9632	11463	displaydone = true;
..	..	@@ -9645,8 +11476,14 @@
9645	11476	{
9646	11477	renderpass++;
9647	11478	// System.out.println("Draw object... ");
	11479	+ STEP = 1;
9648	11480	if (FAST) // in case there is no script
9649		- STEP = 16;
	11481	+ STEP = 8;
	11482	+
	11483	+ if (CURRENTANTIALIAS == 0 \|\| ACSIZE == 1)
	11484	+ {
	11485	+ STEP *= 4;
	11486	+ }
9650	11487
9651	11488	//object.FullInvariants();
9652	11489
..	..	@@ -9660,23 +11497,44 @@
9660	11497	e.printStackTrace();
9661	11498	}
9662	11499
9663		- if (GraphreeD.RENDERME > 0)
9664		- GraphreeD.RENDERME--; // mechante magouille
	11500	+ if (Grafreed.RENDERME > 0)
	11501	+ Grafreed.RENDERME--; // mechante magouille
9665	11502
9666		- ONESTEP = false;
	11503	+ Globals.ONESTEP = false;
9667	11504	}
9668	11505
9669	11506	static boolean zoomonce = false;
9670	11507
	11508	+ static void CreateSelectedPoint()
	11509	+ {
	11510	+ if (selectedpoint == null)
	11511	+ {
	11512	+ debugpointG = new Sphere();
	11513	+ debugpointP = new Sphere();
	11514	+ debugpointC = new Sphere();
	11515	+ debugpointR = new Sphere();
	11516	+
	11517	+ selectedpoint = new Superellipsoid();
	11518	+
	11519	+ for (int i=0; i<8; i++)
	11520	+ {
	11521	+ debugpoints[i] = new Sphere();
	11522	+ }
	11523	+ }
	11524	+ }
	11525	+
9671	11526	void DrawObject(GL gl, boolean draw)
9672	11527	{
	11528	+ // To clear camera values
	11529	+ ResetOptions();
	11530	+
9673	11531	//System.out.println("DRAW OBJECT " + mouseDown);
9674		-// drawMode = SELECTION;
	11532	+// DrawMode() = SELECTION;
9675	11533	//GL gl = getGL();
9676	11534	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
9677	11535	{
9678		- if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && drawMode == SHADOW) // && !lightMode)
9679		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	11536	+ if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
	11537	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
9680	11538	pingthread.StepToTarget(true); // true);
9681	11539	// zoomonce = false;
9682	11540	}
..	..	@@ -9696,9 +11554,9 @@
9696	11554	callist = gl.glGenLists(1);
9697	11555	}
9698	11556
9699		- boolean selectmode = drawMode == SELECTION \|\| CameraPane.DEBUG_SELECTION;
	11557	+ boolean selectmode = DrawMode() == SELECTION \|\| IsDebugSelection();
9700	11558
9701		- boolean active = !selectmode; // drawMode != SELECTION; // mouseDown;
	11559	+ boolean active = !selectmode; // DrawMode() != SELECTION; // mouseDown;
9702	11560
9703	11561	if (!mainDL \|\| !active \|\| touched)
9704	11562	{
..	..	@@ -9725,24 +11583,32 @@
9725	11583	PushMatrix(ClickInfo.matbuffer);
9726	11584	}
9727	11585
9728		- if (drawMode == 0)
	11586	+ if (DrawMode() == 0)
9729	11587	{
9730	11588	// System.out.println("CLEAR +++++++++++++++ +++++++++++++++ +++++++++++++++ +++++++++++++++");
9731	11589
9732	11590	usedtextures.clear();
9733	11591
9734		- BindTextures(DEFAULT_TEXTURES, 2);
	11592	+ try
	11593	+ {
	11594	+ BindTextures(DEFAULT_TEXTURES, 2);
	11595	+ }
	11596	+ catch (Exception e)
	11597	+ {
	11598	+ System.err.println("FAILED: " + DEFAULT_TEXTURES);
	11599	+ }
9735	11600	}
9736	11601	//System.out.println("--> " + stackdepth);
9737		-// GraphreeD.traceon();
	11602	+// GrafreeD.traceon();
9738	11603
9739	11604	// DRAW
9740	11605	object.draw(this, /(Composite)/ object, false, false);
9741	11606
9742		- if (drawMode == DEFAULT)
	11607	+ if (DrawMode() == DEFAULT)
9743	11608	{
9744		- if (DEBUG)
	11609	+ if (Globals.DEBUG)
9745	11610	{
	11611	+ CreateSelectedPoint();
9746	11612	float radius = 0.05f;
9747	11613	if (selectedpoint.radius != radius)
9748	11614	{
..	..	@@ -9750,34 +11616,48 @@
9750	11616	selectedpoint.radius = radius;
9751	11617	selectedpoint.recalculate();
9752	11618	selectedpoint.material = new cMaterial();
9753		- selectedpoint.material.color = 0.25f;
	11619	+ selectedpoint.material.color = 0.15f; // Yellow
9754	11620	selectedpoint.material.modulation = 0.75f;
9755	11621
9756		- debugpoint.radius = radius;
9757		- debugpoint.recalculate();
9758		- debugpoint.material = new cMaterial();
9759		- debugpoint.material.color = 0.25f;
9760		- debugpoint.material.modulation = 0.75f;
	11622	+ debugpointG.radius = radius;
	11623	+ debugpointG.recalculate();
	11624	+ debugpointG.material = new cMaterial();
	11625	+ debugpointG.material.color = 0.25f; // Green
	11626	+ debugpointG.material.modulation = 0.75f;
9761	11627
9762		- debugpoint2.radius = radius;
9763		- debugpoint2.recalculate();
9764		- debugpoint2.material = new cMaterial();
9765		- debugpoint2.material.color = 0.75f;
9766		- debugpoint2.material.modulation = 0.75f;
	11628	+ debugpointP.radius = radius;
	11629	+ debugpointP.recalculate();
	11630	+ debugpointP.material = new cMaterial();
	11631	+ debugpointP.material.color = 0.75f; // Purple
	11632	+ debugpointP.material.modulation = 0.75f;
	11633	+
	11634	+ debugpointC.radius = radius;
	11635	+ debugpointC.recalculate();
	11636	+ debugpointC.material = new cMaterial();
	11637	+ debugpointC.material.color = 0.5f; // Cyan
	11638	+ debugpointC.material.modulation = 0.75f;
	11639	+
	11640	+ debugpointR.radius = radius;
	11641	+ debugpointR.recalculate();
	11642	+ debugpointR.material = new cMaterial();
	11643	+ debugpointR.material.color = 0f; // Red
	11644	+ debugpointR.material.modulation = 0.75f;
9767	11645
9768	11646	InitPoints(radius);
9769	11647	}
9770	11648	selectedpoint.draw(this, /(Composite)/ null, false, false);
9771		- //debugpoint.draw(this, /(Composite)/ null, false);
9772		- //debugpoint2.draw(this, /(Composite)/ null, false);
9773		- DrawPoints(this);
	11649	+ debugpointG.draw(this, /(Composite)/ null, false,false);
	11650	+ debugpointP.draw(this, /(Composite)/ null, false,false);
	11651	+ debugpointC.draw(this, /(Composite)/ null, false,false);
	11652	+ debugpointR.draw(this, /(Composite)/ null, false,false);
	11653	+ // DrawPoints(this);
9774	11654	}
9775	11655
9776	11656	// debugstuff.draw(this, /(Composite)/ null, false);
9777	11657	}
9778		-// GraphreeD.traceoff();
	11658	+// GrafreeD.traceoff();
9779	11659	//System.out.println(stackdepth);
9780		- if (drawMode == 0)
	11660	+ if (DrawMode() == 0)
9781	11661	{
9782	11662	ReleaseTextures(DEFAULT_TEXTURES);
9783	11663
..	..	@@ -9802,17 +11682,26 @@
9802	11682
9803	11683	checker = null;
9804	11684
9805		- if (!ambientOcclusion && !IsFrozen() && drawMode == DEFAULT)
	11685	+ if (!ambientOcclusion && !IsFrozen() && DrawMode() == DEFAULT)
9806	11686	FindChecker(object);
9807	11687
9808		- if (checker != null && drawMode == DEFAULT)
	11688	+ if (checker != null && DrawMode() == DEFAULT)
9809	11689	{
9810		- // BindTexture(IMMORTAL_TEXTURE);
	11690	+ //BindTexture(IMMORTAL_TEXTURE);
	11691	+ try
	11692	+ {
	11693	+ BindTextures(checker.GetTextures(), checker.texres);
	11694	+ }
	11695	+ catch (Exception e)
	11696	+ {
	11697	+ System.err.println("FAILED: " + checker.GetTextures());
	11698	+ }
9811	11699	// NEAREST
9812	11700	GetGL().glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST); // GL.GL_LINEAR);
9813	11701	DrawChecker(gl);
9814	11702	//checker.Draw(this, null, false);
9815	11703	// ReleaseTexture(IMMORTAL_TEXTURE);
	11704	+ ReleaseTextures(checker.GetTextures());
9816	11705	}
9817	11706
9818	11707	if (object.parent != null)
..	..	@@ -9825,7 +11714,7 @@
9825	11714	//gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9826	11715	//gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9827	11716
9828		- if (DISPLAYTEXT && drawMode == DEFAULT)
	11717	+ if (DISPLAYTEXT && DrawMode() == DEFAULT)
9829	11718	{
9830	11719	// Draw it once, then use the raster
9831	11720	Balloon(gl, balloon.createGraphics());
..	..	@@ -9881,14 +11770,14 @@
9881	11770	int[] xs = new int[3];
9882	11771	int[] ys = new int[3];
9883	11772
9884		- void DrawString(Object3D obj) // String string)
	11773	+ public void DrawString(Object3D obj) // String string) // INTERFACE
9885	11774	{
9886		- if (!DISPLAYTEXT \|\| drawMode != DEFAULT)
	11775	+ if (!DISPLAYTEXT \|\| DrawMode() != DEFAULT)
9887	11776	{
9888	11777	return;
9889	11778	}
9890	11779
9891		- String string = obj.GetToolTip();
	11780	+ String string = obj.toString(); //.GetToolTip();
9892	11781
9893	11782	GL gl = GetGL();
9894	11783
..	..	@@ -10205,8 +12094,8 @@
10205	12094	//obj.TransformToWorld(light, light);
10206	12095	for (int i = tp.size(); --i >= 0;)
10207	12096	{
10208		- for (int count = tp.get(i).GetTransformCount(); --count>=0;)
10209		- LA.xformPos(light, tp.get(i).toParent, light);
	12097	+ //for (int count = tp.get(i).GetTransformCount(); --count>=0;)
	12098	+ LA.xformPos(light, tp.get(i).GlobalTransformInv(), light);
10210	12099	}
10211	12100
10212	12101
..	..	@@ -10223,8 +12112,8 @@
10223	12112	parentcam = cameras[0];
10224	12113	}
10225	12114
10226		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10227		- LA.xformPos(light, parentcam.toParent, light); // may 2013
	12115	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	12116	+ LA.xformPos(light, parentcam.GlobalTransform(), light); // may 2013
10228	12117
10229	12118	LA.xformPos(light, renderCamera.toScreen, light);
10230	12119
..	..	@@ -10343,11 +12232,13 @@
10343	12232	"PARAM params6 = program.env[6];" + // bump, noise, borderfade, fog punchthrough
10344	12233	"PARAM params7 = program.env[7];" + // noise power, opacity power
10345	12234	"PARAM options0 = program.env[63];" + // fog density, intensity, elevation
10346		- "PARAM options1 = program.env[62];" + // fog rgb color, image intensity
	12235	+ "PARAM options1 = program.env[62];" + // fog rgb color
	12236	+ "PARAM options2 = program.env[61];" + // image intensity, subsurface, lightsheen
10347	12237	"PARAM pointlight = program.env[127];" + // ...
10348	12238	"PARAM zero = { 0.0, 0.0, 0.0, 0.0 };" +
10349	12239	"PARAM halfhalf = { 0.25, 0.25, 0.25, 1.0 };" +
10350	12240	"PARAM half = { 0.5, 0.5, 0.5, 1.0 };" +
	12241	+ "PARAM threequarter = { 0.75, 0.75, 0.75, 1.0 };" +
10351	12242	"PARAM two = { 2.0, 2.0, 2.0, 1.0 };" +
10352	12243	"PARAM ten = { 10, 10, 10, 1.0 };" +
10353	12244	"PARAM one3rd = { 0.5, 0.33333333333, 0.333333333, 1.0 };" +
..	..	@@ -10368,6 +12259,7 @@
10368	12259	"PARAM lodbias = { 10,10,10,10 };" + // 20, -2, -20, 1.0 };" +
10369	12260	"PARAM infinity = { 100000000, 100000000, 100000000, 1.0 };" +
10370	12261	"PARAM one2048th = { 0.00048828125, 0.00048828125, 0.00048828125, 1.0 };" +
	12262	+ "PARAM ninetenth = { 0.9, 0.9, 0.9, 1.0 };" +
10371	12263	"PARAM almostone = { 0.999, 0.999, 0.999, 1.0 };" +
10372	12264	"PARAM c256 = { 256, 256, 256, 1.0 };" +
10373	12265	"PARAM c256i = { 0.00390625, 0.00390625, 0.00390625, 1.0 };" +
..	..	@@ -10408,6 +12300,10 @@
10408	12300	"TEMP R1;" +
10409	12301	"TEMP R2;" +
10410	12302	"TEMP R3;" +
	12303	+ "TEMP min;" +
	12304	+ "TEMP max;" +
	12305	+ "TEMP average;" +
	12306	+ "TEMP saturation;" +
10411	12307	"TEMP keep1;" +
10412	12308	"TEMP keep2;" +
10413	12309	"TEMP keep3;" +
..	..	@@ -10831,8 +12727,8 @@
10831	12727
10832	12728	// display shadow only (bump == 0)
10833	12729	"SUB temp.x, half.x, shadow.x;" +
10834		- "MOV temp.y, -params6.x;" +
10835		- "SLT temp.z, temp.y, zero.x;" +
	12730	+ "MOV temp.y, -params5.z;" + // params6.x;" +
	12731	+ "SLT temp.z, temp.y, -one2048th.x;" +
10836	12732	"SUB temp.y, one.x, temp.z;" +
10837	12733	"MUL temp.x, temp.x, temp.y;" +
10838	12734	"KIL temp.x;" +
..	..	@@ -10938,10 +12834,42 @@
10938	12834
10939	12835	// skin?
10940	12836	// Saturation for skin
10941		- /**/ // c'est ici
10942		- (Skinshader? "DP3 temp.x, final,one;" +
	12837	+ /**/
	12838	+ (Skinshader?
	12839	+ "DP3 average.x, final,one;" +
	12840	+ "MUL average, one3rd.xxxx,average.xxxx;" +
	12841	+
	12842	+ "MIN min.x, final.x,final.y;" +
	12843	+ "MIN min.x, min.x,final.z;" +
	12844	+
	12845	+ "MAX max.x, final.x,final.y;" +
	12846	+ "MAX max.x, max.x,final.z;" +
	12847	+ "MOV max, max.xxxx;" +
	12848	+
	12849	+ "SUB saturation, max, final;" +
	12850	+
	12851	+ "ADD temp.x, max.x, one10th.x;" +
	12852	+ "RCP temp.x, temp.x;" +
	12853	+ "MUL temp.x, temp.x, half.x;" +
	12854	+ "MUL saturation, saturation, temp.xxxx;" +
	12855	+
	12856	+ "DP3 ndotl.x, normald, light;" +
	12857	+ "MAX ndotl.x, ndotl.x, -ndotl.x;" +
	12858	+
	12859	+ "SUB temp.x, one.x, ndotl.x;" +
	12860	+ // Tuning for default skin
	12861	+ //"ADD temp.x, temp.x, options2.z;" + // lightsheen
	12862	+ "MAD temp.x, options2.z, half.y, temp.x;" + // lightsheen
	12863	+ "ADD temp.y, one.y, options2.y;" + // subsurface
	12864	+ "MUL temp.x, temp.x, temp.y;" +
	12865	+
	12866	+ "MUL saturation, saturation, temp.xxxx;" +
	12867	+ "SUB_SAT temp, max, saturation;" +
	12868	+/**
	12869	+ "DP3 temp.x, final,one;" +
10943	12870	"MUL R2, one3rd.xxxx,temp.xxxx;" +
10944		- "SUB temp, final,R2;" +
	12871	+ "SUB temp, final, R2;" +
	12872	+
10945	12873	// using light angle
10946	12874	"DP3 ndotl.x, normald,light;" +
10947	12875	//"SLT ndotl.y, ndotl.x, zero.x;" +
..	..	@@ -10954,7 +12882,6 @@
10954	12882	// using light intensity
10955	12883	"MOV ndotl.z, R2.x;" +
10956	12884	"MUL ndotl.z, ndotl.z, ndotl.z;" + // tuning...
10957		-
10958	12885	// june 2014
10959	12886	"MAD R1.x, ndotl.z,slope.y,one.x;" +
10960	12887	// "SUB ndotl.x, one.x, ndotl.x;" +
..	..	@@ -10966,6 +12893,7 @@
10966	12893	//"MUL R2.y, shadow.x,R2.y;" + // avril 2014
10967	12894
10968	12895	"MAD temp.x, R2.y, ndotl.y, temp.x;" + // red shift (skin)
	12896	+/**/
10969	12897
10970	12898	// "ADD final, R2,temp;" +
10971	12899	"MOV final, temp;"
..	..	@@ -11055,7 +12983,7 @@
11055	12983	/**/
11056	12984	// HDR
11057	12985	"MOV temp.z, final.a;" +
11058		- "MUL final, final,options1.w;" +
	12986	+ "MUL final, final,options2.x;" +
11059	12987	"MOV final.a, temp.z;" +
11060	12988	/**/
11061	12989
..	..	@@ -11092,10 +13020,17 @@
11092	13020	"MOV final.z, zero.x;" +
11093	13021	"MOV final.a, one.w;":""
11094	13022	) +
	13023	+ /*
11095	13024	(NORMALdebug?"MOV final.x, normal.x;" +
11096	13025	"MOV final.y, normal.y;" +
11097	13026	"MOV final.z, normal.z;" +
11098	13027	"MOV final.a, one.w;":""
	13028	+ ) +
	13029	+ */
	13030	+ (NORMALdebug?"SUB final.x, one.x, final.x;" +
	13031	+ "SUB final.y, one.x, final.y;" +
	13032	+ "SUB final.z, one.x, final.z;" +
	13033	+ "MOV final.a, final.a;":""
11099	13034	) +
11100	13035	// "MOV final, bumpmap;" +
11101	13036	"MOV result.color, final;" +
..	..	@@ -11124,7 +13059,7 @@
11124	13059	//once = true;
11125	13060	}
11126	13061
11127		- System.out.print("Program #" + mode + "; length = " + program.length());
	13062	+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
11128	13063	System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
11129	13064	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
11130	13065
..	..	@@ -11241,6 +13176,7 @@
11241	13176	String Shadow(String depth, String shadow)
11242	13177	{
11243	13178	return "MAX temp.x, ndotl.x, one64th.x;" +
	13179	+ "MIN temp.x, temp.x, ninetenth.x;" +
11244	13180	/**/
11245	13181	// Sine
11246	13182	"MUL temp.y, temp.x, temp.x;" +
..	..	@@ -11256,12 +13192,16 @@
11256	13192
11257	13193	"ADD " + depth + ".z, " + depth + ".z, temp.x;" +
11258	13194	//"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing!
	13195	+
	13196	+ // Compare fragment depth in light space with shadowmap.
11259	13197	"SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" +
11260	13198	"SGE temp.y, temp.x, zero.x;" +
11261		- "SUB " + shadow + ".y, one.x, temp.y;" +
	13199	+ "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded
	13200	+
	13201	+ // Reverse comparison
11262	13202	"SUB temp.x, one.x, temp.x;" +
11263	13203	"MUL " + shadow + ".x, temp.x, temp.y;" +
11264		- "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded
	13204	+ "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse
11265	13205	"POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth
11266	13206
11267	13207	"SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" +
..	..	@@ -11275,6 +13215,10 @@
11275	13215	// No shadow for backface
11276	13216	"DP3 temp.x, normal, lightd;" +
11277	13217	"SLT temp.x, temp.x, zero.x;" + // shadoweps
	13218	+ "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
	13219	+
	13220	+ // No shadow when out of frustrum
	13221	+ "SGE temp.x, " + depth + ".z, one.z;" +
11278	13222	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
11279	13223	"";
11280	13224	}
..	..	@@ -11421,7 +13365,8 @@
11421	13365	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
11422	13366	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
11423	13367	/static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
11424		- Object3D.cVector2[] vector2buffer;
	13368	+
	13369	+ //Object3D.cVector2[] vector2buffer;
11425	13370
11426	13371	// IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
11427	13372	// OUT : diff, spec
..	..	@@ -11437,9 +13382,10 @@
11437	13382	"DP3 " + dest + ".z," + "normals," + "eye;" +
11438	13383	"MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
11439	13384	//"MOV " + dest + ".w," + "normal.z;" +
11440		- "MUL " + dest + ".z," + "params2.w," + dest + ".x;" +
11441		- "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
11442		- //"MOV " + dest + ".z," + "params2.w;" +
	13385	+// "MUL " + dest + ".z," + "params2.w," + dest + ".x;" + // PRETTY HEURISTIC FOR VELVET
	13386	+// "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
	13387	+
	13388	+ "MOV " + dest + ".z," + "params2.w;" + // EXACT
11443	13389	"POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
11444	13390	"RCP " + dest + ".w," + dest + ".w;" +
11445	13391	//"RSQ " + dest + ".w," + dest + ".w;" +
..	..	@@ -11833,7 +13779,7 @@
11833	13779	public void mousePressed(MouseEvent e)
11834	13780	{
11835	13781	//System.out.println("mousePressed: " + e);
11836		- clickStart(e.getX(), e.getY(), e.getModifiersEx());
	13782	+ clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
11837	13783	}
11838	13784
11839	13785	static long prevtime = 0;
..	..	@@ -11860,14 +13806,16 @@
11860	13806
11861	13807	//System.err.println("Dtime = " + Dtime + "; units = " + e.getUnitsToScroll() + "; ratio (units/ms) = " + ratio);
11862	13808
	13809	+ if (BUTTONLESSWHEEL)
11863	13810	if (Math.abs(ratio) < 0.1 \|\| Math.abs(Dtime) == 0) // < 30)
11864	13811	{
11865	13812	return;
11866	13813	}
11867	13814
	13815	+ boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
11868	13816
11869	13817	// TIMER
11870		- if (!wheeltimer.isRunning() && e.getModifiersEx() == 0) // VR
	13818	+ if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
11871	13819	{
11872	13820	keepboxmode = BOXMODE;
11873	13821	keepsupport = SUPPORT;
..	..	@@ -11907,8 +13855,8 @@
11907	13855	// mode \|= META;
11908	13856	//}
11909	13857
11910		- SetMouseMode(WHEEL \| e.getModifiersEx());
11911		- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0);
	13858	+ SetMouseMode(e.getModifiers(), WHEEL \| e.getModifiersEx());
	13859	+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
11912	13860	anchorX = ax;
11913	13861	anchorY = ay;
11914	13862	prevX = px;
..	..	@@ -11942,6 +13890,7 @@
11942	13890	else
11943	13891	if (evt.getSource() == AAtimer)
11944	13892	{
	13893	+ Globals.TIMERRUNNING = false;
11945	13894	if (mouseDown)
11946	13895	{
11947	13896	//new Exception().printStackTrace();
..	..	@@ -11967,6 +13916,10 @@
11967	13916	// LIVE = waslive;
11968	13917	// wasliveok = true;
11969	13918	// waslive = false;
	13919	+
	13920	+ // May 2019 Forget it:
	13921	+ if (true)
	13922	+ return;
11970	13923
11971	13924	// source == timer
11972	13925	if (mouseDown)
..	..	@@ -11996,8 +13949,8 @@
11996	13949	// ObjEditor.tweenManager.update(1f / 60f);
11997	13950
11998	13951	// fev 2014???
11999		- if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && drawMode == SHADOW) // && !lightMode)
12000		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	13952	+ if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
	13953	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
12001	13954	pingthread.StepToTarget(true); // true);
12002	13955	}
12003	13956	// if (!LIVE)
..	..	@@ -12006,12 +13959,13 @@
12006	13959
12007	13960	javax.swing.Timer timer = new javax.swing.Timer(350, this);
12008	13961
12009		- void clickStart(int x, int y, int modifiers)
	13962	+ void clickStart(int x, int y, int modifiers, int modifiersex)
12010	13963	{
12011	13964	if (!wasliveok)
12012	13965	return;
12013	13966
12014	13967	AAtimer.restart(); //
	13968	+ Globals.TIMERRUNNING = true;
12015	13969
12016	13970	// waslive = LIVE;
12017	13971	// LIVE = false;
..	..	@@ -12023,7 +13977,7 @@
12023	13977	// touched = true; // main DL
12024	13978	if (isRenderer)
12025	13979	{
12026		- SetMouseMode(modifiers);
	13980	+ SetMouseMode(modifiers, modifiersex);
12027	13981	}
12028	13982
12029	13983	selectX = anchorX = x;
..	..	@@ -12036,7 +13990,7 @@
12036	13990	clicked = true;
12037	13991	hold = false;
12038	13992
12039		- if (((modifiers & ~1024) & ~0) == 0) // Single or multiple selection
	13993	+ if (((modifiersex & ~1024) & ~0) == 0) // Single or multiple selection
12040	13994	// june 2013 means CTRL_CLICK: if (((modifiers & ~1024) & ~128) == 0) // Single or multiple selection
12041	13995	{
12042	13996	// System.out.println("RESTART II " + modifiers);
..	..	@@ -12067,7 +14021,7 @@
12067	14021	info.camera = renderCamera;
12068	14022	info.x = x;
12069	14023	info.y = y;
12070		- info.modifiers = modifiers;
	14024	+ info.modifiers = modifiersex;
12071	14025	editObj = object.doEditClick(info, 0);
12072	14026	if (!editObj)
12073	14027	{
..	..	@@ -12084,11 +14038,14 @@
12084	14038
12085	14039	public void mouseDragged(MouseEvent e)
12086	14040	{
	14041	+ Globals.MOUSEDRAGGED = true;
	14042	+
	14043	+ //System.out.println("mouseDragged: " + e);
12087	14044	if (isRenderer)
12088	14045	movingcamera = true;
	14046	+
12089	14047	//if (drawing)
12090	14048	//return;
12091		- //System.out.println("mouseDragged: " + e);
12092	14049	if ((e.getModifiersEx() & CTRL) != 0
12093	14050	\|\| (e.getModifiersEx() & COMMAND) != 0) // \|\| IsFrozen())
12094	14051	{
..	..	@@ -12096,7 +14053,7 @@
12096	14053	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
12097	14054	}
12098	14055	else
12099		- drag(e.getX(), e.getY(), e.getModifiersEx());
	14056	+ drag(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
12100	14057
12101	14058	//try { Thread.sleep(1); } catch (Exception ex) {}
12102	14059	}
..	..	@@ -12108,6 +14065,11 @@
12108	14065	cVector tmp = new cVector();
12109	14066	cVector tmp2 = new cVector();
12110	14067	boolean isMoving;
	14068	+
	14069	+ public cVector TargetLookAt()
	14070	+ {
	14071	+ return targetLookAt;
	14072	+ }
12111	14073
12112	14074	class PingThread extends Thread
12113	14075	{
..	..	@@ -12247,7 +14209,7 @@
12247	14209	//System.out.println("---------------- ---------- Paint " + tmp.length2());
12248	14210	if (lightMode)
12249	14211	{
12250		- lighttouched = true;
	14212	+ Globals.lighttouched = true;
12251	14213	}
12252	14214
12253	14215	if (OEILONCE && OEIL)
..	..	@@ -12264,6 +14226,7 @@
12264	14226
12265	14227	public void run()
12266	14228	{
	14229	+ new Exception().printStackTrace();
12267	14230	System.exit(0);
12268	14231	for (;;)
12269	14232	{
..	..	@@ -12305,7 +14268,7 @@
12305	14268	mouseDown = false;
12306	14269	if (lightMode)
12307	14270	{
12308		- lighttouched = true;
	14271	+ Globals.lighttouched = true;
12309	14272	}
12310	14273	repaint();
12311	14274	alreadypainted = true;
..	..	@@ -12313,7 +14276,7 @@
12313	14276	isMoving = false;
12314	14277	} //??
12315	14278
12316		- if (isLIVE() && !alreadypainted)
	14279	+ if (Globals.isLIVE() && !alreadypainted)
12317	14280	{
12318	14281	// FOR DEBUG BREAKPOINT USING PAUSE: while (true)
12319	14282	repaint();
..	..	@@ -12325,9 +14288,9 @@
12325	14288	{
12326	14289	if (lightMode)
12327	14290	{
12328		- lighttouched = true;
	14291	+ Globals.lighttouched = true;
12329	14292	}
12330		- drag(X, (mouseMode != 0) ? Y : anchorY, MODIFIERS);
	14293	+ drag(X, (mouseMode != 0) ? Y : anchorY, 0, MODIFIERS);
12331	14294	}
12332	14295	//else
12333	14296	}
..	..	@@ -12341,12 +14304,12 @@
12341	14304	void GoDown(int mod)
12342	14305	{
12343	14306	MODIFIERS \|= COMMAND;
12344		- /*
	14307	+ /**/
12345	14308	if((mod&SHIFT) == SHIFT)
12346	14309	manipCamera.RotatePosition(0, -speed);
12347	14310	else
12348		- manipCamera.BackForth(0, -speed*delta, getWidth());
12349		- */
	14311	+ manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
	14312	+ /**/
12350	14313	if ((mod & SHIFT) == SHIFT)
12351	14314	{
12352	14315	mouseMode = mouseMode; // VR??
..	..	@@ -12362,12 +14325,12 @@
12362	14325	void GoUp(int mod)
12363	14326	{
12364	14327	MODIFIERS \|= COMMAND;
12365		- /*
	14328	+ /**/
12366	14329	if((mod&SHIFT) == SHIFT)
12367	14330	manipCamera.RotatePosition(0, speed);
12368	14331	else
12369		- manipCamera.BackForth(0, speed*delta, getWidth());
12370		- */
	14332	+ manipCamera.BackForth(0, speed*delta, 0); // getWidth());
	14333	+ /**/
12371	14334	if ((mod & SHIFT) == SHIFT)
12372	14335	{
12373	14336	mouseMode = mouseMode;
..	..	@@ -12383,12 +14346,12 @@
12383	14346	void GoLeft(int mod)
12384	14347	{
12385	14348	MODIFIERS \|= COMMAND;
12386		- /*
	14349	+ /**/
12387	14350	if((mod&SHIFT) == SHIFT)
12388		- manipCamera.RotatePosition(speed, 0);
12389		- else
12390	14351	manipCamera.Translate(speed*delta, 0, getWidth());
12391		- */
	14352	+ else
	14353	+ manipCamera.RotatePosition(speed, 0);
	14354	+ /**/
12392	14355	if ((mod & SHIFT) == SHIFT)
12393	14356	{
12394	14357	mouseMode = mouseMode;
..	..	@@ -12404,12 +14367,12 @@
12404	14367	void GoRight(int mod)
12405	14368	{
12406	14369	MODIFIERS \|= COMMAND;
12407		- /*
	14370	+ /**/
12408	14371	if((mod&SHIFT) == SHIFT)
12409		- manipCamera.RotatePosition(-speed, 0);
12410		- else
12411	14372	manipCamera.Translate(-speed*delta, 0, getWidth());
12412		- */
	14373	+ else
	14374	+ manipCamera.RotatePosition(-speed, 0);
	14375	+ /**/
12413	14376	if ((mod & SHIFT) == SHIFT)
12414	14377	{
12415	14378	mouseMode = mouseMode;
..	..	@@ -12427,7 +14390,7 @@
12427	14390	int X, Y;
12428	14391	boolean SX, SY;
12429	14392
12430		- void drag(int x, int y, int modifiers)
	14393	+ void drag(int x, int y, int modifiers, int modifiersex)
12431	14394	{
12432	14395	if (IsFrozen())
12433	14396	{
..	..	@@ -12436,17 +14399,17 @@
12436	14399
12437	14400	drag = true; // NEW
12438	14401
12439		- boolean continuous = (modifiers & COMMAND) == COMMAND;
	14402	+ boolean continuous = (modifiersex & COMMAND) == COMMAND;
12440	14403
12441	14404	X = x;
12442	14405	Y = y;
12443	14406	// floating state for animation
12444		- MODIFIERS = modifiers;
12445		- modifiers &= ~1024;
	14407	+ MODIFIERS = modifiersex;
	14408	+ modifiersex &= ~1024;
12446	14409	if (false) // modifiers != 0)
12447	14410	{
12448	14411	//new Exception().printStackTrace();
12449		- System.out.println("mouseDragged: " + modifiers);
	14412	+ System.out.println("mouseDragged: " + modifiersex);
12450	14413	System.out.println("SHIFT = " + SHIFT);
12451	14414	System.out.println("CONTROL = " + COMMAND);
12452	14415	System.out.println("META = " + META);
..	..	@@ -12466,7 +14429,8 @@
12466	14429	info.camera = renderCamera;
12467	14430	info.x = x;
12468	14431	info.y = y;
12469		- object.editWindow.copy.doEditDrag(info);
	14432	+ object.GetWindow().copy
	14433	+ .doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
12470	14434	} else
12471	14435	{
12472	14436	if (x < startX)
..	..	@@ -12568,6 +14532,7 @@
12568	14532	{
12569	14533	manipCamera.Translate(dx, dy, getWidth());
12570	14534	}
	14535	+ else
12571	14536	if ((mouseMode & ZOOM) == 0 && (mouseMode & VR) != 0)
12572	14537	{
12573	14538	manipCamera.RotateInterest(dx, dy);
..	..	@@ -12578,7 +14543,7 @@
12578	14543
12579	14544	if (manipCamera == lightCamera)
12580	14545	{
12581		- lighttouched = true;
	14546	+ Globals.lighttouched = true;
12582	14547	}
12583	14548	/*
12584	14549	switch (mode)
..	..	@@ -12617,7 +14582,6 @@
12617	14582	public void mouseMoved(MouseEvent e)
12618	14583	{
12619	14584	//System.out.println("mouseMoved: " + e);
12620		-
12621	14585	if (isRenderer)
12622	14586	return;
12623	14587
..	..	@@ -12630,7 +14594,9 @@
12630	14594	ci.camera = renderCamera;
12631	14595	if (!isRenderer)
12632	14596	{
12633		- if (object.editWindow.copy.doEditClick(ci, 0))
	14597	+ //ObjEditor editWindow = object.editWindow;
	14598	+ //Object3D copy = editWindow.copy;
	14599	+ if (object.doEditClick(ci, 0))
12634	14600	{
12635	14601	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
12636	14602	} else
..	..	@@ -12642,7 +14608,11 @@
12642	14608
12643	14609	public void mouseReleased(MouseEvent e)
12644	14610	{
	14611	+ Globals.MOUSEDRAGGED = false;
	14612	+
12645	14613	movingcamera = false;
	14614	+ X = 0; // getBounds().width/2;
	14615	+ Y = 0; // getBounds().height/2;
12646	14616	//System.out.println("mouseReleased: " + e);
12647	14617	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
12648	14618	}
..	..	@@ -12665,9 +14635,9 @@
12665	14635	boolean control = ((modifiers & CTRL) != 0); // june 2013: for point selection
12666	14636	boolean command = ((modifiers & COMMAND) != 0); // june 2013: for multiple selection
12667	14637
12668		- if (control \|\| command \|\| IsFrozen())
	14638	+// No delay if (control \|\| command \|\| IsFrozen())
12669	14639	timeout = true;
12670		- else
	14640	+// ?? May 2019 else
12671	14641	// timer.setDelay((modifiers & 128) != 0?0:350);
12672	14642	mouseDown = false;
12673	14643	if (!control && !command) // june 2013
..	..	@@ -12777,7 +14747,7 @@
12777	14747	System.out.println("keyReleased: " + e);
12778	14748	}
12779	14749
12780		- void SetMouseMode(int modifiers)
	14750	+ void SetMouseMode(int modifiers, int modifiersex)
12781	14751	{
12782	14752	//System.out.println("SetMouseMode = " + modifiers);
12783	14753	//modifiers &= ~1024;
..	..	@@ -12789,24 +14759,27 @@
12789	14759	//if (modifiers == 0) // \|\| (modifiers == (1024 \| CONTROL)))
12790	14760	// return;
12791	14761	//System.out.println("SetMode = " + modifiers);
12792		- if ((modifiers & WHEEL) == WHEEL)
	14762	+ if ((modifiersex & WHEEL) == WHEEL)
12793	14763	{
12794	14764	mouseMode \|= ZOOM;
12795	14765	}
12796		- if ((modifiers & META) == META)
	14766	+
	14767	+ boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
	14768	+ if (capsLocked) // \|\| (modifiers & META) == META)
12797	14769	{
12798	14770	mouseMode \|= VR; // BACKFORTH;
12799	14771	}
12800		- if ((modifiers & CTRLCLICK) == CTRLCLICK)
12801		- {
12802		- mouseMode \|= SELECT; // BACKFORTH;
12803		- }
12804		- if ((modifiers & COMMAND) == COMMAND)
	14772	+ if ((modifiersex & CTRLCLICK) == CTRLCLICK)
12805	14773	{
12806	14774	mouseMode \|= SELECT;
12807	14775	}
12808		- if ((modifiers & SHIFT) == SHIFT \|\| forcetranslate)
	14776	+ if ((modifiersex & COMMAND) == COMMAND)
12809	14777	{
	14778	+ mouseMode \|= SELECT;
	14779	+ }
	14780	+ if ((modifiersex & SHIFT) == SHIFT \|\| forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
	14781	+ {
	14782	+ mouseMode &= ~VR;
12810	14783	mouseMode \|= TRANSLATE;
12811	14784	}
12812	14785	// if ((modifiers & SHIFT_META) == SHIFT_META)
..	..	@@ -12833,10 +14806,10 @@
12833	14806
12834	14807	if (isRenderer) //
12835	14808	{
12836		- SetMouseMode(modifiers);
	14809	+ SetMouseMode(0, modifiers);
12837	14810	}
12838	14811
12839		- theRenderer.keyPressed(key);
	14812	+ Globals.theRenderer.keyPressed(key);
12840	14813	}
12841	14814
12842	14815	int kompactbit = 4; // power bit
..	..	@@ -12848,7 +14821,7 @@
12848	14821	float SATPOW = 1; // 2; // 0.5f;
12849	14822	float BRIPOW = 1; // 0.5f; // 0.5f;
12850	14823
12851		- void keyPressed(int key)
	14824	+ public void keyPressed(int key)
12852	14825	{
12853	14826	if (key >= '0' && key <= '5')
12854	14827	clampbit = (key-'0');
..	..	@@ -12963,7 +14936,7 @@
12963	14936	case 'B':
12964	14937	BRISMOOTH ^= true;
12965	14938	SHADOWCULLFACE ^= true;
12966		- lighttouched = true;
	14939	+ Globals.lighttouched = true;
12967	14940	repaint();
12968	14941	break;
12969	14942	case 'b':
..	..	@@ -12980,7 +14953,9 @@
12980	14953	case 'E' : COMPACT ^= true;
12981	14954	repaint();
12982	14955	break;
12983		- case 'W' : DEBUGHSB ^= true;
	14956	+ case 'W' : // Wide Window (fullscreen)
	14957	+ //DEBUGHSB ^= true;
	14958	+ ObjEditor.theFrame.ToggleFullScreen();
12984	14959	repaint();
12985	14960	break;
12986	14961	case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
..	..	@@ -13005,8 +14980,8 @@
13005	14980	RevertCamera();
13006	14981	repaint();
13007	14982	break;
13008		- case 'L':
13009	14983	case 'l':
	14984	+ //case 'L':
13010	14985	if (lightMode)
13011	14986	{
13012	14987	lightMode = false;
..	..	@@ -13063,7 +15038,7 @@
13063	15038	repaint();
13064	15039	break;
13065	15040	case 'O':
13066		- drawMode = OCCLUSION;
	15041	+ Globals.drawMode = OCCLUSION; // WARNING
13067	15042	repaint();
13068	15043	break;
13069	15044	case 'o':
..	..	@@ -13149,12 +15124,12 @@
13149	15124	case '_':
13150	15125	kompactbit = 5;
13151	15126	break;
13152		- case '+':
13153		- kompactbit = 6;
13154		- break;
	15127	+// case '+':
	15128	+// kompactbit = 6;
	15129	+// break;
13155	15130	case ' ':
13156	15131	lightMode ^= true;
13157		- lighttouched = true;
	15132	+ Globals.lighttouched = true;
13158	15133	manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
13159	15134	targetLookAt.set(manipCamera.lookAt);
13160	15135	repaint();
..	..	@@ -13163,14 +15138,15 @@
13163	15138	case ESC:
13164	15139	RENDERPROGRAM += 1;
13165	15140	RENDERPROGRAM %= 3;
	15141	+
13166	15142	repaint();
13167	15143	break;
13168	15144	case 'Z':
13169		- RESIZETEXTURE ^= true;
13170		- break;
	15145	+ //RESIZETEXTURE ^= true;
	15146	+ //break;
13171	15147	case 'z':
13172		- RENDERSHADOW ^= true;
13173		- lighttouched = true;
	15148	+ Globals.RENDERSHADOW ^= true;
	15149	+ Globals.lighttouched = true;
13174	15150	repaint();
13175	15151	break;
13176	15152	//case UP:
..	..	@@ -13196,13 +15172,15 @@
13196	15172	FlipTransform();
13197	15173	break;
13198	15174	case ENTER:
13199		- object.editWindow.ScreenFit(); // Edit();
	15175	+ // object.editWindow.ScreenFit(); // Edit();
	15176	+ ToggleLive();
13200	15177	break;
13201	15178	case DELETE:
13202	15179	ClearSelection();
13203	15180	break;
13204		- /*
13205	15181	case '+':
	15182	+
	15183	+ /*
13206	15184	//fontsize += 1;
13207	15185	bbzoom *= 2;
13208	15186	repaint();
..	..	@@ -13219,17 +15197,17 @@
13219	15197	case '=':
13220	15198	IncDepth();
13221	15199	//fontsize += 1;
13222		- object.editWindow.refreshContents(true);
	15200	+ object.GetWindow().refreshContents(true);
13223	15201	maskbit = 6;
13224	15202	break;
13225	15203	case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
13226	15204	DecDepth();
13227	15205	maskbit = 5;
13228	15206	//if(fontsize > 1) fontsize -= 1;
13229		- if (object.editWindow == null)
13230		- new Exception().printStackTrace();
13231		- else
13232		- object.editWindow.refreshContents(true);
	15207	+// if (object.editWindow == null)
	15208	+// new Exception().printStackTrace();
	15209	+// else
	15210	+ object.GetWindow().refreshContents(true);
13233	15211	break;
13234	15212	case '{':
13235	15213	manipCamera.shaper_fovy /= 1.1;
..	..	@@ -13284,6 +15262,7 @@
13284	15262	}
13285	15263	//System.out.println("shaper_fovy = " + manipCamera.shaper_fovy);
13286	15264	}
	15265	+
13287	15266	static double OCCLUSIONBOOST = 1; // 0.5;
13288	15267
13289	15268	void keyReleased(int key, int modifiers)
..	..	@@ -13291,11 +15270,11 @@
13291	15270	//mode = ROTATE;
13292	15271	if ((MODIFIERS & COMMAND) == 0) // VR??
13293	15272	{
13294		- SetMouseMode(modifiers);
	15273	+ SetMouseMode(0, modifiers);
13295	15274	}
13296	15275	}
13297	15276
13298		- protected void processKeyEvent(KeyEvent e)
	15277	+ public void processKeyEvent(KeyEvent e)
13299	15278	{
13300	15279	switch (e.getID())
13301	15280	{
..	..	@@ -13425,8 +15404,9 @@
13425	15404
13426	15405	protected void processMouseMotionEvent(MouseEvent e)
13427	15406	{
13428		- //System.out.println("processMouseMotionEvent: " + mouseMode);
13429		- if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
	15407	+ //System.out.println("processMouseMotionEvent: " + mouseMode + " " + e.getModifiers() + " " + e.getModifiersEx() + " " + e.getButton());
	15408	+ //if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
	15409	+ if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (e.getModifiers() & MouseEvent.BUTTON3_MASK) == 0 && (mouseMode & SELECT) == 0)
13430	15410	{
13431	15411	mouseMoved(e);
13432	15412	} else
..	..	@@ -13451,11 +15431,12 @@
13451	15431	}
13452	15432	*/
13453	15433
13454		- object.editWindow.EditSelection();
	15434	+ object.GetWindow().EditSelection(false);
13455	15435	}
13456	15436
13457	15437	void SelectParent()
13458	15438	{
	15439	+ new Exception().printStackTrace();
13459	15440	System.exit(0);
13460	15441	Composite group = (Composite) object;
13461	15442	java.util.Vector selectees = new java.util.Vector(group.selection);
..	..	@@ -13467,10 +15448,10 @@
13467	15448	{
13468	15449	//selectees.remove(i);
13469	15450	System.out.println("select parent of " + elem);
13470		- group.editWindow.Select(elem.parent.GetTreePath(), first, true);
	15451	+ group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
13471	15452	} else
13472	15453	{
13473		- group.editWindow.Select(elem.GetTreePath(), first, true);
	15454	+ group.GetWindow().Select(elem.GetTreePath(), first, true);
13474	15455	}
13475	15456
13476	15457	first = false;
..	..	@@ -13479,6 +15460,7 @@
13479	15460
13480	15461	void SelectChildren()
13481	15462	{
	15463	+ new Exception().printStackTrace();
13482	15464	System.exit(0);
13483	15465	/*
13484	15466	Composite group = (Composite) object;
..	..	@@ -13511,12 +15493,12 @@
13511	15493	for (int j = 0; j < group.children.size(); j++)
13512	15494	{
13513	15495	elem = (Object3D) group.children.elementAt(j);
13514		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15496	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
13515	15497	first = false;
13516	15498	}
13517	15499	} else
13518	15500	{
13519		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15501	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
13520	15502	}
13521	15503
13522	15504	first = false;
..	..	@@ -13527,21 +15509,21 @@
13527	15509	{
13528	15510	//Composite group = (Composite) object;
13529	15511	Object3D group = object;
13530		- group.editWindow.loadClipboard(true); // ClearSelection(false);
	15512	+ group.GetWindow().loadClipboard(true); // ClearSelection(false);
13531	15513	}
13532	15514
13533	15515	void ResetTransform(int mask)
13534	15516	{
13535	15517	//Composite group = (Composite) object;
13536	15518	Object3D group = object;
13537		- group.editWindow.ResetTransform(mask);
	15519	+ group.GetWindow().ResetTransform(mask);
13538	15520	}
13539	15521
13540	15522	void FlipTransform()
13541	15523	{
13542	15524	//Composite group = (Composite) object;
13543	15525	Object3D group = object;
13544		- group.editWindow.FlipTransform();
	15526	+ group.GetWindow().FlipTransform();
13545	15527	// group.editWindow.ReduceMesh(true);
13546	15528	}
13547	15529
..	..	@@ -13549,7 +15531,7 @@
13549	15531	{
13550	15532	//Composite group = (Composite) object;
13551	15533	Object3D group = object;
13552		- group.editWindow.PrintMemory();
	15534	+ group.GetWindow().PrintMemory();
13553	15535	// group.editWindow.ReduceMesh(true);
13554	15536	}
13555	15537
..	..	@@ -13557,7 +15539,7 @@
13557	15539	{
13558	15540	//Composite group = (Composite) object;
13559	15541	Object3D group = object;
13560		- group.editWindow.ResetCentroid();
	15542	+ group.GetWindow().ResetCentroid();
13561	15543	}
13562	15544
13563	15545	void IncDepth()
..	..	@@ -13643,7 +15625,9 @@
13643	15625	info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
13644	15626	//Image img = CreateImage(width, height);
13645	15627	//System.out.println("width = " + width + "; height = " + height + "\n");
	15628	+
13646	15629	Graphics gr = g; // img.getGraphics();
	15630	+
13647	15631	if (!hasMarquee)
13648	15632	{
13649	15633	if (Xmin < Xmax) // !locked)
..	..	@@ -13731,6 +15715,7 @@
13731	15715	info.bounds.y += (height - desired) / 2;
13732	15716	}
13733	15717	}
	15718	+
13734	15719	info.g = gr;
13735	15720	info.camera = renderCamera;
13736	15721	/*
..	..	@@ -13740,15 +15725,55 @@
13740	15725	*/
13741	15726	if (!isRenderer)
13742	15727	{
13743		- object.drawEditHandles(info, 0);
	15728	+ Grafreed.Assert(object != null);
	15729	+ Grafreed.Assert(object.selection != null);
	15730	+ if (object.selection.Size() > 0)
	15731	+ {
	15732	+ int hitSomething = object.selection.get(0).hitSomething;
	15733	+
	15734	+ info.DX = 0;
	15735	+ info.DY = 0;
	15736	+ info.W = 1;
	15737	+ if (hitSomething == Object3D.hitCenter)
	15738	+ {
	15739	+ info.DX = X;
	15740	+ if (X != 0)
	15741	+ info.DX -= info.bounds.width/2;
	15742	+
	15743	+ info.DY = Y;
	15744	+ if (Y != 0)
	15745	+ info.DY -= info.bounds.height/2;
	15746	+ }
	15747	+
	15748	+ object.drawEditHandles(info, 0);
	15749	+
	15750	+ if (drag && (X != 0 \|\| Y != 0))
	15751	+ {
	15752	+ switch (hitSomething)
	15753	+ {
	15754	+ case Object3D.hitCenter: gr.setColor(Color.pink);
	15755	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15756	+ break;
	15757	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	15758	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15759	+ break;
	15760	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	15761	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15762	+ break;
	15763	+ }
	15764	+
	15765	+ }
	15766	+ }
13744	15767	}
13745	15768	}
	15769	+
13746	15770	if (isRenderer)
13747	15771	{
13748	15772	//gr.setColor(Color.black);
13749	15773	//gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
13750	15774	//gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
13751	15775	}
	15776	+
13752	15777	if (hasMarquee)
13753	15778	{
13754	15779	gr.setXORMode(Color.white);
..	..	@@ -13771,6 +15796,7 @@
13771	15796	//if (g != gr) g.drawImage(img, 0, 0, width, height, null);
13772	15797	}
13773	15798
	15799	+ // To avoid clear.
13774	15800	public void update(Graphics g)
13775	15801	{
13776	15802	paint(g);
..	..	@@ -13860,6 +15886,7 @@
13860	15886	public boolean mouseDown(Event evt, int x, int y)
13861	15887	{
13862	15888	System.out.println("mouseDown: " + evt);
	15889	+ System.exit(0);
13863	15890	/*
13864	15891	locked = true;
13865	15892	drag = false;
..	..	@@ -13903,7 +15930,7 @@
13903	15930	{
13904	15931	keyPressed(0, modifiers);
13905	15932	}
13906		- clickStart(x, y, modifiers);
	15933	+ // clickStart(x, y, modifiers);
13907	15934	return true;
13908	15935	}
13909	15936
..	..	@@ -14021,7 +16048,7 @@
14021	16048	{
14022	16049	keyReleased(0, 0);
14023	16050	}
14024		- drag(x, y, modifiers);
	16051	+ drag(x, y, 0, modifiers);
14025	16052	return true;
14026	16053	}
14027	16054
..	..	@@ -14153,7 +16180,7 @@
14153	16180	Object3D object;
14154	16181	static Object3D trackedobject;
14155	16182	Camera renderCamera; // Light or Eye (or Occlusion)
14156		- /static/ Camera manipCamera; // Light or Eye
	16183	+ /static/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
14157	16184	/static/ Camera eyeCamera;
14158	16185	/static/ Camera lightCamera;
14159	16186	int cameracount;
..	..	@@ -14373,7 +16400,7 @@
14373	16400	gl.glPushAttrib(GL.GL_ALL_ATTRIB_BITS);
14374	16401	gl.glPushMatrix();
14375	16402	gl.glLoadIdentity();
14376		- PushMatrix(checker.toParent);
	16403	+ //PushMatrix(checker.toParent);
14377	16404
14378	16405	gl.glMatrixMode(GL.GL_TEXTURE);
14379	16406	gl.glPushMatrix();
..	..	@@ -14396,8 +16423,8 @@
14396	16423
14397	16424	gl.glNormal3f(0.0f, 0.0f, 1.0f);
14398	16425
14399		- float step = 0.1666f; //0.25f;
14400		- float stepv = step * 1652 / 998;
	16426	+ float step = 2; // 0.1666f; //0.25f;
	16427	+ float stepv = 2; // step * 1652 / 998;
14401	16428
14402	16429	int i0 = 0;
14403	16430	/*
..	..	@@ -14433,20 +16460,21 @@
14433	16460	/**/
14434	16461	//checker.GetMaterial().opacity = 1.1f;
14435	16462	////checker.GetMaterial().ambient = 0.99f;
14436		- Object3D.materialstack[Object3D.materialdepth] = checker.material;
14437		- Object3D.selectedstack[Object3D.materialdepth] = false;
14438		- cStatic.objectstack[Object3D.materialdepth++] = checker;
	16463	+ materialstack[materialdepth] = checker.material;
	16464	+ selectedstack[materialdepth] = false;
	16465	+ cStatic.objectstack[materialdepth++] = checker;
14439	16466	//System.out.println("material " + material);
14440	16467	//Applet3D.tracein(this, selected);
14441		- vector2buffer = checker.projectedVertices;
	16468	+ //vector2buffer = checker.projectedVertices;
14442	16469
14443		- checker.GetMaterial().Draw(this, false); // true);
	16470	+ //checker.GetMaterial().Draw(this, false); // true);
	16471	+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
14444	16472
14445		- Object3D.materialdepth -= 1;
14446		- if (Object3D.materialdepth > 0)
	16473	+ materialdepth -= 1;
	16474	+ if (materialdepth > 0)
14447	16475	{
14448		- vector2buffer = cStatic.objectstack[Object3D.materialdepth - 1].projectedVertices;
14449		- Object3D.materialstack[Object3D.materialdepth - 1].Draw(this, Object3D.selectedstack[Object3D.materialdepth - 1]);
	16476	+ //vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	16477	+ DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
14450	16478	}
14451	16479	//checker.GetMaterial().opacity = 1f;
14452	16480	////checker.GetMaterial().ambient = 1f;
..	..	@@ -14467,15 +16495,27 @@
14467	16495
14468	16496	//float u = (i+1)/2;
14469	16497	//float v = (j+1)/2;
14470		- gl.glTexCoord2f((i + 1) / 2, (j + 1) / 2); // (1,0) // (i+1+step)/2,(j+1)/2);
	16498	+ if (checker.flipV)
	16499	+ gl.glTexCoord2f((i + 1) / 2, 1 - (j + 1) / 2);
	16500	+ else
	16501	+ gl.glTexCoord2f((i + 1) / 2, (j + 1) / 2); // (1,0) // (i+1+step)/2,(j+1)/2);
14471	16502	gl.glVertex3f(i, j, -0.5f);
14472	16503
	16504	+ if (checker.flipV)
	16505	+ gl.glTexCoord2f((i + 1 + step) / 2, 1 - (j + 1) / 2); // (1,1) // (i+1+step)/2,(j+1+step)/2);
	16506	+ else
14473	16507	gl.glTexCoord2f((i + 1 + step) / 2, (j + 1) / 2); // (1,1) // (i+1+step)/2,(j+1+step)/2);
14474	16508	gl.glVertex3f(i + step, j, -0.5f);
14475	16509
	16510	+ if (checker.flipV)
	16511	+ gl.glTexCoord2f((i + 1 + step) / 2, 1 - (j + 1 + stepv) / 2); // (0,1) //(i+1)/2,(j+1+step)/2);
	16512	+ else
14476	16513	gl.glTexCoord2f((i + 1 + step) / 2, (j + 1 + stepv) / 2); // (0,1) //(i+1)/2,(j+1+step)/2);
14477	16514	gl.glVertex3f(i + step, j + stepv, -0.5f);
14478	16515
	16516	+ if (checker.flipV)
	16517	+ gl.glTexCoord2f((i + 1) / 2, 1 - (j + 1 + stepv) / 2); // (0,0) //(i+1)/2,(j+1)/2);
	16518	+ else
14479	16519	gl.glTexCoord2f((i + 1) / 2, (j + 1 + stepv) / 2); // (0,0) //(i+1)/2,(j+1)/2);
14480	16520	gl.glVertex3f(i, j + stepv, -0.5f);
14481	16521	}
..	..	@@ -14487,7 +16527,7 @@
14487	16527	gl.glMatrixMode(GL.GL_PROJECTION);
14488	16528	gl.glPopMatrix();
14489	16529	gl.glMatrixMode(GL.GL_MODELVIEW);
14490		- PopMatrix(null); // checker.toParent); // null);
	16530	+ //PopMatrix(null); // checker.toParent); // null);
14491	16531	gl.glPopMatrix();
14492	16532	PopTextureMatrix(checker.toParent);
14493	16533	gl.glMatrixMode(GL.GL_TEXTURE);
..	..	@@ -14520,6 +16560,14 @@
14520	16560	}
14521	16561	}
14522	16562
	16563	+ private Object3D GetFolder()
	16564	+ {
	16565	+ Object3D folder = object.GetWindow().copy;
	16566	+ if (object.GetWindow().copy.selection.Size() > 0)
	16567	+ folder = object.GetWindow().copy.selection.elementAt(0);
	16568	+ return folder;
	16569	+ }
	16570	+
14523	16571	class SelectBuffer implements GLEventListener
14524	16572	{
14525	16573
..	..	@@ -14578,6 +16626,7 @@
14578	16626	{
14579	16627	if (!selection)
14580	16628	{
	16629	+ new Exception().printStackTrace();
14581	16630	System.exit(0);
14582	16631	return;
14583	16632	}
..	..	@@ -14598,17 +16647,39 @@
14598	16647
14599	16648	//gl.glDisable(GL.GL_POLYGON_OFFSET_FILL);
14600	16649
	16650	+ if (PAINTMODE)
	16651	+ {
	16652	+ if (object.GetWindow().copy.selection.Size() > 0)
	16653	+ {
	16654	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	16655	+
	16656	+ // Make what you paint not selectable.
	16657	+ paintobj.ResetSelectable();
	16658	+ }
	16659	+ }
	16660	+
14601	16661	//int tmp = selection_view;
14602	16662	//selection_view = -1;
14603		- int temp = drawMode;
14604		- drawMode = SELECTION;
	16663	+ int temp = DrawMode();
	16664	+ Globals.drawMode = SELECTION; // WARNING
14605	16665	indexcount = 0;
14606	16666	parent.display(drawable);
14607	16667	//selection_view = tmp;
14608	16668	//if (temp == SELECTION)
14609	16669	// temp = DEFAULT; // patch for selection debug
14610		- drawMode = temp;
	16670	+ Globals.drawMode = temp; // WARNING
14611	16671
	16672	+ if (PAINTMODE)
	16673	+ {
	16674	+ if (object.GetWindow().copy.selection.Size() > 0)
	16675	+ {
	16676	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	16677	+
	16678	+ // Revert.
	16679	+ paintobj.RestoreSelectable();
	16680	+ }
	16681	+ }
	16682	+
14612	16683	//gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
14613	16684
14614	16685	// trying different ways of getting the depth info over
..	..	@@ -14657,6 +16728,13 @@
14657	16728	// System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
14658	16729	// System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
14659	16730
	16731	+ CreateSelectedPoint();
	16732	+
	16733	+ // Will fit the mesh !!!
	16734	+ selectedpoint.toParent[0][0] = 0.0001;
	16735	+ selectedpoint.toParent[1][1] = 0.0001;
	16736	+ selectedpoint.toParent[2][2] = 0.0001;
	16737	+
14660	16738	glu.gluUnProject(x,y,depth,view,0,tempmat2,0,viewport,0,selectedpoint.toParent[3],0);
14661	16739
14662	16740	// if (object.selection != null && object.selection.Size() > 0)
..	..	@@ -14700,34 +16778,36 @@
14700	16778	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]));
14701	16779	}
14702	16780
14703		- previousselectedpoint = (Sphere) GraphreeD.clone(selectedpoint);
	16781	+ previousselectedpoint = (Sphere) Grafreed.clone(selectedpoint);
14704	16782	}
14705	16783	}
14706	16784
14707	16785	if (!movingcamera && !PAINTMODE)
14708		- object.editWindow.ScreenFitPoint(); // fev 2014
	16786	+ object.GetWindow().ScreenFitPoint(); // fev 2014
14709	16787
14710		- if (PAINTMODE && GraphreeD.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	16788	+ if (PAINTMODE) // && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
14711	16789	{
14712		- Object3D paintobj = GraphreeD.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
	16790	+ //Object3D paintobj; // = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
14713	16791
14714		- Object3D group = new Object3D("inst" + paintcount++);
	16792	+ if (object.GetWindow().copy.selection.Size() > 0)
	16793	+ {
	16794	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
14715	16795
14716		- group.CreateMaterial(); // use a void leaf to select instances
14717		-
14718		- group.add(paintobj); // link
14719		-
14720		- object.editWindow.SnapObject(group);
14721		-
14722		- Object3D folder = object.editWindow.copy;
14723		-
14724		- if (object.editWindow.copy.selection.Size() > 0)
14725		- folder = object.editWindow.copy.selection.elementAt(0);
14726		-
14727		- folder.add(group);
14728		-
14729		- object.editWindow.ResetModel();
14730		- object.editWindow.refreshContents();
	16796	+ Object3D inst = new Object3D("inst" + paintcount++);
	16797	+
	16798	+ inst.CreateMaterial(); // use a void leaf to select instances
	16799	+
	16800	+ inst.add(paintobj); // link
	16801	+
	16802	+ object.GetWindow().SnapObject(inst);
	16803	+
	16804	+ Object3D folder = paintFolder; // GetFolder();
	16805	+
	16806	+ folder.add(inst);
	16807	+
	16808	+ object.GetWindow().ResetModel();
	16809	+ object.GetWindow().refreshContents();
	16810	+ }
14731	16811	}
14732	16812	else
14733	16813	paintcount = 0;
..	..	@@ -14766,6 +16846,11 @@
14766	16846	//System.out.println("objects[color] = " + objects[color]);
14767	16847	//objects[color].Select();
14768	16848	indexcount = 0;
	16849	+ ObjEditor window = object.GetWindow();
	16850	+ if (window != null && deselect)
	16851	+ {
	16852	+ window.Select(null, deselect, true);
	16853	+ }
14769	16854	object.Select(color, deselect);
14770	16855	}
14771	16856
..	..	@@ -14865,7 +16950,7 @@
14865	16950	gl.glDisable(gl.GL_CULL_FACE);
14866	16951	}
14867	16952
14868		- if (!RENDERSHADOW)
	16953	+ if (!Globals.RENDERSHADOW)
14869	16954	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
14870	16955
14871	16956	// SB gl.glPolygonOffset(2.5f, 10);
..	..	@@ -14875,14 +16960,14 @@
14875	16960	//gl.glColorMask(false, false, false, false);
14876	16961
14877	16962	//render_scene_from_light_view(gl, drawable, 0, 0);
14878		- if (RENDERSHADOW && lighttouched && !movingcamera) // && !parent.IsFreezed())
	16963	+ if (Globals.RENDERSHADOW && Globals.lighttouched && (!movingcamera \|\| !Globals.FREEZEONMOVE)) // && !parent.IsFreezed())
14879	16964	{
14880	16965	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
14881	16966
14882		- int temp = drawMode;
14883		- drawMode = SHADOW;
	16967	+ int temp = DrawMode();
	16968	+ Globals.drawMode = SHADOW; // WARNING
14884	16969	parent.display(drawable);
14885		- drawMode = temp;
	16970	+ Globals.drawMode = temp; // WARNING
14886	16971	}
14887	16972
14888	16973	gl.glCullFace(gl.GL_BACK);
..	..	@@ -14935,7 +17020,6 @@
14935	17020
14936	17021	class AntialiasBuffer implements GLEventListener
14937	17022	{
14938		-
14939	17023	CameraPane parent = null;
14940	17024
14941	17025	AntialiasBuffer(CameraPane p)
..	..	@@ -15045,13 +17129,19 @@
15045	17129	gl.glFlush();
15046	17130
15047	17131	/**/
15048		- gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_BGRA, GL.GL_UNSIGNED_INT_8_8_8_8_REV, occlusionsizebuffer);
	17132	+ gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusionsizebuffer);
15049	17133
15050		- int[] pixels = occlusionsizebuffer.array();
	17134	+ float[] pixels = occlusionsizebuffer.array();
15051	17135
15052	17136	double r = 0, g = 0, b = 0;
15053	17137
15054	17138	double count = 0;
	17139	+
	17140	+ gl.glGetDoublev(gl.GL_PROJECTION_MATRIX, tempmat2, 0);
	17141	+
	17142	+ float mindepth = 1;
	17143	+
	17144	+ double FACTOR = 1;
15055	17145
15056	17146	for (int i = 0; i < pixels.length; i++)
15057	17147	{
..	..	@@ -15136,7 +17226,7 @@
15136	17226
15137	17227	double scale = ray.z; // 1; // cos
15138	17228
15139		- int p = pixels[newindex];
	17229	+ float depth = pixels[newindex];
15140	17230
15141	17231	/*
15142	17232	int newindex2 = (x + 1) * OCCLUSION_SIZE + y;
..	..	@@ -15160,10 +17250,23 @@
15160	17250	scale = (1 - modu) * modv;
15161	17251	*/
15162	17252
15163		- r += ((p >> 16) & 0xFF) * scale / 255;
15164		- g += ((p >> 8) & 0xFF) * scale / 255;
15165		- b += (p & 0xFF) * scale / 255;
	17253	+ //r += ((p >> 16) & 0xFF) * scale / 255;
	17254	+ //g += ((p >> 8) & 0xFF) * scale / 255;
	17255	+ //b += (p & 0xFF) * scale / 255;
	17256	+
	17257	+ if (mindepth > depth)
	17258	+ {
	17259	+ mindepth = depth;
	17260	+ }
15166	17261
	17262	+ double z_eye = tempmat2[34 + 2] / (depth -2.0 + 1.0 - tempmat2[2*4 + 2]);
	17263	+
	17264	+ double factor = 1 - Math.exp(-z_eye * z_eye / FACTOR);
	17265	+
	17266	+ r += factor * scale;
	17267	+ g += factor * scale;
	17268	+ b += factor * scale;
	17269	+
15167	17270	count += scale;
15168	17271	}
15169	17272
..	..	@@ -15261,12 +17364,6 @@
15261	17364	GLUT glut = new GLUT();
15262	17365
15263	17366
15264		- static final public int DEFAULT = 0;
15265		- static final public int SELECTION = 1;
15266		- static final public int SHADOW = 2;
15267		- static final public int OCCLUSION = 3;
15268		- static
15269		- public int drawMode = DEFAULT;
15270	17367	public boolean spherical = false;
15271	17368	static boolean DEBUG_OCCLUSION = false;
15272	17369	static boolean DEBUG_SELECTION = false;
..	..	@@ -15279,21 +17376,15 @@
15279	17376	int AAbuffersize = 0;
15280	17377
15281	17378	//double[] selectedpoint = new double[3];
15282		- static Sphere selectedpoint = new Sphere();
	17379	+ static Superellipsoid selectedpoint;
15283	17380	static Sphere previousselectedpoint = null;
15284		- static Sphere debugpoint = new Sphere();
15285		- static Sphere debugpoint2 = new Sphere();
	17381	+ static Sphere debugpointG;
	17382	+ static Sphere debugpointP;
	17383	+ static Sphere debugpointC;
	17384	+ static Sphere debugpointR;
15286	17385
15287	17386	static Sphere debugpoints[] = new Sphere[8];
15288	17387
15289		- static
15290		- {
15291		- for (int i=0; i<8; i++)
15292		- {
15293		- debugpoints[i] = new Sphere();
15294		- }
15295		- }
15296		-
15297	17388	static void InitPoints(float radius)
15298	17389	{
15299	17390	for (int i=0; i<8; i++)
..	..	@@ -15313,7 +17404,7 @@
15313	17404	}
15314	17405	}
15315	17406
15316		- static void DrawPoints(CameraPane cpane)
	17407	+ static void DrawPoints(iCameraPane cpane)
15317	17408	{
15318	17409	for (int i=0; i<8; i++) // first and last are red
15319	17410	{
..	..	@@ -15335,7 +17426,8 @@
15335	17426	static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
15336	17427	static IntBuffer selectsizebuffer = IntBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
15337	17428	static java.nio.FloatBuffer pointselectsizebuffer = java.nio.FloatBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
15338		- static IntBuffer occlusionsizebuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17429	+ //static IntBuffer occlusionsizebuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17430	+ static java.nio.FloatBuffer occlusionsizebuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
15339	17431	static BufferedImage bufimage = new BufferedImage(TEX_SIZE, TEX_SIZE, BufferedImage.TYPE_INT_RGB);
15340	17432	static BufferedImage textest = new cBufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB);
15341	17433	static java.util.Vector<BufferedImage> billboards = new java.util.Vector<BufferedImage>();
..	..	@@ -15344,10 +17436,11 @@
15344	17436	static IntBuffer textbuffer = null; // IntBuffer.allocate(TEXT_WIDTH88 * TEXT_HEIGHT);
15345	17437	// Depth buffer format
15346	17438	//private int depth_format;
15347		- static public void NextIndex(Object3D o, GL gl)
	17439	+
	17440	+ public void NextIndex()
15348	17441	{
15349	17442	indexcount+=16;
15350		- gl.glColor3d(((indexcount >>> 16) & 255) / 255.0, ((indexcount >>> 8) & 255) / 255.0, ((indexcount) & 255) / 255.0);
	17443	+ GetGL().glColor3d(((indexcount >>> 16) & 255) / 255.0, ((indexcount >>> 8) & 255) / 255.0, ((indexcount) & 255) / 255.0);
15351	17444	//objects[indexcount] = o;
15352	17445	//System.out.println("indexcount = " + indexcount);
15353	17446	}