~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -31,8 +31,12 @@
31	31
32	32	import gleem.linalg.Mat4f;
33	33
34		-class CameraPane extends GLCanvas implements Runnable, GLEventListener, ActionListener, MouseWheelListener, MouseMotionListener, MouseListener, KeyListener
	34	+class CameraPane extends GLCanvas implements iCameraPane, Runnable, GLEventListener, ActionListener, MouseWheelListener, MouseMotionListener, MouseListener, KeyListener
35	35	{
	36	+ static cMaterial[] materialstack = new cMaterial[65536];
	37	+ static boolean[] selectedstack = new boolean[65536];
	38	+ static int materialdepth = 0;
	39	+
36	40	static boolean DEBUG = false;
37	41	static boolean FRUSTUM = false; // still bogus true; // frustum culling
38	42
..	..	@@ -42,25 +46,7 @@
42	46
43	47	static int STEP = 1;
44	48
45		- static boolean ONESTEP = false; // do LIVE once
46		-
47		- /**
48		- * @return the LIVE
49		- */
50		- public static boolean isLIVE()
51		- {
52		- return LIVE \|\| ONESTEP;
53		- }
54		-
55		- /**
56		- * @param aLIVE the LIVE to set
57		- */
58		- public static void setLIVE(boolean aLIVE)
59		- {
60		- LIVE = aLIVE;
61		- }
62		-
63		- /static/ boolean CULLFACE = false; // true;
	49	+ /static/ private boolean CULLFACE = false; // true;
64	50	/static/ boolean NEAREST = false; // true;
65	51	/static/ boolean WIREFRAME = false; // true;
66	52
..	..	@@ -70,8 +56,6 @@
70	56	static int CURRENTANTIALIAS = 0; // 1;
71	57	/static/ boolean RENDERSHADOW = true;
72	58	/static/ int RENDERPROGRAM = 2; // 0 == none, 1 == fast, 2 == normal
73		- static boolean ANIMATION = false;
74		- static String filename;
75	59
76	60	boolean DISPLAYTEXT = false;
77	61	//boolean REDUCETEXTURE = true;
..	..	@@ -97,10 +81,8 @@
97	81
98	82	static boolean textureon = true;
99	83	static boolean LOCALTRANSFORM = false;
100		-private static boolean LIVE = false;
101	84	static boolean FULLSCREEN = false;
102	85	static boolean SUPPORT = true;
103		-static boolean CROWD = false;
104	86	static boolean INERTIA = true;
105	87	static boolean FAST = false;
106	88	static boolean SLOWPOSE = false;
..	..	@@ -108,6 +90,8 @@
108	90
109	91	static int tickcount = 0; // slow pose issue
110	92
	93	+static boolean BUTTONLESSWHEEL = false;
	94	+static boolean ZOOMBOXMODE = false;
111	95	static boolean BOXMODE = false;
112	96	static boolean IMAGEFLIP = false;
113	97	static boolean SMOOTHFOCUS = false;
..	..	@@ -122,7 +106,7 @@
122	106	static boolean OEIL = true;
123	107	static boolean OEILONCE = false; // do oeilon then oeiloff
124	108	static boolean LOOKAT = true;
125		-static boolean RANDOM = true; // false;
	109	+static boolean SWITCH = true; // false;
126	110	static boolean HANDLES = false; // selection doesn't work!!
127	111	static boolean PAINTMODE = false;
128	112
..	..	@@ -165,12 +149,39 @@
165	149	defaultcaps.setAccumBlueBits(16);
166	150	defaultcaps.setAccumAlphaBits(16);
167	151	}
168		- static CameraPane theRenderer;
169		-
	152	+
170	153	void SetAsGLRenderer(boolean b)
171	154	{
172	155	isRenderer = b;
173		- theRenderer = this;
	156	+ Globals.theRenderer = this;
	157	+ }
	158	+
	159	+ CameraPane(Object3D o, Camera cam, boolean withcontext)
	160	+ {
	161	+ super(defaultcaps, null, withcontext?glcontext:null, null);
	162	+
	163	+ //System.out.println("AMERICA AREA = " + (9458886 + 9210755 + 8480395 + 2736391 + 1943018 + 1289475 + 1141569 + 1069350 + 911559 + 721229 + 395886 + 377972 + 246700 + 211156 + 173985 + 141133 + 118279 + 112079 + 108523));
	164	+ glcontext = getContext();
	165	+
	166	+ cameras = new Camera[2];
	167	+ targetLookAts = new cVector[2];
	168	+
	169	+ SetCamera(cam);
	170	+
	171	+ SetLight(new Camera(new cVector(10, 10, -20)));
	172	+
	173	+ object = o;
	174	+
	175	+ setBackground(Color.white);
	176	+
	177	+ addKeyListener(this);
	178	+ addMouseListener(this);
	179	+ addMouseMotionListener(this);
	180	+ addMouseWheelListener(this);
	181	+ //System.out.println("addGLEventListener: " + this);
	182	+ addGLEventListener(this);
	183	+
	184	+// pingthread.start(); // may 2013
174	185	}
175	186
176	187	static boolean AntialiasingEnabled()
..	..	@@ -178,12 +189,53 @@
178	189	return CURRENTANTIALIAS > 0;
179	190	}
180	191
181		- void ClearDepth()
	192	+ /// INTERFACE
	193	+
	194	+ public javax.media.opengl.GL GetGL0()
	195	+ {
	196	+ return null;
	197	+ }
	198	+
	199	+ public int GenList()
	200	+ {
	201	+ javax.media.opengl.GL gl = GetGL();
	202	+ return gl.glGenLists(1);
	203	+ }
	204	+
	205	+ public void NewList(int id)
	206	+ {
	207	+ javax.media.opengl.GL gl = GetGL();
	208	+ gl.glNewList(id, gl.GL_COMPILE); //_AND_EXECUTE);
	209	+ }
	210	+
	211	+ public void CallList(int id)
	212	+ {
	213	+ javax.media.opengl.GL gl = GetGL();
	214	+ gl.glCallList(id);
	215	+ }
	216	+
	217	+ public void EndList()
	218	+ {
	219	+ javax.media.opengl.GL gl = GetGL();
	220	+ gl.glEndList();
	221	+ }
	222	+
	223	+ public boolean IsBoxMode()
	224	+ {
	225	+ return BOXMODE;
	226	+ }
	227	+
	228	+ public boolean IsZoomBoxMode()
	229	+ {
	230	+ return ZOOMBOXMODE;
	231	+ }
	232	+
	233	+ public void ClearDepth()
182	234	{
183	235	GetGL().glClear(GetGL().GL_DEPTH_BUFFER_BIT);
184	236	}
185	237
186		- void DepthTest(boolean depthtest)
	238	+ public void DepthTest(boolean depthtest)
187	239	{
188	240	if (depthtest)
189	241	GetGL().glDepthFunc(GL.GL_LEQUAL);
..	..	@@ -191,7 +243,7 @@
191	243	GetGL().glDepthFunc(GL.GL_ALWAYS);
192	244	}
193	245
194		- void DepthWrite(boolean depthwrite)
	246	+ public void DepthWrite(boolean depthwrite)
195	247	{
196	248	if (depthwrite)
197	249	GetGL().glDepthMask(true);
..	..	@@ -199,12 +251,1594 @@
199	251	GetGL().glDepthMask(false);
200	252	}
201	253
202		- void BackFaceCull(boolean bfc)
	254	+ public void BackFaceCull(boolean bfc)
203	255	{
204	256	if (bfc)
205	257	GetGL().glEnable(GetGL().GL_CULL_FACE);
206	258	else
207	259	GetGL().glDisable(GetGL().GL_CULL_FACE);
	260	+ }
	261	+
	262	+ public boolean BackFaceCullMode()
	263	+ {
	264	+ return this.CULLFACE;
	265	+ }
	266	+
	267	+ public boolean IsAmbientOcclusionOn()
	268	+ {
	269	+ return this.ambientOcclusion;
	270	+ }
	271	+
	272	+ public boolean IsDebugSelection()
	273	+ {
	274	+ return DEBUG_SELECTION;
	275	+ }
	276	+
	277	+ public boolean IsFrozen()
	278	+ {
	279	+ boolean selectmode = this.DrawMode() == SELECTION \|\| this.IsDebugSelection();
	280	+
	281	+ return !selectmode && cameracount == 0; // != 0;
	282	+ }
	283	+
	284	+ // Currently in Globals
	285	+ public int DrawMode()
	286	+ {
	287	+ return Globals.DrawMode();
	288	+ }
	289	+
	290	+ public Camera EyeCamera()
	291	+ {
	292	+ return eyeCamera;
	293	+ }
	294	+
	295	+ public Camera LightCamera()
	296	+ {
	297	+ return lightCamera;
	298	+ }
	299	+
	300	+ public Camera ManipCamera()
	301	+ {
	302	+ return manipCamera;
	303	+ }
	304	+
	305	+ public Camera RenderCamera()
	306	+ {
	307	+ return renderCamera;
	308	+ }
	309	+
	310	+ public Camera[] Cameras()
	311	+ {
	312	+ return cameras;
	313	+ }
	314	+
	315	+ public void PushMaterial(Object3D obj, boolean selected)
	316	+ {
	317	+ CameraPane display = this;
	318	+ javax.media.opengl.GL gl = display.GetGL();
	319	+ cMaterial material = obj.material;
	320	+
	321	+ if (material != null)
	322	+ {
	323	+ materialstack[materialdepth] = material;
	324	+ selectedstack[materialdepth] = selected;
	325	+ cStatic.objectstack[materialdepth++] = obj;
	326	+ //System.out.println("material " + material);
	327	+ //Applet3D.tracein(this, selected);
	328	+ display.vector2buffer = obj.projectedVertices;
	329	+ if (obj instanceof Camera)
	330	+ {
	331	+ display.options1[0] = material.shift;
	332	+ //System.out.println("shift " + material.shift);
	333	+ display.options1[1] = material.lightarea;
	334	+ display.options1[2] = material.shadowbias;
	335	+ display.options1[3] = material.aniso;
	336	+ display.options1[4] = material.anisoV;
	337	+ display.options2[0] = material.opacity;
	338	+ display.options2[1] = material.diffuse;
	339	+ display.options2[2] = material.factor;
	340	+
	341	+ cColor.HSBtoRGB(material.color, material.modulation, 1, display.options3);
	342	+ display.options4[0] = material.cameralight/0.2f;
	343	+ display.options4[1] = material.subsurface;
	344	+ display.options4[2] = material.sheen;
	345	+
	346	+ // if (display.CURRENTANTIALIAS > 0)
	347	+ // display.options3[3] /= 4;
	348	+
	349	+ /*
	350	+ System.out.println("Focus = " + display.options1[0]);
	351	+ System.out.println("Aperture = " + display.options1[1]);
	352	+ System.out.println("ShadowBlur = " + display.options1[2]);
	353	+ System.out.println("Antialiasing = " + display.options1[3]);
	354	+ System.out.println("Fog = " + display.options2[0]);
	355	+ System.out.println("Intensity = " + display.options2[1]);
	356	+ System.out.println("Elevation = " + display.options2[2]);
	357	+ /**/
	358	+ } else
	359	+ {
	360	+ DrawMaterial(material, selected);
	361	+ }
	362	+ } else
	363	+ {
	364	+ if (selected && CameraPane.flash)
	365	+ {
	366	+ display.modelParams4[1] = 100;
	367	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 4, display.modelParams4, 0);
	368	+ }
	369	+ }
	370	+ }
	371	+
	372	+ public void PushMaterial2(Object3D obj, boolean selected)
	373	+ {
	374	+ CameraPane display = this;
	375	+ cMaterial material = obj.material;
	376	+
	377	+ if (material != null)
	378	+ {
	379	+ materialstack[materialdepth] = material;
	380	+ selectedstack[materialdepth] = selected;
	381	+ cStatic.objectstack[materialdepth++] = obj;
	382	+ //System.out.println("material " + material);
	383	+ //Applet3D.tracein("selected ", selected);
	384	+ display.vector2buffer = obj.projectedVertices;
	385	+ display.DrawMaterial(material, selected);
	386	+ }
	387	+ }
	388	+
	389	+ public void PopMaterial(Object3D obj, boolean selected)
	390	+ {
	391	+ CameraPane display = this;
	392	+ javax.media.opengl.GL gl = display.GetGL();
	393	+ cMaterial material = obj.material;
	394	+
	395	+ //if (parent != null && parent.GetMaterial() != null)
	396	+ // parent.GetMaterial().Draw(display, parent.IsSelected(this));
	397	+ if (material != null)
	398	+ {
	399	+ materialdepth -= 1;
	400	+ if (materialdepth > 0)
	401	+ {
	402	+ display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	403	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	404	+ }
	405	+ //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
	406	+ } else if (selected && CameraPane.flash && obj.GetMaterial() != null)
	407	+ {
	408	+ display.modelParams4[1] = obj.GetMaterial().cameralight;
	409	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 4, display.modelParams4, 0);
	410	+ }
	411	+ }
	412	+
	413	+ public void PopMaterial2(Object3D obj)
	414	+ {
	415	+ CameraPane display = this;
	416	+ cMaterial material = obj.material;
	417	+
	418	+ if (material != null)
	419	+ {
	420	+ materialdepth -= 1;
	421	+ if (materialdepth > 0)
	422	+ {
	423	+ display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	424	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	425	+ }
	426	+ //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
	427	+ //else
	428	+ //material.Draw(display, false);
	429	+ }
	430	+ }
	431	+
	432	+ public void DrawFace(Object3D obj, Vertex pv, Vertex qv, Vertex rv, Face face)
	433	+ {
	434	+ CameraPane display = this;
	435	+
	436	+ if (pv.y == -10000 \|\|
	437	+ qv.y == -10000 \|\|
	438	+ rv.y == -10000)
	439	+ return;
	440	+
	441	+// float b = f.nbiterations & 1;
	442	+// float g = (f.nbiterations>>1) & 1;
	443	+// float r = (f.nbiterations>>2) & 1;
	444	+//
	445	+// //if (f.weight == 10000)
	446	+// //{
	447	+// // r = 1; g = b = 0;
	448	+// //}
	449	+// //else
	450	+// //{
	451	+// // assert(f.weight < 10000);
	452	+// r = g = b = (float)bRep.FaceWeight(f)*100;
	453	+// if (r<0)
	454	+// assert(r>=0);
	455	+// //}
	456	+
	457	+ javax.media.opengl.GL gl = display.GetGL();
	458	+
	459	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
	460	+
	461	+ //System.out.println("p = " + pv + "; q = " + qv + "; r = " + rv);
	462	+ if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
	463	+ {
	464	+ //gl.glBegin(gl.GL_TRIANGLES);
	465	+ boolean hasnorm = pv.norm != null; // && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0);
	466	+ if (!hasnorm)
	467	+ {
	468	+ // System.out.println("FUCK!!");
	469	+ LA.vecSub(pv/.pos/, qv/.pos/, obj.v0);
	470	+ LA.vecSub(pv/.pos/, rv/.pos/, obj.v1);
	471	+ LA.vecCross(obj.v0, obj.v1, obj.v2);
	472	+ LA.vecNormalize(obj.v2);
	473	+ gl.glNormal3f((float) obj.v2.x, (float) obj.v2.y, (float) obj.v2.z);
	474	+ }
	475	+
	476	+ // P
	477	+ float x = (float)pv.x;
	478	+ float y = (float)pv.y;
	479	+ float z = (float)pv.z;
	480	+
	481	+ if (hasnorm)
	482	+ {
	483	+// if (!pv.norm.normalized())
	484	+// assert(pv.norm.normalized());
	485	+
	486	+ //System.out.println("normalp = " + pv.norm.x + ", " + pv.norm.y + ", " + pv.norm.z);
	487	+ float nx = (float)pv.norm.x;
	488	+ float ny = (float)pv.norm.y;
	489	+ float nz = (float)pv.norm.z;
	490	+
	491	+ x += nx * obj.NORMALPUSH;
	492	+ y += ny * obj.NORMALPUSH;
	493	+ z += nz * obj.NORMALPUSH;
	494	+
	495	+ gl.glNormal3f(nx, ny, nz);
	496	+ }
	497	+ gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
	498	+ SetColor(obj, pv);
	499	+ //gl.glColor4f(r, g, b, 1);
	500	+ //gl.glColor4f(pv.boundary, pv.boundary, pv.boundary, 1);
	501	+ if (obj.flipV)
	502	+ gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
	503	+ else
	504	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	505	+ //System.out.println("vertexp = " + pv.x + ", " + pv.y + ", " + pv.z);
	506	+
	507	+ gl.glVertex3f(x, y, z);
	508	+
	509	+ // Q
	510	+ x = (float)qv.x;
	511	+ y = (float)qv.y;
	512	+ z = (float)qv.z;
	513	+
	514	+// Print(pv);
	515	+ if (hasnorm)
	516	+ {
	517	+// assert(qv.norm.normalized());
	518	+ //System.out.println("normalq = " + qv.norm.x + ", " + qv.norm.y + ", " + qv.norm.z);
	519	+ float nx = (float)qv.norm.x;
	520	+ float ny = (float)qv.norm.y;
	521	+ float nz = (float)qv.norm.z;
	522	+
	523	+ x += nx * obj.NORMALPUSH;
	524	+ y += ny * obj.NORMALPUSH;
	525	+ z += nz * obj.NORMALPUSH;
	526	+
	527	+ gl.glNormal3f(nx, ny, nz);
	528	+ }
	529	+ //System.out.println("vertexq = " + qv.s + ", " + qv.t);
	530	+ // boolean locked = false;
	531	+ // float eps = 0.1f;
	532	+ // boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
	533	+
	534	+ // int dot = 0; //*/ (int)f.dot;
	535	+
	536	+ // if ((dot&1) == 0)
	537	+ // dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
	538	+
	539	+ // if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
	540	+ if (obj.flipV)
	541	+ gl.glTexCoord2f((float) qv.s, 1-(float) qv.t);
	542	+ else
	543	+ gl.glTexCoord2f((float) qv.s, (float) qv.t);
	544	+ // else
	545	+ // {
	546	+ // locked = true;
	547	+ // gl.glTexCoord2f((float) pv.s, (float) pv.t);
	548	+ // }
	549	+ gl.glColor4f(qv.AO, qv.AO, qv.AO, 1);
	550	+ SetColor(obj, qv);
	551	+
	552	+ gl.glVertex3f(x, y, z);
	553	+ //gl.glColor4f(r, g, b, 1);
	554	+ //gl.glColor4f(qv.boundary, qv.boundary, qv.boundary, 1);
	555	+ //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
	556	+// Print(qv);
	557	+
	558	+ // R
	559	+ x = (float)rv.x;
	560	+ y = (float)rv.y;
	561	+ z = (float)rv.z;
	562	+
	563	+ if (hasnorm)
	564	+ {
	565	+// assert(rv.norm.normalized());
	566	+ //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
	567	+ float nx = (float)rv.norm.x;
	568	+ float ny = (float)rv.norm.y;
	569	+ float nz = (float)rv.norm.z;
	570	+
	571	+ x += nx * obj.NORMALPUSH;
	572	+ y += ny * obj.NORMALPUSH;
	573	+ z += nz * obj.NORMALPUSH;
	574	+
	575	+ gl.glNormal3f(nx, ny, nz);
	576	+ }
	577	+
	578	+ // if ((dot&4) == 0)
	579	+ // dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
	580	+
	581	+ // if (wrap \|\| !locked && (dot&8) != 0)
	582	+ if (obj.flipV)
	583	+ gl.glTexCoord2f((float) rv.s, 1-(float) rv.t);
	584	+ else
	585	+ gl.glTexCoord2f((float) rv.s, (float) rv.t);
	586	+ // else
	587	+ // gl.glTexCoord2f((float) pv.s, (float) pv.t);
	588	+
	589	+ // f.dot = dot;
	590	+
	591	+ gl.glColor4f(rv.AO, rv.AO, rv.AO, 1);
	592	+ SetColor(obj, rv);
	593	+ //gl.glColor4f(r, g, b, 1);
	594	+ //gl.glColor4f(rv.boundary, rv.boundary, rv.boundary, 1);
	595	+ //System.out.println("vertexr = " + rv.x + ", " + rv.y + ", " + rv.z);
	596	+ gl.glVertex3f(x, y, z);
	597	+// Print(rv);
	598	+ //gl.glEnd();
	599	+ }
	600	+ else
	601	+ {
	602	+ gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
	603	+ gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
	604	+ gl.glVertex3f((float) rv.x, (float) rv.y, (float) rv.z);
	605	+
	606	+ }
	607	+
	608	+ if (false) // (attributes & WIREFRAME) != 0)
	609	+ {
	610	+ gl.glDisable(gl.GL_LIGHTING);
	611	+
	612	+ gl.glBegin(gl.GL_LINE_LOOP);
	613	+ gl.glVertex3d(pv./pos./x, pv./pos./y, pv./pos./z);
	614	+ gl.glVertex3d(qv./pos./x, qv./pos./y, qv./pos./z);
	615	+ gl.glVertex3d(rv./pos./x, rv./pos./y, rv./pos./z);
	616	+ gl.glEnd();
	617	+
	618	+ gl.glEnable(gl.GL_LIGHTING);
	619	+ }
	620	+ }
	621	+
	622	+ /**
	623	+ * <code>draw</code> renders a <code>TriMesh</code> object including
	624	+ * it's normals, colors, textures and vertices.
	625	+ *
	626	+ * @see Renderer#draw(TriMesh)
	627	+ * @param tris
	628	+ * the mesh to render.
	629	+ */
	630	+ public void DrawParticles(TriMesh geo, Object3D shape, boolean selected, boolean rotate) // TriMesh tris)
	631	+ {
	632	+ CameraPane display = this;
	633	+
	634	+ float r = display.modelParams0[0];
	635	+ float g = display.modelParams0[1];
	636	+ float b = display.modelParams0[2];
	637	+ float opacity = display.modelParams5[1];
	638	+
	639	+ //final GL gl = GLU.getCurrentGL();
	640	+ GL gl = display.GetGL(); // getGL();
	641	+
	642	+ FloatBuffer vertBuf = geo.vertBuf;
	643	+
	644	+ int v = vertBuf.capacity();
	645	+
	646	+ int count = 0;
	647	+
	648	+ boolean cf = gl.glIsEnabled(gl.GL_CULL_FACE);
	649	+ gl.glEnable(gl.GL_CULL_FACE);
	650	+ // gl.glScalef(1.0f/1024,1.0f/1024,1.0f/1024);
	651	+ for (int i=0; i<v/3; i++)
	652	+ {
	653	+ int index3 = i*3;
	654	+
	655	+ if (geo.sizeBuf.get(index3+1) == 0)
	656	+ continue;
	657	+
	658	+ count++;
	659	+
	660	+ int index4 = i*4;
	661	+
	662	+ float tx = vertBuf.get(index3);
	663	+ float ty = vertBuf.get(index3+1);
	664	+ float tz = vertBuf.get(index3+2);
	665	+
	666	+ // if (tx == 0 && ty == 0 && tz == 0)
	667	+ // continue;
	668	+
	669	+ gl.glMatrixMode(gl.GL_TEXTURE);
	670	+ gl.glPushMatrix();
	671	+
	672	+ float[] texmat = geo.texmat;
	673	+ texmat[12] = texmat[13] = texmat[14] = i;
	674	+
	675	+ gl.glMultMatrixf(texmat, 0);
	676	+
	677	+ gl.glMatrixMode(gl.GL_MODELVIEW);
	678	+ gl.glPushMatrix();
	679	+
	680	+ gl.glTranslatef(tx,ty,tz);
	681	+
	682	+ if (rotate)
	683	+ gl.glRotatef(i, 0, 1, 0);
	684	+
	685	+ float size = geo.sizeBuf.get(index3) / 100;
	686	+ gl.glScalef(size,size,size);
	687	+
	688	+ float cr = geo.colorBuf.get(index4);
	689	+ float cg = geo.colorBuf.get(index4+1);
	690	+ float cb = geo.colorBuf.get(index4+2);
	691	+ float ca = geo.colorBuf.get(index4+3);
	692	+
	693	+ display.modelParams0[0] = r * cr;
	694	+ display.modelParams0[1] = g * cg;
	695	+ display.modelParams0[2] = b * cb;
	696	+
	697	+ display.modelParams5[1] = opacity * ca;
	698	+
	699	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 0, display.modelParams0, 0);
	700	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 5, display.modelParams5, 0);
	701	+
	702	+ RandomNode.globalseed = (int)geo.sizeBuf.get(index3+2); // i;
	703	+ RandomNode.globalseed2 = RandomNode.globalseed;
	704	+
	705	+// gl.glColor4f(cr,cg,cb,ca);
	706	+ // gl.glScalef(1024/16,1024/16,1024/16);
	707	+ shape.Draw/Node/(display,null,selected,false); // blocked
	708	+ // gl.glScalef(16.0f/1024,16.0f/1024,16.0f/1024);
	709	+ //gl.glTranslatef(-tx,-ty,-tz);
	710	+ gl.glPopMatrix();
	711	+
	712	+ gl.glMatrixMode(gl.GL_TEXTURE);
	713	+ gl.glPopMatrix();
	714	+ }
	715	+ // gl.glScalef(1024,1024,1024);
	716	+ if (!cf)
	717	+ gl.glDisable(gl.GL_CULL_FACE);
	718	+
	719	+ display.modelParams0[0] = r;
	720	+ display.modelParams0[1] = g;
	721	+ display.modelParams0[2] = b;
	722	+
	723	+ display.modelParams5[1] = opacity;
	724	+
	725	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 0, display.modelParams0, 0);
	726	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 5, display.modelParams5, 0);
	727	+
	728	+ gl.glMatrixMode(gl.GL_MODELVIEW);
	729	+
	730	+// System.err.println("total = " + v/3 + "; displayed = " + count);
	731	+ if (true)
	732	+ return;
	733	+
	734	+//// if (!tris.predraw(this))
	735	+//// {
	736	+//// return;
	737	+//// }
	738	+//// if (Debug.stats)
	739	+//// {
	740	+//// StatCollector.addStat(StatType.STAT_TRIANGLE_COUNT, tris.getTriangleCount());
	741	+//// StatCollector.addStat(StatType.STAT_VERTEX_COUNT, tris.getVertexCount());
	742	+//// StatCollector.addStat(StatType.STAT_GEOM_COUNT, 1);
	743	+//// }
	744	+////
	745	+//// if (tris.getDisplayListID() != -1)
	746	+//// {
	747	+//// renderDisplayList(tris);
	748	+//// return;
	749	+//// }
	750	+////
	751	+//// if (!generatingDisplayList)
	752	+//// {
	753	+//// applyStates(tris.states, tris);
	754	+//// }
	755	+//// if (Debug.stats)
	756	+//// {
	757	+//// StatCollector.startStat(StatType.STAT_RENDER_TIMER);
	758	+//// }
	759	+//// boolean transformed = doTransforms(tris);
	760	+//
	761	+// int glMode = GL.GL_TRIANGLES;
	762	+// switch (getMode())
	763	+// {
	764	+// case Triangles:
	765	+// glMode = GL.GL_TRIANGLES;
	766	+// break;
	767	+// case Strip:
	768	+// glMode = GL.GL_TRIANGLE_STRIP;
	769	+// break;
	770	+// case Fan:
	771	+// glMode = GL.GL_TRIANGLE_FAN;
	772	+// break;
	773	+// }
	774	+//
	775	+// if (!predrawGeometry(gl))
	776	+// {
	777	+// // make sure only the necessary indices are sent through on old
	778	+// // cards.
	779	+// IntBuffer indices = this.getIndexBuffer();
	780	+// if (indices == null)
	781	+// {
	782	+// logger.severe("missing indices on geometry object: " + this.toString());
	783	+// } else
	784	+// {
	785	+// indices.rewind();
	786	+// indices.limit(this.getMaxIndex());
	787	+//
	788	+// gl.glDrawElements(glMode, indices.limit(), GL.GL_UNSIGNED_INT, indices); // TODO Check <count> and assumed <type> of GL_UNSIGNED_INT
	789	+//
	790	+// indices.clear();
	791	+// }
	792	+// } else
	793	+// {
	794	+// gl.glDrawElements(glMode, this.getIndexBuffer().limit(),
	795	+// GL.GL_UNSIGNED_INT, 0);
	796	+// }
	797	+//
	798	+//// postdrawGeometry(tris);
	799	+//// if (transformed)
	800	+//// {
	801	+//// undoTransforms(tris);
	802	+//// }
	803	+////
	804	+//// if (Debug.stats)
	805	+//// {
	806	+//// StatCollector.endStat(StatType.STAT_RENDER_TIMER);
	807	+//// }
	808	+//// tris.postdraw(this);
	809	+ }
	810	+
	811	+ static Camera localcamera = new Camera();
	812	+ static cVector from = new cVector();
	813	+ static cVector to = new cVector();
	814	+
	815	+ public void PrepOcclusion(BoundaryRep br, double[][] transform)
	816	+ {
	817	+ CameraPane cp = this;
	818	+
	819	+ Camera keep = cp.RenderCamera();
	820	+ cp.renderCamera = localcamera;
	821	+
	822	+ if (br.trimmed)
	823	+ {
	824	+ float[] colors = new float[br.positions.length / 3];
	825	+
	826	+ int i3 = 0;
	827	+ for (int i = 0; i < br.positions.length / 3; i++, i3 += 3)
	828	+ {
	829	+ if (br.normals[i3] == 0 && br.normals[i3+1] == 0 && br.normals[i3+2] == 0)
	830	+ continue;
	831	+
	832	+ from.set(br.positions[i3], br.positions[i3 + 1], br.positions[i3 + 2]);
	833	+ to.set(br.positions[i3] + br.normals[i3],
	834	+ br.positions[i3 + 1] + br.normals[i3 + 1],
	835	+ br.positions[i3 + 2] + br.normals[i3 + 2]);
	836	+ LA.xformPos(from, transform, from);
	837	+ LA.xformPos(to, transform, to); // RIGID ONLY
	838	+ localcamera.setAim(from, to);
	839	+
	840	+ CameraPane.occlusionbuffer.display();
	841	+
	842	+ if (CameraPane.DEBUG_OCCLUSION)
	843	+ cp.display(); // debug
	844	+
	845	+ colors[i] = cp.vertexOcclusion.r;
	846	+ //colors[i3 + 1] = cp.vertexOcclusion.g;
	847	+ //colors[i3 + 2] = cp.vertexOcclusion.b;
	848	+
	849	+ if ((i % 100) == 0 && i != 0)
	850	+ {
	851	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	852	+ //System.out.println("Color = " + cp.vertexOcclusion.r + ", " + cp.vertexOcclusion.g + ", " + cp.vertexOcclusion.b + "; " + (int)(100.0*i/(positions.length/3)) + "% done");
	853	+ System.out.println((int) (100.0 * i / (br.positions.length / 3)) + "% (" + i + " of " + (br.positions.length / 3) + ")");
	854	+ }
	855	+ }
	856	+
	857	+ br.colors = colors;
	858	+ }
	859	+ else
	860	+ {
	861	+ for (int i = 0; i < br.VertexCount(); i++)
	862	+ {
	863	+ Vertex v = br.GetVertex(i);
	864	+
	865	+ if (v.norm == null \|\| v.norm.x == 0 && v.norm.y == 0 && v.norm.z == 0)
	866	+ continue;
	867	+
	868	+ from.set(v.x, v.y, v.z);
	869	+ to.set(v.x+v.norm.x, v.y+v.norm.y, v.z+v.norm.z);
	870	+ LA.xformPos(from, transform, from);
	871	+ LA.xformPos(to, transform, to); // RIGID ONLY
	872	+ localcamera.setAim(from, to);
	873	+
	874	+ CameraPane.occlusionbuffer.display();
	875	+
	876	+ if (CameraPane.DEBUG_OCCLUSION)
	877	+ cp.display(); // debug
	878	+
	879	+ v.AO = cp.vertexOcclusion.r;
	880	+
	881	+ if ((i % 100) == 0 && i != 0)
	882	+ {
	883	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	884	+ //System.out.println("Color = " + cp.vertexOcclusion.r + ", " + cp.vertexOcclusion.g + ", " + cp.vertexOcclusion.b + "; " + (int)(100.0*i/(positions.length/3)) + "% done");
	885	+ System.out.println((int) (100.0 * i / br.VertexCount()) + "% (" + i + " of " + br.VertexCount() + ")");
	886	+ }
	887	+ }
	888	+ }
	889	+
	890	+ //System.out.println("done.");
	891	+
	892	+ cp.renderCamera = keep;
	893	+ }
	894	+
	895	+ void DrawPointFLow(PointFlow pointFlow, Object3D /Composite/ root, boolean selected, boolean blocked)
	896	+ {
	897	+ CameraPane display = this;
	898	+ pointFlow.CreateHT();
	899	+
	900	+ float r = display.modelParams0[0];
	901	+ float g = display.modelParams0[1];
	902	+ float b = display.modelParams0[2];
	903	+ float opacity = display.modelParams5[1];
	904	+
	905	+ //final GL gl = GLU.getCurrentGL();
	906	+ GL gl = display.GetGL(); // getGL();
	907	+
	908	+ int s = pointFlow.points.size();
	909	+
	910	+ boolean cf = gl.glIsEnabled(gl.GL_CULL_FACE);
	911	+ gl.glEnable(gl.GL_CULL_FACE);
	912	+
	913	+ for (int i=s; --i>=0;)
	914	+ //for (int i=0; i<s; i++)
	915	+ {
	916	+ cVector v = pointFlow.points.get(i);
	917	+
	918	+ double mindist = Double.MAX_VALUE;
	919	+
	920	+ double size = pointFlow.minimumSize;
	921	+
	922	+ double distancenext = 0;
	923	+
	924	+ if (i > 0)
	925	+ {
	926	+ cVector w = pointFlow.points.get(i-1);
	927	+
	928	+ double dist = w.distance(v);
	929	+
	930	+ distancenext = dist;
	931	+
	932	+ if (mindist > dist)
	933	+ {
	934	+ mindist = dist;
	935	+ size = mindist*pointFlow.resizefactor;
	936	+ }
	937	+ }
	938	+
	939	+ if (i < s-1)
	940	+ {
	941	+ cVector w = pointFlow.points.get(i+1);
	942	+
	943	+ double dist = w.distance(v);
	944	+
	945	+ if (mindist > dist)
	946	+ {
	947	+ mindist = dist;
	948	+ size = mindist*pointFlow.resizefactor;
	949	+ }
	950	+ }
	951	+
	952	+ if (size < pointFlow.minimumSize)
	953	+ size = pointFlow.minimumSize;
	954	+ if (size > pointFlow.maximumSize)
	955	+ size = pointFlow.maximumSize;
	956	+
	957	+ double tx = v.x;
	958	+ double ty = v.y;
	959	+ double tz = v.z;
	960	+
	961	+ // if (tx == 0 && ty == 0 && tz == 0)
	962	+ // continue;
	963	+
	964	+ gl.glMatrixMode(gl.GL_TEXTURE);
	965	+ gl.glPushMatrix();
	966	+ pointFlow.texmat[12] = pointFlow.texmat[13] = pointFlow.texmat[14] = i;
	967	+
	968	+ gl.glMultMatrixf(pointFlow.texmat, 0);
	969	+
	970	+ gl.glMatrixMode(gl.GL_MODELVIEW);
	971	+ gl.glPushMatrix();
	972	+
	973	+ gl.glTranslated(tx,ty,tz);
	974	+
	975	+ gl.glScaled(size,size,size);
	976	+
	977	+// float cr = colorBuf.get(index4);
	978	+// float cg = colorBuf.get(index4+1);
	979	+// float cb = colorBuf.get(index4+2);
	980	+// float ca = colorBuf.get(index4+3);
	981	+//
	982	+// display.modelParams0[0] = r * cr;
	983	+// display.modelParams0[1] = g * cg;
	984	+// display.modelParams0[2] = b * cb;
	985	+//
	986	+// display.modelParams5[1] = opacity * ca;
	987	+//
	988	+// gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 0, display.modelParams0, 0);
	989	+// gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 5, display.modelParams5, 0);
	990	+//
	991	+// RandomNode.globalseed = (int)sizeBuf.get(index3+2); // i;
	992	+// RandomNode.globalseed2 = RandomNode.globalseed;
	993	+//
	994	+//// gl.glColor4f(cr,cg,cb,ca);
	995	+// // gl.glScalef(1024/16,1024/16,1024/16);
	996	+ pointFlow.geo.Draw/Node/(display,null,selected, blocked);
	997	+
	998	+ gl.glPopMatrix();
	999	+
	1000	+ double step = size/4; //
	1001	+
	1002	+ if (i == 0 \|\| size == 0 \|\| distancenext > 8*size \|\| distancenext < step)
	1003	+ continue;
	1004	+
	1005	+ int nbsteps = (int)(distancenext/step);
	1006	+
	1007	+ step = distancenext/nbsteps;
	1008	+
	1009	+ cVector next = pointFlow.points.get(i-1);
	1010	+
	1011	+ tmp.set(next);
	1012	+ tmp.sub(v);
	1013	+ tmp.normalize();
	1014	+ tmp.mul(step);
	1015	+
	1016	+ // calculate next size
	1017	+ mindist = Double.MAX_VALUE;
	1018	+
	1019	+ double nextsize = pointFlow.minimumSize;
	1020	+
	1021	+ if (i > 1)
	1022	+ {
	1023	+ cVector w = pointFlow.points.get(i-2);
	1024	+
	1025	+ double dist = w.distance(next);
	1026	+
	1027	+ if (mindist > dist)
	1028	+ {
	1029	+ mindist = dist;
	1030	+ nextsize = mindist*pointFlow.resizefactor;
	1031	+ }
	1032	+ }
	1033	+
	1034	+ double dist = v.distance(next);
	1035	+
	1036	+ if (mindist > dist)
	1037	+ {
	1038	+ mindist = dist;
	1039	+ nextsize = mindist*pointFlow.resizefactor;
	1040	+ }
	1041	+
	1042	+ if (nextsize < pointFlow.minimumSize)
	1043	+ nextsize = pointFlow.minimumSize;
	1044	+ if (nextsize > pointFlow.maximumSize)
	1045	+ nextsize = pointFlow.maximumSize;
	1046	+ //
	1047	+
	1048	+ double count = 0;
	1049	+
	1050	+ while (distancenext > 0.000000001) // step
	1051	+ {
	1052	+ gl.glPushMatrix();
	1053	+
	1054	+ gl.glTranslated(tx + tmp.xcount, ty + tmp.ycount, tz + tmp.z*count);
	1055	+
	1056	+ double K = count/nbsteps;
	1057	+
	1058	+ double intersize = Knextsize + (1-K)size;
	1059	+
	1060	+ gl.glScaled(intersize,intersize,intersize);
	1061	+
	1062	+ pointFlow.geo.Draw/Node/(display,null,selected,blocked);
	1063	+
	1064	+ count++;
	1065	+
	1066	+ distancenext -= step;
	1067	+
	1068	+ gl.glPopMatrix();
	1069	+ }
	1070	+
	1071	+ if (count != nbsteps)
	1072	+ assert(count == nbsteps);
	1073	+
	1074	+ // gl.glScalef(16.0f/1024,16.0f/1024,16.0f/1024);
	1075	+ //gl.glTranslatef(-tx,-ty,-tz);
	1076	+
	1077	+ gl.glMatrixMode(gl.GL_TEXTURE);
	1078	+ gl.glPopMatrix();
	1079	+ }
	1080	+
	1081	+ if (!cf)
	1082	+ gl.glDisable(gl.GL_CULL_FACE);
	1083	+
	1084	+// display.modelParams0[0] = r;
	1085	+// display.modelParams0[1] = g;
	1086	+// display.modelParams0[2] = b;
	1087	+//
	1088	+// display.modelParams5[1] = opacity;
	1089	+//
	1090	+// gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 0, display.modelParams0, 0);
	1091	+// gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 5, display.modelParams5, 0);
	1092	+
	1093	+ gl.glMatrixMode(gl.GL_MODELVIEW);
	1094	+ }
	1095	+
	1096	+ public void DrawBox(cVector min, cVector max)
	1097	+ {
	1098	+ javax.media.opengl.GL gl = GetGL();
	1099	+ gl.glBegin(gl.GL_LINES);
	1100	+
	1101	+ gl.glVertex3d(min.x, min.y, min.z);
	1102	+ gl.glVertex3d(min.x, min.y, max.z);
	1103	+ gl.glVertex3d(min.x, min.y, min.z);
	1104	+ gl.glVertex3d(min.x, max.y, min.z);
	1105	+ gl.glVertex3d(min.x, min.y, min.z);
	1106	+ gl.glVertex3d(max.x, min.y, min.z);
	1107	+
	1108	+ gl.glVertex3d(max.x, max.y, max.z);
	1109	+ gl.glVertex3d(min.x, max.y, max.z);
	1110	+ gl.glVertex3d(max.x, max.y, max.z);
	1111	+ gl.glVertex3d(max.x, min.y, max.z);
	1112	+ gl.glVertex3d(max.x, max.y, max.z);
	1113	+ gl.glVertex3d(max.x, max.y, min.z);
	1114	+
	1115	+ gl.glEnd();
	1116	+ }
	1117	+
	1118	+ public void DrawGeometry(BoundaryRep bRep, boolean flipV, boolean selectmode)
	1119	+ {
	1120	+ int[] strips = bRep.getRawIndices();
	1121	+
	1122	+ javax.media.opengl.GL gl = GetGL();
	1123	+
	1124	+ // TRIANGLE STRIP ARRAY
	1125	+ if (bRep.trimmed)
	1126	+ {
	1127	+ float[] v = bRep.getRawVertices();
	1128	+ float[] n = bRep.getRawNormals();
	1129	+ float[] c = bRep.getRawColors();
	1130	+ float[] uv = bRep.getRawUVMap();
	1131	+
	1132	+ int count2 = 0;
	1133	+ int count3 = 0;
	1134	+
	1135	+ if (n.length > 0)
	1136	+ {
	1137	+ for (int i = 0; i < strips.length; i++)
	1138	+ {
	1139	+ gl.glBegin(gl.GL_TRIANGLE_STRIP);
	1140	+
	1141	+ /*
	1142	+ boolean locked = false;
	1143	+ float eps = 0.1f;
	1144	+ boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
	1145	+
	1146	+ int dot = 0;
	1147	+
	1148	+ if ((dot&1) == 0)
	1149	+ dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
	1150	+
	1151	+ if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
	1152	+ gl.glTexCoord2f((float) qv.s, (float) qv.t);
	1153	+ else
	1154	+ {
	1155	+ locked = true;
	1156	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	1157	+ }
	1158	+ //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
	1159	+ gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
	1160	+ if (hasnorm)
	1161	+ {
	1162	+ //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
	1163	+ gl.glNormal3f((float) rv.norm.x, (float) rv.norm.y, (float) rv.norm.z);
	1164	+ }
	1165	+
	1166	+ if ((dot&4) == 0)
	1167	+ dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
	1168	+
	1169	+ if (wrap \|\| !locked && (dot&8) != 0)
	1170	+ gl.glTexCoord2f((float) rv.s, (float) rv.t);
	1171	+ else
	1172	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	1173	+
	1174	+ f.dot = dot;
	1175	+ */
	1176	+
	1177	+ if (!selectmode)
	1178	+ {
	1179	+ if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
	1180	+ {
	1181	+ gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1182	+ } else
	1183	+ {
	1184	+ gl.glNormal3f(0, 0, 1);
	1185	+ }
	1186	+
	1187	+ if (c != null)
	1188	+ //System.out.println("glcolor = " + c[count3] + ", " + c[count3+1] + ", " + c[count3+2]);
	1189	+ {
	1190	+ gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
	1191	+ }
	1192	+ }
	1193	+ if (flipV)
	1194	+ gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
	1195	+ else
	1196	+ gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1197	+ //System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
	1198	+ gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1199	+
	1200	+ count2 += 2;
	1201	+ count3 += 3;
	1202	+ if (!selectmode)
	1203	+ {
	1204	+ if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
	1205	+ {
	1206	+ gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1207	+ } else
	1208	+ {
	1209	+ gl.glNormal3f(0, 0, 1);
	1210	+ }
	1211	+ if (c != null)
	1212	+ {
	1213	+ gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
	1214	+ }
	1215	+ }
	1216	+ if (flipV)
	1217	+ gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
	1218	+ else
	1219	+ gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1220	+ //System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
	1221	+ gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1222	+
	1223	+ count2 += 2;
	1224	+ count3 += 3;
	1225	+ for (int j = 0; j < strips[i] - 2; j++)
	1226	+ {
	1227	+ //gl.glTexCoord2d(...);
	1228	+ if (!selectmode)
	1229	+ {
	1230	+ if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
	1231	+ {
	1232	+ gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1233	+ } else
	1234	+ {
	1235	+ gl.glNormal3f(0, 0, 1);
	1236	+ }
	1237	+ if (c != null)
	1238	+ {
	1239	+ gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
	1240	+ }
	1241	+ }
	1242	+
	1243	+ if (flipV)
	1244	+ gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
	1245	+ else
	1246	+ gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1247	+ //System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
	1248	+ gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1249	+ count2 += 2;
	1250	+ count3 += 3;
	1251	+ }
	1252	+
	1253	+ gl.glEnd();
	1254	+ }
	1255	+ }
	1256	+
	1257	+ assert count3 == v.length;
	1258	+ }
	1259	+ else // !trimmed
	1260	+ {
	1261	+ int count = 0;
	1262	+ for (int i = 0; i < strips.length; i++)
	1263	+ {
	1264	+ gl.glBegin(gl.GL_TRIANGLE_STRIP);
	1265	+
	1266	+ Vertex p = bRep.GetVertex(bRep.indices[count++]);
	1267	+ Vertex q = bRep.GetVertex(bRep.indices[count++]);
	1268	+
	1269	+ drawVertex(gl, p, flipV, selectmode);
	1270	+ drawVertex(gl, q, flipV, selectmode);
	1271	+
	1272	+ for (int j = 0; j < strips[i] - 2; j++)
	1273	+ {
	1274	+ Vertex r = bRep.GetVertex(bRep.indices[count++]);
	1275	+
	1276	+ // if (j%2 == 0)
	1277	+ // drawFace(p, q, r, display, null);
	1278	+ // else
	1279	+ // drawFace(p, r, q, display, null);
	1280	+
	1281	+ // p = q;
	1282	+ // q = r;
	1283	+ drawVertex(gl, r, flipV, selectmode);
	1284	+ }
	1285	+
	1286	+ gl.glEnd();
	1287	+ }
	1288	+ }
	1289	+ }
	1290	+
	1291	+ static cSpring.Point3D temp = new cSpring.Point3D();
	1292	+ static cSpring.Point3D temp2 = new cSpring.Point3D();
	1293	+ static cSpring.Point3D temp3 = new cSpring.Point3D();
	1294	+
	1295	+ public void DrawDynamicMesh(cMesh mesh)
	1296	+ {
	1297	+ GL gl = GetGL(); // getGL();
	1298	+
	1299	+ cSpring.PhysicsController3D Phys = mesh.Phys;
	1300	+
	1301	+ gl.glDisable(gl.GL_LIGHTING);
	1302	+
	1303	+ gl.glLineWidth(1);
	1304	+ gl.glColor3f(1,1,1);
	1305	+ gl.glBegin(gl.GL_LINES);
	1306	+ double scale = 0;
	1307	+ int count = 0;
	1308	+ for (int s=0; s<Phys.allSprings.size(); s++)
	1309	+ {
	1310	+ cSpring.Spring spring = Phys.allSprings.get(s);
	1311	+ if(s == 0)
	1312	+ {
	1313	+ //System.out.println(" spring : " + spring.a.position + "; " + spring.b.position);
	1314	+ }
	1315	+ if (mesh.showsprings)
	1316	+ {
	1317	+ temp.set(spring.a.position);
	1318	+ temp.add(spring.b.position);
	1319	+ temp.mul(0.5);
	1320	+ temp2.set(spring.a.position);
	1321	+ temp2.sub(spring.b.position);
	1322	+ temp2.mul(spring.restLength/2);
	1323	+ temp.sub(temp2);
	1324	+ gl.glVertex3f((float)temp.x, (float)temp.y, (float)temp.z);
	1325	+ temp.add(temp2);
	1326	+ temp.add(temp2);
	1327	+ gl.glVertex3f((float)temp.x, (float)temp.y, (float)temp.z);
	1328	+ }
	1329	+
	1330	+ if (spring.isHandle)
	1331	+ continue;
	1332	+
	1333	+ //if (scale < spring.restLength)
	1334	+ scale += spring.restLength;
	1335	+ count++;
	1336	+ }
	1337	+ gl.glEnd();
	1338	+
	1339	+ if (count == 0)
	1340	+ scale = 0.01;
	1341	+ else
	1342	+ scale /= count * 3;
	1343	+
	1344	+ //scale = 0.25;
	1345	+
	1346	+ if (mesh.ShowInfo())
	1347	+ {
	1348	+ gl.glLineWidth(4);
	1349	+ for (int s=0; s<Phys.allNodes.size(); s++)
	1350	+ {
	1351	+ cSpring.DynamicNode node = Phys.allNodes.get(s);
	1352	+ if (node.mass == 0)
	1353	+ continue;
	1354	+
	1355	+ int i = node.springs==null?-1:node.springs.size();
	1356	+ gl.glColor3f((i>>2)&1,(i>>1)&1,i&1);
	1357	+ //temp.set(node.springForce.x, node.springForce.y, node.springForce.z);
	1358	+ //temp.normalize();
	1359	+ //gl.glColor3d((temp.x+1)/2, (temp.y+1)/2, (temp.z+1)/2);
	1360	+ gl.glBegin(gl.GL_LINES);
	1361	+ gl.glVertex3d(node.position.x, node.position.y, node.position.z);
	1362	+ //gl.glVertex3d(node.position.x + node.normal.xscale, node.position.y + node.normal.yscale, node.position.z + node.normal.z*scale);
	1363	+ gl.glVertex3d(node.position.x + mesh.bRep.GetVertex(s).norm.x*scale,
	1364	+ node.position.y + mesh.bRep.GetVertex(s).norm.y*scale,
	1365	+ node.position.z + mesh.bRep.GetVertex(s).norm.z*scale);
	1366	+ gl.glEnd();
	1367	+ }
	1368	+
	1369	+ gl.glLineWidth(8);
	1370	+ for (int s=0; s<Phys.allNodes.size(); s++)
	1371	+ {
	1372	+ cSpring.DynamicNode node = Phys.allNodes.get(s);
	1373	+
	1374	+ if (node.springs != null)
	1375	+ {
	1376	+ for (int i=0; i<node.springs.size(); i+=1)
	1377	+ {
	1378	+ cSpring.DynamicNode f = node.springs.get(i).GetOther(node);
	1379	+
	1380	+ int c = i+1;
	1381	+ // c = node.springs.get(i).nbcopies;
	1382	+
	1383	+ gl.glColor3f((c>>2)&1,(c>>1)&1,c&1);
	1384	+ gl.glBegin(gl.GL_LINES);
	1385	+ gl.glVertex3d(node.position.x, node.position.y, node.position.z);
	1386	+ 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);
	1387	+ gl.glEnd();
	1388	+ }
	1389	+ }
	1390	+ }
	1391	+
	1392	+ gl.glLineWidth(1);
	1393	+ }
	1394	+
	1395	+ gl.glEnable(gl.GL_LIGHTING);
	1396	+ }
	1397	+
	1398	+ /// INTERFACE
	1399	+
	1400	+ public void StartTriangles()
	1401	+ {
	1402	+ javax.media.opengl.GL gl = GetGL();
	1403	+ gl.glBegin(gl.GL_TRIANGLES);
	1404	+ }
	1405	+
	1406	+ public void EndTriangles()
	1407	+ {
	1408	+ GetGL().glEnd();
	1409	+ }
	1410	+
	1411	+ void drawVertex(javax.media.opengl.GL gl, Vertex pv, boolean flipV, boolean selectmode)
	1412	+ {
	1413	+ if (!selectmode)
	1414	+ {
	1415	+ gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
	1416	+ gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
	1417	+
	1418	+ if (flipV)
	1419	+ gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
	1420	+ else
	1421	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	1422	+ }
	1423	+
	1424	+ gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
	1425	+ }
	1426	+
	1427	+ void SetColor(Object3D obj, Vertex p0)
	1428	+ {
	1429	+ CameraPane display = this;
	1430	+ BoundaryRep bRep = obj.bRep;
	1431	+
	1432	+ if (RENDERPROGRAM == 0)
	1433	+ {
	1434	+ float r = 0;
	1435	+ if (bRep != null)
	1436	+ {
	1437	+ if (bRep.stripified)
	1438	+ {
	1439	+ r = 1;
	1440	+ }
	1441	+ }
	1442	+ float g = 0;
	1443	+ if (bRep != null)
	1444	+ {
	1445	+ if (bRep.trimmed)
	1446	+ {
	1447	+ g = 1;
	1448	+ }
	1449	+ }
	1450	+ float b = 0;
	1451	+ if (obj.support != null && obj.link2master)
	1452	+ {
	1453	+ b = 1;
	1454	+ }
	1455	+ display.GetGL().glColor3f(rp0.AO, gp0.AO, b*p0.AO);
	1456	+ return;
	1457	+ }
	1458	+
	1459	+ if (display.DrawMode() != CameraPane.SHADOW)
	1460	+ return;
	1461	+
	1462	+ javax.media.opengl.GL gl = display.GetGL();
	1463	+// if (true) return;
	1464	+// float ao = p.AO;
	1465	+//
	1466	+// // if (ao == 0 && !bRep.AOdone) // transient problem!
	1467	+// // ao = 1;
	1468	+//
	1469	+// gl.glColor4f(ao, ao, ao, 1);
	1470	+
	1471	+// CameraPane.selectedpoint.
	1472	+// getAverage(cStatic.point1, true);
	1473	+ if (CameraPane.pointflow == null) // !random) // live)
	1474	+ {
	1475	+ return;
	1476	+ }
	1477	+
	1478	+ cStatic.point1.set(0,0,0);
	1479	+ LA.xformPos(cStatic.point1, CameraPane.selectedpoint.toParent, cStatic.point1);
	1480	+
	1481	+ cStatic.point1.sub(p0);
	1482	+
	1483	+
	1484	+// if (marked && (p0.vertexlinks == null \|\| support == null \|\| support.bRep == null)) // no position delta?
	1485	+// {
	1486	+// return;
	1487	+// }
	1488	+
	1489	+ //if (true)
	1490	+ if (cStatic.point1.dot(cStatic.point1) > 0.000001)
	1491	+ {
	1492	+ return;
	1493	+ }
	1494	+
	1495	+ float[] colorV = new float[3];
	1496	+
	1497	+ if (false) // marked)
	1498	+ {
	1499	+ // debug rigging weights
	1500	+ for (int object = 0; object < p0.vertexlinks.length; object++)
	1501	+ {
	1502	+ float weight = p0.weights[object] / p0.totalweight;
	1503	+
	1504	+ // if (weight < 0.1)
	1505	+ // {
	1506	+ // assert(weight == 0);
	1507	+ // continue;
	1508	+ // }
	1509	+
	1510	+ if (p0.vertexlinks[object] == -1)
	1511	+ continue;
	1512	+
	1513	+ Vertex q = obj.support.bRep.GetVertex(p0.vertexlinks[object]);
	1514	+
	1515	+ int color = //1 << object; //
	1516	+ //p.vertexlinks.length;
	1517	+ obj.support.bRep.supports[p0.closestsupport].links[object];
	1518	+ colorV[2] += (color & 1) * weight;
	1519	+ colorV[1] += ((color & 2) >> 1) * weight;
	1520	+ colorV[0] += ((color & 4) >> 2) * weight;
	1521	+ }
	1522	+ }
	1523	+ else
	1524	+ {
	1525	+ if (obj.drawingstarted)
	1526	+ {
	1527	+ // find next point
	1528	+ if (bRep.GetVertex(0).faceindices == null)
	1529	+ {
	1530	+ bRep.InitFaceIndices();
	1531	+ }
	1532	+
	1533	+ double ymin = p0.y;
	1534	+
	1535	+ Vertex newp = p0;
	1536	+
	1537	+ for (int fii = 0; fii < p0.faceindices.length; fii++)
	1538	+ {
	1539	+ int fi = p0.faceindices[fii];
	1540	+
	1541	+ if (fi == -1)
	1542	+ break;
	1543	+
	1544	+ Face f = bRep.GetFace(fi);
	1545	+
	1546	+ Vertex p = bRep.GetVertex(f.p);
	1547	+ Vertex q = bRep.GetVertex(f.q);
	1548	+ Vertex r = bRep.GetVertex(f.r);
	1549	+
	1550	+ int swap = (int)(Math.random()*3);
	1551	+
	1552	+// for (int s=swap; --s>=0;)
	1553	+// {
	1554	+// Vertex t = p;
	1555	+// p = q;
	1556	+// q = r;
	1557	+// r = t;
	1558	+// }
	1559	+ if (ymin > p.y)
	1560	+ {
	1561	+ ymin = p.y;
	1562	+ newp = p;
	1563	+// break;
	1564	+ }
	1565	+ if (ymin > q.y)
	1566	+ {
	1567	+ ymin = q.y;
	1568	+ newp = q;
	1569	+// break;
	1570	+ }
	1571	+ if (ymin > r.y)
	1572	+ {
	1573	+ ymin = r.y;
	1574	+ newp = r;
	1575	+// break;
	1576	+ }
	1577	+ }
	1578	+
	1579	+ CameraPane.selectedpoint.toParent[3][0] = newp.x;
	1580	+ CameraPane.selectedpoint.toParent[3][1] = newp.y;
	1581	+ CameraPane.selectedpoint.toParent[3][2] = newp.z;
	1582	+
	1583	+ obj.drawingstarted = false;
	1584	+
	1585	+ // return;
	1586	+ }
	1587	+
	1588	+ if (false) // CameraPane.DRAW
	1589	+ {
	1590	+ p0.AO = colorV[0] = 2;
	1591	+ colorV[1] = 2;
	1592	+ colorV[2] = 2;
	1593	+ }
	1594	+
	1595	+ CameraPane.pointflow.add(p0);
	1596	+ CameraPane.pointflow.Touch();
	1597	+ }
	1598	+
	1599	+// gl.glColor3f(colorV[0], colorV[1], colorV[2]);
	1600	+// gl.glMaterialfv(gl.GL_FRONT, gl.GL_DIFFUSE, colorV, 0);
	1601	+// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
	1602	+ }
	1603	+
	1604	+ void DrawMaterial(cMaterial material, boolean selected)
	1605	+ {
	1606	+ CameraPane display = this;
	1607	+ //new Exception().printStackTrace();
	1608	+
	1609	+ if (display.IsFrozen() && !selected \|\| display.IsAmbientOcclusionOn()) // \|\| display.drawMode == display.SHADOW)
	1610	+ {
	1611	+ return;
	1612	+ }
	1613	+
	1614	+ javax.media.opengl.GL gl = display.GetGL();
	1615	+
	1616	+ //Color col = Color.getHSBColor(color,modulation,1);
	1617	+ //col.getColorComponents(ColorSpace.getInstance(ColorSpace.CS_LINEAR_RGB), CameraPane.modelParams0);
	1618	+ if (!material.multiply)
	1619	+ {
	1620	+ display.color = material.color;
	1621	+ display.saturation = material.modulation;
	1622	+ }
	1623	+ else
	1624	+ {
	1625	+ display.color = material.color2;
	1626	+ display.saturation = material.modulation2;
	1627	+ }
	1628	+
	1629	+ cColor.HSBtoRGB(display.color, display.saturation, 1, display.modelParams0);
	1630	+
	1631	+ float[] colorV = GrafreeD.colorV;
	1632	+
	1633	+ /**/
	1634	+ if (display.DrawMode() == display.DEFAULT) // && display.RENDERPROGRAM == 0)
	1635	+ {
	1636	+ colorV[0] = display.modelParams0[0] * material.diffuse;
	1637	+ colorV[1] = display.modelParams0[1] * material.diffuse;
	1638	+ colorV[2] = display.modelParams0[2] * material.diffuse;
	1639	+ colorV[3] = material.opacity;
	1640	+
	1641	+ gl.glColor4f(colorV[0], colorV[1], colorV[2], material.opacity);
	1642	+ //System.out.println("Opacity = " + opacity);
	1643	+
	1644	+ gl.glMaterialfv(gl.GL_FRONT, gl.GL_DIFFUSE, colorV, 0);
	1645	+ //color[0] /= 2; color[1] /= 2; color[2] /= 2;
	1646	+ gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
	1647	+
	1648	+ float amb = material.ambient;
	1649	+ if (amb < material.cameralight)
	1650	+ {
	1651	+ amb = material.cameralight;
	1652	+ }
	1653	+ colorV[0] = display.modelParams0[0] * material.diffuse * amb;
	1654	+ colorV[1] = display.modelParams0[1] * material.diffuse * amb;
	1655	+ colorV[2] = display.modelParams0[2] * material.diffuse * amb;
	1656	+ gl.glMaterialfv(gl.GL_FRONT, gl.GL_AMBIENT, colorV, 0);
	1657	+ //color[0] /= 2; color[1] /= 2; color[2] /= 2;
	1658	+ gl.glMaterialfv(gl.GL_BACK, gl.GL_AMBIENT, colorV, 0);
	1659	+
	1660	+ /**/
	1661	+ colorV[0] = ((1 - material.metalness) + display.modelParams0[0] * material.metalness) * material.specular;
	1662	+ colorV[1] = ((1 - material.metalness) + display.modelParams0[1] * material.metalness) * material.specular;
	1663	+ colorV[2] = ((1 - material.metalness) + display.modelParams0[2] * material.metalness) * material.specular;
	1664	+ gl.glMaterialfv(gl.GL_FRONT, gl.GL_SPECULAR, colorV, 0);
	1665	+ //color[0] /= 2; color[1] /= 2; color[2] /= 2;
	1666	+ gl.glMaterialfv(gl.GL_BACK, gl.GL_SPECULAR, colorV, 0);
	1667	+ colorV[0] = 10 / material.shininess; // 1/0.005f;
	1668	+ //System.out.println("shininess = " + colorV[0]);
	1669	+ if (colorV[0] > 128)
	1670	+ {
	1671	+ colorV[0] = 128;
	1672	+ }
	1673	+ gl.glMaterialfv(gl.GL_FRONT, gl.GL_SHININESS, colorV, 0);
	1674	+ gl.glMaterialfv(gl.GL_BACK, gl.GL_SHININESS, colorV, 0);
	1675	+ /**/
	1676	+ }
	1677	+ /**/
	1678	+
	1679	+ //selected = false;
	1680	+ selected = selected && display.flash;
	1681	+
	1682	+ //display.modelParams0[0] = 0; // pigment.r;
	1683	+ //display.modelParams0[1] = 0; // pigment.g;
	1684	+ //display.modelParams0[2] = 0; // pigment.b;
	1685	+ if (!material.multiply)
	1686	+ {
	1687	+ display.modelParams0[3] = material.metalness;
	1688	+ display.modelParams1[0] = material.diffuse;
	1689	+ display.modelParams1[1] = material.specular;
	1690	+ display.modelParams1[2] = 1 / material.shininess;
	1691	+ display.modelParams1[3] = material.shift;
	1692	+ display.modelParams2[0] = material.ambient;
	1693	+ display.modelParams2[1] = material.lightarea;
	1694	+ //System.out.println("light area = " + lightarea);
	1695	+ display.modelParams2[2] = 1 / material.factor; // diffuseness
	1696	+ display.modelParams2[3] = material.velvet;
	1697	+ display.modelParams3[0] = material.sheen;
	1698	+ display.modelParams3[1] = material.subsurface;
	1699	+ display.modelParams3[2] = material.bump; // backlit
	1700	+ display.modelParams3[3] = material.aniso;
	1701	+ display.modelParams4[0] = material.anisoV;
	1702	+ display.modelParams4[1] = selected ? 100 : material.cameralight;
	1703	+ //System.out.println("selected = " + selected);
	1704	+ display.modelParams4[2] = material.diffuseness;
	1705	+ display.modelParams4[3] = material.shadow;
	1706	+ display.modelParams5[0] = material.texture;
	1707	+ display.modelParams5[1] = material.opacity;
	1708	+ display.modelParams5[2] = material.fakedepth;
	1709	+ display.modelParams5[3] = CameraPane.SHADOWCULLFACE ? 0f : (material.shadowbias - 0.005f) / 10;
	1710	+ }
	1711	+ else
	1712	+ {
	1713	+ display.modelParams0[3] = material.metalness2;
	1714	+ display.modelParams1[0] = material.diffuse2;
	1715	+ display.modelParams1[1] = material.specular2;
	1716	+ display.modelParams1[2] = material.shininess2;
	1717	+ display.modelParams1[3] = material.shift2;
	1718	+ display.modelParams2[0] = material.ambient2;
	1719	+ display.modelParams2[1] = material.lightarea2;
	1720	+ display.modelParams2[2] = material.factor2;
	1721	+ display.modelParams2[3] = material.velvet2;
	1722	+ display.modelParams3[0] = material.sheen2;
	1723	+ display.modelParams3[1] = material.subsurface2;
	1724	+ display.modelParams3[2] = material.bump2;
	1725	+ display.modelParams3[3] = material.aniso2;
	1726	+ display.modelParams4[0] = material.anisoV2;
	1727	+ display.modelParams4[1] = material.cameralight2;
	1728	+ //System.out.println("selected = " + selected);
	1729	+ display.modelParams4[2] = material.diffuseness2;
	1730	+ display.modelParams4[3] = material.shadow2;
	1731	+ display.modelParams5[0] = material.texture2;
	1732	+ display.modelParams5[1] = material.opacity2;
	1733	+ display.modelParams5[2] = material.fakedepth2;
	1734	+ display.modelParams5[3] = material.shadowbias2;
	1735	+ }
	1736	+
	1737	+ display.modelParams6[0] = 0;
	1738	+ display.modelParams6[1] = 0;
	1739	+ display.modelParams6[2] = 0;
	1740	+ display.modelParams6[3] = 0;
	1741	+
	1742	+ display.modelParams7[0] = 0;
	1743	+ display.modelParams7[1] = 1000;
	1744	+ display.modelParams7[2] = 0;
	1745	+ display.modelParams7[3] = 0;
	1746	+
	1747	+ display.modelParams6[0] = 100; // criss de bug de bump
	1748	+
	1749	+ Object3D.cVector2[] extparams = display.vector2buffer;
	1750	+ if (extparams != null && extparams.length > 0 && extparams[0] != null)
	1751	+ {
	1752	+ display.modelParams6[0] = extparams[0].x / 1000.0f; // bump
	1753	+ display.modelParams6[1] = extparams[0].y / 1000.0f; // noise
	1754	+ if (extparams.length > 1)
	1755	+ {
	1756	+ display.modelParams6[2] = extparams[1].x / 1000.0f; // borderfade
	1757	+ display.modelParams6[3] = extparams[1].y / 1000.0f; // (float)Math.exp(-extparams[1].y / 1000.0f); // fog punchthrough
	1758	+ if (extparams.length > 2)
	1759	+ {
	1760	+ display.modelParams7[0] = extparams[2].x / 1000.0f; // noise power
	1761	+ float x = extparams[2].y / 1000.0f;
	1762	+ //if (x == 0)
	1763	+ // x = 1f;
	1764	+ 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
	1765	+ if (extparams[2].y > 0)
	1766	+ {
	1767	+ //System.out.println("extparams[1].y = " + extparams[1].y);
	1768	+ //System.out.println("extparams[2].y = " + extparams[2].y);
	1769	+ //System.out.println("opacity power = " + display.modelParams7[1]);
	1770	+ }
	1771	+ }
	1772	+ }
	1773	+ }
	1774	+
	1775	+ //if (display.modelParams6[2] != 0)
	1776	+ /*
	1777	+ System.out.println("modelParams0[0] = " + display.modelParams0[0]);
	1778	+ System.out.println("modelParams0[1] = " + display.modelParams0[1]);
	1779	+ System.out.println("modelParams0[2] = " + display.modelParams0[2]);
	1780	+ System.out.println("modelParams0[3] = " + display.modelParams0[3]);
	1781	+ System.out.println("modelParams1[0] = " + display.modelParams1[0]);
	1782	+ System.out.println("modelParams1[1] = " + display.modelParams1[1]);
	1783	+ System.out.println("modelParams1[2] = " + display.modelParams1[2]);
	1784	+ System.out.println("modelParams1[3] = " + display.modelParams1[3]);
	1785	+ System.out.println("modelParams2[0] = " + display.modelParams2[0]);
	1786	+ System.out.println("modelParams2[1] = " + display.modelParams2[1]);
	1787	+ System.out.println("modelParams2[2] = " + display.modelParams2[2]);
	1788	+ System.out.println("modelParams2[3] = " + display.modelParams2[3]);
	1789	+ System.out.println("modelParams3[0] = " + display.modelParams3[0]);
	1790	+ System.out.println("modelParams3[1] = " + display.modelParams3[1]);
	1791	+ System.out.println("modelParams3[2] = " + display.modelParams3[2]);
	1792	+ System.out.println("modelParams3[3] = " + display.modelParams3[3]);
	1793	+ System.out.println("modelParams4[0] = " + display.modelParams4[0]);
	1794	+ System.out.println("modelParams4[1] = " + display.modelParams4[1]);
	1795	+ System.out.println("modelParams4[2] = " + display.modelParams4[2]);
	1796	+ System.out.println("modelParams4[3] = " + display.modelParams4[3]);
	1797	+ System.out.println("modelParams5[0] = " + display.modelParams5[0]);
	1798	+ System.out.println("modelParams5[1] = " + display.modelParams5[1]);
	1799	+ System.out.println("modelParams5[2] = " + display.modelParams5[2]);
	1800	+ System.out.println("modelParams5[3] = " + display.modelParams5[3]);
	1801	+ System.out.println("modelParams6[0] = " + display.modelParams6[0]);
	1802	+ System.out.println("modelParams6[1] = " + display.modelParams6[1]);
	1803	+ System.out.println("modelParams6[2] = " + display.modelParams6[2]);
	1804	+ System.out.println("modelParams6[3] = " + display.modelParams6[3]);
	1805	+ System.out.println("modelParams7[0] = " + display.modelParams7[0]);
	1806	+ System.out.println("modelParams7[1] = " + display.modelParams7[1]);
	1807	+ System.out.println("modelParams7[2] = " + display.modelParams7[2]);
	1808	+ System.out.println("modelParams7[3] = " + display.modelParams7[3]);
	1809	+ /**/
	1810	+ //assert (display.modelParams6[2] == 0);
	1811	+
	1812	+ //System.out.println("noise power = " + display.modelParams7[0]);
	1813	+ //System.out.println("shadowbias = " + shadowbias);
	1814	+
	1815	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 0, display.modelParams0, 0);
	1816	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 1, display.modelParams1, 0);
	1817	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 2, display.modelParams2, 0);
	1818	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 3, display.modelParams3, 0);
	1819	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 4, display.modelParams4, 0);
	1820	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 5, display.modelParams5, 0);
	1821	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 6, display.modelParams6, 0);
	1822	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 7, display.modelParams7, 0);
	1823	+
	1824	+ int mode = display.FP_SHADER;
	1825	+
	1826	+ if (material.aniso != material.anisoV \|\| material.aniso > 0.002)
	1827	+ {
	1828	+ mode \|= display.FP_ANISO;
	1829	+ }
	1830	+
	1831	+ display.EnableProgram(mode);
	1832	+
	1833	+ //System.out.println("opacity power = " + display.modelParams7[1]);
	1834	+
	1835	+ if (!material.multiply)
	1836	+ {
	1837	+ if (Globals.drawMode == CameraPane.SHADOW)
	1838	+ gl.glDepthMask(material.opacity >= 0.9 && display.modelParams7[1] > 0.1);
	1839	+ else
	1840	+ gl.glDepthMask(material.opacity >= 0.99);
	1841	+ }
208	1842	}
209	1843
210	1844	int matrixdepth = 0; // 10000; // CONFLICT WITH cMESH... WARNING WARNING WARNING WARNING WARNING WARNING !!!!!!!!!!!! 0;
..	..	@@ -225,10 +1859,10 @@
225	1859	currentGL.glMultMatrixd(model, 0);
226	1860	}
227	1861
228		- void PushMatrix(double[][] matrix, int count)
	1862	+ public void PushMatrix(double[][] matrix, int count) // INTERFACE
229	1863	{
230	1864	matrixdepth++;
231		- // GraphreeD.tracein(matrix);
	1865	+ // GrafreeD.tracein(matrix);
232	1866	if (matrix == null)
233	1867	return; // Identity
234	1868
..	..	@@ -253,13 +1887,13 @@
253	1887
254	1888	void PushMatrix(double[][] matrix)
255	1889	{
256		- // GraphreeD.tracein(matrix);
	1890	+ // GrafreeD.tracein(matrix);
257	1891	PushMatrix(matrix,1);
258	1892	}
259	1893
260	1894	void PushMatrix()
261	1895	{
262		- // GraphreeD.tracein(null);
	1896	+ // GrafreeD.tracein(null);
263	1897	if (matrixdepth++ < MAXSTACK - 1)
264	1898	{
265	1899	currentGL.glPushMatrix();
..	..	@@ -270,11 +1904,11 @@
270	1904
271	1905	double[][] tmpmat = new double[4][4];
272	1906
273		- void PopMatrix(double[][] inverse)
	1907	+ public void PopMatrix(double[][] inverse) // INTERFACE
274	1908	{
275	1909	--matrixdepth;
276	1910
277		- // GraphreeD.traceout(inverse);
	1911	+ // GrafreeD.traceout(inverse);
278	1912	if (inverse == null)
279	1913	return; // Identity
280	1914
..	..	@@ -292,7 +1926,7 @@
292	1926
293	1927	void PopMatrix()
294	1928	{
295		- // GraphreeD.traceout(null);
	1929	+ // GrafreeD.traceout(null);
296	1930	// inverse == null??
297	1931	if (--matrixdepth < MAXSTACK - 1)
298	1932	{
..	..	@@ -310,7 +1944,7 @@
310	1944	PushTextureMatrix(matrix, 1);
311	1945	}
312	1946
313		- void PushTextureMatrix(double[][] matrix, int count)
	1947	+ public void PushTextureMatrix(double[][] matrix, int count) // INTERFACE
314	1948	{
315	1949	currentGL.glActiveTexture(GetGL().GL_TEXTURE0);
316	1950
..	..	@@ -324,7 +1958,7 @@
324	1958	currentGL.glMatrixMode(GetGL().GL_MODELVIEW);
325	1959	}
326	1960
327		- void PopTextureMatrix(double[][] inverse)
	1961	+ public void PopTextureMatrix(double[][] inverse) // INTERFACE
328	1962	{
329	1963	currentGL.glActiveTexture(GetGL().GL_TEXTURE0);
330	1964	currentGL.glMatrixMode(GetGL().GL_TEXTURE);
..	..	@@ -351,15 +1985,15 @@
351	1985
352	1986	static int camerachangeframe;
353	1987
354		- boolean SetCamera(Camera cam)
	1988	+ public boolean SetCamera(Camera cam)
355	1989	{
356	1990	// may 2014 if (cam == cameras[0] \|\| cam == cameras[1])
357	1991	// return false;
358	1992
359		- if (REFUSEMODE && isLIVE() && camerachangeframe != 0 && camerachangeframe != framecount)
	1993	+ if (REFUSEMODE && Globals.isLIVE() && camerachangeframe != 0 && camerachangeframe != Globals.framecount)
360	1994	{
361	1995	// check for last change
362		- if (framecount < camerachangeframe + 400) // 120 == 1 second
	1996	+ if (Globals.framecount < camerachangeframe + 400) // 120 == 1 second
363	1997	{
364	1998	// refuse the camera change
365	1999	System.err.println("Camera " + cam + " REFUSED");
..	..	@@ -367,7 +2001,7 @@
367	2001	}
368	2002	}
369	2003
370		- camerachangeframe = framecount;
	2004	+ camerachangeframe = Globals.framecount;
371	2005
372	2006	cam.hAspect = -1; // Read only
373	2007
..	..	@@ -398,7 +2032,7 @@
398	2032	{
399	2033	//System.err.println("Oeil on");
400	2034	TRACK = true;
401		-// JUNE 2014 if (TRACK && trackedobject != null && drawMode == SHADOW) // && !lightMode)
	2035	+// JUNE 2014 if (TRACK && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
402	2036	// object.editWindow.ScreenFit(trackedobject);
403	2037	//pingthread.StepToTarget(true);
404	2038	}
..	..	@@ -407,7 +2041,7 @@
407	2041	{
408	2042	//System.err.println("Oeil on");
409	2043	OEIL = true;
410		- if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && drawMode == SHADOW) // && !lightMode)
	2044	+ if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
411	2045	object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
412	2046	//pingthread.StepToTarget(true);
413	2047	}
..	..	@@ -471,39 +2105,12 @@
471	2105	{
472	2106	frozen ^= true;
473	2107	// Weird...
474		- lighttouched = true;
	2108	+ Globals.lighttouched = true;
475	2109	}
476	2110
477	2111	void ToggleDL()
478	2112	{
479	2113	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	2114	}
508	2115
509	2116	void ToggleFullScreen()
..	..	@@ -513,12 +2120,7 @@
513	2120
514	2121	void ToggleCrowd()
515	2122	{
516		- CROWD ^= true;
517		- }
518		-
519		- void ToggleInertia()
520		- {
521		- INERTIA ^= true;
	2123	+ Globals.CROWD ^= true;
522	2124	}
523	2125
524	2126	void ToggleLocal()
..	..	@@ -526,62 +2128,89 @@
526	2128	LOCALTRANSFORM ^= true;
527	2129	}
528	2130
529		- void ToggleFast()
	2131	+ public void ToggleTexture()
	2132	+ {
	2133	+ textureon ^= true;
	2134	+ }
	2135	+
	2136	+ public void ToggleLive()
	2137	+ {
	2138	+ Globals.setLIVE(Globals.isLIVE() ^ true);
	2139	+
	2140	+ System.err.println("LIVE = " + Globals.isLIVE());
	2141	+
	2142	+ if (!Globals.isLIVE()) // save sound
	2143	+ GrafreeD.savesound = true; // wav.save();
	2144	+ // else
	2145	+ repaint(); // start loop // may 2013
	2146	+ }
	2147	+
	2148	+ public void ToggleSupport()
	2149	+ {
	2150	+ SUPPORT ^= true;
	2151	+ }
	2152	+
	2153	+ public void ToggleAbort()
	2154	+ {
	2155	+ ABORTMODE ^= true;
	2156	+ }
	2157	+
	2158	+ public void ToggleInertia()
	2159	+ {
	2160	+ INERTIA ^= true;
	2161	+ }
	2162	+
	2163	+ public void ToggleFast()
530	2164	{
531	2165	FAST ^= true;
532	2166	}
533	2167
534		- void ToggleSlowPose()
	2168	+ public void ToggleSlowPose()
535	2169	{
536	2170	SLOWPOSE ^= true;
537	2171	}
538	2172
539		- void ToggleFootContact()
540		- {
541		- FOOTCONTACT ^= true;
542		- }
543		-
544		- void ToggleBoxMode()
	2173	+ public void ToggleBoxMode()
545	2174	{
546	2175	BOXMODE ^= true;
547	2176	}
548	2177
549		- void ToggleSmoothFocus()
	2178	+ public void ToggleZoomBoxMode()
	2179	+ {
	2180	+ ZOOMBOXMODE ^= true;
	2181	+ }
	2182	+
	2183	+ public void ToggleSmoothFocus()
550	2184	{
551	2185	SMOOTHFOCUS ^= true;
552	2186	}
553	2187
554		- void ToggleImageFlip()
	2188	+ public void ToggleImageFlip()
555	2189	{
556	2190	IMAGEFLIP ^= true;
557	2191	}
558	2192
559		- void ToggleSpeakerMocap()
	2193	+ public void ToggleSpeakerMocap()
560	2194	{
561	2195	SPEAKERMOCAP ^= true;
562	2196	}
563	2197
564		- void ToggleSpeakerCamera()
	2198	+ public void ToggleSpeakerCamera()
565	2199	{
566	2200	SPEAKERCAMERA ^= true;
567	2201	}
568	2202
569		- void ToggleSpeakerFocus()
	2203	+ public void ToggleSpeakerFocus()
570	2204	{
571	2205	SPEAKERFOCUS ^= true;
572	2206	}
573	2207
574		- void ToggleDebug()
575		- {
576		- DEBUG ^= true;
577		- }
578		-
579		- void ToggleFrustum()
	2208	+ public void ToggleFrustum()
580	2209	{
581	2210	FRUSTUM ^= true;
582	2211	}
583	2212
584		- void ToggleTrack()
	2213	+ public void ToggleTrack()
585	2214	{
586	2215	TRACK ^= true;
587	2216	if (TRACK)
..	..	@@ -600,25 +2229,35 @@
600	2229	repaint();
601	2230	}
602	2231
603		- void ToggleTrackOnce()
	2232	+ public void ToggleTrackOnce()
604	2233	{
605	2234	TRACKONCE ^= true;
606	2235	}
607	2236
608		- void ToggleShadowTrack()
	2237	+ public void ToggleShadowTrack()
609	2238	{
610	2239	SHADOWTRACK ^= true;
611	2240	repaint();
612	2241	}
613	2242
614		- void ToggleOeil()
	2243	+ public void ToggleOeil()
615	2244	{
616	2245	OEIL ^= true;
617	2246	}
618	2247
619		- void ToggleOeilOnce()
	2248	+ public void ToggleOeilOnce()
620	2249	{
621	2250	OEILONCE ^= true;
	2251	+ }
	2252	+
	2253	+ void ToggleFootContact()
	2254	+ {
	2255	+ FOOTCONTACT ^= true;
	2256	+ }
	2257	+
	2258	+ void ToggleDebug()
	2259	+ {
	2260	+ DEBUG ^= true;
622	2261	}
623	2262
624	2263	void ToggleLookAt()
..	..	@@ -628,7 +2267,7 @@
628	2267
629	2268	void ToggleRandom()
630	2269	{
631		- RANDOM ^= true;
	2270	+ SWITCH ^= true;
632	2271	}
633	2272
634	2273	void ToggleHandles()
..	..	@@ -672,34 +2311,6 @@
672	2311	//assert (cam.hAspect == 0);
673	2312	cam.hAspect = 0;
674	2313	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	2314	}
704	2315
705	2316	private static void ApplyTransform(GL gl, Mat4f xform)
..	..	@@ -759,7 +2370,7 @@
759	2370
760	2371	GL currentGL;
761	2372
762		- GL GetGL()
	2373	+ public GL GetGL() // INTERFACE
763	2374	{
764	2375	return currentGL;
765	2376	}
..	..	@@ -2000,10 +3611,12 @@
2000	3611	*/
2001	3612	TextureData ReduceTexture(TextureData texturedata, int resolution) // String name)
2002	3613	{
	3614	+ int pixelformat = texturedata.getPixelFormat();
	3615	+
2003	3616	int stride = 1;
2004		- if (texturedata.getPixelFormat() == GetGL().GL_RGB \|\| texturedata.getPixelFormat() == GetGL().GL_BGR) // \|\| texturedata.getPixelFormat() == GL.GL_LUMINANCE)
	3617	+ if (pixelformat == GetGL().GL_RGB \|\| pixelformat == GetGL().GL_BGR) // \|\| texturedata.getPixelFormat() == GL.GL_LUMINANCE)
2005	3618	stride = 3;
2006		- if (texturedata.getPixelFormat() == GetGL().GL_RGBA \|\| texturedata.getPixelFormat() == GetGL().GL_BGRA) // \|\| texturedata.getPixelFormat() == GL.GL_LUMINANCE_ALPHA)
	3619	+ if (pixelformat == GetGL().GL_RGBA \|\| pixelformat == GetGL().GL_BGRA) // \|\| texturedata.getPixelFormat() == GL.GL_LUMINANCE_ALPHA)
2007	3620	stride = 4;
2008	3621
2009	3622	int width = texturedata.getWidth();
..	..	@@ -2593,6 +4206,7 @@
2593	4206
2594	4207	com.sun.opengl.util.texture.Texture CompressTexture2(String name)
2595	4208	{
	4209	+ new Exception().printStackTrace();
2596	4210	System.exit(0);
2597	4211	com.sun.opengl.util.texture.Texture texture = null;
2598	4212
..	..	@@ -6269,7 +7883,7 @@
6269	7883	return null;
6270	7884	}
6271	7885
6272		- void ReleaseTextures(cTexture tex)
	7886	+ public void ReleaseTextures(cTexture tex) // INTERFACE
6273	7887	{
6274	7888	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
6275	7889	{
..	..	@@ -6307,7 +7921,7 @@
6307	7921
6308	7922	void ReleaseTexture(String tex, boolean bump)
6309	7923	{
6310		- if (// drawMode != 0 \|\| /tex == null \|\|/
	7924	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
6311	7925	ambientOcclusion ) // \|\| !textureon)
6312	7926	{
6313	7927	return;
..	..	@@ -6333,7 +7947,7 @@
6333	7947	{
6334	7948	bumpdepth--;
6335	7949
6336		- // GraphreeD.trace("POP " + tex + "(" + pigmentdepth + ")" + " : " + pigmentstack[pigmentdepth] + " vs " + texture);
	7950	+ // GrafreeD.trace("POP " + tex + "(" + pigmentdepth + ")" + " : " + pigmentstack[pigmentdepth] + " vs " + texture);
6337	7951	if (bumpstack[bumpdepth] != (texture!=null?texture.texture:null))
6338	7952	{
6339	7953	// assert (bumpstack[bumpdepth] == texture);
..	..	@@ -6363,7 +7977,7 @@
6363	7977	{
6364	7978	pigmentdepth--;
6365	7979
6366		- // GraphreeD.trace("POP " + tex + "(" + pigmentdepth + ")" + " : " + pigmentstack[pigmentdepth] + " vs " + texture);
	7980	+ // GrafreeD.trace("POP " + tex + "(" + pigmentdepth + ")" + " : " + pigmentstack[pigmentdepth] + " vs " + texture);
6367	7981	if (pigmentstack[pigmentdepth] != (texture!=null?texture.texture:null))
6368	7982	{
6369	7983	// assert (pigmentstack[pigmentdepth] == texture);
..	..	@@ -6408,9 +8022,9 @@
6408	8022	}
6409	8023	}
6410	8024
6411		- /boolean/ void BindTextures(cTexture tex, int resolution)
	8025	+ /boolean/ public void BindTextures(cTexture tex, int resolution) // INTERFACE
6412	8026	{
6413		- if (// drawMode != 0 \|\| /tex == null \|\|/
	8027	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
6414	8028	ambientOcclusion ) // \|\| !textureon)
6415	8029	{
6416	8030	return; // false;
..	..	@@ -6461,12 +8075,16 @@
6461	8075	{
6462	8076	String texname = tex;
6463	8077
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;
	8078	+// String[] split = tex.split("Textures");
	8079	+// if (split.length > 1)
	8080	+// texname = "/Users/nbriere/Textures" + split[split.length-1];
	8081	+// else
	8082	+// if (!texname.startsWith("/"))
	8083	+// texname = "/Users/nbriere/Textures/" + texname;
	8084	+ if (!new File(tex).exists())
	8085	+ {
	8086	+ texname = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory() + "/Textures/" + texname;
	8087	+ }
6470	8088
6471	8089	if (CACHETEXTURE)
6472	8090	texture = textures.get(texname); // TEXTURE CACHE
..	..	@@ -6694,19 +8312,19 @@
6694	8312
6695	8313	if (bump)
6696	8314	{
6697		- // GraphreeD.trace("PUSH BUMP " + tex + "(" + bumpdepth + ")" + " : " + texture);
	8315	+ // GrafreeD.trace("PUSH BUMP " + tex + "(" + bumpdepth + ")" + " : " + texture);
6698	8316	bumpstack[bumpdepth++] = texture!=null?texture.texture:null;
6699	8317	}
6700	8318	else
6701	8319	{
6702		- // GraphreeD.trace("PUSH PIGMENT " + tex + "(" + pigmentdepth + ")" + " : " + texture);
	8320	+ // GrafreeD.trace("PUSH PIGMENT " + tex + "(" + pigmentdepth + ")" + " : " + texture);
6703	8321	pigmentstack[pigmentdepth++] = texture!=null?texture.texture:null;
6704	8322	}
6705	8323
6706	8324	return texture!=null?texture.texture:null;
6707	8325	}
6708	8326
6709		- com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution)
	8327	+ public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution)
6710	8328	{
6711	8329	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
6712	8330
..	..	@@ -7310,9 +8928,9 @@
7310	8928	static boolean occlusionInitialized = false;
7311	8929	boolean selection = false;
7312	8930	boolean pointselection = false;
7313		- /static/ boolean lighttouched = true;
	8931	+ ///static/ boolean lighttouched = true;
7314	8932	boolean deselect;
7315		- boolean ambientOcclusion = false;
	8933	+ private boolean ambientOcclusion = false;
7316	8934	static boolean flash = false;
7317	8935	/static/ boolean wait = false;
7318	8936	boolean displaydone = false; // after repaint() calls
..	..	@@ -7442,6 +9060,8 @@
7442	9060	//gl.glFrustum(-0.5scale, 0.5scale, -0.5scale, 0.5scale, 1, 100);
7443	9061	//glu.gluPerspective(lightshaper_fovy, 1, lightshaper_zNear, lightshaper_zFar);
7444	9062	double scale = lightCamera.SCALE / lightCamera.Distance();
	9063	+// PATCH FILLE AUX JEANS
	9064	+ //scale *= lightCamera.shaper_fovy / 25;
7445	9065	gl.glScaled(2 * scale, 2 * scale, -scale);
7446	9066	gl.glTranslated(0, 0, lightCamera.DECAL);
7447	9067
..	..	@@ -7590,15 +9210,14 @@
7590	9210
7591	9211	float[] options1 = new float[]{1000, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
7592	9212	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
	9213	+ float[] options3 = new float[]{1, 1, 1, 0}; // fog color
	9214	+ float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
7594	9215
7595	9216	static int imagecount = 0; // movie generation
7596	9217
7597	9218	static int jitter = 0;
7598	9219
7599	9220	boolean restartframe = false;
7600		-
7601		- static int framecount = 0; // general-purpose global count
7602	9221
7603	9222	void displayAntiAliased(javax.media.opengl.GL gl)
7604	9223	{
..	..	@@ -7628,14 +9247,14 @@
7628	9247
7629	9248	//System.out.println("start frame");
7630	9249	gl.glClear(gl.GL_ACCUM_BUFFER_BIT);
7631		- for (jitter = 0; jitter < ACSIZE; jitter++) //, GraphreeD.wav.cursor += LIVE ? 735 : 0)
	9250	+ for (jitter = 0; jitter < ACSIZE; jitter++) //, GrafreeD.wav.cursor += LIVE ? 735 : 0)
7632	9251	{
7633		- framecount++;
	9252	+ Globals.framecount++;
7634	9253
7635	9254	if (CameraPane.tickcount > 0)
7636	9255	CameraPane.tickcount--;
7637	9256
7638		-// GraphreeD.wav.cursor += 735; // 44100 Hz / 120 Hz * 2 (for 16 bits)
	9257	+// GrafreeD.wav.cursor += 735; // 44100 Hz / 120 Hz * 2 (for 16 bits)
7639	9258	// restartframe = true;
7640	9259	if (options1[2] > 100 && (jitter%2==0))
7641	9260	{
..	..	@@ -7668,7 +9287,7 @@
7668	9287
7669	9288	gl.glLightfv(gl.GL_LIGHT0, gl.GL_POSITION, pos, 0);
7670	9289	*/
7671		- lighttouched = true;
	9290	+ Globals.lighttouched = true;
7672	9291	//System.err.println(" shadowbuffer: " + jitter);
7673	9292	shadowbuffer.display();
7674	9293
..	..	@@ -7690,7 +9309,7 @@
7690	9309
7691	9310	if (renderCamera != lightCamera)
7692	9311	for (int count = parentcam.GetTransformCount(); --count>=0;)
7693		- LA.matConcat(parentcam.toParent, matrix, matrix);
	9312	+ LA.matConcat(matrix, parentcam.toParent, matrix);
7694	9313
7695	9314	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
7696	9315
..	..	@@ -7706,7 +9325,7 @@
7706	9325
7707	9326	if (renderCamera != lightCamera)
7708	9327	for (int count = parentcam.GetTransformCount(); --count>=0;)
7709		- LA.matConcat(matrix, parentcam.fromParent, matrix);
	9328	+ LA.matConcat(parentcam.fromParent, matrix, matrix);
7710	9329
7711	9330	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
7712	9331
..	..	@@ -7778,7 +9397,7 @@
7778	9397	//gl.glFlush();
7779	9398	gl.glAccum(gl.GL_ACCUM, 1.0f / ACSIZE);
7780	9399
7781		- if (ANIMATION && ABORTED)
	9400	+ if (Globals.ANIMATION && ABORTED)
7782	9401	{
7783	9402	System.err.println(" ABORTED FRAME");
7784	9403	break;
..	..	@@ -7808,7 +9427,7 @@
7808	9427	setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
7809	9428
7810	9429	// save image
7811		- if (ANIMATION && !ABORTED)
	9430	+ if (Globals.ANIMATION && !ABORTED)
7812	9431	{
7813	9432	VPwidth = viewport[2];
7814	9433	VPheight = viewport[3];
..	..	@@ -7919,11 +9538,11 @@
7919	9538
7920	9539	// imagecount++;
7921	9540
7922		- String fullname = filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
	9541	+ String fullname = Globals.filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
7923	9542
7924	9543	if (!BOXMODE)
7925	9544	{
7926		- System.out.println("image: " + fullname + " (" + (GraphreeD.wav.cursor / 735 / 4) + ")");
	9545	+ System.out.println("image: " + fullname + " (wav cursor=" + (GrafreeD.wav.cursor / 735 / 4) + ")");
7927	9546	}
7928	9547
7929	9548	if (!BOXMODE)
..	..	@@ -7951,7 +9570,7 @@
7951	9570	{
7952	9571	if (ACSIZE > 1)
7953	9572	{
7954		- // System.err.println("image #" + (GraphreeD.wav.cursor / 735 / 4));
	9573	+ // System.err.println("image #" + (GrafreeD.wav.cursor / 735 / 4));
7955	9574	}
7956	9575	}
7957	9576
..	..	@@ -7961,7 +9580,7 @@
7961	9580	ABORTED = false;
7962	9581	}
7963	9582	else
7964		- GraphreeD.wav.cursor += 735 * ACSIZE;
	9583	+ GrafreeD.wav.cursor += 735 * ACSIZE;
7965	9584
7966	9585	if (false)
7967	9586	{
..	..	@@ -8615,13 +10234,6 @@
8615	10234	}
8616	10235	}
8617	10236
8618		- boolean IsFrozen()
8619		- {
8620		- boolean selectmode = drawMode == SELECTION \|\| CameraPane.DEBUG_SELECTION;
8621		-
8622		- return !selectmode && cameracount == 0; // != 0;
8623		- }
8624		-
8625	10237	boolean niceon = false;
8626	10238	javax.swing.Timer AAtimer = new javax.swing.Timer(750, this);
8627	10239	boolean currentlydrawing = false;
..	..	@@ -8631,16 +10243,16 @@
8631	10243
8632	10244	public void display(GLAutoDrawable drawable)
8633	10245	{
8634		- if (GraphreeD.savesound && GraphreeD.hassound)
	10246	+ if (GrafreeD.savesound && GrafreeD.hassound)
8635	10247	{
8636		- GraphreeD.wav.save();
8637		- GraphreeD.savesound = false;
8638		- GraphreeD.hassound = false;
	10248	+ GrafreeD.wav.save();
	10249	+ GrafreeD.savesound = false;
	10250	+ GrafreeD.hassound = false;
8639	10251	}
8640	10252	// if (DEBUG_SELECTION)
8641	10253	// {
8642		-// if (drawMode != SELECTION)
8643		-// drawMode = SELECTION;
	10254	+// if (DrawMode() != SELECTION)
	10255	+// DrawMode() = SELECTION;
8644	10256	// }
8645	10257
8646	10258	if (!isRenderer)
..	..	@@ -8696,9 +10308,9 @@
8696	10308
8697	10309	//ANTIALIAS = 0;
8698	10310
8699		- if (drawMode == DEFAULT) // && CURRENTANTIALIAS > 0)
	10311	+ if (DrawMode() == DEFAULT) // && CURRENTANTIALIAS > 0)
8700	10312	{
8701		- if (niceon \|\| isLIVE())
	10313	+ if (niceon \|\| Globals.isLIVE())
8702	10314	{
8703	10315	//if(active == 0)
8704	10316	// antialiaser = null;
..	..	@@ -8723,7 +10335,7 @@
8723	10335	assert eyeCamera.shaper_zFar == 1E5f; // 500.0f;
8724	10336	*/
8725	10337
8726		- if (drawMode == DEFAULT)
	10338	+ if (DrawMode() == DEFAULT)
8727	10339	{
8728	10340	currentlydrawing = true;
8729	10341	}
..	..	@@ -8754,18 +10366,18 @@
8754	10366
8755	10367	// if(Applet3D.clipboard != null)
8756	10368	// System.out.println("Clipboard = " + Applet3D.clipboard); //.get(0).parent);
8757		-//drawMode = SELECTION;
	10369	+//DrawMode() = SELECTION;
8758	10370	indexcount = 0;
8759	10371
8760		- if (drawMode == OCCLUSION)
	10372	+ if (DrawMode() == OCCLUSION)
8761	10373	{
8762		- drawMode = DEFAULT;
	10374	+ Globals.drawMode = DEFAULT; // WARNING
8763	10375	ambientOcclusion = true;
8764	10376	setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
8765	10377	Object3D theobject = object;
8766	10378	Object3D theparent = object.parent;
8767	10379	object.parent = null;
8768		- object = (Object3D)GraphreeD.clone(object);
	10380	+ object = (Object3D)GrafreeD.clone(object);
8769	10381	object.Stripify();
8770	10382	if (theobject.selection == null \|\| theobject.selection.Size() == 0)
8771	10383	theobject.PreprocessOcclusion(this);
..	..	@@ -8778,19 +10390,19 @@
8778	10390	ambientOcclusion = false;
8779	10391	}
8780	10392
8781		- if (lighttouched && drawMode == DEFAULT && !lightMode) // && !FROZEN)
	10393	+ if (Globals.lighttouched && DrawMode() == DEFAULT && !lightMode) // && !FROZEN)
8782	10394	{
8783	10395	//if (RENDERSHADOW) // ?
8784	10396	if (!IsFrozen())
8785	10397	{
8786	10398	// dec 2012
8787		- if (!(!flash && !lightMode && drawMode == DEFAULT && ANTIALIAS > 0))
	10399	+ if (!ambientOcclusion && !(!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0))
8788	10400	{
8789		- framecount++;
	10401	+ Globals.framecount++;
8790	10402	shadowbuffer.display();
8791	10403	}
8792	10404	}
8793		- lighttouched = false; // ??
	10405	+ Globals.lighttouched = false; // ??
8794	10406	//drawing = true;
8795	10407	//lighttouched = true;
8796	10408	}
..	..	@@ -8811,9 +10423,9 @@
8811	10423	//eyeCamera.shaper_fovy = 1;
8812	10424	}
8813	10425
8814		- if ((RENDERPROGRAM != 0 \|\| ambientOcclusion \|\| spherical) && drawMode == DEFAULT) // SELECTION)
	10426	+ if ((RENDERPROGRAM != 0 \|\| ambientOcclusion \|\| spherical) && DrawMode() == DEFAULT) // SELECTION)
8815	10427	{
8816		- //System.out.println("drawMode = " + drawMode);
	10428	+ //System.out.println("DrawMode() = " + DrawMode());
8817	10429	vertexMode \|= VP_PASS;
8818	10430	//vertexMode \|= VP_PROJECTION;
8819	10431	if (!ambientOcclusion)
..	..	@@ -8873,7 +10485,7 @@
8873	10485	Camera cam = renderCamera; // lightMode?lightCamera:eyeCamera;
8874	10486	//Camera lightcam = new Camera(light0);
8875	10487
8876		- if (drawMode == SHADOW)
	10488	+ if (DrawMode() == SHADOW)
8877	10489	{
8878	10490	/*
8879	10491	gl.glMatrixMode(GL.GL_MODELVIEW);
..	..	@@ -8912,7 +10524,7 @@
8912	10524	// if (parentcam != renderCamera) // not a light
8913	10525	if (cam != lightCamera)
8914	10526	for (int count = parentcam.GetTransformCount(); --count>=0;)
8915		- LA.matConcat(parentcam.toParent, matrix, matrix);
	10527	+ LA.matConcat(matrix, parentcam.toParent, matrix);
8916	10528
8917	10529	for (int j = 0; j < 4; j++)
8918	10530	{
..	..	@@ -8927,7 +10539,7 @@
8927	10539	// if (parentcam != renderCamera) // not a light
8928	10540	if (cam != lightCamera)
8929	10541	for (int count = parentcam.GetTransformCount(); --count>=0;)
8930		- LA.matConcat(matrix, parentcam.fromParent, matrix);
	10542	+ LA.matConcat(parentcam.fromParent, matrix, matrix);
8931	10543
8932	10544	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
8933	10545
..	..	@@ -8963,7 +10575,7 @@
8963	10575	gl.glClear(gl.GL_DEPTH_BUFFER_BIT);
8964	10576	} else
8965	10577	{
8966		- if (drawMode != DEFAULT)
	10578	+ if (DrawMode() != DEFAULT)
8967	10579	{
8968	10580	gl.glClearColor(1, 1, 1, 0);
8969	10581	} // 1);
..	..	@@ -9028,7 +10640,7 @@
9028	10640
9029	10641	fast &= !ambientOcclusion;
9030	10642
9031		- if (drawMode == DEFAULT)
	10643	+ if (DrawMode() == DEFAULT)
9032	10644	{
9033	10645	//gl.glEnable(gl.GL_ALPHA_TEST);
9034	10646	//gl.glActiveTexture(GL.GL_TEXTURE0);
..	..	@@ -9089,6 +10701,8 @@
9089	10701	//gl.glFrustum(-0.5scale, 0.5scale, -0.5scale, 0.5scale, 1, 100);
9090	10702	//glu.gluPerspective(lightshaper_fovy, 1, lightshaper_zNear, lightshaper_zFar);
9091	10703	double scale = lightCamera.SCALE / lightCamera.Distance();
	10704	+// PATCH FILLE AUX JEANS
	10705	+ //scale *= lightCamera.shaper_fovy / 25;
9092	10706	gl.glScaled(2 * scale, 2 * scale, -scale);
9093	10707	gl.glTranslated(0, 0, lightCamera.DECAL);
9094	10708
..	..	@@ -9224,10 +10838,12 @@
9224	10838	gl.glMatrixMode(gl.GL_PROJECTION);
9225	10839	gl.glLoadIdentity();
9226	10840
9227		- if (drawMode == SHADOW \|\| cam == lightCamera) // \|\| (vertexMode&VP_PROJECTION) != 0)
	10841	+ if (DrawMode() == SHADOW \|\| cam == lightCamera) // \|\| (vertexMode&VP_PROJECTION) != 0)
9228	10842	{
9229	10843	//glu.gluPerspective(lightshaper_fovy, 1, lightshaper_zNear, lightshaper_zFar);
9230	10844	double scale = lightCamera.SCALE / lightCamera.Distance();
	10845	+// PATCH FILLE AUX JEANS
	10846	+ //scale *= lightCamera.shaper_fovy / 25;
9231	10847	gl.glScaled(2 * scale, 2 * scale, -scale);
9232	10848	gl.glTranslated(0, 0, lightCamera.DECAL);
9233	10849	//System.out.println("DECAL = " + LIGHTDECAL + "; SCALE = " + LIGHTSCALE);
..	..	@@ -9280,7 +10896,7 @@
9280	10896	//gl.glPushMatrix();
9281	10897	gl.glLoadIdentity();
9282	10898
9283		- if (!ambientOcclusion) // drawMode != OCCLUSION)
	10899	+ if (!ambientOcclusion) // DrawMode() != OCCLUSION)
9284	10900	{
9285	10901	//LA.xformPos(light0, lightCamera.fromScreen, light);
9286	10902	LA.xformDir(dirlight, lightCamera.fromScreen, lightposition);
..	..	@@ -9367,7 +10983,7 @@
9367	10983	}
9368	10984
9369	10985	/**/
9370		- if (true) // drawMode == SELECTION) // != DEFAULT)
	10986	+ if (true) // DrawMode() == SELECTION) // != DEFAULT)
9371	10987	gl.glDisable(gl.GL_LIGHTING);
9372	10988	else
9373	10989	gl.glEnable(gl.GL_LIGHTING);
..	..	@@ -9379,12 +10995,13 @@
9379	10995
9380	10996	gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 63, options2, 0);
9381	10997	gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 62, options3, 0);
	10998	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 61, options4, 0);
9382	10999
9383	11000	options2[0] *= renderCamera.Distance();
9384	11001
9385	11002	lightslot = 64;
9386	11003
9387		- if (!frozen && !ambientOcclusion && isRenderer && drawMode == DEFAULT)
	11004	+ if (!frozen && !ambientOcclusion && isRenderer && DrawMode() == DEFAULT)
9388	11005	{
9389	11006	DrawLights(object);
9390	11007	}
..	..	@@ -9395,7 +11012,7 @@
9395	11012	fragmentMode \|= (lightslot - 64) << 2; // 1; // first bit is available for aniso
9396	11013	//System.out.println("fragmentMode = " + fragmentMode);
9397	11014
9398		- if (drawMode == DEFAULT \|\| drawMode == SELECTION \|\| DEBUG_SELECTION)
	11015	+ if (DrawMode() == DEFAULT \|\| DrawMode() == SELECTION \|\| IsDebugSelection())
9399	11016	{
9400	11017	/*
9401	11018	if (CULLFACE \|\| (ambientOcclusion && OCCLUSION_CULLING))
..	..	@@ -9428,7 +11045,7 @@
9428	11045	}
9429	11046	}
9430	11047
9431		- if (drawMode == DEFAULT)
	11048	+ if (DrawMode() == DEFAULT)
9432	11049	{
9433	11050	if (WIREFRAME && !ambientOcclusion)
9434	11051	{
..	..	@@ -9446,7 +11063,7 @@
9446	11063	gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9447	11064	gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9448	11065
9449		- if (!fast/RENDERPROGRAM != 0/ && (drawMode == DEFAULT \|\| drawMode == SHADOW)) // && !WIREFRAME) //
	11066	+ if (!fast/RENDERPROGRAM != 0/ && (DrawMode() == DEFAULT \|\| DrawMode() == SHADOW)) // && !WIREFRAME) //
9450	11067	{
9451	11068	if (vertexMode != 0) // && !fast)
9452	11069	{
..	..	@@ -9466,7 +11083,7 @@
9466	11083	}
9467	11084	}
9468	11085
9469		- if (false) // fast && !IsFreezed() && drawMode != SELECTION && !ambientOcclusion)
	11086	+ if (false) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
9470	11087	{
9471	11088	//gl.glDepthFunc(GL.GL_LEQUAL);
9472	11089	//gl.glClear(gl.GL_COLOR_BUFFER_BIT \| gl.GL_DEPTH_BUFFER_BIT);
..	..	@@ -9494,7 +11111,7 @@
9494	11111	//gl.glDepthMask(false);
9495	11112	}
9496	11113
9497		- if (false) // drawMode == SHADOW)
	11114	+ if (false) // DrawMode() == SHADOW)
9498	11115	{
9499	11116	//SetColumnMajorData(cameraInverseTransform, view_1);
9500	11117	//System.out.println("light = " + cameraInverseTransform);
..	..	@@ -9508,16 +11125,16 @@
9508	11125	//System.out.println("object = " + object);
9509	11126	if (!frozen && !imageLocked)
9510	11127	{
9511		- if (!flash && !lightMode && drawMode == DEFAULT && ANTIALIAS > 0)
	11128	+ if (!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0)
9512	11129	{
9513	11130	displayAntiAliased(gl);
9514	11131	} else
9515	11132	{
9516	11133	programcount = 0;
9517		- int keepmode = drawMode;
	11134	+ int keepmode = DrawMode();
9518	11135	// if (DEBUG_SELECTION)
9519	11136	// {
9520		-// drawMode = SELECTION;
	11137	+// DrawMode() = SELECTION;
9521	11138	// }
9522	11139	// for point selection
9523	11140	// gl.glGetDoublev(gl.GL_MODELVIEW_MATRIX, tempmat, 0);
..	..	@@ -9527,10 +11144,10 @@
9527	11144	DrawObject(gl);
9528	11145
9529	11146	// jan 2013 System.err.println("RESET ABORT (display)");
9530		- // if (drawMode == DEFAULT)
	11147	+ // if (DrawMode() == DEFAULT)
9531	11148	// ABORTED = false;
9532	11149	fullreset = false;
9533		- drawMode = keepmode;
	11150	+ Globals.drawMode = keepmode; // WARNING
9534	11151	//System.out.println("PROGRAM SWITCH " + programcount);
9535	11152	}
9536	11153	}
..	..	@@ -9538,11 +11155,11 @@
9538	11155	gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9539	11156	gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9540	11157
9541		- if (drawMode == DEFAULT)
	11158	+ if (DrawMode() == DEFAULT)
9542	11159	{
9543	11160	ReleaseTexture(NOISE_TEXTURE, false);
9544	11161	}
9545		- //if (drawMode == DEFAULT)
	11162	+ //if (DrawMode() == DEFAULT)
9546	11163	{
9547	11164
9548	11165	gl.glActiveTexture(GL.GL_TEXTURE1);
..	..	@@ -9554,7 +11171,7 @@
9554	11171	//else
9555	11172	//gl.glDisable(gl.GL_TEXTURE_2D);
9556	11173	//gl.glPopMatrix();
9557		- if (imageCompleted && ANTIALIAS > 0 && drawMode == DEFAULT && cam != lightCamera && !ambientOcclusion)
	11174	+ if (imageCompleted && ANTIALIAS > 0 && DrawMode() == DEFAULT && cam != lightCamera && !ambientOcclusion)
9558	11175	{
9559	11176	//new Exception().printStackTrace();
9560	11177	//System.out.println("Draw image " + width + ", " + height);
..	..	@@ -9596,7 +11213,7 @@
9596	11213	//gl.glFlush();
9597	11214	}
9598	11215
9599		- if (flash && drawMode == DEFAULT)
	11216	+ if (flash && DrawMode() == DEFAULT)
9600	11217	{
9601	11218	flash = false;
9602	11219	wait = true;
..	..	@@ -9604,9 +11221,9 @@
9604	11221	}
9605	11222
9606	11223	//drawing = false;
9607		- //if(drawMode == DEFAULT)
	11224	+ //if(DrawMode() == DEFAULT)
9608	11225	// niceon = false;
9609		- if (drawMode == DEFAULT)
	11226	+ if (DrawMode() == DEFAULT)
9610	11227	{
9611	11228	currentlydrawing = false;
9612	11229	}
..	..	@@ -9626,7 +11243,7 @@
9626	11243	repaint();
9627	11244	}
9628	11245
9629		- if (isLIVE() && drawMode == DEFAULT) // may 2013
	11246	+ if (Globals.isLIVE() && DrawMode() == DEFAULT) // may 2013
9630	11247	repaint();
9631	11248
9632	11249	displaydone = true;
..	..	@@ -9645,8 +11262,14 @@
9645	11262	{
9646	11263	renderpass++;
9647	11264	// System.out.println("Draw object... ");
	11265	+ STEP = 1;
9648	11266	if (FAST) // in case there is no script
9649		- STEP = 16;
	11267	+ STEP = 8;
	11268	+
	11269	+ if (CURRENTANTIALIAS == 0 \|\| ACSIZE == 1)
	11270	+ {
	11271	+ STEP *= 4;
	11272	+ }
9650	11273
9651	11274	//object.FullInvariants();
9652	11275
..	..	@@ -9660,10 +11283,10 @@
9660	11283	e.printStackTrace();
9661	11284	}
9662	11285
9663		- if (GraphreeD.RENDERME > 0)
9664		- GraphreeD.RENDERME--; // mechante magouille
	11286	+ if (GrafreeD.RENDERME > 0)
	11287	+ GrafreeD.RENDERME--; // mechante magouille
9665	11288
9666		- ONESTEP = false;
	11289	+ Globals.ONESTEP = false;
9667	11290	}
9668	11291
9669	11292	static boolean zoomonce = false;
..	..	@@ -9671,11 +11294,11 @@
9671	11294	void DrawObject(GL gl, boolean draw)
9672	11295	{
9673	11296	//System.out.println("DRAW OBJECT " + mouseDown);
9674		-// drawMode = SELECTION;
	11297	+// DrawMode() = SELECTION;
9675	11298	//GL gl = getGL();
9676	11299	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
9677	11300	{
9678		- if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && drawMode == SHADOW) // && !lightMode)
	11301	+ if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
9679	11302	object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
9680	11303	pingthread.StepToTarget(true); // true);
9681	11304	// zoomonce = false;
..	..	@@ -9696,9 +11319,9 @@
9696	11319	callist = gl.glGenLists(1);
9697	11320	}
9698	11321
9699		- boolean selectmode = drawMode == SELECTION \|\| CameraPane.DEBUG_SELECTION;
	11322	+ boolean selectmode = DrawMode() == SELECTION \|\| IsDebugSelection();
9700	11323
9701		- boolean active = !selectmode; // drawMode != SELECTION; // mouseDown;
	11324	+ boolean active = !selectmode; // DrawMode() != SELECTION; // mouseDown;
9702	11325
9703	11326	if (!mainDL \|\| !active \|\| touched)
9704	11327	{
..	..	@@ -9725,7 +11348,7 @@
9725	11348	PushMatrix(ClickInfo.matbuffer);
9726	11349	}
9727	11350
9728		- if (drawMode == 0)
	11351	+ if (DrawMode() == 0)
9729	11352	{
9730	11353	// System.out.println("CLEAR +++++++++++++++ +++++++++++++++ +++++++++++++++ +++++++++++++++");
9731	11354
..	..	@@ -9734,12 +11357,12 @@
9734	11357	BindTextures(DEFAULT_TEXTURES, 2);
9735	11358	}
9736	11359	//System.out.println("--> " + stackdepth);
9737		-// GraphreeD.traceon();
	11360	+// GrafreeD.traceon();
9738	11361
9739	11362	// DRAW
9740	11363	object.draw(this, /(Composite)/ object, false, false);
9741	11364
9742		- if (drawMode == DEFAULT)
	11365	+ if (DrawMode() == DEFAULT)
9743	11366	{
9744	11367	if (DEBUG)
9745	11368	{
..	..	@@ -9750,34 +11373,48 @@
9750	11373	selectedpoint.radius = radius;
9751	11374	selectedpoint.recalculate();
9752	11375	selectedpoint.material = new cMaterial();
9753		- selectedpoint.material.color = 0.25f;
	11376	+ selectedpoint.material.color = 0.15f; // Yellow
9754	11377	selectedpoint.material.modulation = 0.75f;
9755	11378
9756		- debugpoint.radius = radius;
9757		- debugpoint.recalculate();
9758		- debugpoint.material = new cMaterial();
9759		- debugpoint.material.color = 0.25f;
9760		- debugpoint.material.modulation = 0.75f;
	11379	+ debugpointG.radius = radius;
	11380	+ debugpointG.recalculate();
	11381	+ debugpointG.material = new cMaterial();
	11382	+ debugpointG.material.color = 0.25f; // Green
	11383	+ debugpointG.material.modulation = 0.75f;
9761	11384
9762		- debugpoint2.radius = radius;
9763		- debugpoint2.recalculate();
9764		- debugpoint2.material = new cMaterial();
9765		- debugpoint2.material.color = 0.75f;
9766		- debugpoint2.material.modulation = 0.75f;
	11385	+ debugpointP.radius = radius;
	11386	+ debugpointP.recalculate();
	11387	+ debugpointP.material = new cMaterial();
	11388	+ debugpointP.material.color = 0.75f; // Purple
	11389	+ debugpointP.material.modulation = 0.75f;
	11390	+
	11391	+ debugpointC.radius = radius;
	11392	+ debugpointC.recalculate();
	11393	+ debugpointC.material = new cMaterial();
	11394	+ debugpointC.material.color = 0.5f; // Cyan
	11395	+ debugpointC.material.modulation = 0.75f;
	11396	+
	11397	+ debugpointR.radius = radius;
	11398	+ debugpointR.recalculate();
	11399	+ debugpointR.material = new cMaterial();
	11400	+ debugpointR.material.color = 0f; // Red
	11401	+ debugpointR.material.modulation = 0.75f;
9767	11402
9768	11403	InitPoints(radius);
9769	11404	}
9770	11405	selectedpoint.draw(this, /(Composite)/ null, false, false);
9771		- //debugpoint.draw(this, /(Composite)/ null, false);
9772		- //debugpoint2.draw(this, /(Composite)/ null, false);
9773		- DrawPoints(this);
	11406	+ debugpointG.draw(this, /(Composite)/ null, false,false);
	11407	+ debugpointP.draw(this, /(Composite)/ null, false,false);
	11408	+ debugpointC.draw(this, /(Composite)/ null, false,false);
	11409	+ debugpointR.draw(this, /(Composite)/ null, false,false);
	11410	+ // DrawPoints(this);
9774	11411	}
9775	11412
9776	11413	// debugstuff.draw(this, /(Composite)/ null, false);
9777	11414	}
9778		-// GraphreeD.traceoff();
	11415	+// GrafreeD.traceoff();
9779	11416	//System.out.println(stackdepth);
9780		- if (drawMode == 0)
	11417	+ if (DrawMode() == 0)
9781	11418	{
9782	11419	ReleaseTextures(DEFAULT_TEXTURES);
9783	11420
..	..	@@ -9802,17 +11439,19 @@
9802	11439
9803	11440	checker = null;
9804	11441
9805		- if (!ambientOcclusion && !IsFrozen() && drawMode == DEFAULT)
	11442	+ if (!ambientOcclusion && !IsFrozen() && DrawMode() == DEFAULT)
9806	11443	FindChecker(object);
9807	11444
9808		- if (checker != null && drawMode == DEFAULT)
	11445	+ if (checker != null && DrawMode() == DEFAULT)
9809	11446	{
9810		- // BindTexture(IMMORTAL_TEXTURE);
	11447	+ //BindTexture(IMMORTAL_TEXTURE);
	11448	+ BindTextures(checker.GetTextures(), checker.texres);
9811	11449	// NEAREST
9812	11450	GetGL().glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST); // GL.GL_LINEAR);
9813	11451	DrawChecker(gl);
9814	11452	//checker.Draw(this, null, false);
9815	11453	// ReleaseTexture(IMMORTAL_TEXTURE);
	11454	+ ReleaseTextures(checker.GetTextures());
9816	11455	}
9817	11456
9818	11457	if (object.parent != null)
..	..	@@ -9825,7 +11464,7 @@
9825	11464	//gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9826	11465	//gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9827	11466
9828		- if (DISPLAYTEXT && drawMode == DEFAULT)
	11467	+ if (DISPLAYTEXT && DrawMode() == DEFAULT)
9829	11468	{
9830	11469	// Draw it once, then use the raster
9831	11470	Balloon(gl, balloon.createGraphics());
..	..	@@ -9881,9 +11520,9 @@
9881	11520	int[] xs = new int[3];
9882	11521	int[] ys = new int[3];
9883	11522
9884		- void DrawString(Object3D obj) // String string)
	11523	+ public void DrawString(Object3D obj) // String string) // INTERFACE
9885	11524	{
9886		- if (!DISPLAYTEXT \|\| drawMode != DEFAULT)
	11525	+ if (!DISPLAYTEXT \|\| DrawMode() != DEFAULT)
9887	11526	{
9888	11527	return;
9889	11528	}
..	..	@@ -10343,11 +11982,13 @@
10343	11982	"PARAM params6 = program.env[6];" + // bump, noise, borderfade, fog punchthrough
10344	11983	"PARAM params7 = program.env[7];" + // noise power, opacity power
10345	11984	"PARAM options0 = program.env[63];" + // fog density, intensity, elevation
10346		- "PARAM options1 = program.env[62];" + // fog rgb color, image intensity
	11985	+ "PARAM options1 = program.env[62];" + // fog rgb color
	11986	+ "PARAM options2 = program.env[61];" + // image intensity, subsurface, lightsheen
10347	11987	"PARAM pointlight = program.env[127];" + // ...
10348	11988	"PARAM zero = { 0.0, 0.0, 0.0, 0.0 };" +
10349	11989	"PARAM halfhalf = { 0.25, 0.25, 0.25, 1.0 };" +
10350	11990	"PARAM half = { 0.5, 0.5, 0.5, 1.0 };" +
	11991	+ "PARAM threequarter = { 0.75, 0.75, 0.75, 1.0 };" +
10351	11992	"PARAM two = { 2.0, 2.0, 2.0, 1.0 };" +
10352	11993	"PARAM ten = { 10, 10, 10, 1.0 };" +
10353	11994	"PARAM one3rd = { 0.5, 0.33333333333, 0.333333333, 1.0 };" +
..	..	@@ -10368,6 +12009,7 @@
10368	12009	"PARAM lodbias = { 10,10,10,10 };" + // 20, -2, -20, 1.0 };" +
10369	12010	"PARAM infinity = { 100000000, 100000000, 100000000, 1.0 };" +
10370	12011	"PARAM one2048th = { 0.00048828125, 0.00048828125, 0.00048828125, 1.0 };" +
	12012	+ "PARAM ninetenth = { 0.9, 0.9, 0.9, 1.0 };" +
10371	12013	"PARAM almostone = { 0.999, 0.999, 0.999, 1.0 };" +
10372	12014	"PARAM c256 = { 256, 256, 256, 1.0 };" +
10373	12015	"PARAM c256i = { 0.00390625, 0.00390625, 0.00390625, 1.0 };" +
..	..	@@ -10408,6 +12050,10 @@
10408	12050	"TEMP R1;" +
10409	12051	"TEMP R2;" +
10410	12052	"TEMP R3;" +
	12053	+ "TEMP min;" +
	12054	+ "TEMP max;" +
	12055	+ "TEMP average;" +
	12056	+ "TEMP saturation;" +
10411	12057	"TEMP keep1;" +
10412	12058	"TEMP keep2;" +
10413	12059	"TEMP keep3;" +
..	..	@@ -10938,10 +12584,42 @@
10938	12584
10939	12585	// skin?
10940	12586	// Saturation for skin
10941		- /**/ // c'est ici
10942		- (Skinshader? "DP3 temp.x, final,one;" +
	12587	+ /**/
	12588	+ (Skinshader?
	12589	+ "DP3 average.x, final,one;" +
	12590	+ "MUL average, one3rd.xxxx,average.xxxx;" +
	12591	+
	12592	+ "MIN min.x, final.x,final.y;" +
	12593	+ "MIN min.x, min.x,final.z;" +
	12594	+
	12595	+ "MAX max.x, final.x,final.y;" +
	12596	+ "MAX max.x, max.x,final.z;" +
	12597	+ "MOV max, max.xxxx;" +
	12598	+
	12599	+ "SUB saturation, max, final;" +
	12600	+
	12601	+ "ADD temp.x, max.x, one10th.x;" +
	12602	+ "RCP temp.x, temp.x;" +
	12603	+ "MUL temp.x, temp.x, half.x;" +
	12604	+ "MUL saturation, saturation, temp.xxxx;" +
	12605	+
	12606	+ "DP3 ndotl.x, normald, light;" +
	12607	+ "MAX ndotl.x, ndotl.x, -ndotl.x;" +
	12608	+
	12609	+ "SUB temp.x, one.x, ndotl.x;" +
	12610	+ // Tuning for default skin
	12611	+ //"ADD temp.x, temp.x, options2.z;" + // lightsheen
	12612	+ "MAD temp.x, options2.z, half.y, temp.x;" + // lightsheen
	12613	+ "ADD temp.y, one.y, options2.y;" + // subsurface
	12614	+ "MUL temp.x, temp.x, temp.y;" +
	12615	+
	12616	+ "MUL saturation, saturation, temp.xxxx;" +
	12617	+ "SUB_SAT temp, max, saturation;" +
	12618	+/**
	12619	+ "DP3 temp.x, final,one;" +
10943	12620	"MUL R2, one3rd.xxxx,temp.xxxx;" +
10944		- "SUB temp, final,R2;" +
	12621	+ "SUB temp, final, R2;" +
	12622	+
10945	12623	// using light angle
10946	12624	"DP3 ndotl.x, normald,light;" +
10947	12625	//"SLT ndotl.y, ndotl.x, zero.x;" +
..	..	@@ -10954,7 +12632,6 @@
10954	12632	// using light intensity
10955	12633	"MOV ndotl.z, R2.x;" +
10956	12634	"MUL ndotl.z, ndotl.z, ndotl.z;" + // tuning...
10957		-
10958	12635	// june 2014
10959	12636	"MAD R1.x, ndotl.z,slope.y,one.x;" +
10960	12637	// "SUB ndotl.x, one.x, ndotl.x;" +
..	..	@@ -10966,6 +12643,7 @@
10966	12643	//"MUL R2.y, shadow.x,R2.y;" + // avril 2014
10967	12644
10968	12645	"MAD temp.x, R2.y, ndotl.y, temp.x;" + // red shift (skin)
	12646	+/**/
10969	12647
10970	12648	// "ADD final, R2,temp;" +
10971	12649	"MOV final, temp;"
..	..	@@ -11055,7 +12733,7 @@
11055	12733	/**/
11056	12734	// HDR
11057	12735	"MOV temp.z, final.a;" +
11058		- "MUL final, final,options1.w;" +
	12736	+ "MUL final, final,options2.x;" +
11059	12737	"MOV final.a, temp.z;" +
11060	12738	/**/
11061	12739
..	..	@@ -11092,10 +12770,17 @@
11092	12770	"MOV final.z, zero.x;" +
11093	12771	"MOV final.a, one.w;":""
11094	12772	) +
	12773	+ /*
11095	12774	(NORMALdebug?"MOV final.x, normal.x;" +
11096	12775	"MOV final.y, normal.y;" +
11097	12776	"MOV final.z, normal.z;" +
11098	12777	"MOV final.a, one.w;":""
	12778	+ ) +
	12779	+ */
	12780	+ (NORMALdebug?"SUB final.x, one.x, final.x;" +
	12781	+ "SUB final.y, one.x, final.y;" +
	12782	+ "SUB final.z, one.x, final.z;" +
	12783	+ "MOV final.a, final.a;":""
11099	12784	) +
11100	12785	// "MOV final, bumpmap;" +
11101	12786	"MOV result.color, final;" +
..	..	@@ -11241,6 +12926,7 @@
11241	12926	String Shadow(String depth, String shadow)
11242	12927	{
11243	12928	return "MAX temp.x, ndotl.x, one64th.x;" +
	12929	+ "MIN temp.x, temp.x, ninetenth.x;" +
11244	12930	/**/
11245	12931	// Sine
11246	12932	"MUL temp.y, temp.x, temp.x;" +
..	..	@@ -11833,7 +13519,7 @@
11833	13519	public void mousePressed(MouseEvent e)
11834	13520	{
11835	13521	//System.out.println("mousePressed: " + e);
11836		- clickStart(e.getX(), e.getY(), e.getModifiersEx());
	13522	+ clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
11837	13523	}
11838	13524
11839	13525	static long prevtime = 0;
..	..	@@ -11860,14 +13546,16 @@
11860	13546
11861	13547	//System.err.println("Dtime = " + Dtime + "; units = " + e.getUnitsToScroll() + "; ratio (units/ms) = " + ratio);
11862	13548
	13549	+ if (BUTTONLESSWHEEL)
11863	13550	if (Math.abs(ratio) < 0.1 \|\| Math.abs(Dtime) == 0) // < 30)
11864	13551	{
11865	13552	return;
11866	13553	}
11867	13554
	13555	+ boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
11868	13556
11869	13557	// TIMER
11870		- if (!wheeltimer.isRunning() && e.getModifiersEx() == 0) // VR
	13558	+ if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
11871	13559	{
11872	13560	keepboxmode = BOXMODE;
11873	13561	keepsupport = SUPPORT;
..	..	@@ -11907,8 +13595,8 @@
11907	13595	// mode \|= META;
11908	13596	//}
11909	13597
11910		- SetMouseMode(WHEEL \| e.getModifiersEx());
11911		- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0);
	13598	+ SetMouseMode(e.getModifiers(), WHEEL \| e.getModifiersEx());
	13599	+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
11912	13600	anchorX = ax;
11913	13601	anchorY = ay;
11914	13602	prevX = px;
..	..	@@ -11996,7 +13684,7 @@
11996	13684	// ObjEditor.tweenManager.update(1f / 60f);
11997	13685
11998	13686	// fev 2014???
11999		- if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && drawMode == SHADOW) // && !lightMode)
	13687	+ if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
12000	13688	object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
12001	13689	pingthread.StepToTarget(true); // true);
12002	13690	}
..	..	@@ -12006,7 +13694,7 @@
12006	13694
12007	13695	javax.swing.Timer timer = new javax.swing.Timer(350, this);
12008	13696
12009		- void clickStart(int x, int y, int modifiers)
	13697	+ void clickStart(int x, int y, int modifiers, int modifiersex)
12010	13698	{
12011	13699	if (!wasliveok)
12012	13700	return;
..	..	@@ -12023,7 +13711,7 @@
12023	13711	// touched = true; // main DL
12024	13712	if (isRenderer)
12025	13713	{
12026		- SetMouseMode(modifiers);
	13714	+ SetMouseMode(modifiers, modifiersex);
12027	13715	}
12028	13716
12029	13717	selectX = anchorX = x;
..	..	@@ -12036,7 +13724,7 @@
12036	13724	clicked = true;
12037	13725	hold = false;
12038	13726
12039		- if (((modifiers & ~1024) & ~0) == 0) // Single or multiple selection
	13727	+ if (((modifiersex & ~1024) & ~0) == 0) // Single or multiple selection
12040	13728	// june 2013 means CTRL_CLICK: if (((modifiers & ~1024) & ~128) == 0) // Single or multiple selection
12041	13729	{
12042	13730	// System.out.println("RESTART II " + modifiers);
..	..	@@ -12067,7 +13755,7 @@
12067	13755	info.camera = renderCamera;
12068	13756	info.x = x;
12069	13757	info.y = y;
12070		- info.modifiers = modifiers;
	13758	+ info.modifiers = modifiersex;
12071	13759	editObj = object.doEditClick(info, 0);
12072	13760	if (!editObj)
12073	13761	{
..	..	@@ -12084,11 +13772,11 @@
12084	13772
12085	13773	public void mouseDragged(MouseEvent e)
12086	13774	{
	13775	+ //System.out.println("mouseDragged: " + e);
12087	13776	if (isRenderer)
12088	13777	movingcamera = true;
12089	13778	//if (drawing)
12090	13779	//return;
12091		- //System.out.println("mouseDragged: " + e);
12092	13780	if ((e.getModifiersEx() & CTRL) != 0
12093	13781	\|\| (e.getModifiersEx() & COMMAND) != 0) // \|\| IsFrozen())
12094	13782	{
..	..	@@ -12096,7 +13784,7 @@
12096	13784	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
12097	13785	}
12098	13786	else
12099		- drag(e.getX(), e.getY(), e.getModifiersEx());
	13787	+ drag(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
12100	13788
12101	13789	//try { Thread.sleep(1); } catch (Exception ex) {}
12102	13790	}
..	..	@@ -12108,6 +13796,11 @@
12108	13796	cVector tmp = new cVector();
12109	13797	cVector tmp2 = new cVector();
12110	13798	boolean isMoving;
	13799	+
	13800	+ public cVector TargetLookAt()
	13801	+ {
	13802	+ return targetLookAt;
	13803	+ }
12111	13804
12112	13805	class PingThread extends Thread
12113	13806	{
..	..	@@ -12247,7 +13940,7 @@
12247	13940	//System.out.println("---------------- ---------- Paint " + tmp.length2());
12248	13941	if (lightMode)
12249	13942	{
12250		- lighttouched = true;
	13943	+ Globals.lighttouched = true;
12251	13944	}
12252	13945
12253	13946	if (OEILONCE && OEIL)
..	..	@@ -12264,6 +13957,7 @@
12264	13957
12265	13958	public void run()
12266	13959	{
	13960	+ new Exception().printStackTrace();
12267	13961	System.exit(0);
12268	13962	for (;;)
12269	13963	{
..	..	@@ -12305,7 +13999,7 @@
12305	13999	mouseDown = false;
12306	14000	if (lightMode)
12307	14001	{
12308		- lighttouched = true;
	14002	+ Globals.lighttouched = true;
12309	14003	}
12310	14004	repaint();
12311	14005	alreadypainted = true;
..	..	@@ -12313,7 +14007,7 @@
12313	14007	isMoving = false;
12314	14008	} //??
12315	14009
12316		- if (isLIVE() && !alreadypainted)
	14010	+ if (Globals.isLIVE() && !alreadypainted)
12317	14011	{
12318	14012	// FOR DEBUG BREAKPOINT USING PAUSE: while (true)
12319	14013	repaint();
..	..	@@ -12325,9 +14019,9 @@
12325	14019	{
12326	14020	if (lightMode)
12327	14021	{
12328		- lighttouched = true;
	14022	+ Globals.lighttouched = true;
12329	14023	}
12330		- drag(X, (mouseMode != 0) ? Y : anchorY, MODIFIERS);
	14024	+ drag(X, (mouseMode != 0) ? Y : anchorY, 0, MODIFIERS);
12331	14025	}
12332	14026	//else
12333	14027	}
..	..	@@ -12427,7 +14121,7 @@
12427	14121	int X, Y;
12428	14122	boolean SX, SY;
12429	14123
12430		- void drag(int x, int y, int modifiers)
	14124	+ void drag(int x, int y, int modifiers, int modifiersex)
12431	14125	{
12432	14126	if (IsFrozen())
12433	14127	{
..	..	@@ -12436,17 +14130,17 @@
12436	14130
12437	14131	drag = true; // NEW
12438	14132
12439		- boolean continuous = (modifiers & COMMAND) == COMMAND;
	14133	+ boolean continuous = (modifiersex & COMMAND) == COMMAND;
12440	14134
12441	14135	X = x;
12442	14136	Y = y;
12443	14137	// floating state for animation
12444		- MODIFIERS = modifiers;
12445		- modifiers &= ~1024;
	14138	+ MODIFIERS = modifiersex;
	14139	+ modifiersex &= ~1024;
12446	14140	if (false) // modifiers != 0)
12447	14141	{
12448	14142	//new Exception().printStackTrace();
12449		- System.out.println("mouseDragged: " + modifiers);
	14143	+ System.out.println("mouseDragged: " + modifiersex);
12450	14144	System.out.println("SHIFT = " + SHIFT);
12451	14145	System.out.println("CONTROL = " + COMMAND);
12452	14146	System.out.println("META = " + META);
..	..	@@ -12466,7 +14160,7 @@
12466	14160	info.camera = renderCamera;
12467	14161	info.x = x;
12468	14162	info.y = y;
12469		- object.editWindow.copy.doEditDrag(info);
	14163	+ object.editWindow.copy.doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
12470	14164	} else
12471	14165	{
12472	14166	if (x < startX)
..	..	@@ -12568,6 +14262,7 @@
12568	14262	{
12569	14263	manipCamera.Translate(dx, dy, getWidth());
12570	14264	}
	14265	+ else
12571	14266	if ((mouseMode & ZOOM) == 0 && (mouseMode & VR) != 0)
12572	14267	{
12573	14268	manipCamera.RotateInterest(dx, dy);
..	..	@@ -12578,7 +14273,7 @@
12578	14273
12579	14274	if (manipCamera == lightCamera)
12580	14275	{
12581		- lighttouched = true;
	14276	+ Globals.lighttouched = true;
12582	14277	}
12583	14278	/*
12584	14279	switch (mode)
..	..	@@ -12617,7 +14312,6 @@
12617	14312	public void mouseMoved(MouseEvent e)
12618	14313	{
12619	14314	//System.out.println("mouseMoved: " + e);
12620		-
12621	14315	if (isRenderer)
12622	14316	return;
12623	14317
..	..	@@ -12667,7 +14361,7 @@
12667	14361
12668	14362	if (control \|\| command \|\| IsFrozen())
12669	14363	timeout = true;
12670		- else
	14364	+// ?? May 2019 else
12671	14365	// timer.setDelay((modifiers & 128) != 0?0:350);
12672	14366	mouseDown = false;
12673	14367	if (!control && !command) // june 2013
..	..	@@ -12777,7 +14471,7 @@
12777	14471	System.out.println("keyReleased: " + e);
12778	14472	}
12779	14473
12780		- void SetMouseMode(int modifiers)
	14474	+ void SetMouseMode(int modifiers, int modifiersex)
12781	14475	{
12782	14476	//System.out.println("SetMouseMode = " + modifiers);
12783	14477	//modifiers &= ~1024;
..	..	@@ -12789,24 +14483,27 @@
12789	14483	//if (modifiers == 0) // \|\| (modifiers == (1024 \| CONTROL)))
12790	14484	// return;
12791	14485	//System.out.println("SetMode = " + modifiers);
12792		- if ((modifiers & WHEEL) == WHEEL)
	14486	+ if ((modifiersex & WHEEL) == WHEEL)
12793	14487	{
12794	14488	mouseMode \|= ZOOM;
12795	14489	}
12796		- if ((modifiers & META) == META)
	14490	+
	14491	+ boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
	14492	+ if (capsLocked) // \|\| (modifiers & META) == META)
12797	14493	{
12798	14494	mouseMode \|= VR; // BACKFORTH;
12799	14495	}
12800		- if ((modifiers & CTRLCLICK) == CTRLCLICK)
12801		- {
12802		- mouseMode \|= SELECT; // BACKFORTH;
12803		- }
12804		- if ((modifiers & COMMAND) == COMMAND)
	14496	+ if ((modifiersex & CTRLCLICK) == CTRLCLICK)
12805	14497	{
12806	14498	mouseMode \|= SELECT;
12807	14499	}
12808		- if ((modifiers & SHIFT) == SHIFT \|\| forcetranslate)
	14500	+ if ((modifiersex & COMMAND) == COMMAND)
12809	14501	{
	14502	+ mouseMode \|= SELECT;
	14503	+ }
	14504	+ if ((modifiersex & SHIFT) == SHIFT \|\| forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
	14505	+ {
	14506	+ mouseMode &= ~VR;
12810	14507	mouseMode \|= TRANSLATE;
12811	14508	}
12812	14509	// if ((modifiers & SHIFT_META) == SHIFT_META)
..	..	@@ -12833,10 +14530,10 @@
12833	14530
12834	14531	if (isRenderer) //
12835	14532	{
12836		- SetMouseMode(modifiers);
	14533	+ SetMouseMode(0, modifiers);
12837	14534	}
12838	14535
12839		- theRenderer.keyPressed(key);
	14536	+ Globals.theRenderer.keyPressed(key);
12840	14537	}
12841	14538
12842	14539	int kompactbit = 4; // power bit
..	..	@@ -12848,7 +14545,7 @@
12848	14545	float SATPOW = 1; // 2; // 0.5f;
12849	14546	float BRIPOW = 1; // 0.5f; // 0.5f;
12850	14547
12851		- void keyPressed(int key)
	14548	+ public void keyPressed(int key)
12852	14549	{
12853	14550	if (key >= '0' && key <= '5')
12854	14551	clampbit = (key-'0');
..	..	@@ -12963,7 +14660,7 @@
12963	14660	case 'B':
12964	14661	BRISMOOTH ^= true;
12965	14662	SHADOWCULLFACE ^= true;
12966		- lighttouched = true;
	14663	+ Globals.lighttouched = true;
12967	14664	repaint();
12968	14665	break;
12969	14666	case 'b':
..	..	@@ -13063,7 +14760,7 @@
13063	14760	repaint();
13064	14761	break;
13065	14762	case 'O':
13066		- drawMode = OCCLUSION;
	14763	+ Globals.drawMode = OCCLUSION; // WARNING
13067	14764	repaint();
13068	14765	break;
13069	14766	case 'o':
..	..	@@ -13154,7 +14851,7 @@
13154	14851	break;
13155	14852	case ' ':
13156	14853	lightMode ^= true;
13157		- lighttouched = true;
	14854	+ Globals.lighttouched = true;
13158	14855	manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
13159	14856	targetLookAt.set(manipCamera.lookAt);
13160	14857	repaint();
..	..	@@ -13166,11 +14863,11 @@
13166	14863	repaint();
13167	14864	break;
13168	14865	case 'Z':
13169		- RESIZETEXTURE ^= true;
13170		- break;
	14866	+ //RESIZETEXTURE ^= true;
	14867	+ //break;
13171	14868	case 'z':
13172	14869	RENDERSHADOW ^= true;
13173		- lighttouched = true;
	14870	+ Globals.lighttouched = true;
13174	14871	repaint();
13175	14872	break;
13176	14873	//case UP:
..	..	@@ -13196,7 +14893,8 @@
13196	14893	FlipTransform();
13197	14894	break;
13198	14895	case ENTER:
13199		- object.editWindow.ScreenFit(); // Edit();
	14896	+ // object.editWindow.ScreenFit(); // Edit();
	14897	+ ToggleLive();
13200	14898	break;
13201	14899	case DELETE:
13202	14900	ClearSelection();
..	..	@@ -13284,6 +14982,7 @@
13284	14982	}
13285	14983	//System.out.println("shaper_fovy = " + manipCamera.shaper_fovy);
13286	14984	}
	14985	+
13287	14986	static double OCCLUSIONBOOST = 1; // 0.5;
13288	14987
13289	14988	void keyReleased(int key, int modifiers)
..	..	@@ -13291,11 +14990,11 @@
13291	14990	//mode = ROTATE;
13292	14991	if ((MODIFIERS & COMMAND) == 0) // VR??
13293	14992	{
13294		- SetMouseMode(modifiers);
	14993	+ SetMouseMode(0, modifiers);
13295	14994	}
13296	14995	}
13297	14996
13298		- protected void processKeyEvent(KeyEvent e)
	14997	+ public void processKeyEvent(KeyEvent e)
13299	14998	{
13300	14999	switch (e.getID())
13301	15000	{
..	..	@@ -13425,8 +15124,9 @@
13425	15124
13426	15125	protected void processMouseMotionEvent(MouseEvent e)
13427	15126	{
13428		- //System.out.println("processMouseMotionEvent: " + mouseMode);
13429		- if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
	15127	+ //System.out.println("processMouseMotionEvent: " + mouseMode + " " + e.getModifiers() + " " + e.getModifiersEx() + " " + e.getButton());
	15128	+ //if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
	15129	+ if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (e.getModifiers() & MouseEvent.BUTTON3_MASK) == 0 && (mouseMode & SELECT) == 0)
13430	15130	{
13431	15131	mouseMoved(e);
13432	15132	} else
..	..	@@ -13456,6 +15156,7 @@
13456	15156
13457	15157	void SelectParent()
13458	15158	{
	15159	+ new Exception().printStackTrace();
13459	15160	System.exit(0);
13460	15161	Composite group = (Composite) object;
13461	15162	java.util.Vector selectees = new java.util.Vector(group.selection);
..	..	@@ -13479,6 +15180,7 @@
13479	15180
13480	15181	void SelectChildren()
13481	15182	{
	15183	+ new Exception().printStackTrace();
13482	15184	System.exit(0);
13483	15185	/*
13484	15186	Composite group = (Composite) object;
..	..	@@ -13771,6 +15473,7 @@
13771	15473	//if (g != gr) g.drawImage(img, 0, 0, width, height, null);
13772	15474	}
13773	15475
	15476	+ // To avoid clear.
13774	15477	public void update(Graphics g)
13775	15478	{
13776	15479	paint(g);
..	..	@@ -13860,6 +15563,7 @@
13860	15563	public boolean mouseDown(Event evt, int x, int y)
13861	15564	{
13862	15565	System.out.println("mouseDown: " + evt);
	15566	+ System.exit(0);
13863	15567	/*
13864	15568	locked = true;
13865	15569	drag = false;
..	..	@@ -13903,7 +15607,7 @@
13903	15607	{
13904	15608	keyPressed(0, modifiers);
13905	15609	}
13906		- clickStart(x, y, modifiers);
	15610	+ // clickStart(x, y, modifiers);
13907	15611	return true;
13908	15612	}
13909	15613
..	..	@@ -14021,7 +15725,7 @@
14021	15725	{
14022	15726	keyReleased(0, 0);
14023	15727	}
14024		- drag(x, y, modifiers);
	15728	+ drag(x, y, 0, modifiers);
14025	15729	return true;
14026	15730	}
14027	15731
..	..	@@ -14373,7 +16077,7 @@
14373	16077	gl.glPushAttrib(GL.GL_ALL_ATTRIB_BITS);
14374	16078	gl.glPushMatrix();
14375	16079	gl.glLoadIdentity();
14376		- PushMatrix(checker.toParent);
	16080	+ //PushMatrix(checker.toParent);
14377	16081
14378	16082	gl.glMatrixMode(GL.GL_TEXTURE);
14379	16083	gl.glPushMatrix();
..	..	@@ -14396,8 +16100,8 @@
14396	16100
14397	16101	gl.glNormal3f(0.0f, 0.0f, 1.0f);
14398	16102
14399		- float step = 0.1666f; //0.25f;
14400		- float stepv = step * 1652 / 998;
	16103	+ float step = 2; // 0.1666f; //0.25f;
	16104	+ float stepv = 2; // step * 1652 / 998;
14401	16105
14402	16106	int i0 = 0;
14403	16107	/*
..	..	@@ -14433,20 +16137,21 @@
14433	16137	/**/
14434	16138	//checker.GetMaterial().opacity = 1.1f;
14435	16139	////checker.GetMaterial().ambient = 0.99f;
14436		- Object3D.materialstack[Object3D.materialdepth] = checker.material;
14437		- Object3D.selectedstack[Object3D.materialdepth] = false;
14438		- cStatic.objectstack[Object3D.materialdepth++] = checker;
	16140	+ materialstack[materialdepth] = checker.material;
	16141	+ selectedstack[materialdepth] = false;
	16142	+ cStatic.objectstack[materialdepth++] = checker;
14439	16143	//System.out.println("material " + material);
14440	16144	//Applet3D.tracein(this, selected);
14441	16145	vector2buffer = checker.projectedVertices;
14442	16146
14443		- checker.GetMaterial().Draw(this, false); // true);
	16147	+ //checker.GetMaterial().Draw(this, false); // true);
	16148	+ DrawMaterial(checker.GetMaterial(), false); // true);
14444	16149
14445		- Object3D.materialdepth -= 1;
14446		- if (Object3D.materialdepth > 0)
	16150	+ materialdepth -= 1;
	16151	+ if (materialdepth > 0)
14447	16152	{
14448		- vector2buffer = cStatic.objectstack[Object3D.materialdepth - 1].projectedVertices;
14449		- Object3D.materialstack[Object3D.materialdepth - 1].Draw(this, Object3D.selectedstack[Object3D.materialdepth - 1]);
	16153	+ vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	16154	+ DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
14450	16155	}
14451	16156	//checker.GetMaterial().opacity = 1f;
14452	16157	////checker.GetMaterial().ambient = 1f;
..	..	@@ -14467,15 +16172,27 @@
14467	16172
14468	16173	//float u = (i+1)/2;
14469	16174	//float v = (j+1)/2;
14470		- gl.glTexCoord2f((i + 1) / 2, (j + 1) / 2); // (1,0) // (i+1+step)/2,(j+1)/2);
	16175	+ if (checker.flipV)
	16176	+ gl.glTexCoord2f((i + 1) / 2, 1 - (j + 1) / 2);
	16177	+ else
	16178	+ gl.glTexCoord2f((i + 1) / 2, (j + 1) / 2); // (1,0) // (i+1+step)/2,(j+1)/2);
14471	16179	gl.glVertex3f(i, j, -0.5f);
14472	16180
	16181	+ if (checker.flipV)
	16182	+ gl.glTexCoord2f((i + 1 + step) / 2, 1 - (j + 1) / 2); // (1,1) // (i+1+step)/2,(j+1+step)/2);
	16183	+ else
14473	16184	gl.glTexCoord2f((i + 1 + step) / 2, (j + 1) / 2); // (1,1) // (i+1+step)/2,(j+1+step)/2);
14474	16185	gl.glVertex3f(i + step, j, -0.5f);
14475	16186
	16187	+ if (checker.flipV)
	16188	+ gl.glTexCoord2f((i + 1 + step) / 2, 1 - (j + 1 + stepv) / 2); // (0,1) //(i+1)/2,(j+1+step)/2);
	16189	+ else
14476	16190	gl.glTexCoord2f((i + 1 + step) / 2, (j + 1 + stepv) / 2); // (0,1) //(i+1)/2,(j+1+step)/2);
14477	16191	gl.glVertex3f(i + step, j + stepv, -0.5f);
14478	16192
	16193	+ if (checker.flipV)
	16194	+ gl.glTexCoord2f((i + 1) / 2, 1 - (j + 1 + stepv) / 2); // (0,0) //(i+1)/2,(j+1)/2);
	16195	+ else
14479	16196	gl.glTexCoord2f((i + 1) / 2, (j + 1 + stepv) / 2); // (0,0) //(i+1)/2,(j+1)/2);
14480	16197	gl.glVertex3f(i, j + stepv, -0.5f);
14481	16198	}
..	..	@@ -14487,7 +16204,7 @@
14487	16204	gl.glMatrixMode(GL.GL_PROJECTION);
14488	16205	gl.glPopMatrix();
14489	16206	gl.glMatrixMode(GL.GL_MODELVIEW);
14490		- PopMatrix(null); // checker.toParent); // null);
	16207	+ //PopMatrix(null); // checker.toParent); // null);
14491	16208	gl.glPopMatrix();
14492	16209	PopTextureMatrix(checker.toParent);
14493	16210	gl.glMatrixMode(GL.GL_TEXTURE);
..	..	@@ -14578,6 +16295,7 @@
14578	16295	{
14579	16296	if (!selection)
14580	16297	{
	16298	+ new Exception().printStackTrace();
14581	16299	System.exit(0);
14582	16300	return;
14583	16301	}
..	..	@@ -14600,14 +16318,14 @@
14600	16318
14601	16319	//int tmp = selection_view;
14602	16320	//selection_view = -1;
14603		- int temp = drawMode;
14604		- drawMode = SELECTION;
	16321	+ int temp = DrawMode();
	16322	+ Globals.drawMode = SELECTION; // WARNING
14605	16323	indexcount = 0;
14606	16324	parent.display(drawable);
14607	16325	//selection_view = tmp;
14608	16326	//if (temp == SELECTION)
14609	16327	// temp = DEFAULT; // patch for selection debug
14610		- drawMode = temp;
	16328	+ Globals.drawMode = temp; // WARNING
14611	16329
14612	16330	//gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
14613	16331
..	..	@@ -14657,6 +16375,11 @@
14657	16375	// System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
14658	16376	// System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
14659	16377
	16378	+ // Will fit the mesh !!!
	16379	+ selectedpoint.toParent[0][0] = 0.0001;
	16380	+ selectedpoint.toParent[1][1] = 0.0001;
	16381	+ selectedpoint.toParent[2][2] = 0.0001;
	16382	+
14660	16383	glu.gluUnProject(x,y,depth,view,0,tempmat2,0,viewport,0,selectedpoint.toParent[3],0);
14661	16384
14662	16385	// if (object.selection != null && object.selection.Size() > 0)
..	..	@@ -14700,16 +16423,16 @@
14700	16423	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	16424	}
14702	16425
14703		- previousselectedpoint = (Sphere) GraphreeD.clone(selectedpoint);
	16426	+ previousselectedpoint = (Sphere) GrafreeD.clone(selectedpoint);
14704	16427	}
14705	16428	}
14706	16429
14707	16430	if (!movingcamera && !PAINTMODE)
14708	16431	object.editWindow.ScreenFitPoint(); // fev 2014
14709	16432
14710		- if (PAINTMODE && GraphreeD.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	16433	+ if (PAINTMODE && GrafreeD.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
14711	16434	{
14712		- Object3D paintobj = GraphreeD.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
	16435	+ Object3D paintobj = GrafreeD.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
14713	16436
14714	16437	Object3D group = new Object3D("inst" + paintcount++);
14715	16438
..	..	@@ -14875,14 +16598,14 @@
14875	16598	//gl.glColorMask(false, false, false, false);
14876	16599
14877	16600	//render_scene_from_light_view(gl, drawable, 0, 0);
14878		- if (RENDERSHADOW && lighttouched && !movingcamera) // && !parent.IsFreezed())
	16601	+ if (RENDERSHADOW && Globals.lighttouched && !movingcamera) // && !parent.IsFreezed())
14879	16602	{
14880	16603	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
14881	16604
14882		- int temp = drawMode;
14883		- drawMode = SHADOW;
	16605	+ int temp = DrawMode();
	16606	+ Globals.drawMode = SHADOW; // WARNING
14884	16607	parent.display(drawable);
14885		- drawMode = temp;
	16608	+ Globals.drawMode = temp; // WARNING
14886	16609	}
14887	16610
14888	16611	gl.glCullFace(gl.GL_BACK);
..	..	@@ -14935,7 +16658,6 @@
14935	16658
14936	16659	class AntialiasBuffer implements GLEventListener
14937	16660	{
14938		-
14939	16661	CameraPane parent = null;
14940	16662
14941	16663	AntialiasBuffer(CameraPane p)
..	..	@@ -15045,13 +16767,19 @@
15045	16767	gl.glFlush();
15046	16768
15047	16769	/**/
15048		- gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_BGRA, GL.GL_UNSIGNED_INT_8_8_8_8_REV, occlusionsizebuffer);
	16770	+ gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusionsizebuffer);
15049	16771
15050		- int[] pixels = occlusionsizebuffer.array();
	16772	+ float[] pixels = occlusionsizebuffer.array();
15051	16773
15052	16774	double r = 0, g = 0, b = 0;
15053	16775
15054	16776	double count = 0;
	16777	+
	16778	+ gl.glGetDoublev(gl.GL_PROJECTION_MATRIX, tempmat2, 0);
	16779	+
	16780	+ float mindepth = 1;
	16781	+
	16782	+ double FACTOR = 1;
15055	16783
15056	16784	for (int i = 0; i < pixels.length; i++)
15057	16785	{
..	..	@@ -15136,7 +16864,7 @@
15136	16864
15137	16865	double scale = ray.z; // 1; // cos
15138	16866
15139		- int p = pixels[newindex];
	16867	+ float depth = pixels[newindex];
15140	16868
15141	16869	/*
15142	16870	int newindex2 = (x + 1) * OCCLUSION_SIZE + y;
..	..	@@ -15160,10 +16888,23 @@
15160	16888	scale = (1 - modu) * modv;
15161	16889	*/
15162	16890
15163		- r += ((p >> 16) & 0xFF) * scale / 255;
15164		- g += ((p >> 8) & 0xFF) * scale / 255;
15165		- b += (p & 0xFF) * scale / 255;
	16891	+ //r += ((p >> 16) & 0xFF) * scale / 255;
	16892	+ //g += ((p >> 8) & 0xFF) * scale / 255;
	16893	+ //b += (p & 0xFF) * scale / 255;
	16894	+
	16895	+ if (mindepth > depth)
	16896	+ {
	16897	+ mindepth = depth;
	16898	+ }
15166	16899
	16900	+ double z_eye = tempmat2[34 + 2] / (depth -2.0 + 1.0 - tempmat2[2*4 + 2]);
	16901	+
	16902	+ double factor = 1 - Math.exp(-z_eye * z_eye / FACTOR);
	16903	+
	16904	+ r += factor * scale;
	16905	+ g += factor * scale;
	16906	+ b += factor * scale;
	16907	+
15167	16908	count += scale;
15168	16909	}
15169	16910
..	..	@@ -15261,12 +17002,6 @@
15261	17002	GLUT glut = new GLUT();
15262	17003
15263	17004
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	17005	public boolean spherical = false;
15271	17006	static boolean DEBUG_OCCLUSION = false;
15272	17007	static boolean DEBUG_SELECTION = false;
..	..	@@ -15279,10 +17014,12 @@
15279	17014	int AAbuffersize = 0;
15280	17015
15281	17016	//double[] selectedpoint = new double[3];
15282		- static Sphere selectedpoint = new Sphere();
	17017	+ static Superellipsoid selectedpoint = new Superellipsoid();
15283	17018	static Sphere previousselectedpoint = null;
15284		- static Sphere debugpoint = new Sphere();
15285		- static Sphere debugpoint2 = new Sphere();
	17019	+ static Sphere debugpointG = new Sphere();
	17020	+ static Sphere debugpointP = new Sphere();
	17021	+ static Sphere debugpointC = new Sphere();
	17022	+ static Sphere debugpointR = new Sphere();
15286	17023
15287	17024	static Sphere debugpoints[] = new Sphere[8];
15288	17025
..	..	@@ -15313,7 +17050,7 @@
15313	17050	}
15314	17051	}
15315	17052
15316		- static void DrawPoints(CameraPane cpane)
	17053	+ static void DrawPoints(iCameraPane cpane)
15317	17054	{
15318	17055	for (int i=0; i<8; i++) // first and last are red
15319	17056	{
..	..	@@ -15335,7 +17072,8 @@
15335	17072	static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
15336	17073	static IntBuffer selectsizebuffer = IntBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
15337	17074	static java.nio.FloatBuffer pointselectsizebuffer = java.nio.FloatBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
15338		- static IntBuffer occlusionsizebuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17075	+ //static IntBuffer occlusionsizebuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17076	+ static java.nio.FloatBuffer occlusionsizebuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
15339	17077	static BufferedImage bufimage = new BufferedImage(TEX_SIZE, TEX_SIZE, BufferedImage.TYPE_INT_RGB);
15340	17078	static BufferedImage textest = new cBufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB);
15341	17079	static java.util.Vector<BufferedImage> billboards = new java.util.Vector<BufferedImage>();
..	..	@@ -15344,10 +17082,11 @@
15344	17082	static IntBuffer textbuffer = null; // IntBuffer.allocate(TEXT_WIDTH88 * TEXT_HEIGHT);
15345	17083	// Depth buffer format
15346	17084	//private int depth_format;
15347		- static public void NextIndex(Object3D o, GL gl)
	17085	+
	17086	+ public void NextIndex()
15348	17087	{
15349	17088	indexcount+=16;
15350		- gl.glColor3d(((indexcount >>> 16) & 255) / 255.0, ((indexcount >>> 8) & 255) / 255.0, ((indexcount) & 255) / 255.0);
	17089	+ GetGL().glColor3d(((indexcount >>> 16) & 255) / 255.0, ((indexcount >>> 8) & 255) / 255.0, ((indexcount) & 255) / 255.0);
15351	17090	//objects[indexcount] = o;
15352	17091	//System.out.println("indexcount = " + indexcount);
15353	17092	}