~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -31,9 +31,12 @@
31	31
32	32	import gleem.linalg.Mat4f;
33	33
34		-class CameraPane extends GLCanvas implements Runnable, GLEventListener, ActionListener, MouseWheelListener, MouseMotionListener, MouseListener, KeyListener
	34	+class CameraPane extends GLCanvas implements iCameraPane, Runnable, GLEventListener, ActionListener, MouseWheelListener, MouseMotionListener, MouseListener, KeyListener
35	35	{
36		- static boolean DEBUG = false;
	36	+ static cMaterial[] materialstack = new cMaterial[65536];
	37	+ static boolean[] selectedstack = new boolean[65536];
	38	+ static int materialdepth = 0;
	39	+
37	40	static boolean FRUSTUM = false; // still bogus true; // frustum culling
38	41
39	42	// camera change fix
..	..	@@ -42,25 +45,7 @@
42	45
43	46	static int STEP = 1;
44	47
45		- static boolean ONESTEP = false; // do LIVE once
46		-
47		- /**
48		- * @return the LIVE
49		- */
50		- public static boolean isLIVE()
51		- {
52		- return LIVE \|\| ONESTEP;
53		- }
54		-
55		- /**
56		- * @param aLIVE the LIVE to set
57		- */
58		- public static void setLIVE(boolean aLIVE)
59		- {
60		- LIVE = aLIVE;
61		- }
62		-
63		- /static/ boolean CULLFACE = false; // true;
	48	+ /static/ private boolean CULLFACE = false; // true;
64	49	/static/ boolean NEAREST = false; // true;
65	50	/static/ boolean WIREFRAME = false; // true;
66	51
..	..	@@ -70,14 +55,12 @@
70	55	static int CURRENTANTIALIAS = 0; // 1;
71	56	/static/ boolean RENDERSHADOW = true;
72	57	/static/ int RENDERPROGRAM = 2; // 0 == none, 1 == fast, 2 == normal
73		- static boolean ANIMATION = false;
74		- static String filename;
75	58
76	59	boolean DISPLAYTEXT = false;
77	60	//boolean REDUCETEXTURE = true;
78	61	boolean CACHETEXTURE = true;
79	62	boolean CLEANCACHE = false; // true;
80		- boolean MIPMAP = false; // true;
	63	+ boolean MIPMAP = true; // false; // true;
81	64	boolean COMPRESSTEXTURE = false;
82	65	boolean KOMPACTTEXTURE = false; // true;
83	66	boolean RESIZETEXTURE = false;
..	..	@@ -97,10 +80,8 @@
97	80
98	81	static boolean textureon = true;
99	82	static boolean LOCALTRANSFORM = false;
100		-private static boolean LIVE = false;
101	83	static boolean FULLSCREEN = false;
102	84	static boolean SUPPORT = true;
103		-static boolean CROWD = false;
104	85	static boolean INERTIA = true;
105	86	static boolean FAST = false;
106	87	static boolean SLOWPOSE = false;
..	..	@@ -108,6 +89,8 @@
108	89
109	90	static int tickcount = 0; // slow pose issue
110	91
	92	+static boolean BUTTONLESSWHEEL = false;
	93	+static boolean ZOOMBOXMODE = false;
111	94	static boolean BOXMODE = false;
112	95	static boolean IMAGEFLIP = false;
113	96	static boolean SMOOTHFOCUS = false;
..	..	@@ -122,7 +105,7 @@
122	105	static boolean OEIL = true;
123	106	static boolean OEILONCE = false; // do oeilon then oeiloff
124	107	static boolean LOOKAT = true;
125		-static boolean RANDOM = true; // false;
	108	+static boolean SWITCH = true; // false;
126	109	static boolean HANDLES = false; // selection doesn't work!!
127	110	static boolean PAINTMODE = false;
128	111
..	..	@@ -165,12 +148,41 @@
165	148	defaultcaps.setAccumBlueBits(16);
166	149	defaultcaps.setAccumAlphaBits(16);
167	150	}
168		- static CameraPane theRenderer;
169		-
	151	+
	152	+ private File defaultDirectory = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory();
	153	+
170	154	void SetAsGLRenderer(boolean b)
171	155	{
172	156	isRenderer = b;
173		- theRenderer = this;
	157	+ Globals.theRenderer = this;
	158	+ }
	159	+
	160	+ CameraPane(Object3D o, Camera cam, boolean withcontext)
	161	+ {
	162	+ super(defaultcaps, null, withcontext?glcontext:null, null);
	163	+
	164	+ //System.out.println("AMERICA AREA = " + (9458886 + 9210755 + 8480395 + 2736391 + 1943018 + 1289475 + 1141569 + 1069350 + 911559 + 721229 + 395886 + 377972 + 246700 + 211156 + 173985 + 141133 + 118279 + 112079 + 108523));
	165	+ glcontext = getContext();
	166	+
	167	+ cameras = new Camera[2];
	168	+ targetLookAts = new cVector[2];
	169	+
	170	+ SetCamera(cam);
	171	+
	172	+ SetLight(new Camera(new cVector(10, 10, -20)));
	173	+
	174	+ object = o;
	175	+
	176	+ setBackground(Color.white);
	177	+
	178	+ addKeyListener(this);
	179	+ addMouseListener(this);
	180	+ addMouseMotionListener(this);
	181	+ addMouseWheelListener(this);
	182	+ //System.out.println("addGLEventListener: " + this);
	183	+ addGLEventListener(this);
	184	+
	185	+// pingthread.start(); // may 2013
174	186	}
175	187
176	188	static boolean AntialiasingEnabled()
..	..	@@ -178,12 +190,53 @@
178	190	return CURRENTANTIALIAS > 0;
179	191	}
180	192
181		- void ClearDepth()
	193	+ /// INTERFACE
	194	+
	195	+ public javax.media.opengl.GL GetGL0()
	196	+ {
	197	+ return null;
	198	+ }
	199	+
	200	+ public int GenList()
	201	+ {
	202	+ javax.media.opengl.GL gl = GetGL();
	203	+ return gl.glGenLists(1);
	204	+ }
	205	+
	206	+ public void NewList(int id)
	207	+ {
	208	+ javax.media.opengl.GL gl = GetGL();
	209	+ gl.glNewList(id, gl.GL_COMPILE); //_AND_EXECUTE);
	210	+ }
	211	+
	212	+ public void CallList(int id)
	213	+ {
	214	+ javax.media.opengl.GL gl = GetGL();
	215	+ gl.glCallList(id);
	216	+ }
	217	+
	218	+ public void EndList()
	219	+ {
	220	+ javax.media.opengl.GL gl = GetGL();
	221	+ gl.glEndList();
	222	+ }
	223	+
	224	+ public boolean IsBoxMode()
	225	+ {
	226	+ return BOXMODE;
	227	+ }
	228	+
	229	+ public boolean IsZoomBoxMode()
	230	+ {
	231	+ return ZOOMBOXMODE;
	232	+ }
	233	+
	234	+ public void ClearDepth()
182	235	{
183	236	GetGL().glClear(GetGL().GL_DEPTH_BUFFER_BIT);
184	237	}
185	238
186		- void DepthTest(boolean depthtest)
	239	+ public void DepthTest(boolean depthtest)
187	240	{
188	241	if (depthtest)
189	242	GetGL().glDepthFunc(GL.GL_LEQUAL);
..	..	@@ -191,7 +244,7 @@
191	244	GetGL().glDepthFunc(GL.GL_ALWAYS);
192	245	}
193	246
194		- void DepthWrite(boolean depthwrite)
	247	+ public void DepthWrite(boolean depthwrite)
195	248	{
196	249	if (depthwrite)
197	250	GetGL().glDepthMask(true);
..	..	@@ -199,12 +252,1616 @@
199	252	GetGL().glDepthMask(false);
200	253	}
201	254
202		- void BackFaceCull(boolean bfc)
	255	+ public void BackFaceCull(boolean bfc)
203	256	{
204	257	if (bfc)
205	258	GetGL().glEnable(GetGL().GL_CULL_FACE);
206	259	else
207	260	GetGL().glDisable(GetGL().GL_CULL_FACE);
	261	+ }
	262	+
	263	+ public boolean BackFaceCullMode()
	264	+ {
	265	+ return this.CULLFACE;
	266	+ }
	267	+
	268	+ public boolean IsAmbientOcclusionOn()
	269	+ {
	270	+ return this.ambientOcclusion;
	271	+ }
	272	+
	273	+ public boolean IsDebugSelection()
	274	+ {
	275	+ return DEBUG_SELECTION;
	276	+ }
	277	+
	278	+ public boolean IsFrozen()
	279	+ {
	280	+ boolean selectmode = this.DrawMode() == SELECTION \|\| this.IsDebugSelection();
	281	+
	282	+ return !selectmode && cameracount == 0; // != 0;
	283	+ }
	284	+
	285	+ // Currently in Globals
	286	+ public int DrawMode()
	287	+ {
	288	+ return Globals.DrawMode();
	289	+ }
	290	+
	291	+ public Camera EyeCamera()
	292	+ {
	293	+ return eyeCamera;
	294	+ }
	295	+
	296	+ public Camera LightCamera()
	297	+ {
	298	+ return lightCamera;
	299	+ }
	300	+
	301	+ public Camera ManipCamera()
	302	+ {
	303	+ return manipCamera;
	304	+ }
	305	+
	306	+ public Camera RenderCamera()
	307	+ {
	308	+ return renderCamera;
	309	+ }
	310	+
	311	+ public Camera[] Cameras()
	312	+ {
	313	+ return cameras;
	314	+ }
	315	+
	316	+ public void PushMaterial(Object3D obj, boolean selected)
	317	+ {
	318	+ CameraPane display = this;
	319	+ javax.media.opengl.GL gl = display.GetGL();
	320	+ cMaterial material = obj.material;
	321	+
	322	+ if (material != null)
	323	+ {
	324	+ materialstack[materialdepth] = material;
	325	+ selectedstack[materialdepth] = selected;
	326	+ cStatic.objectstack[materialdepth++] = obj;
	327	+ //System.out.println("material " + material);
	328	+ //Applet3D.tracein(this, selected);
	329	+ //display.vector2buffer = obj.projectedVertices;
	330	+ if (obj instanceof Camera)
	331	+ {
	332	+ display.options1[0] = material.shift;
	333	+ //System.out.println("shift " + material.shift);
	334	+ display.options1[1] = material.lightarea;
	335	+ display.options1[2] = material.shadowbias;
	336	+ display.options1[3] = material.aniso;
	337	+ display.options1[4] = material.anisoV;
	338	+// System.out.println("display.options1[0] " + display.options1[0]);
	339	+// System.out.println("display.options1[1] " + display.options1[1]);
	340	+// System.out.println("display.options1[2] " + display.options1[2]);
	341	+// System.out.println("display.options1[3] " + display.options1[3]);
	342	+// System.out.println("display.options1[4] " + display.options1[4]);
	343	+ display.options2[0] = material.opacity;
	344	+ display.options2[1] = material.diffuse;
	345	+ display.options2[2] = material.factor;
	346	+// System.out.println("display.options2[0] " + display.options2[0]);
	347	+// System.out.println("display.options2[1] " + display.options2[1]);
	348	+// System.out.println("display.options2[2] " + display.options2[2]);
	349	+
	350	+ cColor.HSBtoRGB(material.color, material.modulation, 1, display.options3);
	351	+// System.out.println("display.options3[0] " + display.options3[0]);
	352	+// System.out.println("display.options3[1] " + display.options3[1]);
	353	+// System.out.println("display.options3[2] " + display.options3[2]);
	354	+ display.options4[0] = material.cameralight/0.2f;
	355	+ display.options4[1] = material.subsurface;
	356	+ display.options4[2] = material.sheen;
	357	+// System.out.println("display.options4[0] " + display.options4[0]);
	358	+// System.out.println("display.options4[1] " + display.options4[1]);
	359	+// System.out.println("display.options4[2] " + display.options4[2]);
	360	+
	361	+ // if (display.CURRENTANTIALIAS > 0)
	362	+ // display.options3[3] /= 4;
	363	+
	364	+ /*
	365	+ System.out.println("Focus = " + display.options1[0]);
	366	+ System.out.println("Aperture = " + display.options1[1]);
	367	+ System.out.println("ShadowBlur = " + display.options1[2]);
	368	+ System.out.println("Antialiasing = " + display.options1[3]);
	369	+ System.out.println("Fog = " + display.options2[0]);
	370	+ System.out.println("Intensity = " + display.options2[1]);
	371	+ System.out.println("Elevation = " + display.options2[2]);
	372	+ /**/
	373	+ } else
	374	+ {
	375	+ DrawMaterial(material, selected, obj.projectedVertices);
	376	+ }
	377	+ } else
	378	+ {
	379	+ if (selected && CameraPane.flash)
	380	+ {
	381	+ display.modelParams4[1] = 100;
	382	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 4, display.modelParams4, 0);
	383	+ }
	384	+ }
	385	+ }
	386	+
	387	+ public void PushMaterial2(Object3D obj, boolean selected)
	388	+ {
	389	+ CameraPane display = this;
	390	+ cMaterial material = obj.material;
	391	+
	392	+ if (material != null)
	393	+ {
	394	+ materialstack[materialdepth] = material;
	395	+ selectedstack[materialdepth] = selected;
	396	+ cStatic.objectstack[materialdepth++] = obj;
	397	+ //System.out.println("material " + material);
	398	+ //Applet3D.tracein("selected ", selected);
	399	+ //display.vector2buffer = obj.projectedVertices;
	400	+ display.DrawMaterial(material, selected, obj.projectedVertices);
	401	+ }
	402	+ }
	403	+
	404	+ public void PopMaterial(Object3D obj, boolean selected)
	405	+ {
	406	+ CameraPane display = this;
	407	+ javax.media.opengl.GL gl = display.GetGL();
	408	+ cMaterial material = obj.material;
	409	+
	410	+ //if (parent != null && parent.GetMaterial() != null)
	411	+ // parent.GetMaterial().Draw(display, parent.IsSelected(this));
	412	+ if (material != null)
	413	+ {
	414	+ materialdepth -= 1;
	415	+ if (materialdepth > 0)
	416	+ {
	417	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	418	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
	419	+ }
	420	+ //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
	421	+ } else if (selected && CameraPane.flash && obj.GetMaterial() != null)
	422	+ {
	423	+ display.modelParams4[1] = obj.GetMaterial().cameralight;
	424	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 4, display.modelParams4, 0);
	425	+ }
	426	+ }
	427	+
	428	+ public void PopMaterial2(Object3D obj)
	429	+ {
	430	+ CameraPane display = this;
	431	+ cMaterial material = obj.material;
	432	+
	433	+ if (material != null)
	434	+ {
	435	+ materialdepth -= 1;
	436	+ if (materialdepth > 0)
	437	+ {
	438	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	439	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
	440	+ }
	441	+ //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
	442	+ //else
	443	+ //material.Draw(display, false);
	444	+ }
	445	+ }
	446	+
	447	+ public void DrawFace(Object3D obj, Vertex pv, Vertex qv, Vertex rv, Face face)
	448	+ {
	449	+ CameraPane display = this;
	450	+
	451	+ if (pv.y == -10000 \|\|
	452	+ qv.y == -10000 \|\|
	453	+ rv.y == -10000)
	454	+ return;
	455	+
	456	+// float b = f.nbiterations & 1;
	457	+// float g = (f.nbiterations>>1) & 1;
	458	+// float r = (f.nbiterations>>2) & 1;
	459	+//
	460	+// //if (f.weight == 10000)
	461	+// //{
	462	+// // r = 1; g = b = 0;
	463	+// //}
	464	+// //else
	465	+// //{
	466	+// // assert(f.weight < 10000);
	467	+// r = g = b = (float)bRep.FaceWeight(f)*100;
	468	+// if (r<0)
	469	+// assert(r>=0);
	470	+// //}
	471	+
	472	+ javax.media.opengl.GL gl = display.GetGL();
	473	+
	474	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
	475	+
	476	+ //System.out.println("p = " + pv + "; q = " + qv + "; r = " + rv);
	477	+ if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
	478	+ {
	479	+ //gl.glBegin(gl.GL_TRIANGLES);
	480	+ boolean hasnorm = pv.norm != null && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0)
	481	+ // TEST LIVE NORMALS && !obj.dontselect
	482	+ ;
	483	+ if (!hasnorm)
	484	+ {
	485	+ // System.out.println("Mesh normal");
	486	+ LA.vecSub(pv/.pos/, qv/.pos/, obj.v0);
	487	+ LA.vecSub(pv/.pos/, rv/.pos/, obj.v1);
	488	+ LA.vecCross(obj.v0, obj.v1, obj.v2);
	489	+ LA.vecNormalize(obj.v2);
	490	+ gl.glNormal3f((float) obj.v2.x, (float) obj.v2.y, (float) obj.v2.z);
	491	+ }
	492	+
	493	+ // P
	494	+ float x = (float)pv.x;
	495	+ float y = (float)pv.y;
	496	+ float z = (float)pv.z;
	497	+
	498	+ if (hasnorm)
	499	+ {
	500	+// if (!pv.norm.normalized())
	501	+// assert(pv.norm.normalized());
	502	+
	503	+ //System.out.println("normalp = " + pv.norm.x + ", " + pv.norm.y + ", " + pv.norm.z);
	504	+ float nx = (float)pv.norm.x;
	505	+ float ny = (float)pv.norm.y;
	506	+ float nz = (float)pv.norm.z;
	507	+
	508	+ x += nx * obj.NORMALPUSH;
	509	+ y += ny * obj.NORMALPUSH;
	510	+ z += nz * obj.NORMALPUSH;
	511	+
	512	+ gl.glNormal3f(nx, ny, nz);
	513	+ }
	514	+ gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
	515	+ SetColor(obj, pv);
	516	+ //gl.glColor4f(r, g, b, 1);
	517	+ //gl.glColor4f(pv.boundary, pv.boundary, pv.boundary, 1);
	518	+ if (obj.flipV)
	519	+ gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
	520	+ else
	521	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	522	+ //System.out.println("vertexp = " + pv.x + ", " + pv.y + ", " + pv.z);
	523	+
	524	+ gl.glVertex3f(x, y, z);
	525	+
	526	+ // Q
	527	+ x = (float)qv.x;
	528	+ y = (float)qv.y;
	529	+ z = (float)qv.z;
	530	+
	531	+// Print(pv);
	532	+ if (hasnorm)
	533	+ {
	534	+// assert(qv.norm.normalized());
	535	+ //System.out.println("normalq = " + qv.norm.x + ", " + qv.norm.y + ", " + qv.norm.z);
	536	+ float nx = (float)qv.norm.x;
	537	+ float ny = (float)qv.norm.y;
	538	+ float nz = (float)qv.norm.z;
	539	+
	540	+ x += nx * obj.NORMALPUSH;
	541	+ y += ny * obj.NORMALPUSH;
	542	+ z += nz * obj.NORMALPUSH;
	543	+
	544	+ gl.glNormal3f(nx, ny, nz);
	545	+ }
	546	+ //System.out.println("vertexq = " + qv.s + ", " + qv.t);
	547	+ // boolean locked = false;
	548	+ // float eps = 0.1f;
	549	+ // boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
	550	+
	551	+ // int dot = 0; //*/ (int)f.dot;
	552	+
	553	+ // if ((dot&1) == 0)
	554	+ // dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
	555	+
	556	+ // if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
	557	+ if (obj.flipV)
	558	+ gl.glTexCoord2f((float) qv.s, 1-(float) qv.t);
	559	+ else
	560	+ gl.glTexCoord2f((float) qv.s, (float) qv.t);
	561	+ // else
	562	+ // {
	563	+ // locked = true;
	564	+ // gl.glTexCoord2f((float) pv.s, (float) pv.t);
	565	+ // }
	566	+ gl.glColor4f(qv.AO, qv.AO, qv.AO, 1);
	567	+ SetColor(obj, qv);
	568	+
	569	+ gl.glVertex3f(x, y, z);
	570	+ //gl.glColor4f(r, g, b, 1);
	571	+ //gl.glColor4f(qv.boundary, qv.boundary, qv.boundary, 1);
	572	+ //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
	573	+// Print(qv);
	574	+
	575	+ // R
	576	+ x = (float)rv.x;
	577	+ y = (float)rv.y;
	578	+ z = (float)rv.z;
	579	+
	580	+ if (hasnorm)
	581	+ {
	582	+// assert(rv.norm.normalized());
	583	+ //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
	584	+ float nx = (float)rv.norm.x;
	585	+ float ny = (float)rv.norm.y;
	586	+ float nz = (float)rv.norm.z;
	587	+
	588	+ x += nx * obj.NORMALPUSH;
	589	+ y += ny * obj.NORMALPUSH;
	590	+ z += nz * obj.NORMALPUSH;
	591	+
	592	+ gl.glNormal3f(nx, ny, nz);
	593	+ }
	594	+
	595	+ // if ((dot&4) == 0)
	596	+ // dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
	597	+
	598	+ // if (wrap \|\| !locked && (dot&8) != 0)
	599	+ if (obj.flipV)
	600	+ gl.glTexCoord2f((float) rv.s, 1-(float) rv.t);
	601	+ else
	602	+ gl.glTexCoord2f((float) rv.s, (float) rv.t);
	603	+ // else
	604	+ // gl.glTexCoord2f((float) pv.s, (float) pv.t);
	605	+
	606	+ // f.dot = dot;
	607	+
	608	+ gl.glColor4f(rv.AO, rv.AO, rv.AO, 1);
	609	+ SetColor(obj, rv);
	610	+ //gl.glColor4f(r, g, b, 1);
	611	+ //gl.glColor4f(rv.boundary, rv.boundary, rv.boundary, 1);
	612	+ //System.out.println("vertexr = " + rv.x + ", " + rv.y + ", " + rv.z);
	613	+ gl.glVertex3f(x, y, z);
	614	+// Print(rv);
	615	+ //gl.glEnd();
	616	+ }
	617	+ else
	618	+ {
	619	+ gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
	620	+ gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
	621	+ gl.glVertex3f((float) rv.x, (float) rv.y, (float) rv.z);
	622	+
	623	+ }
	624	+
	625	+ if (false) // (attributes & WIREFRAME) != 0)
	626	+ {
	627	+ gl.glDisable(gl.GL_LIGHTING);
	628	+
	629	+ gl.glBegin(gl.GL_LINE_LOOP);
	630	+ gl.glVertex3d(pv./pos./x, pv./pos./y, pv./pos./z);
	631	+ gl.glVertex3d(qv./pos./x, qv./pos./y, qv./pos./z);
	632	+ gl.glVertex3d(rv./pos./x, rv./pos./y, rv./pos./z);
	633	+ gl.glEnd();
	634	+
	635	+ gl.glEnable(gl.GL_LIGHTING);
	636	+ }
	637	+ }
	638	+
	639	+ /**
	640	+ * <code>draw</code> renders a <code>TriMesh</code> object including
	641	+ * it's normals, colors, textures and vertices.
	642	+ *
	643	+ * @see Renderer#draw(TriMesh)
	644	+ * @param tris
	645	+ * the mesh to render.
	646	+ */
	647	+ public void DrawParticles(TriMesh geo, Object3D shape, boolean selected, boolean rotate) // TriMesh tris)
	648	+ {
	649	+ CameraPane display = this;
	650	+
	651	+ float r = display.modelParams0[0];
	652	+ float g = display.modelParams0[1];
	653	+ float b = display.modelParams0[2];
	654	+ float opacity = display.modelParams5[1];
	655	+
	656	+ //final GL gl = GLU.getCurrentGL();
	657	+ GL gl = display.GetGL(); // getGL();
	658	+
	659	+ FloatBuffer vertBuf = geo.vertBuf;
	660	+
	661	+ int v = vertBuf.capacity();
	662	+
	663	+ int count = 0;
	664	+
	665	+ boolean cf = gl.glIsEnabled(gl.GL_CULL_FACE);
	666	+ gl.glEnable(gl.GL_CULL_FACE);
	667	+ // gl.glScalef(1.0f/1024,1.0f/1024,1.0f/1024);
	668	+ for (int i=0; i<v/3; i++)
	669	+ {
	670	+ int index3 = i*3;
	671	+
	672	+ if (geo.sizeBuf.get(index3+1) == 0)
	673	+ continue;
	674	+
	675	+ count++;
	676	+
	677	+ int index4 = i*4;
	678	+
	679	+ float tx = vertBuf.get(index3);
	680	+ float ty = vertBuf.get(index3+1);
	681	+ float tz = vertBuf.get(index3+2);
	682	+
	683	+ // if (tx == 0 && ty == 0 && tz == 0)
	684	+ // continue;
	685	+
	686	+ gl.glMatrixMode(gl.GL_TEXTURE);
	687	+ gl.glPushMatrix();
	688	+
	689	+ float[] texmat = geo.texmat;
	690	+ texmat[12] = texmat[13] = texmat[14] = i;
	691	+
	692	+ gl.glMultMatrixf(texmat, 0);
	693	+
	694	+ gl.glMatrixMode(gl.GL_MODELVIEW);
	695	+ gl.glPushMatrix();
	696	+
	697	+ gl.glTranslatef(tx,ty,tz);
	698	+
	699	+ if (rotate)
	700	+ gl.glRotatef(i, 0, 1, 0);
	701	+
	702	+ float size = geo.sizeBuf.get(index3) / 100;
	703	+ gl.glScalef(size,size,size);
	704	+
	705	+ float cr = geo.colorBuf.get(index4);
	706	+ float cg = geo.colorBuf.get(index4+1);
	707	+ float cb = geo.colorBuf.get(index4+2);
	708	+ float ca = geo.colorBuf.get(index4+3);
	709	+
	710	+ display.modelParams0[0] = r * cr;
	711	+ display.modelParams0[1] = g * cg;
	712	+ display.modelParams0[2] = b * cb;
	713	+
	714	+ display.modelParams5[1] = opacity * ca;
	715	+
	716	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 0, display.modelParams0, 0);
	717	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 5, display.modelParams5, 0);
	718	+
	719	+ RandomNode.globalseed = (int)geo.sizeBuf.get(index3+2); // i;
	720	+ RandomNode.globalseed2 = RandomNode.globalseed;
	721	+
	722	+// gl.glColor4f(cr,cg,cb,ca);
	723	+ // gl.glScalef(1024/16,1024/16,1024/16);
	724	+ shape.Draw/Node/(display,null,selected,false); // blocked
	725	+ // gl.glScalef(16.0f/1024,16.0f/1024,16.0f/1024);
	726	+ //gl.glTranslatef(-tx,-ty,-tz);
	727	+ gl.glPopMatrix();
	728	+
	729	+ gl.glMatrixMode(gl.GL_TEXTURE);
	730	+ gl.glPopMatrix();
	731	+ }
	732	+ // gl.glScalef(1024,1024,1024);
	733	+ if (!cf)
	734	+ gl.glDisable(gl.GL_CULL_FACE);
	735	+
	736	+ display.modelParams0[0] = r;
	737	+ display.modelParams0[1] = g;
	738	+ display.modelParams0[2] = b;
	739	+
	740	+ display.modelParams5[1] = opacity;
	741	+
	742	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 0, display.modelParams0, 0);
	743	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 5, display.modelParams5, 0);
	744	+
	745	+ gl.glMatrixMode(gl.GL_MODELVIEW);
	746	+
	747	+// System.err.println("total = " + v/3 + "; displayed = " + count);
	748	+ if (true)
	749	+ return;
	750	+
	751	+//// if (!tris.predraw(this))
	752	+//// {
	753	+//// return;
	754	+//// }
	755	+//// if (Debug.stats)
	756	+//// {
	757	+//// StatCollector.addStat(StatType.STAT_TRIANGLE_COUNT, tris.getTriangleCount());
	758	+//// StatCollector.addStat(StatType.STAT_VERTEX_COUNT, tris.getVertexCount());
	759	+//// StatCollector.addStat(StatType.STAT_GEOM_COUNT, 1);
	760	+//// }
	761	+////
	762	+//// if (tris.getDisplayListID() != -1)
	763	+//// {
	764	+//// renderDisplayList(tris);
	765	+//// return;
	766	+//// }
	767	+////
	768	+//// if (!generatingDisplayList)
	769	+//// {
	770	+//// applyStates(tris.states, tris);
	771	+//// }
	772	+//// if (Debug.stats)
	773	+//// {
	774	+//// StatCollector.startStat(StatType.STAT_RENDER_TIMER);
	775	+//// }
	776	+//// boolean transformed = doTransforms(tris);
	777	+//
	778	+// int glMode = GL.GL_TRIANGLES;
	779	+// switch (getMode())
	780	+// {
	781	+// case Triangles:
	782	+// glMode = GL.GL_TRIANGLES;
	783	+// break;
	784	+// case Strip:
	785	+// glMode = GL.GL_TRIANGLE_STRIP;
	786	+// break;
	787	+// case Fan:
	788	+// glMode = GL.GL_TRIANGLE_FAN;
	789	+// break;
	790	+// }
	791	+//
	792	+// if (!predrawGeometry(gl))
	793	+// {
	794	+// // make sure only the necessary indices are sent through on old
	795	+// // cards.
	796	+// IntBuffer indices = this.getIndexBuffer();
	797	+// if (indices == null)
	798	+// {
	799	+// logger.severe("missing indices on geometry object: " + this.toString());
	800	+// } else
	801	+// {
	802	+// indices.rewind();
	803	+// indices.limit(this.getMaxIndex());
	804	+//
	805	+// gl.glDrawElements(glMode, indices.limit(), GL.GL_UNSIGNED_INT, indices); // TODO Check <count> and assumed <type> of GL_UNSIGNED_INT
	806	+//
	807	+// indices.clear();
	808	+// }
	809	+// } else
	810	+// {
	811	+// gl.glDrawElements(glMode, this.getIndexBuffer().limit(),
	812	+// GL.GL_UNSIGNED_INT, 0);
	813	+// }
	814	+//
	815	+//// postdrawGeometry(tris);
	816	+//// if (transformed)
	817	+//// {
	818	+//// undoTransforms(tris);
	819	+//// }
	820	+////
	821	+//// if (Debug.stats)
	822	+//// {
	823	+//// StatCollector.endStat(StatType.STAT_RENDER_TIMER);
	824	+//// }
	825	+//// tris.postdraw(this);
	826	+ }
	827	+
	828	+ static Camera localcamera = new Camera();
	829	+ static cVector from = new cVector();
	830	+ static cVector to = new cVector();
	831	+
	832	+ public void PrepOcclusion(BoundaryRep br, double[][] transform)
	833	+ {
	834	+ CameraPane cp = this;
	835	+
	836	+ Camera keep = cp.RenderCamera();
	837	+ cp.renderCamera = localcamera;
	838	+
	839	+ if (br.trimmed)
	840	+ {
	841	+ float[] colors = new float[br.positions.length / 3];
	842	+
	843	+ int i3 = 0;
	844	+ for (int i = 0; i < br.positions.length / 3; i++, i3 += 3)
	845	+ {
	846	+ if (br.normals[i3] == 0 && br.normals[i3+1] == 0 && br.normals[i3+2] == 0)
	847	+ continue;
	848	+
	849	+ from.set(br.positions[i3], br.positions[i3 + 1], br.positions[i3 + 2]);
	850	+ to.set(br.positions[i3] + br.normals[i3],
	851	+ br.positions[i3 + 1] + br.normals[i3 + 1],
	852	+ br.positions[i3 + 2] + br.normals[i3 + 2]);
	853	+ LA.xformPos(from, transform, from);
	854	+ LA.xformPos(to, transform, to); // RIGID ONLY
	855	+ localcamera.setAim(from, to);
	856	+
	857	+ CameraPane.occlusionbuffer.display();
	858	+
	859	+ if (CameraPane.DEBUG_OCCLUSION)
	860	+ cp.display(); // debug
	861	+
	862	+ colors[i] = cp.vertexOcclusion.r;
	863	+ //colors[i3 + 1] = cp.vertexOcclusion.g;
	864	+ //colors[i3 + 2] = cp.vertexOcclusion.b;
	865	+
	866	+ if ((i % 100) == 0 && i != 0)
	867	+ {
	868	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	869	+ //System.out.println("Color = " + cp.vertexOcclusion.r + ", " + cp.vertexOcclusion.g + ", " + cp.vertexOcclusion.b + "; " + (int)(100.0*i/(positions.length/3)) + "% done");
	870	+ System.out.println((int) (100.0 * i / (br.positions.length / 3)) + "% (" + i + " of " + (br.positions.length / 3) + ")");
	871	+ }
	872	+ }
	873	+
	874	+ br.colors = colors;
	875	+ }
	876	+ else
	877	+ {
	878	+ for (int i = 0; i < br.VertexCount(); i++)
	879	+ {
	880	+ Vertex v = br.GetVertex(i);
	881	+
	882	+ if (v.norm == null \|\| v.norm.x == 0 && v.norm.y == 0 && v.norm.z == 0)
	883	+ continue;
	884	+
	885	+ from.set(v.x, v.y, v.z);
	886	+ to.set(v.x+v.norm.x, v.y+v.norm.y, v.z+v.norm.z);
	887	+ LA.xformPos(from, transform, from);
	888	+ LA.xformPos(to, transform, to); // RIGID ONLY
	889	+ localcamera.setAim(from, to);
	890	+
	891	+ CameraPane.occlusionbuffer.display();
	892	+
	893	+ if (CameraPane.DEBUG_OCCLUSION)
	894	+ cp.display(); // debug
	895	+
	896	+ v.AO = cp.vertexOcclusion.r;
	897	+
	898	+ if ((i % 100) == 0 && i != 0)
	899	+ {
	900	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	901	+ //System.out.println("Color = " + cp.vertexOcclusion.r + ", " + cp.vertexOcclusion.g + ", " + cp.vertexOcclusion.b + "; " + (int)(100.0*i/(positions.length/3)) + "% done");
	902	+ System.out.println((int) (100.0 * i / br.VertexCount()) + "% (" + i + " of " + br.VertexCount() + ")");
	903	+ }
	904	+ }
	905	+ }
	906	+
	907	+ //System.out.println("done.");
	908	+
	909	+ cp.renderCamera = keep;
	910	+ }
	911	+
	912	+ void DrawPointFLow(PointFlow pointFlow, Object3D /Composite/ root, boolean selected, boolean blocked)
	913	+ {
	914	+ CameraPane display = this;
	915	+ pointFlow.CreateHT();
	916	+
	917	+ float r = display.modelParams0[0];
	918	+ float g = display.modelParams0[1];
	919	+ float b = display.modelParams0[2];
	920	+ float opacity = display.modelParams5[1];
	921	+
	922	+ //final GL gl = GLU.getCurrentGL();
	923	+ GL gl = display.GetGL(); // getGL();
	924	+
	925	+ int s = pointFlow.points.size();
	926	+
	927	+ boolean cf = gl.glIsEnabled(gl.GL_CULL_FACE);
	928	+ gl.glEnable(gl.GL_CULL_FACE);
	929	+
	930	+ for (int i=s; --i>=0;)
	931	+ //for (int i=0; i<s; i++)
	932	+ {
	933	+ cVector v = pointFlow.points.get(i);
	934	+
	935	+ double mindist = Double.MAX_VALUE;
	936	+
	937	+ double size = pointFlow.minimumSize;
	938	+
	939	+ double distancenext = 0;
	940	+
	941	+ if (i > 0)
	942	+ {
	943	+ cVector w = pointFlow.points.get(i-1);
	944	+
	945	+ double dist = w.distance(v);
	946	+
	947	+ distancenext = dist;
	948	+
	949	+ if (mindist > dist)
	950	+ {
	951	+ mindist = dist;
	952	+ size = mindist*pointFlow.resizefactor;
	953	+ }
	954	+ }
	955	+
	956	+ if (i < s-1)
	957	+ {
	958	+ cVector w = pointFlow.points.get(i+1);
	959	+
	960	+ double dist = w.distance(v);
	961	+
	962	+ if (mindist > dist)
	963	+ {
	964	+ mindist = dist;
	965	+ size = mindist*pointFlow.resizefactor;
	966	+ }
	967	+ }
	968	+
	969	+ if (size < pointFlow.minimumSize)
	970	+ size = pointFlow.minimumSize;
	971	+ if (size > pointFlow.maximumSize)
	972	+ size = pointFlow.maximumSize;
	973	+
	974	+ double tx = v.x;
	975	+ double ty = v.y;
	976	+ double tz = v.z;
	977	+
	978	+ // if (tx == 0 && ty == 0 && tz == 0)
	979	+ // continue;
	980	+
	981	+ gl.glMatrixMode(gl.GL_TEXTURE);
	982	+ gl.glPushMatrix();
	983	+ pointFlow.texmat[12] = pointFlow.texmat[13] = pointFlow.texmat[14] = i;
	984	+
	985	+ gl.glMultMatrixf(pointFlow.texmat, 0);
	986	+
	987	+ gl.glMatrixMode(gl.GL_MODELVIEW);
	988	+ gl.glPushMatrix();
	989	+
	990	+ gl.glTranslated(tx,ty,tz);
	991	+
	992	+ gl.glScaled(size,size,size);
	993	+
	994	+// float cr = colorBuf.get(index4);
	995	+// float cg = colorBuf.get(index4+1);
	996	+// float cb = colorBuf.get(index4+2);
	997	+// float ca = colorBuf.get(index4+3);
	998	+//
	999	+// display.modelParams0[0] = r * cr;
	1000	+// display.modelParams0[1] = g * cg;
	1001	+// display.modelParams0[2] = b * cb;
	1002	+//
	1003	+// display.modelParams5[1] = opacity * ca;
	1004	+//
	1005	+// gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 0, display.modelParams0, 0);
	1006	+// gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 5, display.modelParams5, 0);
	1007	+//
	1008	+// RandomNode.globalseed = (int)sizeBuf.get(index3+2); // i;
	1009	+// RandomNode.globalseed2 = RandomNode.globalseed;
	1010	+//
	1011	+//// gl.glColor4f(cr,cg,cb,ca);
	1012	+// // gl.glScalef(1024/16,1024/16,1024/16);
	1013	+ pointFlow.geo.Draw/Node/(display,null,selected, blocked);
	1014	+
	1015	+ gl.glPopMatrix();
	1016	+
	1017	+ double step = size/4; //
	1018	+
	1019	+ if (i == 0 \|\| size == 0 \|\| distancenext > 8*size \|\| distancenext < step)
	1020	+ continue;
	1021	+
	1022	+ int nbsteps = (int)(distancenext/step);
	1023	+
	1024	+ step = distancenext/nbsteps;
	1025	+
	1026	+ cVector next = pointFlow.points.get(i-1);
	1027	+
	1028	+ tmp.set(next);
	1029	+ tmp.sub(v);
	1030	+ tmp.normalize();
	1031	+ tmp.mul(step);
	1032	+
	1033	+ // calculate next size
	1034	+ mindist = Double.MAX_VALUE;
	1035	+
	1036	+ double nextsize = pointFlow.minimumSize;
	1037	+
	1038	+ if (i > 1)
	1039	+ {
	1040	+ cVector w = pointFlow.points.get(i-2);
	1041	+
	1042	+ double dist = w.distance(next);
	1043	+
	1044	+ if (mindist > dist)
	1045	+ {
	1046	+ mindist = dist;
	1047	+ nextsize = mindist*pointFlow.resizefactor;
	1048	+ }
	1049	+ }
	1050	+
	1051	+ double dist = v.distance(next);
	1052	+
	1053	+ if (mindist > dist)
	1054	+ {
	1055	+ mindist = dist;
	1056	+ nextsize = mindist*pointFlow.resizefactor;
	1057	+ }
	1058	+
	1059	+ if (nextsize < pointFlow.minimumSize)
	1060	+ nextsize = pointFlow.minimumSize;
	1061	+ if (nextsize > pointFlow.maximumSize)
	1062	+ nextsize = pointFlow.maximumSize;
	1063	+ //
	1064	+
	1065	+ double count = 0;
	1066	+
	1067	+ while (distancenext > 0.000000001) // step
	1068	+ {
	1069	+ gl.glPushMatrix();
	1070	+
	1071	+ gl.glTranslated(tx + tmp.xcount, ty + tmp.ycount, tz + tmp.z*count);
	1072	+
	1073	+ double K = count/nbsteps;
	1074	+
	1075	+ double intersize = Knextsize + (1-K)size;
	1076	+
	1077	+ gl.glScaled(intersize,intersize,intersize);
	1078	+
	1079	+ pointFlow.geo.Draw/Node/(display,null,selected,blocked);
	1080	+
	1081	+ count++;
	1082	+
	1083	+ distancenext -= step;
	1084	+
	1085	+ gl.glPopMatrix();
	1086	+ }
	1087	+
	1088	+ if (count != nbsteps)
	1089	+ assert(count == nbsteps);
	1090	+
	1091	+ // gl.glScalef(16.0f/1024,16.0f/1024,16.0f/1024);
	1092	+ //gl.glTranslatef(-tx,-ty,-tz);
	1093	+
	1094	+ gl.glMatrixMode(gl.GL_TEXTURE);
	1095	+ gl.glPopMatrix();
	1096	+ }
	1097	+
	1098	+ if (!cf)
	1099	+ gl.glDisable(gl.GL_CULL_FACE);
	1100	+
	1101	+// display.modelParams0[0] = r;
	1102	+// display.modelParams0[1] = g;
	1103	+// display.modelParams0[2] = b;
	1104	+//
	1105	+// display.modelParams5[1] = opacity;
	1106	+//
	1107	+// gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 0, display.modelParams0, 0);
	1108	+// gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 5, display.modelParams5, 0);
	1109	+
	1110	+ gl.glMatrixMode(gl.GL_MODELVIEW);
	1111	+ }
	1112	+
	1113	+ public void DrawBox(cVector min, cVector max)
	1114	+ {
	1115	+ javax.media.opengl.GL gl = GetGL();
	1116	+ gl.glBegin(gl.GL_LINES);
	1117	+
	1118	+ gl.glVertex3d(min.x, min.y, min.z);
	1119	+ gl.glVertex3d(min.x, min.y, max.z);
	1120	+ gl.glVertex3d(min.x, min.y, min.z);
	1121	+ gl.glVertex3d(min.x, max.y, min.z);
	1122	+ gl.glVertex3d(min.x, min.y, min.z);
	1123	+ gl.glVertex3d(max.x, min.y, min.z);
	1124	+
	1125	+ gl.glVertex3d(max.x, max.y, max.z);
	1126	+ gl.glVertex3d(min.x, max.y, max.z);
	1127	+ gl.glVertex3d(max.x, max.y, max.z);
	1128	+ gl.glVertex3d(max.x, min.y, max.z);
	1129	+ gl.glVertex3d(max.x, max.y, max.z);
	1130	+ gl.glVertex3d(max.x, max.y, min.z);
	1131	+
	1132	+ gl.glEnd();
	1133	+ }
	1134	+
	1135	+ public void DrawGeometry(BoundaryRep bRep, boolean flipV, boolean selectmode)
	1136	+ {
	1137	+ int[] strips = bRep.getRawIndices();
	1138	+
	1139	+ javax.media.opengl.GL gl = GetGL();
	1140	+
	1141	+ // TRIANGLE STRIP ARRAY
	1142	+ if (bRep.trimmed)
	1143	+ {
	1144	+ float[] v = bRep.getRawVertices();
	1145	+ float[] n = bRep.getRawNormals();
	1146	+ float[] c = bRep.getRawColors();
	1147	+ float[] uv = bRep.getRawUVMap();
	1148	+
	1149	+ int count2 = 0;
	1150	+ int count3 = 0;
	1151	+
	1152	+ if (n.length > 0)
	1153	+ {
	1154	+ for (int i = 0; i < strips.length; i++)
	1155	+ {
	1156	+ gl.glBegin(gl.GL_TRIANGLE_STRIP);
	1157	+
	1158	+ /*
	1159	+ boolean locked = false;
	1160	+ float eps = 0.1f;
	1161	+ boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
	1162	+
	1163	+ int dot = 0;
	1164	+
	1165	+ if ((dot&1) == 0)
	1166	+ dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
	1167	+
	1168	+ if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
	1169	+ gl.glTexCoord2f((float) qv.s, (float) qv.t);
	1170	+ else
	1171	+ {
	1172	+ locked = true;
	1173	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	1174	+ }
	1175	+ //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
	1176	+ gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
	1177	+ if (hasnorm)
	1178	+ {
	1179	+ //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
	1180	+ gl.glNormal3f((float) rv.norm.x, (float) rv.norm.y, (float) rv.norm.z);
	1181	+ }
	1182	+
	1183	+ if ((dot&4) == 0)
	1184	+ dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
	1185	+
	1186	+ if (wrap \|\| !locked && (dot&8) != 0)
	1187	+ gl.glTexCoord2f((float) rv.s, (float) rv.t);
	1188	+ else
	1189	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	1190	+
	1191	+ f.dot = dot;
	1192	+ */
	1193	+
	1194	+ if (!selectmode)
	1195	+ {
	1196	+ if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
	1197	+ {
	1198	+ gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1199	+ } else
	1200	+ {
	1201	+ gl.glNormal3f(0, 0, 1);
	1202	+ }
	1203	+
	1204	+ if (c != null)
	1205	+ //System.out.println("glcolor = " + c[count3] + ", " + c[count3+1] + ", " + c[count3+2]);
	1206	+ {
	1207	+ gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
	1208	+ }
	1209	+ }
	1210	+
	1211	+ if (flipV)
	1212	+ gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
	1213	+ else
	1214	+ gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1215	+
	1216	+ //System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
	1217	+ gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1218	+
	1219	+ count2 += 2;
	1220	+ count3 += 3;
	1221	+ if (!selectmode)
	1222	+ {
	1223	+ if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
	1224	+ {
	1225	+ gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1226	+ } else
	1227	+ {
	1228	+ gl.glNormal3f(0, 0, 1);
	1229	+ }
	1230	+ if (c != null)
	1231	+ {
	1232	+ gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
	1233	+ }
	1234	+ }
	1235	+
	1236	+ if (flipV)
	1237	+ gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
	1238	+ else
	1239	+ gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1240	+
	1241	+ //System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
	1242	+ gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1243	+
	1244	+ count2 += 2;
	1245	+ count3 += 3;
	1246	+ for (int j = 0; j < strips[i] - 2; j++)
	1247	+ {
	1248	+ //gl.glTexCoord2d(...);
	1249	+ if (!selectmode)
	1250	+ {
	1251	+ if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
	1252	+ {
	1253	+ gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1254	+ } else
	1255	+ {
	1256	+ gl.glNormal3f(0, 0, 1);
	1257	+ }
	1258	+ if (c != null)
	1259	+ {
	1260	+ gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
	1261	+ }
	1262	+ }
	1263	+
	1264	+ if (flipV)
	1265	+ gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
	1266	+ else
	1267	+ gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1268	+
	1269	+ //System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
	1270	+ gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1271	+
	1272	+ count2 += 2;
	1273	+ count3 += 3;
	1274	+ }
	1275	+
	1276	+ gl.glEnd();
	1277	+ }
	1278	+ }
	1279	+
	1280	+ assert count3 == v.length;
	1281	+ }
	1282	+ else // !trimmed
	1283	+ {
	1284	+ int count = 0;
	1285	+ for (int i = 0; i < strips.length; i++)
	1286	+ {
	1287	+ gl.glBegin(gl.GL_TRIANGLE_STRIP);
	1288	+
	1289	+ Vertex p = bRep.GetVertex(bRep.indices[count++]);
	1290	+ Vertex q = bRep.GetVertex(bRep.indices[count++]);
	1291	+
	1292	+ drawVertex(gl, p, flipV, selectmode);
	1293	+ drawVertex(gl, q, flipV, selectmode);
	1294	+
	1295	+ for (int j = 0; j < strips[i] - 2; j++)
	1296	+ {
	1297	+ Vertex r = bRep.GetVertex(bRep.indices[count++]);
	1298	+
	1299	+ // if (j%2 == 0)
	1300	+ // drawFace(p, q, r, display, null);
	1301	+ // else
	1302	+ // drawFace(p, r, q, display, null);
	1303	+
	1304	+ // p = q;
	1305	+ // q = r;
	1306	+ drawVertex(gl, r, flipV, selectmode);
	1307	+ }
	1308	+
	1309	+ gl.glEnd();
	1310	+ }
	1311	+ }
	1312	+ }
	1313	+
	1314	+ static cSpring.Point3D temp = new cSpring.Point3D();
	1315	+ static cSpring.Point3D temp2 = new cSpring.Point3D();
	1316	+ static cSpring.Point3D temp3 = new cSpring.Point3D();
	1317	+
	1318	+ public void DrawDynamicMesh(cMesh mesh)
	1319	+ {
	1320	+ GL gl = GetGL(); // getGL();
	1321	+
	1322	+ cSpring.PhysicsController3D Phys = mesh.Phys;
	1323	+
	1324	+ gl.glDisable(gl.GL_LIGHTING);
	1325	+
	1326	+ gl.glLineWidth(1);
	1327	+ gl.glColor3f(1,1,1);
	1328	+ gl.glBegin(gl.GL_LINES);
	1329	+ double scale = 0;
	1330	+ int count = 0;
	1331	+ for (int s=0; s<Phys.allSprings.size(); s++)
	1332	+ {
	1333	+ cSpring.Spring spring = Phys.allSprings.get(s);
	1334	+ if(s == 0)
	1335	+ {
	1336	+ //System.out.println(" spring : " + spring.a.position + "; " + spring.b.position);
	1337	+ }
	1338	+ if (mesh.showsprings)
	1339	+ {
	1340	+ temp.set(spring.a.position);
	1341	+ temp.add(spring.b.position);
	1342	+ temp.mul(0.5);
	1343	+ temp2.set(spring.a.position);
	1344	+ temp2.sub(spring.b.position);
	1345	+ temp2.mul(spring.restLength/2);
	1346	+ temp.sub(temp2);
	1347	+ gl.glVertex3f((float)temp.x, (float)temp.y, (float)temp.z);
	1348	+ temp.add(temp2);
	1349	+ temp.add(temp2);
	1350	+ gl.glVertex3f((float)temp.x, (float)temp.y, (float)temp.z);
	1351	+ }
	1352	+
	1353	+ if (spring.isHandle)
	1354	+ continue;
	1355	+
	1356	+ //if (scale < spring.restLength)
	1357	+ scale += spring.restLength;
	1358	+ count++;
	1359	+ }
	1360	+ gl.glEnd();
	1361	+
	1362	+ if (count == 0)
	1363	+ scale = 0.01;
	1364	+ else
	1365	+ scale /= count * 3;
	1366	+
	1367	+ //scale = 0.25;
	1368	+
	1369	+ if (mesh.ShowInfo())
	1370	+ {
	1371	+ gl.glLineWidth(4);
	1372	+ for (int s=0; s<Phys.allNodes.size(); s++)
	1373	+ {
	1374	+ cSpring.DynamicNode node = Phys.allNodes.get(s);
	1375	+ if (node.mass == 0)
	1376	+ continue;
	1377	+
	1378	+ int i = node.springs==null?-1:node.springs.size();
	1379	+ gl.glColor3f((i>>2)&1,(i>>1)&1,i&1);
	1380	+ //temp.set(node.springForce.x, node.springForce.y, node.springForce.z);
	1381	+ //temp.normalize();
	1382	+ //gl.glColor3d((temp.x+1)/2, (temp.y+1)/2, (temp.z+1)/2);
	1383	+ gl.glBegin(gl.GL_LINES);
	1384	+ gl.glVertex3d(node.position.x, node.position.y, node.position.z);
	1385	+ //gl.glVertex3d(node.position.x + node.normal.xscale, node.position.y + node.normal.yscale, node.position.z + node.normal.z*scale);
	1386	+ gl.glVertex3d(node.position.x + mesh.bRep.GetVertex(s).norm.x*scale,
	1387	+ node.position.y + mesh.bRep.GetVertex(s).norm.y*scale,
	1388	+ node.position.z + mesh.bRep.GetVertex(s).norm.z*scale);
	1389	+ gl.glEnd();
	1390	+ }
	1391	+
	1392	+ gl.glLineWidth(8);
	1393	+ for (int s=0; s<Phys.allNodes.size(); s++)
	1394	+ {
	1395	+ cSpring.DynamicNode node = Phys.allNodes.get(s);
	1396	+
	1397	+ if (node.springs != null)
	1398	+ {
	1399	+ for (int i=0; i<node.springs.size(); i+=1)
	1400	+ {
	1401	+ cSpring.DynamicNode f = node.springs.get(i).GetOther(node);
	1402	+
	1403	+ int c = i+1;
	1404	+ // c = node.springs.get(i).nbcopies;
	1405	+
	1406	+ gl.glColor3f((c>>2)&1,(c>>1)&1,c&1);
	1407	+ gl.glBegin(gl.GL_LINES);
	1408	+ gl.glVertex3d(node.position.x, node.position.y, node.position.z);
	1409	+ gl.glVertex3d(f.position.x/3+node.position.x2/3, f.position.y/3+node.position.y2/3, f.position.z/3+node.position.z*2/3);
	1410	+ gl.glEnd();
	1411	+ }
	1412	+ }
	1413	+ }
	1414	+
	1415	+ gl.glLineWidth(1);
	1416	+ }
	1417	+
	1418	+ gl.glEnable(gl.GL_LIGHTING);
	1419	+ }
	1420	+
	1421	+ /// INTERFACE
	1422	+
	1423	+ public void StartTriangles()
	1424	+ {
	1425	+ javax.media.opengl.GL gl = GetGL();
	1426	+ gl.glBegin(gl.GL_TRIANGLES);
	1427	+ }
	1428	+
	1429	+ public void EndTriangles()
	1430	+ {
	1431	+ GetGL().glEnd();
	1432	+ }
	1433	+
	1434	+ void drawVertex(javax.media.opengl.GL gl, Vertex pv, boolean flipV, boolean selectmode)
	1435	+ {
	1436	+ if (!selectmode)
	1437	+ {
	1438	+ gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
	1439	+ gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
	1440	+
	1441	+ if (flipV)
	1442	+ gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
	1443	+ else
	1444	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	1445	+ }
	1446	+
	1447	+ gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
	1448	+ }
	1449	+
	1450	+ void SetColor(Object3D obj, Vertex p0)
	1451	+ {
	1452	+ CameraPane display = this;
	1453	+ BoundaryRep bRep = obj.bRep;
	1454	+
	1455	+ if (RENDERPROGRAM == 0)
	1456	+ {
	1457	+ float r = 0;
	1458	+ if (bRep != null)
	1459	+ {
	1460	+ if (bRep.stripified)
	1461	+ {
	1462	+ r = 1;
	1463	+ }
	1464	+ }
	1465	+ float g = 0;
	1466	+ if (bRep != null)
	1467	+ {
	1468	+ if (bRep.trimmed)
	1469	+ {
	1470	+ g = 1;
	1471	+ }
	1472	+ }
	1473	+ float b = 0;
	1474	+ if (obj.support != null && obj.link2master)
	1475	+ {
	1476	+ b = 1;
	1477	+ }
	1478	+ display.GetGL().glColor3f(rp0.AO, gp0.AO, b*p0.AO);
	1479	+ return;
	1480	+ }
	1481	+
	1482	+ if (display.DrawMode() != CameraPane.SHADOW)
	1483	+ return;
	1484	+
	1485	+ javax.media.opengl.GL gl = display.GetGL();
	1486	+// if (true) return;
	1487	+// float ao = p.AO;
	1488	+//
	1489	+// // if (ao == 0 && !bRep.AOdone) // transient problem!
	1490	+// // ao = 1;
	1491	+//
	1492	+// gl.glColor4f(ao, ao, ao, 1);
	1493	+
	1494	+// CameraPane.selectedpoint.
	1495	+// getAverage(cStatic.point1, true);
	1496	+ if (CameraPane.pointflow == null) // !random) // live)
	1497	+ {
	1498	+ return;
	1499	+ }
	1500	+
	1501	+ cStatic.point1.set(0,0,0);
	1502	+ LA.xformPos(cStatic.point1, CameraPane.selectedpoint.toParent, cStatic.point1);
	1503	+
	1504	+ cStatic.point1.sub(p0);
	1505	+
	1506	+
	1507	+// if (marked && (p0.vertexlinks == null \|\| support == null \|\| support.bRep == null)) // no position delta?
	1508	+// {
	1509	+// return;
	1510	+// }
	1511	+
	1512	+ //if (true)
	1513	+ if (cStatic.point1.dot(cStatic.point1) > 0.000001)
	1514	+ {
	1515	+ return;
	1516	+ }
	1517	+
	1518	+ float[] colorV = new float[3];
	1519	+
	1520	+ if (false) // marked)
	1521	+ {
	1522	+ // debug rigging weights
	1523	+ for (int object = 0; object < p0.vertexlinks.length; object++)
	1524	+ {
	1525	+ float weight = p0.weights[object] / p0.totalweight;
	1526	+
	1527	+ // if (weight < 0.1)
	1528	+ // {
	1529	+ // assert(weight == 0);
	1530	+ // continue;
	1531	+ // }
	1532	+
	1533	+ if (p0.vertexlinks[object] == -1)
	1534	+ continue;
	1535	+
	1536	+ Vertex q = obj.support.bRep.GetVertex(p0.vertexlinks[object]);
	1537	+
	1538	+ int color = //1 << object; //
	1539	+ //p.vertexlinks.length;
	1540	+ obj.support.bRep.supports[p0.closestsupport].links[object];
	1541	+ colorV[2] += (color & 1) * weight;
	1542	+ colorV[1] += ((color & 2) >> 1) * weight;
	1543	+ colorV[0] += ((color & 4) >> 2) * weight;
	1544	+ }
	1545	+ }
	1546	+ else
	1547	+ {
	1548	+ if (obj.drawingstarted)
	1549	+ {
	1550	+ // find next point
	1551	+ if (bRep.GetVertex(0).faceindices == null)
	1552	+ {
	1553	+ bRep.InitFaceIndices();
	1554	+ }
	1555	+
	1556	+ double ymin = p0.y;
	1557	+
	1558	+ Vertex newp = p0;
	1559	+
	1560	+ for (int fii = 0; fii < p0.faceindices.length; fii++)
	1561	+ {
	1562	+ int fi = p0.faceindices[fii];
	1563	+
	1564	+ if (fi == -1)
	1565	+ break;
	1566	+
	1567	+ Face f = bRep.GetFace(fi);
	1568	+
	1569	+ Vertex p = bRep.GetVertex(f.p);
	1570	+ Vertex q = bRep.GetVertex(f.q);
	1571	+ Vertex r = bRep.GetVertex(f.r);
	1572	+
	1573	+ int swap = (int)(Math.random()*3);
	1574	+
	1575	+// for (int s=swap; --s>=0;)
	1576	+// {
	1577	+// Vertex t = p;
	1578	+// p = q;
	1579	+// q = r;
	1580	+// r = t;
	1581	+// }
	1582	+ if (ymin > p.y)
	1583	+ {
	1584	+ ymin = p.y;
	1585	+ newp = p;
	1586	+// break;
	1587	+ }
	1588	+ if (ymin > q.y)
	1589	+ {
	1590	+ ymin = q.y;
	1591	+ newp = q;
	1592	+// break;
	1593	+ }
	1594	+ if (ymin > r.y)
	1595	+ {
	1596	+ ymin = r.y;
	1597	+ newp = r;
	1598	+// break;
	1599	+ }
	1600	+ }
	1601	+
	1602	+ CameraPane.selectedpoint.toParent[3][0] = newp.x;
	1603	+ CameraPane.selectedpoint.toParent[3][1] = newp.y;
	1604	+ CameraPane.selectedpoint.toParent[3][2] = newp.z;
	1605	+
	1606	+ obj.drawingstarted = false;
	1607	+
	1608	+ // return;
	1609	+ }
	1610	+
	1611	+ if (false) // CameraPane.DRAW
	1612	+ {
	1613	+ p0.AO = colorV[0] = 2;
	1614	+ colorV[1] = 2;
	1615	+ colorV[2] = 2;
	1616	+ }
	1617	+
	1618	+ CameraPane.pointflow.add(p0);
	1619	+ CameraPane.pointflow.Touch();
	1620	+ }
	1621	+
	1622	+// gl.glColor3f(colorV[0], colorV[1], colorV[2]);
	1623	+// gl.glMaterialfv(gl.GL_FRONT, gl.GL_DIFFUSE, colorV, 0);
	1624	+// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
	1625	+ }
	1626	+
	1627	+ void DrawMaterial(cMaterial material, boolean selected, Object3D.cVector2[] others)
	1628	+ {
	1629	+ CameraPane display = this;
	1630	+ //new Exception().printStackTrace();
	1631	+
	1632	+ if (display.IsFrozen() && !selected \|\| display.IsAmbientOcclusionOn()) // \|\| display.drawMode == display.SHADOW)
	1633	+ {
	1634	+ return;
	1635	+ }
	1636	+
	1637	+ javax.media.opengl.GL gl = display.GetGL();
	1638	+
	1639	+ //Color col = Color.getHSBColor(color,modulation,1);
	1640	+ //col.getColorComponents(ColorSpace.getInstance(ColorSpace.CS_LINEAR_RGB), CameraPane.modelParams0);
	1641	+ if (!material.multiply)
	1642	+ {
	1643	+ display.color = material.color;
	1644	+ display.saturation = material.modulation;
	1645	+ }
	1646	+ else
	1647	+ {
	1648	+ display.color = material.color2;
	1649	+ display.saturation = material.modulation2;
	1650	+ }
	1651	+
	1652	+ cColor.HSBtoRGB(display.color, display.saturation, 1, display.modelParams0);
	1653	+
	1654	+ float[] colorV = Grafreed.colorV;
	1655	+
	1656	+ /**/
	1657	+ if (display.DrawMode() == display.DEFAULT) // && display.RENDERPROGRAM == 0)
	1658	+ {
	1659	+ colorV[0] = display.modelParams0[0] * material.diffuse;
	1660	+ colorV[1] = display.modelParams0[1] * material.diffuse;
	1661	+ colorV[2] = display.modelParams0[2] * material.diffuse;
	1662	+ colorV[3] = 1; // material.opacity;
	1663	+
	1664	+ gl.glColor4f(colorV[0], colorV[1], colorV[2], material.opacity);
	1665	+ //System.out.println("Opacity = " + opacity);
	1666	+
	1667	+ gl.glMaterialfv(gl.GL_FRONT, gl.GL_DIFFUSE, colorV, 0);
	1668	+ //color[0] /= 2; color[1] /= 2; color[2] /= 2;
	1669	+ gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
	1670	+
	1671	+ float amb = material.ambient;
	1672	+ if (amb < material.cameralight)
	1673	+ {
	1674	+ amb = material.cameralight;
	1675	+ }
	1676	+ colorV[0] = display.modelParams0[0] * material.diffuse * amb;
	1677	+ colorV[1] = display.modelParams0[1] * material.diffuse * amb;
	1678	+ colorV[2] = display.modelParams0[2] * material.diffuse * amb;
	1679	+ gl.glMaterialfv(gl.GL_FRONT, gl.GL_AMBIENT, colorV, 0);
	1680	+ //color[0] /= 2; color[1] /= 2; color[2] /= 2;
	1681	+ gl.glMaterialfv(gl.GL_BACK, gl.GL_AMBIENT, colorV, 0);
	1682	+
	1683	+ /**/
	1684	+ colorV[0] = ((1 - material.metalness) + display.modelParams0[0] * material.metalness) * material.specular;
	1685	+ colorV[1] = ((1 - material.metalness) + display.modelParams0[1] * material.metalness) * material.specular;
	1686	+ colorV[2] = ((1 - material.metalness) + display.modelParams0[2] * material.metalness) * material.specular;
	1687	+ gl.glMaterialfv(gl.GL_FRONT, gl.GL_SPECULAR, colorV, 0);
	1688	+ //color[0] /= 2; color[1] /= 2; color[2] /= 2;
	1689	+ gl.glMaterialfv(gl.GL_BACK, gl.GL_SPECULAR, colorV, 0);
	1690	+ colorV[0] = 10 / material.shininess; // 1/0.005f;
	1691	+ //System.out.println("shininess = " + colorV[0]);
	1692	+ if (colorV[0] > 128)
	1693	+ {
	1694	+ colorV[0] = 128;
	1695	+ }
	1696	+ gl.glMaterialfv(gl.GL_FRONT, gl.GL_SHININESS, colorV, 0);
	1697	+ gl.glMaterialfv(gl.GL_BACK, gl.GL_SHININESS, colorV, 0);
	1698	+ /**/
	1699	+ }
	1700	+ /**/
	1701	+
	1702	+ //selected = false;
	1703	+ selected = selected && display.flash;
	1704	+
	1705	+ //display.modelParams0[0] = 0; // pigment.r;
	1706	+ //display.modelParams0[1] = 0; // pigment.g;
	1707	+ //display.modelParams0[2] = 0; // pigment.b;
	1708	+ if (!material.multiply)
	1709	+ {
	1710	+ display.modelParams0[3] = material.metalness;
	1711	+ display.modelParams1[0] = material.diffuse;
	1712	+ display.modelParams1[1] = material.specular;
	1713	+ display.modelParams1[2] = 1 / material.shininess;
	1714	+ display.modelParams1[3] = material.shift;
	1715	+ display.modelParams2[0] = material.ambient;
	1716	+ display.modelParams2[1] = material.lightarea;
	1717	+ //System.out.println("light area = " + lightarea);
	1718	+ display.modelParams2[2] = 1 / material.factor; // diffuseness
	1719	+ display.modelParams2[3] = material.velvet;
	1720	+ display.modelParams3[0] = material.sheen;
	1721	+ display.modelParams3[1] = material.subsurface;
	1722	+ display.modelParams3[2] = material.bump; // backlit
	1723	+ display.modelParams3[3] = material.aniso;
	1724	+ display.modelParams4[0] = material.anisoV;
	1725	+ display.modelParams4[1] = selected ? 100 : material.cameralight;
	1726	+ //System.out.println("selected = " + selected);
	1727	+ display.modelParams4[2] = material.diffuseness;
	1728	+ display.modelParams4[3] = material.shadow;
	1729	+ display.modelParams5[0] = material.texture;
	1730	+ display.modelParams5[1] = material.opacity;
	1731	+ display.modelParams5[2] = material.fakedepth;
	1732	+ display.modelParams5[3] = CameraPane.SHADOWCULLFACE ? 0f : (material.shadowbias - 0.005f) / 10;
	1733	+ }
	1734	+ else
	1735	+ {
	1736	+ display.modelParams0[3] = material.metalness2;
	1737	+ display.modelParams1[0] = material.diffuse2;
	1738	+ display.modelParams1[1] = material.specular2;
	1739	+ display.modelParams1[2] = material.shininess2;
	1740	+ display.modelParams1[3] = material.shift2;
	1741	+ display.modelParams2[0] = material.ambient2;
	1742	+ display.modelParams2[1] = material.lightarea2;
	1743	+ display.modelParams2[2] = material.factor2;
	1744	+ display.modelParams2[3] = material.velvet2;
	1745	+ display.modelParams3[0] = material.sheen2;
	1746	+ display.modelParams3[1] = material.subsurface2;
	1747	+ display.modelParams3[2] = material.bump2;
	1748	+ display.modelParams3[3] = material.aniso2;
	1749	+ display.modelParams4[0] = material.anisoV2;
	1750	+ display.modelParams4[1] = material.cameralight2;
	1751	+ //System.out.println("selected = " + selected);
	1752	+ display.modelParams4[2] = material.diffuseness2;
	1753	+ display.modelParams4[3] = material.shadow2;
	1754	+ display.modelParams5[0] = material.texture2;
	1755	+ display.modelParams5[1] = material.opacity2;
	1756	+ display.modelParams5[2] = material.fakedepth2;
	1757	+ display.modelParams5[3] = material.shadowbias2;
	1758	+ }
	1759	+
	1760	+ display.modelParams6[0] = 0;
	1761	+ display.modelParams6[1] = 0;
	1762	+ display.modelParams6[2] = 0;
	1763	+ display.modelParams6[3] = 0;
	1764	+
	1765	+ display.modelParams7[0] = 0;
	1766	+ display.modelParams7[1] = 1000;
	1767	+ display.modelParams7[2] = 0;
	1768	+ display.modelParams7[3] = 0;
	1769	+
	1770	+ //display.modelParams6[0] = 100; // criss de bug de bump
	1771	+
	1772	+ Object3D.cVector2[] extparams = others; // display.vector2buffer;
	1773	+ if (extparams != null && extparams.length > 0 && extparams[0] != null)
	1774	+ {
	1775	+ display.modelParams6[0] = extparams[0].x / 1000.0f; // bump
	1776	+ display.modelParams6[1] = extparams[0].y / 1000.0f; // noise
	1777	+ if (extparams.length > 1)
	1778	+ {
	1779	+ display.modelParams6[2] = extparams[1].x / 1000.0f; // borderfade
	1780	+ display.modelParams6[3] = extparams[1].y / 1000.0f; // (float)Math.exp(-extparams[1].y / 1000.0f); // fog punchthrough
	1781	+ if (extparams.length > 2)
	1782	+ {
	1783	+ display.modelParams7[0] = extparams[2].x / 1000.0f; // noise power
	1784	+ float x = extparams[2].y / 1000.0f;
	1785	+ //if (x == 0)
	1786	+ // x = 1f;
	1787	+ display.modelParams7[1] = 1 / x / x / x / x / x / x / x / x / x / x / x / x / x; // (float)Math.pow(-Math.log((extparams[2].y+0.00) / 1000.0f), 1); // opacity power
	1788	+ if (extparams[2].y > 0)
	1789	+ {
	1790	+ //System.out.println("extparams[1].y = " + extparams[1].y);
	1791	+ //System.out.println("extparams[2].y = " + extparams[2].y);
	1792	+ //System.out.println("opacity power = " + display.modelParams7[1]);
	1793	+ }
	1794	+ }
	1795	+ }
	1796	+ }
	1797	+
	1798	+ //if (display.modelParams6[2] != 0)
	1799	+ /*
	1800	+ System.out.println("modelParams0[0] = " + display.modelParams0[0]);
	1801	+ System.out.println("modelParams0[1] = " + display.modelParams0[1]);
	1802	+ System.out.println("modelParams0[2] = " + display.modelParams0[2]);
	1803	+ System.out.println("modelParams0[3] = " + display.modelParams0[3]);
	1804	+ System.out.println("modelParams1[0] = " + display.modelParams1[0]);
	1805	+ System.out.println("modelParams1[1] = " + display.modelParams1[1]);
	1806	+ System.out.println("modelParams1[2] = " + display.modelParams1[2]);
	1807	+ System.out.println("modelParams1[3] = " + display.modelParams1[3]);
	1808	+ System.out.println("modelParams2[0] = " + display.modelParams2[0]);
	1809	+ System.out.println("modelParams2[1] = " + display.modelParams2[1]);
	1810	+ System.out.println("modelParams2[2] = " + display.modelParams2[2]);
	1811	+ System.out.println("modelParams2[3] = " + display.modelParams2[3]);
	1812	+ System.out.println("modelParams3[0] = " + display.modelParams3[0]);
	1813	+ System.out.println("modelParams3[1] = " + display.modelParams3[1]);
	1814	+ System.out.println("modelParams3[2] = " + display.modelParams3[2]);
	1815	+ System.out.println("modelParams3[3] = " + display.modelParams3[3]);
	1816	+ System.out.println("modelParams4[0] = " + display.modelParams4[0]);
	1817	+ System.out.println("modelParams4[1] = " + display.modelParams4[1]);
	1818	+ System.out.println("modelParams4[2] = " + display.modelParams4[2]);
	1819	+ System.out.println("modelParams4[3] = " + display.modelParams4[3]);
	1820	+ System.out.println("modelParams5[0] = " + display.modelParams5[0]);
	1821	+ System.out.println("modelParams5[1] = " + display.modelParams5[1]);
	1822	+ System.out.println("modelParams5[2] = " + display.modelParams5[2]);
	1823	+ System.out.println("modelParams5[3] = " + display.modelParams5[3]);
	1824	+ System.out.println("modelParams6[0] = " + display.modelParams6[0]);
	1825	+ System.out.println("modelParams6[1] = " + display.modelParams6[1]);
	1826	+ System.out.println("modelParams6[2] = " + display.modelParams6[2]);
	1827	+ System.out.println("modelParams6[3] = " + display.modelParams6[3]);
	1828	+ System.out.println("modelParams7[0] = " + display.modelParams7[0]);
	1829	+ System.out.println("modelParams7[1] = " + display.modelParams7[1]);
	1830	+ System.out.println("modelParams7[2] = " + display.modelParams7[2]);
	1831	+ System.out.println("modelParams7[3] = " + display.modelParams7[3]);
	1832	+ /**/
	1833	+ //assert (display.modelParams6[2] == 0);
	1834	+
	1835	+ //System.out.println("noise power = " + display.modelParams7[0]);
	1836	+ //System.out.println("shadowbias = " + shadowbias);
	1837	+
	1838	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 0, display.modelParams0, 0);
	1839	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 1, display.modelParams1, 0);
	1840	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 2, display.modelParams2, 0);
	1841	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 3, display.modelParams3, 0);
	1842	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 4, display.modelParams4, 0);
	1843	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 5, display.modelParams5, 0);
	1844	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 6, display.modelParams6, 0);
	1845	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 7, display.modelParams7, 0);
	1846	+
	1847	+ int mode = display.FP_SHADER;
	1848	+
	1849	+ if (material.aniso != material.anisoV \|\| material.aniso > 0.002)
	1850	+ {
	1851	+ mode \|= display.FP_ANISO;
	1852	+ }
	1853	+
	1854	+ display.EnableProgram(mode);
	1855	+
	1856	+ //System.out.println("opacity power = " + display.modelParams7[1]);
	1857	+
	1858	+ if (!material.multiply)
	1859	+ {
	1860	+ if (Globals.drawMode == CameraPane.SHADOW)
	1861	+ gl.glDepthMask(material.opacity >= 0.9 && display.modelParams7[1] > 0.1);
	1862	+ else
	1863	+ gl.glDepthMask(material.opacity >= 0.99);
	1864	+ }
208	1865	}
209	1866
210	1867	int matrixdepth = 0; // 10000; // CONFLICT WITH cMESH... WARNING WARNING WARNING WARNING WARNING WARNING !!!!!!!!!!!! 0;
..	..	@@ -225,10 +1882,10 @@
225	1882	currentGL.glMultMatrixd(model, 0);
226	1883	}
227	1884
228		- void PushMatrix(double[][] matrix, int count)
	1885	+ public void PushMatrix(double[][] matrix, int count) // INTERFACE
229	1886	{
230	1887	matrixdepth++;
231		- // GraphreeD.tracein(matrix);
	1888	+ // GrafreeD.tracein(matrix);
232	1889	if (matrix == null)
233	1890	return; // Identity
234	1891
..	..	@@ -253,13 +1910,13 @@
253	1910
254	1911	void PushMatrix(double[][] matrix)
255	1912	{
256		- // GraphreeD.tracein(matrix);
257		- PushMatrix(matrix,1);
	1913	+ // GrafreeD.tracein(matrix);
	1914	+ PushMatrix(matrix, 1);
258	1915	}
259	1916
260	1917	void PushMatrix()
261	1918	{
262		- // GraphreeD.tracein(null);
	1919	+ // GrafreeD.tracein(null);
263	1920	if (matrixdepth++ < MAXSTACK - 1)
264	1921	{
265	1922	currentGL.glPushMatrix();
..	..	@@ -270,11 +1927,11 @@
270	1927
271	1928	double[][] tmpmat = new double[4][4];
272	1929
273		- void PopMatrix(double[][] inverse)
	1930	+ public void PopMatrix(double[][] inverse) // INTERFACE
274	1931	{
275	1932	--matrixdepth;
276	1933
277		- // GraphreeD.traceout(inverse);
	1934	+ // GrafreeD.traceout(inverse);
278	1935	if (inverse == null)
279	1936	return; // Identity
280	1937
..	..	@@ -292,7 +1949,7 @@
292	1949
293	1950	void PopMatrix()
294	1951	{
295		- // GraphreeD.traceout(null);
	1952	+ // GrafreeD.traceout(null);
296	1953	// inverse == null??
297	1954	if (--matrixdepth < MAXSTACK - 1)
298	1955	{
..	..	@@ -310,7 +1967,7 @@
310	1967	PushTextureMatrix(matrix, 1);
311	1968	}
312	1969
313		- void PushTextureMatrix(double[][] matrix, int count)
	1970	+ public void PushTextureMatrix(double[][] matrix, int count) // INTERFACE
314	1971	{
315	1972	currentGL.glActiveTexture(GetGL().GL_TEXTURE0);
316	1973
..	..	@@ -324,7 +1981,7 @@
324	1981	currentGL.glMatrixMode(GetGL().GL_MODELVIEW);
325	1982	}
326	1983
327		- void PopTextureMatrix(double[][] inverse)
	1984	+ public void PopTextureMatrix(double[][] inverse) // INTERFACE
328	1985	{
329	1986	currentGL.glActiveTexture(GetGL().GL_TEXTURE0);
330	1987	currentGL.glMatrixMode(GetGL().GL_TEXTURE);
..	..	@@ -351,15 +2008,15 @@
351	2008
352	2009	static int camerachangeframe;
353	2010
354		- boolean SetCamera(Camera cam)
	2011	+ public boolean SetCamera(Camera cam)
355	2012	{
356	2013	// may 2014 if (cam == cameras[0] \|\| cam == cameras[1])
357	2014	// return false;
358	2015
359		- if (REFUSEMODE && isLIVE() && camerachangeframe != 0 && camerachangeframe != framecount)
	2016	+ if (REFUSEMODE && Globals.isLIVE() && camerachangeframe != 0 && camerachangeframe != Globals.framecount)
360	2017	{
361	2018	// check for last change
362		- if (framecount < camerachangeframe + 400) // 120 == 1 second
	2019	+ if (Globals.framecount < camerachangeframe + 400) // 120 == 1 second
363	2020	{
364	2021	// refuse the camera change
365	2022	System.err.println("Camera " + cam + " REFUSED");
..	..	@@ -367,7 +2024,7 @@
367	2024	}
368	2025	}
369	2026
370		- camerachangeframe = framecount;
	2027	+ camerachangeframe = Globals.framecount;
371	2028
372	2029	cam.hAspect = -1; // Read only
373	2030
..	..	@@ -398,7 +2055,7 @@
398	2055	{
399	2056	//System.err.println("Oeil on");
400	2057	TRACK = true;
401		-// JUNE 2014 if (TRACK && trackedobject != null && drawMode == SHADOW) // && !lightMode)
	2058	+// JUNE 2014 if (TRACK && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
402	2059	// object.editWindow.ScreenFit(trackedobject);
403	2060	//pingthread.StepToTarget(true);
404	2061	}
..	..	@@ -407,8 +2064,8 @@
407	2064	{
408	2065	//System.err.println("Oeil on");
409	2066	OEIL = true;
410		- if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && drawMode == SHADOW) // && !lightMode)
411		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	2067	+ if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
	2068	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
412	2069	//pingthread.StepToTarget(true);
413	2070	}
414	2071
..	..	@@ -471,39 +2128,12 @@
471	2128	{
472	2129	frozen ^= true;
473	2130	// Weird...
474		- lighttouched = true;
	2131	+ Globals.lighttouched = true;
475	2132	}
476	2133
477	2134	void ToggleDL()
478	2135	{
479	2136	mainDL ^= true;
480		- }
481		-
482		- void ToggleTexture()
483		- {
484		- textureon ^= true;
485		- }
486		-
487		- void ToggleLive()
488		- {
489		- setLIVE(isLIVE() ^ true);
490		-
491		- System.err.println("LIVE = " + isLIVE());
492		-
493		- if (!isLIVE()) // save sound
494		- GraphreeD.savesound = true; // wav.save();
495		- // else
496		- repaint(); // start loop // may 2013
497		- }
498		-
499		- void ToggleSupport()
500		- {
501		- SUPPORT ^= true;
502		- }
503		-
504		- void ToggleAbort()
505		- {
506		- ABORTMODE ^= true;
507	2137	}
508	2138
509	2139	void ToggleFullScreen()
..	..	@@ -513,12 +2143,7 @@
513	2143
514	2144	void ToggleCrowd()
515	2145	{
516		- CROWD ^= true;
517		- }
518		-
519		- void ToggleInertia()
520		- {
521		- INERTIA ^= true;
	2146	+ Globals.CROWD ^= true;
522	2147	}
523	2148
524	2149	void ToggleLocal()
..	..	@@ -526,62 +2151,89 @@
526	2151	LOCALTRANSFORM ^= true;
527	2152	}
528	2153
529		- void ToggleFast()
	2154	+ public void ToggleTexture()
	2155	+ {
	2156	+ textureon ^= true;
	2157	+ }
	2158	+
	2159	+ public void ToggleLive()
	2160	+ {
	2161	+ Globals.setLIVE(Globals.isLIVE() ^ true);
	2162	+
	2163	+ System.err.println("LIVE = " + Globals.isLIVE());
	2164	+
	2165	+ if (!Globals.isLIVE()) // save sound
	2166	+ Grafreed.savesound = true; // wav.save();
	2167	+ // else
	2168	+ repaint(); // start loop // may 2013
	2169	+ }
	2170	+
	2171	+ public void ToggleSupport()
	2172	+ {
	2173	+ SUPPORT ^= true;
	2174	+ }
	2175	+
	2176	+ public void ToggleAbort()
	2177	+ {
	2178	+ ABORTMODE ^= true;
	2179	+ }
	2180	+
	2181	+ public void ToggleInertia()
	2182	+ {
	2183	+ INERTIA ^= true;
	2184	+ }
	2185	+
	2186	+ public void ToggleFast()
530	2187	{
531	2188	FAST ^= true;
532	2189	}
533	2190
534		- void ToggleSlowPose()
	2191	+ public void ToggleSlowPose()
535	2192	{
536	2193	SLOWPOSE ^= true;
537	2194	}
538	2195
539		- void ToggleFootContact()
540		- {
541		- FOOTCONTACT ^= true;
542		- }
543		-
544		- void ToggleBoxMode()
	2196	+ public void ToggleBoxMode()
545	2197	{
546	2198	BOXMODE ^= true;
547	2199	}
548	2200
549		- void ToggleSmoothFocus()
	2201	+ public void ToggleZoomBoxMode()
	2202	+ {
	2203	+ ZOOMBOXMODE ^= true;
	2204	+ }
	2205	+
	2206	+ public void ToggleSmoothFocus()
550	2207	{
551	2208	SMOOTHFOCUS ^= true;
552	2209	}
553	2210
554		- void ToggleImageFlip()
	2211	+ public void ToggleImageFlip()
555	2212	{
556	2213	IMAGEFLIP ^= true;
557	2214	}
558	2215
559		- void ToggleSpeakerMocap()
	2216	+ public void ToggleSpeakerMocap()
560	2217	{
561	2218	SPEAKERMOCAP ^= true;
562	2219	}
563	2220
564		- void ToggleSpeakerCamera()
	2221	+ public void ToggleSpeakerCamera()
565	2222	{
566	2223	SPEAKERCAMERA ^= true;
567	2224	}
568	2225
569		- void ToggleSpeakerFocus()
	2226	+ public void ToggleSpeakerFocus()
570	2227	{
571	2228	SPEAKERFOCUS ^= true;
572	2229	}
573	2230
574		- void ToggleDebug()
575		- {
576		- DEBUG ^= true;
577		- }
578		-
579		- void ToggleFrustum()
	2231	+ public void ToggleFrustum()
580	2232	{
581	2233	FRUSTUM ^= true;
582	2234	}
583	2235
584		- void ToggleTrack()
	2236	+ public void ToggleTrack()
585	2237	{
586	2238	TRACK ^= true;
587	2239	if (TRACK)
..	..	@@ -600,25 +2252,35 @@
600	2252	repaint();
601	2253	}
602	2254
603		- void ToggleTrackOnce()
	2255	+ public void ToggleTrackOnce()
604	2256	{
605	2257	TRACKONCE ^= true;
606	2258	}
607	2259
608		- void ToggleShadowTrack()
	2260	+ public void ToggleShadowTrack()
609	2261	{
610	2262	SHADOWTRACK ^= true;
611	2263	repaint();
612	2264	}
613	2265
614		- void ToggleOeil()
	2266	+ public void ToggleOeil()
615	2267	{
616	2268	OEIL ^= true;
617	2269	}
618	2270
619		- void ToggleOeilOnce()
	2271	+ public void ToggleOeilOnce()
620	2272	{
621	2273	OEILONCE ^= true;
	2274	+ }
	2275	+
	2276	+ void ToggleFootContact()
	2277	+ {
	2278	+ FOOTCONTACT ^= true;
	2279	+ }
	2280	+
	2281	+ void ToggleDebug()
	2282	+ {
	2283	+ Globals.DEBUG ^= true;
622	2284	}
623	2285
624	2286	void ToggleLookAt()
..	..	@@ -626,9 +2288,9 @@
626	2288	LOOKAT ^= true;
627	2289	}
628	2290
629		- void ToggleRandom()
	2291	+ void ToggleSwitch()
630	2292	{
631		- RANDOM ^= true;
	2293	+ SWITCH ^= true;
632	2294	}
633	2295
634	2296	void ToggleHandles()
..	..	@@ -636,10 +2298,17 @@
636	2298	HANDLES ^= true;
637	2299	}
638	2300
	2301	+ Object3D paintFolder;
	2302	+
639	2303	void TogglePaint()
640	2304	{
641	2305	PAINTMODE ^= true;
642	2306	paintcount = 0;
	2307	+
	2308	+ if (PAINTMODE)
	2309	+ {
	2310	+ paintFolder = GetFolder();
	2311	+ }
643	2312	}
644	2313
645	2314	void SwapCamera(int a, int b)
..	..	@@ -672,34 +2341,6 @@
672	2341	//assert (cam.hAspect == 0);
673	2342	cam.hAspect = 0;
674	2343	lightCamera = cam;
675		- }
676		-
677		- CameraPane(Object3D o, Camera cam, boolean withcontext)
678		- {
679		- super(defaultcaps, null, withcontext?glcontext:null, null);
680		-
681		- //System.out.println("AMERICA AREA = " + (9458886 + 9210755 + 8480395 + 2736391 + 1943018 + 1289475 + 1141569 + 1069350 + 911559 + 721229 + 395886 + 377972 + 246700 + 211156 + 173985 + 141133 + 118279 + 112079 + 108523));
682		- glcontext = getContext();
683		-
684		- cameras = new Camera[2];
685		- targetLookAts = new cVector[2];
686		-
687		- SetCamera(cam);
688		-
689		- SetLight(new Camera(new cVector(10, 10, -20)));
690		-
691		- object = o;
692		-
693		- setBackground(Color.white);
694		-
695		- addKeyListener(this);
696		- addMouseListener(this);
697		- addMouseMotionListener(this);
698		- addMouseWheelListener(this);
699		- //System.out.println("addGLEventListener: " + this);
700		- addGLEventListener(this);
701		-
702		-// pingthread.start(); // may 2013
703	2344	}
704	2345
705	2346	private static void ApplyTransform(GL gl, Mat4f xform)
..	..	@@ -759,15 +2400,56 @@
759	2400
760	2401	GL currentGL;
761	2402
762		- GL GetGL()
	2403	+ public GL GetGL() // INTERFACE
763	2404	{
764	2405	return currentGL;
765	2406	}
766		-
	2407	+
	2408	+ private BufferedImage CreateBim(TextureData texturedata)
	2409	+ {
	2410	+ // cache to disk
	2411	+ Buffer buffer = texturedata.getBuffer(); // getMipmapData();
	2412	+ //buffers[0].
	2413	+ ByteBuffer bytebuf = (ByteBuffer)buffer; // ).asIntBuffer();
	2414	+ int[] pixels = new int[bytebuf.capacity()/3];
	2415	+ int width = texturedata.getWidth(); //(int)Math.sqrt(pixels.length); // squared
	2416	+ int height = width;
	2417	+ for (int i=pixels.length; --i>=0;)
	2418	+ {
	2419	+ int i3 = i*3;
	2420	+ pixels[i] = 0xFF;
	2421	+ pixels[i] <<= 8;
	2422	+ pixels[i] \|= bytebuf.get(i3+2) & 0xFF;
	2423	+ pixels[i] <<= 8;
	2424	+ pixels[i] \|= bytebuf.get(i3+1) & 0xFF;
	2425	+ pixels[i] <<= 8;
	2426	+ pixels[i] \|= bytebuf.get(i3) & 0xFF;
	2427	+ }
	2428	+ /*
	2429	+ int r=0,g=0,b=0,a=0;
	2430	+ for (int i=0; i<width; i++)
	2431	+ for (int j=0; j<height; j++)
	2432	+ {
	2433	+ int index = j*width+i;
	2434	+ int p = pixels[index];
	2435	+ a = ((p>>24) & 0xFF);
	2436	+ r = ((p>>16) & 0xFF);
	2437	+ g = ((p>>8) & 0xFF);
	2438	+ b = (p & 0xFF);
	2439	+ pixels[index] = (a<<24) \| (b<<16) \| (g<<8) \| r;
	2440	+ }
	2441	+ /**/
	2442	+ BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
	2443	+ rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
	2444	+ return rendImage;
	2445	+ }
	2446	+
767	2447	/**/
768	2448	class CacheTexture
769	2449	{
770	2450	com.sun.opengl.util.texture.Texture texture;
	2451	+ com.sun.opengl.util.texture.TextureData texturedata;
	2452	+
771	2453	int resolution;
772	2454
773	2455	CacheTexture(com.sun.opengl.util.texture.Texture tex, int res)
..	..	@@ -779,9 +2461,10 @@
779	2461	/**/
780	2462
781	2463	// TEXTURE static Texture texture;
782		- static public java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/> textures
783		- = new java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/>();
784		- static public java.util.Hashtable<String, String> usedtextures = new java.util.Hashtable<String, String>();
	2464	+ static public java.util.Hashtable<String, CacheTexture> textures = new java.util.Hashtable<String, CacheTexture>();
	2465	+ static public java.util.Hashtable<BufferedImage, CacheTexture> bimtextures = new java.util.Hashtable<BufferedImage, CacheTexture>();
	2466	+ static public java.util.HashSet<String> usedtextures = new java.util.HashSet<String>();
	2467	+
785	2468	int pigmentdepth = 0;
786	2469	public com.sun.opengl.util.texture.Texture[] pigmentstack = new com.sun.opengl.util.texture.Texture[65536];
787	2470	int bumpdepth = 0;
..	..	@@ -803,6 +2486,33 @@
803	2486	true,
804	2487	com.sun.opengl.util.texture.TextureIO.PNG);
805	2488	} catch (java.io.IOException e)
	2489	+ {
	2490	+ throw new javax.media.opengl.GLException(e);
	2491	+ }
	2492	+
	2493	+ if (bump)
	2494	+ texturedata = ConvertBump(texturedata, false);
	2495	+
	2496	+ com.sun.opengl.util.texture.Texture texture =
	2497	+ com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
	2498	+
	2499	+ texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
	2500	+ texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
	2501	+
	2502	+ return texture;
	2503	+ }
	2504	+
	2505	+ com.sun.opengl.util.texture.Texture GetBimTexture(BufferedImage name, boolean bump)
	2506	+ {
	2507	+ TextureData texturedata = null;
	2508	+
	2509	+ try
	2510	+ {
	2511	+ texturedata =
	2512	+ com.sun.opengl.util.texture.TextureIO.newTextureData(
	2513	+ name,
	2514	+ true);
	2515	+ } catch (Exception e)
806	2516	{
807	2517	throw new javax.media.opengl.GLException(e);
808	2518	}
..	..	@@ -1889,6 +3599,8 @@
1889	3599
1890	3600	System.out.println("LOADING TEXTURE : " + name);
1891	3601
	3602	+ Object x = texturedata.getMipmapData(); // .getBuffer();
	3603	+
1892	3604	//
1893	3605	if (false) // compressbit > 0)
1894	3606	{
..	..	@@ -1998,10 +3710,12 @@
1998	3710	*/
1999	3711	TextureData ReduceTexture(TextureData texturedata, int resolution) // String name)
2000	3712	{
	3713	+ int pixelformat = texturedata.getPixelFormat();
	3714	+
2001	3715	int stride = 1;
2002		- if (texturedata.getPixelFormat() == GetGL().GL_RGB \|\| texturedata.getPixelFormat() == GetGL().GL_BGR) // \|\| texturedata.getPixelFormat() == GL.GL_LUMINANCE)
	3716	+ if (pixelformat == GetGL().GL_RGB \|\| pixelformat == GetGL().GL_BGR) // \|\| texturedata.getPixelFormat() == GL.GL_LUMINANCE)
2003	3717	stride = 3;
2004		- if (texturedata.getPixelFormat() == GetGL().GL_RGBA \|\| texturedata.getPixelFormat() == GetGL().GL_BGRA) // \|\| texturedata.getPixelFormat() == GL.GL_LUMINANCE_ALPHA)
	3718	+ if (pixelformat == GetGL().GL_RGBA \|\| pixelformat == GetGL().GL_BGRA) // \|\| texturedata.getPixelFormat() == GL.GL_LUMINANCE_ALPHA)
2005	3719	stride = 4;
2006	3720
2007	3721	int width = texturedata.getWidth();
..	..	@@ -2591,6 +4305,7 @@
2591	4305
2592	4306	com.sun.opengl.util.texture.Texture CompressTexture2(String name)
2593	4307	{
	4308	+ new Exception().printStackTrace();
2594	4309	System.exit(0);
2595	4310	com.sun.opengl.util.texture.Texture texture = null;
2596	4311
..	..	@@ -6267,7 +7982,7 @@
6267	7982	return null;
6268	7983	}
6269	7984
6270		- void ReleaseTextures(cTexture tex)
	7985	+ public void ReleaseTextures(cTexture tex) // INTERFACE
6271	7986	{
6272	7987	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
6273	7988	{
..	..	@@ -6284,7 +7999,7 @@
6284	7999	String pigment = Object3D.GetPigment(tex);
6285	8000	String bump = Object3D.GetBump(tex);
6286	8001
6287		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8002	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
6288	8003	{
6289	8004	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
6290	8005	// System.out.println("; bump = " + bump);
..	..	@@ -6303,9 +8018,67 @@
6303	8018	ReleaseTexture(pigment, false);
6304	8019	}
6305	8020
	8021	+ public void ReleasePigmentTexture(cTexture tex) // INTERFACE
	8022	+ {
	8023	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	8024	+ {
	8025	+ return;
	8026	+ }
	8027	+
	8028	+ if (tex == null)
	8029	+ {
	8030	+ ReleaseTexture(null, false);
	8031	+ return;
	8032	+ }
	8033	+
	8034	+ String pigment = Object3D.GetPigment(tex);
	8035	+
	8036	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8037	+ {
	8038	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	8039	+ // System.out.println("; bump = " + bump);
	8040	+ }
	8041	+
	8042	+ if (pigment.equals(""))
	8043	+ {
	8044	+ pigment = null;
	8045	+ }
	8046	+
	8047	+ ReleaseTexture(pigment, false);
	8048	+ }
	8049	+
	8050	+ public void ReleaseBumpTexture(cTexture tex) // INTERFACE
	8051	+ {
	8052	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	8053	+ {
	8054	+ return;
	8055	+ }
	8056	+
	8057	+ if (tex == null)
	8058	+ {
	8059	+ ReleaseTexture(null, true);
	8060	+ return;
	8061	+ }
	8062	+
	8063	+ String bump = Object3D.GetBump(tex);
	8064	+
	8065	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8066	+ {
	8067	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	8068	+ // System.out.println("; bump = " + bump);
	8069	+ }
	8070	+
	8071	+ if (bump.equals(""))
	8072	+ {
	8073	+ bump = null;
	8074	+ }
	8075	+
	8076	+ ReleaseTexture(bump, true);
	8077	+ }
	8078	+
6306	8079	void ReleaseTexture(String tex, boolean bump)
6307	8080	{
6308		- if (// drawMode != 0 \|\| /tex == null \|\|/
	8081	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
6309	8082	ambientOcclusion ) // \|\| !textureon)
6310	8083	{
6311	8084	return;
..	..	@@ -6331,7 +8104,7 @@
6331	8104	{
6332	8105	bumpdepth--;
6333	8106
6334		- // GraphreeD.trace("POP " + tex + "(" + pigmentdepth + ")" + " : " + pigmentstack[pigmentdepth] + " vs " + texture);
	8107	+ // GrafreeD.trace("POP " + tex + "(" + pigmentdepth + ")" + " : " + pigmentstack[pigmentdepth] + " vs " + texture);
6335	8108	if (bumpstack[bumpdepth] != (texture!=null?texture.texture:null))
6336	8109	{
6337	8110	// assert (bumpstack[bumpdepth] == texture);
..	..	@@ -6361,7 +8134,7 @@
6361	8134	{
6362	8135	pigmentdepth--;
6363	8136
6364		- // GraphreeD.trace("POP " + tex + "(" + pigmentdepth + ")" + " : " + pigmentstack[pigmentdepth] + " vs " + texture);
	8137	+ // GrafreeD.trace("POP " + tex + "(" + pigmentdepth + ")" + " : " + pigmentstack[pigmentdepth] + " vs " + texture);
6365	8138	if (pigmentstack[pigmentdepth] != (texture!=null?texture.texture:null))
6366	8139	{
6367	8140	// assert (pigmentstack[pigmentdepth] == texture);
..	..	@@ -6406,9 +8179,57 @@
6406	8179	}
6407	8180	}
6408	8181
6409		- /boolean/ void BindTextures(cTexture tex, int resolution)
	8182	+ /boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
6410	8183	{
6411		- if (// drawMode != 0 \|\| /tex == null \|\|/
	8184	+// if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8185	+// ambientOcclusion ) // \|\| !textureon)
	8186	+// {
	8187	+// return; // false;
	8188	+// }
	8189	+//
	8190	+// if (tex == null)
	8191	+// {
	8192	+// BindTexture(null,false,resolution);
	8193	+// BindTexture(null,true,resolution);
	8194	+// return;
	8195	+// }
	8196	+//
	8197	+// String pigment = Object3D.GetPigment(tex);
	8198	+// String bump = Object3D.GetBump(tex);
	8199	+//
	8200	+// usedtextures.add(pigment);
	8201	+// usedtextures.add(bump);
	8202	+//
	8203	+// //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8204	+// {
	8205	+// // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8206	+// // System.out.println("; bump = " + bump);
	8207	+// }
	8208	+//
	8209	+// if (bump.equals(""))
	8210	+// {
	8211	+// bump = null;
	8212	+// }
	8213	+// if (pigment.equals(""))
	8214	+// {
	8215	+// pigment = null;
	8216	+// }
	8217	+//
	8218	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8219	+// BindTexture(pigment, false, resolution);
	8220	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
	8221	+// BindTexture(bump, true, resolution);
	8222	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8223	+//
	8224	+// return; // true;
	8225	+
	8226	+ BindPigmentTexture(tex, resolution);
	8227	+ BindBumpTexture(tex, resolution);
	8228	+ }
	8229	+
	8230	+ /boolean/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8231	+ {
	8232	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
6412	8233	ambientOcclusion ) // \|\| !textureon)
6413	8234	{
6414	8235	return; // false;
..	..	@@ -6416,18 +8237,48 @@
6416	8237
6417	8238	if (tex == null)
6418	8239	{
6419		- BindTexture(null,false,resolution);
6420		- BindTexture(null,true,resolution);
	8240	+ BindTexture(null, null,false,resolution);
6421	8241	return;
6422	8242	}
6423	8243
6424	8244	String pigment = Object3D.GetPigment(tex);
	8245	+
	8246	+ usedtextures.add(pigment);
	8247	+
	8248	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8249	+ {
	8250	+ // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8251	+ // System.out.println("; bump = " + bump);
	8252	+ }
	8253	+
	8254	+ if (pigment.equals(""))
	8255	+ {
	8256	+ pigment = null;
	8257	+ }
	8258	+
	8259	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8260	+ BindTexture(tex.pigmenttexture, pigment, false, resolution);
	8261	+ }
	8262	+
	8263	+ /boolean/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8264	+ {
	8265	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8266	+ ambientOcclusion ) // \|\| !textureon)
	8267	+ {
	8268	+ return; // false;
	8269	+ }
	8270	+
	8271	+ if (tex == null)
	8272	+ {
	8273	+ BindTexture(null, null,true,resolution);
	8274	+ return;
	8275	+ }
	8276	+
6425	8277	String bump = Object3D.GetBump(tex);
6426	8278
6427		- usedtextures.put(pigment, pigment);
6428		- usedtextures.put(bump, bump);
	8279	+ usedtextures.add(bump);
6429	8280
6430		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8281	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
6431	8282	{
6432	8283	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
6433	8284	// System.out.println("; bump = " + bump);
..	..	@@ -6437,42 +8288,70 @@
6437	8288	{
6438	8289	bump = null;
6439	8290	}
6440		- if (pigment.equals(""))
6441		- {
6442		- pigment = null;
6443		- }
6444	8291
6445		- GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
6446		- BindTexture(pigment, false, resolution);
6447	8292	GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
6448		- BindTexture(bump, true, resolution);
	8293	+ BindTexture(tex.bumptexture, bump, true, resolution);
6449	8294	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
6450		-
6451		- return; // true;
6452	8295	}
6453	8296
6454		- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution)
	8297	+ java.util.HashSet<String> missingTextures = new java.util.HashSet<String>();
	8298	+
	8299	+ private boolean FileExists(String tex)
6455	8300	{
6456		- CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
	8301	+ if (missingTextures.contains(tex))
	8302	+ {
	8303	+ return false;
	8304	+ }
	8305	+
	8306	+ boolean fileExists = new File(tex).exists();
	8307	+
	8308	+ if (!fileExists)
	8309	+ {
	8310	+ // If file exists, the "new File()" is not executed sgain
	8311	+ missingTextures.add(tex);
	8312	+ }
	8313	+
	8314	+ return fileExists;
	8315	+ }
	8316	+
	8317	+ CacheTexture GetCacheTexture(java.awt.image.BufferedImage bim, String tex, boolean bump, int resolution) throws Exception
	8318	+ {
	8319	+ CacheTexture texturecache = null;
6457	8320
6458	8321	if (tex != null)
6459	8322	{
6460	8323	String texname = tex;
6461	8324
6462		- String[] split = tex.split("Textures");
6463		- if (split.length > 1)
6464		- texname = "/Users/nbriere/Textures" + split[split.length-1];
6465		- else
6466		- if (!texname.startsWith("/"))
6467		- texname = "/Users/nbriere/Textures/" + texname;
	8325	+ String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
	8326	+
	8327	+// String[] split = tex.split("Textures");
	8328	+// if (split.length > 1)
	8329	+// texname = "/Users/nbriere/Textures" + split[split.length-1];
	8330	+// else
	8331	+// if (!texname.startsWith("/"))
	8332	+// texname = "/Users/nbriere/Textures/" + texname;
	8333	+ if (!FileExists(tex))
	8334	+ {
	8335	+ texname = fallbackTextureName;
	8336	+ }
6468	8337
6469	8338	if (CACHETEXTURE)
6470		- texture = textures.get(texname); // TEXTURE CACHE
6471		-
6472		- TextureData texturedata = null;
6473		-
6474		- if (texture == null \|\| texture.resolution < resolution)
6475	8339	{
	8340	+ if (bim == null)
	8341	+ texturecache = textures.get(texname); // TEXTURE CACHE
	8342	+ else
	8343	+ texturecache = bimtextures.get(bim); // TEXTURE CACHE
	8344	+ }
	8345	+
	8346	+ if (texturecache == null \|\| texturecache.resolution < resolution)
	8347	+ {
	8348	+ TextureData texturedata = null;
	8349	+
	8350	+ if (bim != null)
	8351	+ {
	8352	+ texturecache = new CacheTexture(GetBimTexture(bim, bump), -1);
	8353	+ }
	8354	+ else
6476	8355	if (tex.equals("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
6477	8356	{
6478	8357	assert(!bump);
..	..	@@ -6484,19 +8363,23 @@
6484	8363	// }
6485	8364	// else
6486	8365	// {
6487		- texture = textures.get(tex);
6488		- if (texture == null)
	8366	+ texturecache = textures.get(tex);
	8367	+ if (texturecache == null)
6489	8368	{
6490		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8369	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
6491	8370	}
	8371	+ else
	8372	+ new Exception().printStackTrace();
6492	8373	// }
6493	8374	} else
6494	8375	if (tex.equals("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
6495	8376	{
6496	8377	assert(bump);
6497		- texture = textures.get(tex);
6498		- if (texture == null)
6499		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8378	+ texturecache = textures.get(tex);
	8379	+ if (texturecache == null)
	8380	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8381	+ else
	8382	+ new Exception().printStackTrace();
6500	8383	} else
6501	8384	{
6502	8385	//if (tex.equals("IMMORTAL"))
..	..	@@ -6506,9 +8389,11 @@
6506	8389	//{
6507	8390	if (tex.equals("WHITE_NOISE"))
6508	8391	{
6509		- texture = textures.get(tex);
6510		- if (texture == null)
6511		- texture = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8392	+ texturecache = textures.get(tex);
	8393	+ if (texturecache == null)
	8394	+ texturecache = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8395	+ else
	8396	+ new Exception().printStackTrace();
6512	8397	} else
6513	8398	{
6514	8399	if (textureon)
..	..	@@ -6533,7 +8418,7 @@
6533	8418	}
6534	8419
6535	8420	cachename = texname.substring(0, texname.length()-4)+ext+".jpg";
6536		- if (!new File(cachename).exists())
	8421	+ if (!FileExists(cachename))
6537	8422	cachename = texname;
6538	8423	else
6539	8424	processbump = false; // don't process bump map again
..	..	@@ -6555,7 +8440,7 @@
6555	8440	}
6556	8441
6557	8442	cachename = texname.substring(0, texname.length()-4)+ext+".png";
6558		- if (!new File(cachename).exists())
	8443	+ if (!FileExists(cachename))
6559	8444	cachename = texname;
6560	8445	else
6561	8446	processbump = false; // don't process bump map again
..	..	@@ -6564,20 +8449,23 @@
6564	8449	texturedata = GetFileTexture(cachename, processbump, resolution);
6565	8450
6566	8451
6567		- if (texturedata != null)
6568		- texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
	8452	+ if (texturedata == null)
	8453	+ throw new Exception();
	8454	+
	8455	+ texturecache = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
6569	8456	//texture = GetTexture(tex, bump);
6570	8457	}
6571	8458	}
6572	8459	//}
6573	8460	}
6574	8461
6575		- if (/CACHETEXTURE &&/ texture != null && textureon)
	8462	+ if (/CACHETEXTURE &&/ texturecache != null && textureon)
6576	8463	{
6577	8464	//return false;
	8465	+ assert(bim == null);
6578	8466
6579	8467	// System.out.println("CACHE +++++++++++++++ TEXTURE : " + texname + " (" + texture.getEstimatedMemorySize() + ")");
6580		- if (texturedata != null && (texname.endsWith(".jpg") \|\| texname.endsWith(".JPG")))
	8468	+ if (texturedata != null && texname.toLowerCase().endsWith(".jpg"))
6581	8469	{
6582	8470	// String ext = "_highres";
6583	8471	// if (REDUCETEXTURE)
..	..	@@ -6594,52 +8482,17 @@
6594	8482	File cachefile = new File(texname.substring(0, texname.length()-4)+ext+".jpg");
6595	8483	if (!cachefile.exists())
6596	8484	{
6597		- // cache to disk
6598		- Buffer buffer = texturedata.getBuffer(); // getMipmapData();
6599		- //buffers[0].
6600		-
6601		- ByteBuffer bytebuf = (ByteBuffer)buffer; // ).asIntBuffer();
6602		- int[] pixels = new int[bytebuf.capacity()/3];
6603		-
6604		- // squared size heuristic...
6605		- if ((int)Math.sqrt(pixels.length) == Math.sqrt(pixels.length))
	8485	+ //if (texturedata.getWidth() == texturedata.getHeight())
6606	8486	{
6607		- for (int i=pixels.length; --i>=0;)
6608		- {
6609		- int i3 = i*3;
6610		- pixels[i] = 0xFF;
6611		- pixels[i] <<= 8;
6612		- pixels[i] \|= bytebuf.get(i3+2) & 0xFF;
6613		- pixels[i] <<= 8;
6614		- pixels[i] \|= bytebuf.get(i3+1) & 0xFF;
6615		- pixels[i] <<= 8;
6616		- pixels[i] \|= bytebuf.get(i3) & 0xFF;
6617		- }
6618		-
6619		- /*
6620		- int r=0,g=0,b=0,a=0;
6621		- for (int i=0; i<width; i++)
6622		- for (int j=0; j<height; j++)
6623		- {
6624		- int index = j*width+i;
6625		- int p = pixels[index];
6626		- a = ((p>>24) & 0xFF);
6627		- r = ((p>>16) & 0xFF);
6628		- g = ((p>>8) & 0xFF);
6629		- b = (p & 0xFF);
6630		- pixels[index] = (a<<24) \| (b<<16) \| (g<<8) \| r;
6631		- }
6632		- /**/
6633		- int width = (int)Math.sqrt(pixels.length); // squared
6634		- int height = width;
6635		- BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
6636		- rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
	8487	+ BufferedImage rendImage = CreateBim(texturedata);
	8488	+
6637	8489	ImageWriter writer = null;
6638	8490	Iterator iter = ImageIO.getImageWritersByFormatName("jpg");
6639	8491	if (iter.hasNext()) {
6640	8492	writer = (ImageWriter)iter.next();
6641	8493	}
6642		- float compressionQuality = 0.9f;
	8494	+
	8495	+ float compressionQuality = 0.85f;
6643	8496	try
6644	8497	{
6645	8498	ImageOutputStream ios = ImageIO.createImageOutputStream(cachefile);
..	..	@@ -6665,7 +8518,9 @@
6665	8518	thetex.texture.dispose();
6666	8519	textures.remove(texname);
6667	8520	}
6668		- textures.put(texname, texture);
	8521	+
	8522	+ //texture.texturedata = texturedata;
	8523	+ textures.put(texname, texturecache);
6669	8524
6670	8525	// newtex = true;
6671	8526	}
..	..	@@ -6681,30 +8536,49 @@
6681	8536	}
6682	8537	}
6683	8538
	8539	+ return texturecache;
	8540	+ }
	8541	+
	8542	+ static void EmbedTextures(cTexture tex)
	8543	+ {
	8544	+
	8545	+ }
	8546	+
	8547	+ com.sun.opengl.util.texture.Texture GetTexture(java.awt.image.BufferedImage stream, String tex, boolean bump, int resolution) throws Exception
	8548	+ {
	8549	+ CacheTexture texture = GetCacheTexture(stream, tex, bump, resolution);
	8550	+
6684	8551	if (bump)
6685	8552	{
6686		- // GraphreeD.trace("PUSH BUMP " + tex + "(" + bumpdepth + ")" + " : " + texture);
	8553	+ // GrafreeD.trace("PUSH BUMP " + tex + "(" + bumpdepth + ")" + " : " + texture);
6687	8554	bumpstack[bumpdepth++] = texture!=null?texture.texture:null;
6688	8555	}
6689	8556	else
6690	8557	{
6691		- // GraphreeD.trace("PUSH PIGMENT " + tex + "(" + pigmentdepth + ")" + " : " + texture);
	8558	+ // GrafreeD.trace("PUSH PIGMENT " + tex + "(" + pigmentdepth + ")" + " : " + texture);
6692	8559	pigmentstack[pigmentdepth++] = texture!=null?texture.texture:null;
6693	8560	}
6694	8561
6695	8562	return texture!=null?texture.texture:null;
6696	8563	}
6697	8564
6698		- boolean BindTexture(String tex, boolean bump, int resolution)
	8565	+ public com.sun.opengl.util.texture.TextureData GetTextureData(java.awt.image.BufferedImage stream, String tex, boolean bump, int resolution) throws Exception
	8566	+ {
	8567	+ CacheTexture texture = GetCacheTexture(stream, tex, bump, resolution);
	8568	+
	8569	+ return texture!=null?texture.texturedata:null;
	8570	+ }
	8571	+
	8572	+ boolean BindTexture(java.awt.image.BufferedImage stream, String tex, boolean bump, int resolution) throws Exception
6699	8573	{
6700	8574	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
6701	8575	{
6702	8576	return false;
6703	8577	}
6704	8578
6705		- boolean newtex = false;
	8579	+ //boolean newtex = false;
6706	8580
6707		- com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
	8581	+ com.sun.opengl.util.texture.Texture texture = GetTexture(stream, tex, bump, resolution);
6708	8582
6709	8583	if (texture == null)
6710	8584	return false;
..	..	@@ -6734,7 +8608,7 @@
6734	8608	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_S, GetGL().GL_REPEAT);
6735	8609	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_T, GetGL().GL_REPEAT);
6736	8610
6737		- return newtex;
	8611	+ return true; // Warning: not used.
6738	8612	}
6739	8613
6740	8614	ShadowBuffer shadowPBuf;
..	..	@@ -7292,9 +9166,9 @@
7292	9166	static boolean occlusionInitialized = false;
7293	9167	boolean selection = false;
7294	9168	boolean pointselection = false;
7295		- /static/ boolean lighttouched = true;
	9169	+ ///static/ boolean lighttouched = true;
7296	9170	boolean deselect;
7297		- boolean ambientOcclusion = false;
	9171	+ private boolean ambientOcclusion = false;
7298	9172	static boolean flash = false;
7299	9173	/static/ boolean wait = false;
7300	9174	boolean displaydone = false; // after repaint() calls
..	..	@@ -7424,6 +9298,8 @@
7424	9298	//gl.glFrustum(-0.5scale, 0.5scale, -0.5scale, 0.5scale, 1, 100);
7425	9299	//glu.gluPerspective(lightshaper_fovy, 1, lightshaper_zNear, lightshaper_zFar);
7426	9300	double scale = lightCamera.SCALE / lightCamera.Distance();
	9301	+// PATCH FILLE AUX JEANS
	9302	+ //scale *= lightCamera.shaper_fovy / 25;
7427	9303	gl.glScaled(2 * scale, 2 * scale, -scale);
7428	9304	gl.glTranslated(0, 0, lightCamera.DECAL);
7429	9305
..	..	@@ -7570,17 +9446,40 @@
7570	9446	jy8[3] = 0.5f;
7571	9447	}
7572	9448
7573		- float[] options1 = new float[]{1000, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
	9449	+ float[] options1 = new float[]{100, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
7574	9450	float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
7575		- float[] options3 = new float[]{1, 1, 1, 1}; // fog color. image intensity
	9451	+ float[] options3 = new float[]{1, 1, 1, 0}; // fog color
	9452	+ float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
7576	9453
	9454	+ void ResetOptions()
	9455	+ {
	9456	+ options1[0] = 100;
	9457	+ options1[1] = 0.025f;
	9458	+ options1[2] = 0.01f;
	9459	+ options1[3] = 0;
	9460	+ options1[4] = 0;
	9461	+
	9462	+ options2[0] = 0;
	9463	+ options2[1] = 0.75f;
	9464	+ options2[2] = 0;
	9465	+ options2[3] = 0;
	9466	+
	9467	+ options3[0] = 1;
	9468	+ options3[1] = 1;
	9469	+ options3[2] = 1;
	9470	+ options3[3] = 0;
	9471	+
	9472	+ options4[0] = 1;
	9473	+ options4[1] = 0;
	9474	+ options4[2] = 1;
	9475	+ options4[3] = 0;
	9476	+ }
	9477	+
7577	9478	static int imagecount = 0; // movie generation
7578	9479
7579	9480	static int jitter = 0;
7580	9481
7581	9482	boolean restartframe = false;
7582		-
7583		- static int framecount = 0; // general-purpose global count
7584	9483
7585	9484	void displayAntiAliased(javax.media.opengl.GL gl)
7586	9485	{
..	..	@@ -7610,14 +9509,14 @@
7610	9509
7611	9510	//System.out.println("start frame");
7612	9511	gl.glClear(gl.GL_ACCUM_BUFFER_BIT);
7613		- for (jitter = 0; jitter < ACSIZE; jitter++) //, GraphreeD.wav.cursor += LIVE ? 735 : 0)
	9512	+ for (jitter = 0; jitter < ACSIZE; jitter++) //, GrafreeD.wav.cursor += LIVE ? 735 : 0)
7614	9513	{
7615		- framecount++;
	9514	+ Globals.framecount++;
7616	9515
7617	9516	if (CameraPane.tickcount > 0)
7618	9517	CameraPane.tickcount--;
7619	9518
7620		-// GraphreeD.wav.cursor += 735; // 44100 Hz / 120 Hz * 2 (for 16 bits)
	9519	+// GrafreeD.wav.cursor += 735; // 44100 Hz / 120 Hz * 2 (for 16 bits)
7621	9520	// restartframe = true;
7622	9521	if (options1[2] > 100 && (jitter%2==0))
7623	9522	{
..	..	@@ -7650,7 +9549,7 @@
7650	9549
7651	9550	gl.glLightfv(gl.GL_LIGHT0, gl.GL_POSITION, pos, 0);
7652	9551	*/
7653		- lighttouched = true;
	9552	+ Globals.lighttouched = true;
7654	9553	//System.err.println(" shadowbuffer: " + jitter);
7655	9554	shadowbuffer.display();
7656	9555
..	..	@@ -7671,8 +9570,8 @@
7671	9570	assert (parentcam != renderCamera);
7672	9571
7673	9572	if (renderCamera != lightCamera)
7674		- for (int count = parentcam.GetTransformCount(); --count>=0;)
7675		- LA.matConcat(parentcam.toParent, matrix, matrix);
	9573	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9574	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
7676	9575
7677	9576	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
7678	9577
..	..	@@ -7687,8 +9586,8 @@
7687	9586	LA.matCopy(renderCamera.fromScreen, matrix);
7688	9587
7689	9588	if (renderCamera != lightCamera)
7690		- for (int count = parentcam.GetTransformCount(); --count>=0;)
7691		- LA.matConcat(matrix, parentcam.fromParent, matrix);
	9589	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9590	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
7692	9591
7693	9592	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
7694	9593
..	..	@@ -7760,7 +9659,7 @@
7760	9659	//gl.glFlush();
7761	9660	gl.glAccum(gl.GL_ACCUM, 1.0f / ACSIZE);
7762	9661
7763		- if (ANIMATION && ABORTED)
	9662	+ if (Globals.ANIMATION && ABORTED)
7764	9663	{
7765	9664	System.err.println(" ABORTED FRAME");
7766	9665	break;
..	..	@@ -7790,7 +9689,7 @@
7790	9689	setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
7791	9690
7792	9691	// save image
7793		- if (ANIMATION && !ABORTED)
	9692	+ if (Globals.ANIMATION && !ABORTED)
7794	9693	{
7795	9694	VPwidth = viewport[2];
7796	9695	VPheight = viewport[3];
..	..	@@ -7901,11 +9800,11 @@
7901	9800
7902	9801	// imagecount++;
7903	9802
7904		- String fullname = filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
	9803	+ String fullname = Globals.filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
7905	9804
7906	9805	if (!BOXMODE)
7907	9806	{
7908		- System.out.println("image: " + fullname + " (" + (GraphreeD.wav.cursor / 735 / 4) + ")");
	9807	+ System.out.println("image: " + fullname + " (wav cursor=" + (Grafreed.wav.cursor / 735 / 4) + ")");
7909	9808	}
7910	9809
7911	9810	if (!BOXMODE)
..	..	@@ -7933,7 +9832,7 @@
7933	9832	{
7934	9833	if (ACSIZE > 1)
7935	9834	{
7936		- // System.err.println("image #" + (GraphreeD.wav.cursor / 735 / 4));
	9835	+ // System.err.println("image #" + (GrafreeD.wav.cursor / 735 / 4));
7937	9836	}
7938	9837	}
7939	9838
..	..	@@ -7943,7 +9842,7 @@
7943	9842	ABORTED = false;
7944	9843	}
7945	9844	else
7946		- GraphreeD.wav.cursor += 735 * ACSIZE;
	9845	+ Grafreed.wav.cursor += 735 * ACSIZE;
7947	9846
7948	9847	if (false)
7949	9848	{
..	..	@@ -8597,13 +10496,6 @@
8597	10496	}
8598	10497	}
8599	10498
8600		- boolean IsFrozen()
8601		- {
8602		- boolean selectmode = drawMode == SELECTION \|\| CameraPane.DEBUG_SELECTION;
8603		-
8604		- return !selectmode && cameracount == 0; // != 0;
8605		- }
8606		-
8607	10499	boolean niceon = false;
8608	10500	javax.swing.Timer AAtimer = new javax.swing.Timer(750, this);
8609	10501	boolean currentlydrawing = false;
..	..	@@ -8613,16 +10505,16 @@
8613	10505
8614	10506	public void display(GLAutoDrawable drawable)
8615	10507	{
8616		- if (GraphreeD.savesound && GraphreeD.hassound)
	10508	+ if (Grafreed.savesound && Grafreed.hassound)
8617	10509	{
8618		- GraphreeD.wav.save();
8619		- GraphreeD.savesound = false;
8620		- GraphreeD.hassound = false;
	10510	+ Grafreed.wav.save();
	10511	+ Grafreed.savesound = false;
	10512	+ Grafreed.hassound = false;
8621	10513	}
8622	10514	// if (DEBUG_SELECTION)
8623	10515	// {
8624		-// if (drawMode != SELECTION)
8625		-// drawMode = SELECTION;
	10516	+// if (DrawMode() != SELECTION)
	10517	+// DrawMode() = SELECTION;
8626	10518	// }
8627	10519
8628	10520	if (!isRenderer)
..	..	@@ -8678,9 +10570,9 @@
8678	10570
8679	10571	//ANTIALIAS = 0;
8680	10572
8681		- if (drawMode == DEFAULT) // && CURRENTANTIALIAS > 0)
	10573	+ if (DrawMode() == DEFAULT) // && CURRENTANTIALIAS > 0)
8682	10574	{
8683		- if (niceon \|\| isLIVE())
	10575	+ if (niceon \|\| Globals.isLIVE())
8684	10576	{
8685	10577	//if(active == 0)
8686	10578	// antialiaser = null;
..	..	@@ -8693,6 +10585,7 @@
8693	10585	ANTIALIAS = 0;
8694	10586	//System.out.println("RESTART");
8695	10587	AAtimer.restart();
	10588	+ Globals.TIMERRUNNING = true;
8696	10589	}
8697	10590	}
8698	10591	}
..	..	@@ -8705,7 +10598,7 @@
8705	10598	assert eyeCamera.shaper_zFar == 1E5f; // 500.0f;
8706	10599	*/
8707	10600
8708		- if (drawMode == DEFAULT)
	10601	+ if (DrawMode() == DEFAULT)
8709	10602	{
8710	10603	currentlydrawing = true;
8711	10604	}
..	..	@@ -8736,18 +10629,18 @@
8736	10629
8737	10630	// if(Applet3D.clipboard != null)
8738	10631	// System.out.println("Clipboard = " + Applet3D.clipboard); //.get(0).parent);
8739		-//drawMode = SELECTION;
	10632	+//DrawMode() = SELECTION;
8740	10633	indexcount = 0;
8741	10634
8742		- if (drawMode == OCCLUSION)
	10635	+ if (DrawMode() == OCCLUSION)
8743	10636	{
8744		- drawMode = DEFAULT;
	10637	+ Globals.drawMode = DEFAULT; // WARNING
8745	10638	ambientOcclusion = true;
8746	10639	setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
8747	10640	Object3D theobject = object;
8748	10641	Object3D theparent = object.parent;
8749	10642	object.parent = null;
8750		- object = (Object3D)GraphreeD.clone(object);
	10643	+ object = (Object3D)Grafreed.clone(object);
8751	10644	object.Stripify();
8752	10645	if (theobject.selection == null \|\| theobject.selection.Size() == 0)
8753	10646	theobject.PreprocessOcclusion(this);
..	..	@@ -8760,19 +10653,20 @@
8760	10653	ambientOcclusion = false;
8761	10654	}
8762	10655
8763		- if (lighttouched && drawMode == DEFAULT && !lightMode) // && !FROZEN)
	10656	+ if (//Globals.lighttouched &&
	10657	+ DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
8764	10658	{
8765	10659	//if (RENDERSHADOW) // ?
8766	10660	if (!IsFrozen())
8767	10661	{
8768	10662	// dec 2012
8769		- if (!(!flash && !lightMode && drawMode == DEFAULT && ANTIALIAS > 0))
	10663	+ if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
8770	10664	{
8771		- framecount++;
	10665	+ Globals.framecount++;
8772	10666	shadowbuffer.display();
8773	10667	}
8774	10668	}
8775		- lighttouched = false; // ??
	10669	+ Globals.lighttouched = false; // ??
8776	10670	//drawing = true;
8777	10671	//lighttouched = true;
8778	10672	}
..	..	@@ -8793,9 +10687,9 @@
8793	10687	//eyeCamera.shaper_fovy = 1;
8794	10688	}
8795	10689
8796		- if ((RENDERPROGRAM != 0 \|\| ambientOcclusion \|\| spherical) && drawMode == DEFAULT) // SELECTION)
	10690	+ if ((RENDERPROGRAM != 0 \|\| ambientOcclusion \|\| spherical) && DrawMode() == DEFAULT) // SELECTION)
8797	10691	{
8798		- //System.out.println("drawMode = " + drawMode);
	10692	+ //System.out.println("DrawMode() = " + DrawMode());
8799	10693	vertexMode \|= VP_PASS;
8800	10694	//vertexMode \|= VP_PROJECTION;
8801	10695	if (!ambientOcclusion)
..	..	@@ -8855,7 +10749,7 @@
8855	10749	Camera cam = renderCamera; // lightMode?lightCamera:eyeCamera;
8856	10750	//Camera lightcam = new Camera(light0);
8857	10751
8858		- if (drawMode == SHADOW)
	10752	+ if (DrawMode() == SHADOW)
8859	10753	{
8860	10754	/*
8861	10755	gl.glMatrixMode(GL.GL_MODELVIEW);
..	..	@@ -8893,8 +10787,8 @@
8893	10787
8894	10788	// if (parentcam != renderCamera) // not a light
8895	10789	if (cam != lightCamera)
8896		- for (int count = parentcam.GetTransformCount(); --count>=0;)
8897		- LA.matConcat(parentcam.toParent, matrix, matrix);
	10790	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10791	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
8898	10792
8899	10793	for (int j = 0; j < 4; j++)
8900	10794	{
..	..	@@ -8908,8 +10802,8 @@
8908	10802
8909	10803	// if (parentcam != renderCamera) // not a light
8910	10804	if (cam != lightCamera)
8911		- for (int count = parentcam.GetTransformCount(); --count>=0;)
8912		- LA.matConcat(matrix, parentcam.fromParent, matrix);
	10805	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10806	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
8913	10807
8914	10808	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
8915	10809
..	..	@@ -8945,7 +10839,7 @@
8945	10839	gl.glClear(gl.GL_DEPTH_BUFFER_BIT);
8946	10840	} else
8947	10841	{
8948		- if (drawMode != DEFAULT)
	10842	+ if (DrawMode() != DEFAULT)
8949	10843	{
8950	10844	gl.glClearColor(1, 1, 1, 0);
8951	10845	} // 1);
..	..	@@ -9010,7 +10904,7 @@
9010	10904
9011	10905	fast &= !ambientOcclusion;
9012	10906
9013		- if (drawMode == DEFAULT)
	10907	+ if (DrawMode() == DEFAULT)
9014	10908	{
9015	10909	//gl.glEnable(gl.GL_ALPHA_TEST);
9016	10910	//gl.glActiveTexture(GL.GL_TEXTURE0);
..	..	@@ -9071,6 +10965,8 @@
9071	10965	//gl.glFrustum(-0.5scale, 0.5scale, -0.5scale, 0.5scale, 1, 100);
9072	10966	//glu.gluPerspective(lightshaper_fovy, 1, lightshaper_zNear, lightshaper_zFar);
9073	10967	double scale = lightCamera.SCALE / lightCamera.Distance();
	10968	+// PATCH FILLE AUX JEANS
	10969	+ //scale *= lightCamera.shaper_fovy / 25;
9074	10970	gl.glScaled(2 * scale, 2 * scale, -scale);
9075	10971	gl.glTranslated(0, 0, lightCamera.DECAL);
9076	10972
..	..	@@ -9166,7 +11062,16 @@
9166	11062	// Bump noise
9167	11063	gl.glActiveTexture(GL.GL_TEXTURE6);
9168	11064	//gl.glBindTexture(GL.GL_TEXTURE_2D, bump_noise);
9169		- BindTexture(NOISE_TEXTURE, false, 2);
	11065	+
	11066	+ try
	11067	+ {
	11068	+ BindTexture(null, NOISE_TEXTURE, false, 2);
	11069	+ }
	11070	+ catch (Exception e)
	11071	+ {
	11072	+ System.err.println("FAILED: " + NOISE_TEXTURE);
	11073	+ }
	11074	+
9170	11075
9171	11076	gl.glActiveTexture(GL.GL_TEXTURE0);
9172	11077	gl.glEnable(GL.GL_TEXTURE_2D);
..	..	@@ -9189,9 +11094,9 @@
9189	11094
9190	11095	gl.glMatrixMode(GL.GL_MODELVIEW);
9191	11096
9192		-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
9193		-//gl.glEnable(gl.GL_POLYGON_SMOOTH);
9194		-//gl.glEnable(gl.GL_MULTISAMPLE);
	11097	+gl.glEnable(gl.GL_POLYGON_SMOOTH);
	11098	+gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
	11099	+gl.glEnable(gl.GL_MULTISAMPLE);
9195	11100	} else
9196	11101	{
9197	11102	//gl.glDisable(GL.GL_TEXTURE_2D);
..	..	@@ -9202,14 +11107,16 @@
9202	11107	//System.out.println("BLENDING ON");
9203	11108	gl.glEnable(GL.GL_BLEND);
9204	11109	gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
9205		-
	11110	+// gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
9206	11111	gl.glMatrixMode(gl.GL_PROJECTION);
9207	11112	gl.glLoadIdentity();
9208	11113
9209		- if (drawMode == SHADOW \|\| cam == lightCamera) // \|\| (vertexMode&VP_PROJECTION) != 0)
	11114	+ if (DrawMode() == SHADOW \|\| cam == lightCamera) // \|\| (vertexMode&VP_PROJECTION) != 0)
9210	11115	{
9211	11116	//glu.gluPerspective(lightshaper_fovy, 1, lightshaper_zNear, lightshaper_zFar);
9212	11117	double scale = lightCamera.SCALE / lightCamera.Distance();
	11118	+// PATCH FILLE AUX JEANS
	11119	+ //scale *= lightCamera.shaper_fovy / 25;
9213	11120	gl.glScaled(2 * scale, 2 * scale, -scale);
9214	11121	gl.glTranslated(0, 0, lightCamera.DECAL);
9215	11122	//System.out.println("DECAL = " + LIGHTDECAL + "; SCALE = " + LIGHTSCALE);
..	..	@@ -9262,7 +11169,7 @@
9262	11169	//gl.glPushMatrix();
9263	11170	gl.glLoadIdentity();
9264	11171
9265		- if (!ambientOcclusion) // drawMode != OCCLUSION)
	11172	+ if (!ambientOcclusion) // DrawMode() != OCCLUSION)
9266	11173	{
9267	11174	//LA.xformPos(light0, lightCamera.fromScreen, light);
9268	11175	LA.xformDir(dirlight, lightCamera.fromScreen, lightposition);
..	..	@@ -9289,8 +11196,8 @@
9289	11196	System.err.println("parentcam != renderCamera");
9290	11197
9291	11198	// if (cam != lightCamera)
9292		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9293		- LA.xformDir(lightposition, parentcam.toParent, lightposition); // may 2013
	11199	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11200	+ LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
9294	11201	}
9295	11202
9296	11203	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -9311,8 +11218,8 @@
9311	11218	if (true) // TODO
9312	11219	{
9313	11220	if (cam != lightCamera)
9314		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9315		- LA.xformDir(light0, parentcam.toParent, light0); // may 2013
	11221	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11222	+ LA.xformDir(light0, parentcam.GlobalTransform(), light0); // may 2013
9316	11223	}
9317	11224
9318	11225	LA.xformPos(light0, cam.toScreen, light0);
..	..	@@ -9349,7 +11256,7 @@
9349	11256	}
9350	11257
9351	11258	/**/
9352		- if (true) // drawMode == SELECTION) // != DEFAULT)
	11259	+ if (true) // DrawMode() == SELECTION) // != DEFAULT)
9353	11260	gl.glDisable(gl.GL_LIGHTING);
9354	11261	else
9355	11262	gl.glEnable(gl.GL_LIGHTING);
..	..	@@ -9361,12 +11268,13 @@
9361	11268
9362	11269	gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 63, options2, 0);
9363	11270	gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 62, options3, 0);
	11271	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 61, options4, 0);
9364	11272
9365	11273	options2[0] *= renderCamera.Distance();
9366	11274
9367	11275	lightslot = 64;
9368	11276
9369		- if (!frozen && !ambientOcclusion && isRenderer && drawMode == DEFAULT)
	11277	+ if (!frozen && !ambientOcclusion && isRenderer && DrawMode() == DEFAULT)
9370	11278	{
9371	11279	DrawLights(object);
9372	11280	}
..	..	@@ -9377,7 +11285,7 @@
9377	11285	fragmentMode \|= (lightslot - 64) << 2; // 1; // first bit is available for aniso
9378	11286	//System.out.println("fragmentMode = " + fragmentMode);
9379	11287
9380		- if (drawMode == DEFAULT \|\| drawMode == SELECTION \|\| DEBUG_SELECTION)
	11288	+ if (DrawMode() == DEFAULT \|\| DrawMode() == SELECTION \|\| IsDebugSelection())
9381	11289	{
9382	11290	/*
9383	11291	if (CULLFACE \|\| (ambientOcclusion && OCCLUSION_CULLING))
..	..	@@ -9410,7 +11318,7 @@
9410	11318	}
9411	11319	}
9412	11320
9413		- if (drawMode == DEFAULT)
	11321	+ if (DrawMode() == DEFAULT)
9414	11322	{
9415	11323	if (WIREFRAME && !ambientOcclusion)
9416	11324	{
..	..	@@ -9428,7 +11336,7 @@
9428	11336	gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9429	11337	gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9430	11338
9431		- if (!fast/RENDERPROGRAM != 0/ && (drawMode == DEFAULT \|\| drawMode == SHADOW)) // && !WIREFRAME) //
	11339	+ if (!fast/RENDERPROGRAM != 0/ && (DrawMode() == DEFAULT \|\| DrawMode() == SHADOW)) // && !WIREFRAME) //
9432	11340	{
9433	11341	if (vertexMode != 0) // && !fast)
9434	11342	{
..	..	@@ -9448,7 +11356,7 @@
9448	11356	}
9449	11357	}
9450	11358
9451		- if (false) // fast && !IsFreezed() && drawMode != SELECTION && !ambientOcclusion)
	11359	+ if (false) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
9452	11360	{
9453	11361	//gl.glDepthFunc(GL.GL_LEQUAL);
9454	11362	//gl.glClear(gl.GL_COLOR_BUFFER_BIT \| gl.GL_DEPTH_BUFFER_BIT);
..	..	@@ -9476,7 +11384,7 @@
9476	11384	//gl.glDepthMask(false);
9477	11385	}
9478	11386
9479		- if (false) // drawMode == SHADOW)
	11387	+ if (false) // DrawMode() == SHADOW)
9480	11388	{
9481	11389	//SetColumnMajorData(cameraInverseTransform, view_1);
9482	11390	//System.out.println("light = " + cameraInverseTransform);
..	..	@@ -9490,16 +11398,16 @@
9490	11398	//System.out.println("object = " + object);
9491	11399	if (!frozen && !imageLocked)
9492	11400	{
9493		- if (!flash && !lightMode && drawMode == DEFAULT && ANTIALIAS > 0)
	11401	+ if (!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0)
9494	11402	{
9495	11403	displayAntiAliased(gl);
9496	11404	} else
9497	11405	{
9498	11406	programcount = 0;
9499		- int keepmode = drawMode;
	11407	+ int keepmode = DrawMode();
9500	11408	// if (DEBUG_SELECTION)
9501	11409	// {
9502		-// drawMode = SELECTION;
	11410	+// DrawMode() = SELECTION;
9503	11411	// }
9504	11412	// for point selection
9505	11413	// gl.glGetDoublev(gl.GL_MODELVIEW_MATRIX, tempmat, 0);
..	..	@@ -9509,10 +11417,10 @@
9509	11417	DrawObject(gl);
9510	11418
9511	11419	// jan 2013 System.err.println("RESET ABORT (display)");
9512		- // if (drawMode == DEFAULT)
	11420	+ // if (DrawMode() == DEFAULT)
9513	11421	// ABORTED = false;
9514	11422	fullreset = false;
9515		- drawMode = keepmode;
	11423	+ Globals.drawMode = keepmode; // WARNING
9516	11424	//System.out.println("PROGRAM SWITCH " + programcount);
9517	11425	}
9518	11426	}
..	..	@@ -9520,11 +11428,11 @@
9520	11428	gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9521	11429	gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9522	11430
9523		- if (drawMode == DEFAULT)
	11431	+ if (DrawMode() == DEFAULT)
9524	11432	{
9525	11433	ReleaseTexture(NOISE_TEXTURE, false);
9526	11434	}
9527		- //if (drawMode == DEFAULT)
	11435	+ //if (DrawMode() == DEFAULT)
9528	11436	{
9529	11437
9530	11438	gl.glActiveTexture(GL.GL_TEXTURE1);
..	..	@@ -9536,7 +11444,7 @@
9536	11444	//else
9537	11445	//gl.glDisable(gl.GL_TEXTURE_2D);
9538	11446	//gl.glPopMatrix();
9539		- if (imageCompleted && ANTIALIAS > 0 && drawMode == DEFAULT && cam != lightCamera && !ambientOcclusion)
	11447	+ if (imageCompleted && ANTIALIAS > 0 && DrawMode() == DEFAULT && cam != lightCamera && !ambientOcclusion)
9540	11448	{
9541	11449	//new Exception().printStackTrace();
9542	11450	//System.out.println("Draw image " + width + ", " + height);
..	..	@@ -9578,7 +11486,7 @@
9578	11486	//gl.glFlush();
9579	11487	}
9580	11488
9581		- if (flash && drawMode == DEFAULT)
	11489	+ if (flash && DrawMode() == DEFAULT)
9582	11490	{
9583	11491	flash = false;
9584	11492	wait = true;
..	..	@@ -9586,9 +11494,9 @@
9586	11494	}
9587	11495
9588	11496	//drawing = false;
9589		- //if(drawMode == DEFAULT)
	11497	+ //if(DrawMode() == DEFAULT)
9590	11498	// niceon = false;
9591		- if (drawMode == DEFAULT)
	11499	+ if (DrawMode() == DEFAULT)
9592	11500	{
9593	11501	currentlydrawing = false;
9594	11502	}
..	..	@@ -9608,7 +11516,7 @@
9608	11516	repaint();
9609	11517	}
9610	11518
9611		- if (isLIVE() && drawMode == DEFAULT) // may 2013
	11519	+ if (Globals.isLIVE() && DrawMode() == DEFAULT) // may 2013
9612	11520	repaint();
9613	11521
9614	11522	displaydone = true;
..	..	@@ -9627,8 +11535,14 @@
9627	11535	{
9628	11536	renderpass++;
9629	11537	// System.out.println("Draw object... ");
	11538	+ STEP = 1;
9630	11539	if (FAST) // in case there is no script
9631		- STEP = 16;
	11540	+ STEP = 8;
	11541	+
	11542	+ if (CURRENTANTIALIAS == 0 \|\| ACSIZE == 1)
	11543	+ {
	11544	+ STEP *= 4;
	11545	+ }
9632	11546
9633	11547	//object.FullInvariants();
9634	11548
..	..	@@ -9642,23 +11556,44 @@
9642	11556	e.printStackTrace();
9643	11557	}
9644	11558
9645		- if (GraphreeD.RENDERME > 0)
9646		- GraphreeD.RENDERME--; // mechante magouille
	11559	+ if (Grafreed.RENDERME > 0)
	11560	+ Grafreed.RENDERME--; // mechante magouille
9647	11561
9648		- ONESTEP = false;
	11562	+ Globals.ONESTEP = false;
9649	11563	}
9650	11564
9651	11565	static boolean zoomonce = false;
9652	11566
	11567	+ static void CreateSelectedPoint()
	11568	+ {
	11569	+ if (selectedpoint == null)
	11570	+ {
	11571	+ debugpointG = new Sphere();
	11572	+ debugpointP = new Sphere();
	11573	+ debugpointC = new Sphere();
	11574	+ debugpointR = new Sphere();
	11575	+
	11576	+ selectedpoint = new Superellipsoid();
	11577	+
	11578	+ for (int i=0; i<8; i++)
	11579	+ {
	11580	+ debugpoints[i] = new Sphere();
	11581	+ }
	11582	+ }
	11583	+ }
	11584	+
9653	11585	void DrawObject(GL gl, boolean draw)
9654	11586	{
	11587	+ // To clear camera values
	11588	+ ResetOptions();
	11589	+
9655	11590	//System.out.println("DRAW OBJECT " + mouseDown);
9656		-// drawMode = SELECTION;
	11591	+// DrawMode() = SELECTION;
9657	11592	//GL gl = getGL();
9658	11593	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
9659	11594	{
9660		- if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && drawMode == SHADOW) // && !lightMode)
9661		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	11595	+ if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
	11596	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
9662	11597	pingthread.StepToTarget(true); // true);
9663	11598	// zoomonce = false;
9664	11599	}
..	..	@@ -9678,9 +11613,9 @@
9678	11613	callist = gl.glGenLists(1);
9679	11614	}
9680	11615
9681		- boolean selectmode = drawMode == SELECTION \|\| CameraPane.DEBUG_SELECTION;
	11616	+ boolean selectmode = DrawMode() == SELECTION \|\| IsDebugSelection();
9682	11617
9683		- boolean active = !selectmode; // drawMode != SELECTION; // mouseDown;
	11618	+ boolean active = !selectmode; // DrawMode() != SELECTION; // mouseDown;
9684	11619
9685	11620	if (!mainDL \|\| !active \|\| touched)
9686	11621	{
..	..	@@ -9707,24 +11642,32 @@
9707	11642	PushMatrix(ClickInfo.matbuffer);
9708	11643	}
9709	11644
9710		- if (drawMode == 0)
	11645	+ if (DrawMode() == 0)
9711	11646	{
9712	11647	// System.out.println("CLEAR +++++++++++++++ +++++++++++++++ +++++++++++++++ +++++++++++++++");
9713	11648
9714	11649	usedtextures.clear();
9715	11650
9716		- BindTextures(DEFAULT_TEXTURES, 2);
	11651	+ try
	11652	+ {
	11653	+ BindTextures(DEFAULT_TEXTURES, 2);
	11654	+ }
	11655	+ catch (Exception e)
	11656	+ {
	11657	+ System.err.println("FAILED: " + DEFAULT_TEXTURES);
	11658	+ }
9717	11659	}
9718	11660	//System.out.println("--> " + stackdepth);
9719		-// GraphreeD.traceon();
	11661	+// GrafreeD.traceon();
9720	11662
9721	11663	// DRAW
9722	11664	object.draw(this, /(Composite)/ object, false, false);
9723	11665
9724		- if (drawMode == DEFAULT)
	11666	+ if (DrawMode() == DEFAULT)
9725	11667	{
9726		- if (DEBUG)
	11668	+ if (Globals.DEBUG)
9727	11669	{
	11670	+ CreateSelectedPoint();
9728	11671	float radius = 0.05f;
9729	11672	if (selectedpoint.radius != radius)
9730	11673	{
..	..	@@ -9732,34 +11675,48 @@
9732	11675	selectedpoint.radius = radius;
9733	11676	selectedpoint.recalculate();
9734	11677	selectedpoint.material = new cMaterial();
9735		- selectedpoint.material.color = 0.25f;
	11678	+ selectedpoint.material.color = 0.15f; // Yellow
9736	11679	selectedpoint.material.modulation = 0.75f;
9737	11680
9738		- debugpoint.radius = radius;
9739		- debugpoint.recalculate();
9740		- debugpoint.material = new cMaterial();
9741		- debugpoint.material.color = 0.25f;
9742		- debugpoint.material.modulation = 0.75f;
	11681	+ debugpointG.radius = radius;
	11682	+ debugpointG.recalculate();
	11683	+ debugpointG.material = new cMaterial();
	11684	+ debugpointG.material.color = 0.25f; // Green
	11685	+ debugpointG.material.modulation = 0.75f;
9743	11686
9744		- debugpoint2.radius = radius;
9745		- debugpoint2.recalculate();
9746		- debugpoint2.material = new cMaterial();
9747		- debugpoint2.material.color = 0.75f;
9748		- debugpoint2.material.modulation = 0.75f;
	11687	+ debugpointP.radius = radius;
	11688	+ debugpointP.recalculate();
	11689	+ debugpointP.material = new cMaterial();
	11690	+ debugpointP.material.color = 0.75f; // Purple
	11691	+ debugpointP.material.modulation = 0.75f;
	11692	+
	11693	+ debugpointC.radius = radius;
	11694	+ debugpointC.recalculate();
	11695	+ debugpointC.material = new cMaterial();
	11696	+ debugpointC.material.color = 0.5f; // Cyan
	11697	+ debugpointC.material.modulation = 0.75f;
	11698	+
	11699	+ debugpointR.radius = radius;
	11700	+ debugpointR.recalculate();
	11701	+ debugpointR.material = new cMaterial();
	11702	+ debugpointR.material.color = 0f; // Red
	11703	+ debugpointR.material.modulation = 0.75f;
9749	11704
9750	11705	InitPoints(radius);
9751	11706	}
9752	11707	selectedpoint.draw(this, /(Composite)/ null, false, false);
9753		- //debugpoint.draw(this, /(Composite)/ null, false);
9754		- //debugpoint2.draw(this, /(Composite)/ null, false);
9755		- DrawPoints(this);
	11708	+ debugpointG.draw(this, /(Composite)/ null, false,false);
	11709	+ debugpointP.draw(this, /(Composite)/ null, false,false);
	11710	+ debugpointC.draw(this, /(Composite)/ null, false,false);
	11711	+ debugpointR.draw(this, /(Composite)/ null, false,false);
	11712	+ // DrawPoints(this);
9756	11713	}
9757	11714
9758	11715	// debugstuff.draw(this, /(Composite)/ null, false);
9759	11716	}
9760		-// GraphreeD.traceoff();
	11717	+// GrafreeD.traceoff();
9761	11718	//System.out.println(stackdepth);
9762		- if (drawMode == 0)
	11719	+ if (DrawMode() == 0)
9763	11720	{
9764	11721	ReleaseTextures(DEFAULT_TEXTURES);
9765	11722
..	..	@@ -9773,7 +11730,7 @@
9773	11730	if (tex.equals("WHITE_NOISE"))
9774	11731	continue;
9775	11732
9776		- if (!usedtextures.containsKey(tex))
	11733	+ if (!usedtextures.contains(tex))
9777	11734	{
9778	11735	// System.out.println("DISPOSE +++++++++++++++ " + tex);
9779	11736	textures.get(tex).texture.dispose();
..	..	@@ -9784,17 +11741,26 @@
9784	11741
9785	11742	checker = null;
9786	11743
9787		- if (!ambientOcclusion && !IsFrozen() && drawMode == DEFAULT)
	11744	+ if (!ambientOcclusion && !IsFrozen() && DrawMode() == DEFAULT)
9788	11745	FindChecker(object);
9789	11746
9790		- if (checker != null && drawMode == DEFAULT)
	11747	+ if (checker != null && DrawMode() == DEFAULT)
9791	11748	{
9792		- // BindTexture(IMMORTAL_TEXTURE);
	11749	+ //BindTexture(IMMORTAL_TEXTURE);
	11750	+ try
	11751	+ {
	11752	+ BindTextures(checker.GetTextures(), checker.texres);
	11753	+ }
	11754	+ catch (Exception e)
	11755	+ {
	11756	+ System.err.println("FAILED: " + checker.GetTextures());
	11757	+ }
9793	11758	// NEAREST
9794	11759	GetGL().glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST); // GL.GL_LINEAR);
9795	11760	DrawChecker(gl);
9796	11761	//checker.Draw(this, null, false);
9797	11762	// ReleaseTexture(IMMORTAL_TEXTURE);
	11763	+ ReleaseTextures(checker.GetTextures());
9798	11764	}
9799	11765
9800	11766	if (object.parent != null)
..	..	@@ -9807,7 +11773,7 @@
9807	11773	//gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9808	11774	//gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9809	11775
9810		- if (DISPLAYTEXT && drawMode == DEFAULT)
	11776	+ if (DISPLAYTEXT && DrawMode() == DEFAULT)
9811	11777	{
9812	11778	// Draw it once, then use the raster
9813	11779	Balloon(gl, balloon.createGraphics());
..	..	@@ -9863,14 +11829,14 @@
9863	11829	int[] xs = new int[3];
9864	11830	int[] ys = new int[3];
9865	11831
9866		- void DrawString(Object3D obj) // String string)
	11832	+ public void DrawString(Object3D obj) // String string) // INTERFACE
9867	11833	{
9868		- if (!DISPLAYTEXT \|\| drawMode != DEFAULT)
	11834	+ if (!DISPLAYTEXT \|\| DrawMode() != DEFAULT)
9869	11835	{
9870	11836	return;
9871	11837	}
9872	11838
9873		- String string = obj.GetToolTip();
	11839	+ String string = obj.toString(); //.GetToolTip();
9874	11840
9875	11841	GL gl = GetGL();
9876	11842
..	..	@@ -10187,8 +12153,8 @@
10187	12153	//obj.TransformToWorld(light, light);
10188	12154	for (int i = tp.size(); --i >= 0;)
10189	12155	{
10190		- for (int count = tp.get(i).GetTransformCount(); --count>=0;)
10191		- LA.xformPos(light, tp.get(i).toParent, light);
	12156	+ //for (int count = tp.get(i).GetTransformCount(); --count>=0;)
	12157	+ LA.xformPos(light, tp.get(i).GlobalTransformInv(), light);
10192	12158	}
10193	12159
10194	12160
..	..	@@ -10205,8 +12171,8 @@
10205	12171	parentcam = cameras[0];
10206	12172	}
10207	12173
10208		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10209		- LA.xformPos(light, parentcam.toParent, light); // may 2013
	12174	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	12175	+ LA.xformPos(light, parentcam.GlobalTransform(), light); // may 2013
10210	12176
10211	12177	LA.xformPos(light, renderCamera.toScreen, light);
10212	12178
..	..	@@ -10253,7 +12219,7 @@
10253	12219	return;
10254	12220	}
10255	12221
10256		- if (obj instanceof CheckerIG)
	12222	+ if (obj instanceof Checker)
10257	12223	{
10258	12224	checker = obj;
10259	12225
..	..	@@ -10325,11 +12291,13 @@
10325	12291	"PARAM params6 = program.env[6];" + // bump, noise, borderfade, fog punchthrough
10326	12292	"PARAM params7 = program.env[7];" + // noise power, opacity power
10327	12293	"PARAM options0 = program.env[63];" + // fog density, intensity, elevation
10328		- "PARAM options1 = program.env[62];" + // fog rgb color, image intensity
	12294	+ "PARAM options1 = program.env[62];" + // fog rgb color
	12295	+ "PARAM options2 = program.env[61];" + // image intensity, subsurface, lightsheen
10329	12296	"PARAM pointlight = program.env[127];" + // ...
10330	12297	"PARAM zero = { 0.0, 0.0, 0.0, 0.0 };" +
10331	12298	"PARAM halfhalf = { 0.25, 0.25, 0.25, 1.0 };" +
10332	12299	"PARAM half = { 0.5, 0.5, 0.5, 1.0 };" +
	12300	+ "PARAM threequarter = { 0.75, 0.75, 0.75, 1.0 };" +
10333	12301	"PARAM two = { 2.0, 2.0, 2.0, 1.0 };" +
10334	12302	"PARAM ten = { 10, 10, 10, 1.0 };" +
10335	12303	"PARAM one3rd = { 0.5, 0.33333333333, 0.333333333, 1.0 };" +
..	..	@@ -10350,6 +12318,7 @@
10350	12318	"PARAM lodbias = { 10,10,10,10 };" + // 20, -2, -20, 1.0 };" +
10351	12319	"PARAM infinity = { 100000000, 100000000, 100000000, 1.0 };" +
10352	12320	"PARAM one2048th = { 0.00048828125, 0.00048828125, 0.00048828125, 1.0 };" +
	12321	+ "PARAM ninetenth = { 0.9, 0.9, 0.9, 1.0 };" +
10353	12322	"PARAM almostone = { 0.999, 0.999, 0.999, 1.0 };" +
10354	12323	"PARAM c256 = { 256, 256, 256, 1.0 };" +
10355	12324	"PARAM c256i = { 0.00390625, 0.00390625, 0.00390625, 1.0 };" +
..	..	@@ -10390,6 +12359,10 @@
10390	12359	"TEMP R1;" +
10391	12360	"TEMP R2;" +
10392	12361	"TEMP R3;" +
	12362	+ "TEMP min;" +
	12363	+ "TEMP max;" +
	12364	+ "TEMP average;" +
	12365	+ "TEMP saturation;" +
10393	12366	"TEMP keep1;" +
10394	12367	"TEMP keep2;" +
10395	12368	"TEMP keep3;" +
..	..	@@ -10813,8 +12786,8 @@
10813	12786
10814	12787	// display shadow only (bump == 0)
10815	12788	"SUB temp.x, half.x, shadow.x;" +
10816		- "MOV temp.y, -params6.x;" +
10817		- "SLT temp.z, temp.y, zero.x;" +
	12789	+ "MOV temp.y, -params5.z;" + // params6.x;" +
	12790	+ "SLT temp.z, temp.y, -one2048th.x;" +
10818	12791	"SUB temp.y, one.x, temp.z;" +
10819	12792	"MUL temp.x, temp.x, temp.y;" +
10820	12793	"KIL temp.x;" +
..	..	@@ -10920,10 +12893,42 @@
10920	12893
10921	12894	// skin?
10922	12895	// Saturation for skin
10923		- /**/ // c'est ici
10924		- (Skinshader? "DP3 temp.x, final,one;" +
	12896	+ /**/
	12897	+ (Skinshader?
	12898	+ "DP3 average.x, final,one;" +
	12899	+ "MUL average, one3rd.xxxx,average.xxxx;" +
	12900	+
	12901	+ "MIN min.x, final.x,final.y;" +
	12902	+ "MIN min.x, min.x,final.z;" +
	12903	+
	12904	+ "MAX max.x, final.x,final.y;" +
	12905	+ "MAX max.x, max.x,final.z;" +
	12906	+ "MOV max, max.xxxx;" +
	12907	+
	12908	+ "SUB saturation, max, final;" +
	12909	+
	12910	+ "ADD temp.x, max.x, one10th.x;" +
	12911	+ "RCP temp.x, temp.x;" +
	12912	+ "MUL temp.x, temp.x, half.x;" +
	12913	+ "MUL saturation, saturation, temp.xxxx;" +
	12914	+
	12915	+ "DP3 ndotl.x, normald, light;" +
	12916	+ "MAX ndotl.x, ndotl.x, -ndotl.x;" +
	12917	+
	12918	+ "SUB temp.x, one.x, ndotl.x;" +
	12919	+ // Tuning for default skin
	12920	+ //"ADD temp.x, temp.x, options2.z;" + // lightsheen
	12921	+ "MAD temp.x, options2.z, half.y, temp.x;" + // lightsheen
	12922	+ "ADD temp.y, one.y, options2.y;" + // subsurface
	12923	+ "MUL temp.x, temp.x, temp.y;" +
	12924	+
	12925	+ "MUL saturation, saturation, temp.xxxx;" +
	12926	+ "SUB_SAT temp, max, saturation;" +
	12927	+/**
	12928	+ "DP3 temp.x, final,one;" +
10925	12929	"MUL R2, one3rd.xxxx,temp.xxxx;" +
10926		- "SUB temp, final,R2;" +
	12930	+ "SUB temp, final, R2;" +
	12931	+
10927	12932	// using light angle
10928	12933	"DP3 ndotl.x, normald,light;" +
10929	12934	//"SLT ndotl.y, ndotl.x, zero.x;" +
..	..	@@ -10936,7 +12941,6 @@
10936	12941	// using light intensity
10937	12942	"MOV ndotl.z, R2.x;" +
10938	12943	"MUL ndotl.z, ndotl.z, ndotl.z;" + // tuning...
10939		-
10940	12944	// june 2014
10941	12945	"MAD R1.x, ndotl.z,slope.y,one.x;" +
10942	12946	// "SUB ndotl.x, one.x, ndotl.x;" +
..	..	@@ -10948,6 +12952,7 @@
10948	12952	//"MUL R2.y, shadow.x,R2.y;" + // avril 2014
10949	12953
10950	12954	"MAD temp.x, R2.y, ndotl.y, temp.x;" + // red shift (skin)
	12955	+/**/
10951	12956
10952	12957	// "ADD final, R2,temp;" +
10953	12958	"MOV final, temp;"
..	..	@@ -11037,7 +13042,7 @@
11037	13042	/**/
11038	13043	// HDR
11039	13044	"MOV temp.z, final.a;" +
11040		- "MUL final, final,options1.w;" +
	13045	+ "MUL final, final,options2.x;" +
11041	13046	"MOV final.a, temp.z;" +
11042	13047	/**/
11043	13048
..	..	@@ -11074,10 +13079,17 @@
11074	13079	"MOV final.z, zero.x;" +
11075	13080	"MOV final.a, one.w;":""
11076	13081	) +
	13082	+ /*
11077	13083	(NORMALdebug?"MOV final.x, normal.x;" +
11078	13084	"MOV final.y, normal.y;" +
11079	13085	"MOV final.z, normal.z;" +
11080	13086	"MOV final.a, one.w;":""
	13087	+ ) +
	13088	+ */
	13089	+ (NORMALdebug?"SUB final.x, one.x, final.x;" +
	13090	+ "SUB final.y, one.x, final.y;" +
	13091	+ "SUB final.z, one.x, final.z;" +
	13092	+ "MOV final.a, final.a;":""
11081	13093	) +
11082	13094	// "MOV final, bumpmap;" +
11083	13095	"MOV result.color, final;" +
..	..	@@ -11106,7 +13118,7 @@
11106	13118	//once = true;
11107	13119	}
11108	13120
11109		- System.out.print("Program #" + mode + "; length = " + program.length());
	13121	+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
11110	13122	System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
11111	13123	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
11112	13124
..	..	@@ -11223,6 +13235,7 @@
11223	13235	String Shadow(String depth, String shadow)
11224	13236	{
11225	13237	return "MAX temp.x, ndotl.x, one64th.x;" +
	13238	+ "MIN temp.x, temp.x, ninetenth.x;" +
11226	13239	/**/
11227	13240	// Sine
11228	13241	"MUL temp.y, temp.x, temp.x;" +
..	..	@@ -11238,12 +13251,16 @@
11238	13251
11239	13252	"ADD " + depth + ".z, " + depth + ".z, temp.x;" +
11240	13253	//"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing!
	13254	+
	13255	+ // Compare fragment depth in light space with shadowmap.
11241	13256	"SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" +
11242	13257	"SGE temp.y, temp.x, zero.x;" +
11243		- "SUB " + shadow + ".y, one.x, temp.y;" +
	13258	+ "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded
	13259	+
	13260	+ // Reverse comparison
11244	13261	"SUB temp.x, one.x, temp.x;" +
11245	13262	"MUL " + shadow + ".x, temp.x, temp.y;" +
11246		- "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded
	13263	+ "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse
11247	13264	"POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth
11248	13265
11249	13266	"SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" +
..	..	@@ -11257,6 +13274,10 @@
11257	13274	// No shadow for backface
11258	13275	"DP3 temp.x, normal, lightd;" +
11259	13276	"SLT temp.x, temp.x, zero.x;" + // shadoweps
	13277	+ "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
	13278	+
	13279	+ // No shadow when out of frustrum
	13280	+ "SGE temp.x, " + depth + ".z, one.z;" +
11260	13281	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
11261	13282	"";
11262	13283	}
..	..	@@ -11403,7 +13424,8 @@
11403	13424	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
11404	13425	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
11405	13426	/static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
11406		- Object3D.cVector2[] vector2buffer;
	13427	+
	13428	+ //Object3D.cVector2[] vector2buffer;
11407	13429
11408	13430	// IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
11409	13431	// OUT : diff, spec
..	..	@@ -11419,9 +13441,10 @@
11419	13441	"DP3 " + dest + ".z," + "normals," + "eye;" +
11420	13442	"MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
11421	13443	//"MOV " + dest + ".w," + "normal.z;" +
11422		- "MUL " + dest + ".z," + "params2.w," + dest + ".x;" +
11423		- "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
11424		- //"MOV " + dest + ".z," + "params2.w;" +
	13444	+// "MUL " + dest + ".z," + "params2.w," + dest + ".x;" + // PRETTY HEURISTIC FOR VELVET
	13445	+// "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
	13446	+
	13447	+ "MOV " + dest + ".z," + "params2.w;" + // EXACT
11425	13448	"POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
11426	13449	"RCP " + dest + ".w," + dest + ".w;" +
11427	13450	//"RSQ " + dest + ".w," + dest + ".w;" +
..	..	@@ -11815,7 +13838,7 @@
11815	13838	public void mousePressed(MouseEvent e)
11816	13839	{
11817	13840	//System.out.println("mousePressed: " + e);
11818		- clickStart(e.getX(), e.getY(), e.getModifiersEx());
	13841	+ clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
11819	13842	}
11820	13843
11821	13844	static long prevtime = 0;
..	..	@@ -11842,14 +13865,16 @@
11842	13865
11843	13866	//System.err.println("Dtime = " + Dtime + "; units = " + e.getUnitsToScroll() + "; ratio (units/ms) = " + ratio);
11844	13867
	13868	+ if (BUTTONLESSWHEEL)
11845	13869	if (Math.abs(ratio) < 0.1 \|\| Math.abs(Dtime) == 0) // < 30)
11846	13870	{
11847	13871	return;
11848	13872	}
11849	13873
	13874	+ boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
11850	13875
11851	13876	// TIMER
11852		- if (!wheeltimer.isRunning() && e.getModifiersEx() == 0) // VR
	13877	+ if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
11853	13878	{
11854	13879	keepboxmode = BOXMODE;
11855	13880	keepsupport = SUPPORT;
..	..	@@ -11889,8 +13914,8 @@
11889	13914	// mode \|= META;
11890	13915	//}
11891	13916
11892		- SetMouseMode(WHEEL \| e.getModifiersEx());
11893		- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0);
	13917	+ SetMouseMode(e.getModifiers(), WHEEL \| e.getModifiersEx());
	13918	+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
11894	13919	anchorX = ax;
11895	13920	anchorY = ay;
11896	13921	prevX = px;
..	..	@@ -11924,6 +13949,7 @@
11924	13949	else
11925	13950	if (evt.getSource() == AAtimer)
11926	13951	{
	13952	+ Globals.TIMERRUNNING = false;
11927	13953	if (mouseDown)
11928	13954	{
11929	13955	//new Exception().printStackTrace();
..	..	@@ -11949,6 +13975,10 @@
11949	13975	// LIVE = waslive;
11950	13976	// wasliveok = true;
11951	13977	// waslive = false;
	13978	+
	13979	+ // May 2019 Forget it:
	13980	+ if (true)
	13981	+ return;
11952	13982
11953	13983	// source == timer
11954	13984	if (mouseDown)
..	..	@@ -11978,8 +14008,8 @@
11978	14008	// ObjEditor.tweenManager.update(1f / 60f);
11979	14009
11980	14010	// fev 2014???
11981		- if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && drawMode == SHADOW) // && !lightMode)
11982		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	14011	+ if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
	14012	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11983	14013	pingthread.StepToTarget(true); // true);
11984	14014	}
11985	14015	// if (!LIVE)
..	..	@@ -11988,12 +14018,13 @@
11988	14018
11989	14019	javax.swing.Timer timer = new javax.swing.Timer(350, this);
11990	14020
11991		- void clickStart(int x, int y, int modifiers)
	14021	+ void clickStart(int x, int y, int modifiers, int modifiersex)
11992	14022	{
11993	14023	if (!wasliveok)
11994	14024	return;
11995	14025
11996	14026	AAtimer.restart(); //
	14027	+ Globals.TIMERRUNNING = true;
11997	14028
11998	14029	// waslive = LIVE;
11999	14030	// LIVE = false;
..	..	@@ -12005,7 +14036,7 @@
12005	14036	// touched = true; // main DL
12006	14037	if (isRenderer)
12007	14038	{
12008		- SetMouseMode(modifiers);
	14039	+ SetMouseMode(modifiers, modifiersex);
12009	14040	}
12010	14041
12011	14042	selectX = anchorX = x;
..	..	@@ -12018,7 +14049,7 @@
12018	14049	clicked = true;
12019	14050	hold = false;
12020	14051
12021		- if (((modifiers & ~1024) & ~0) == 0) // Single or multiple selection
	14052	+ if (((modifiersex & ~1024) & ~0) == 0) // Single or multiple selection
12022	14053	// june 2013 means CTRL_CLICK: if (((modifiers & ~1024) & ~128) == 0) // Single or multiple selection
12023	14054	{
12024	14055	// System.out.println("RESTART II " + modifiers);
..	..	@@ -12049,7 +14080,7 @@
12049	14080	info.camera = renderCamera;
12050	14081	info.x = x;
12051	14082	info.y = y;
12052		- info.modifiers = modifiers;
	14083	+ info.modifiers = modifiersex;
12053	14084	editObj = object.doEditClick(info, 0);
12054	14085	if (!editObj)
12055	14086	{
..	..	@@ -12066,11 +14097,14 @@
12066	14097
12067	14098	public void mouseDragged(MouseEvent e)
12068	14099	{
	14100	+ Globals.MOUSEDRAGGED = true;
	14101	+
	14102	+ //System.out.println("mouseDragged: " + e);
12069	14103	if (isRenderer)
12070	14104	movingcamera = true;
	14105	+
12071	14106	//if (drawing)
12072	14107	//return;
12073		- //System.out.println("mouseDragged: " + e);
12074	14108	if ((e.getModifiersEx() & CTRL) != 0
12075	14109	\|\| (e.getModifiersEx() & COMMAND) != 0) // \|\| IsFrozen())
12076	14110	{
..	..	@@ -12078,7 +14112,7 @@
12078	14112	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
12079	14113	}
12080	14114	else
12081		- drag(e.getX(), e.getY(), e.getModifiersEx());
	14115	+ drag(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
12082	14116
12083	14117	//try { Thread.sleep(1); } catch (Exception ex) {}
12084	14118	}
..	..	@@ -12090,6 +14124,11 @@
12090	14124	cVector tmp = new cVector();
12091	14125	cVector tmp2 = new cVector();
12092	14126	boolean isMoving;
	14127	+
	14128	+ public cVector TargetLookAt()
	14129	+ {
	14130	+ return targetLookAt;
	14131	+ }
12093	14132
12094	14133	class PingThread extends Thread
12095	14134	{
..	..	@@ -12229,7 +14268,7 @@
12229	14268	//System.out.println("---------------- ---------- Paint " + tmp.length2());
12230	14269	if (lightMode)
12231	14270	{
12232		- lighttouched = true;
	14271	+ Globals.lighttouched = true;
12233	14272	}
12234	14273
12235	14274	if (OEILONCE && OEIL)
..	..	@@ -12246,6 +14285,7 @@
12246	14285
12247	14286	public void run()
12248	14287	{
	14288	+ new Exception().printStackTrace();
12249	14289	System.exit(0);
12250	14290	for (;;)
12251	14291	{
..	..	@@ -12287,7 +14327,7 @@
12287	14327	mouseDown = false;
12288	14328	if (lightMode)
12289	14329	{
12290		- lighttouched = true;
	14330	+ Globals.lighttouched = true;
12291	14331	}
12292	14332	repaint();
12293	14333	alreadypainted = true;
..	..	@@ -12295,7 +14335,7 @@
12295	14335	isMoving = false;
12296	14336	} //??
12297	14337
12298		- if (isLIVE() && !alreadypainted)
	14338	+ if (Globals.isLIVE() && !alreadypainted)
12299	14339	{
12300	14340	// FOR DEBUG BREAKPOINT USING PAUSE: while (true)
12301	14341	repaint();
..	..	@@ -12307,9 +14347,9 @@
12307	14347	{
12308	14348	if (lightMode)
12309	14349	{
12310		- lighttouched = true;
	14350	+ Globals.lighttouched = true;
12311	14351	}
12312		- drag(X, (mouseMode != 0) ? Y : anchorY, MODIFIERS);
	14352	+ drag(X, (mouseMode != 0) ? Y : anchorY, 0, MODIFIERS);
12313	14353	}
12314	14354	//else
12315	14355	}
..	..	@@ -12323,12 +14363,12 @@
12323	14363	void GoDown(int mod)
12324	14364	{
12325	14365	MODIFIERS \|= COMMAND;
12326		- /*
	14366	+ /**/
12327	14367	if((mod&SHIFT) == SHIFT)
12328	14368	manipCamera.RotatePosition(0, -speed);
12329	14369	else
12330		- manipCamera.BackForth(0, -speed*delta, getWidth());
12331		- */
	14370	+ manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
	14371	+ /**/
12332	14372	if ((mod & SHIFT) == SHIFT)
12333	14373	{
12334	14374	mouseMode = mouseMode; // VR??
..	..	@@ -12344,12 +14384,12 @@
12344	14384	void GoUp(int mod)
12345	14385	{
12346	14386	MODIFIERS \|= COMMAND;
12347		- /*
	14387	+ /**/
12348	14388	if((mod&SHIFT) == SHIFT)
12349	14389	manipCamera.RotatePosition(0, speed);
12350	14390	else
12351		- manipCamera.BackForth(0, speed*delta, getWidth());
12352		- */
	14391	+ manipCamera.BackForth(0, speed*delta, 0); // getWidth());
	14392	+ /**/
12353	14393	if ((mod & SHIFT) == SHIFT)
12354	14394	{
12355	14395	mouseMode = mouseMode;
..	..	@@ -12365,12 +14405,12 @@
12365	14405	void GoLeft(int mod)
12366	14406	{
12367	14407	MODIFIERS \|= COMMAND;
12368		- /*
	14408	+ /**/
12369	14409	if((mod&SHIFT) == SHIFT)
12370		- manipCamera.RotatePosition(speed, 0);
12371		- else
12372	14410	manipCamera.Translate(speed*delta, 0, getWidth());
12373		- */
	14411	+ else
	14412	+ manipCamera.RotatePosition(speed, 0);
	14413	+ /**/
12374	14414	if ((mod & SHIFT) == SHIFT)
12375	14415	{
12376	14416	mouseMode = mouseMode;
..	..	@@ -12386,12 +14426,12 @@
12386	14426	void GoRight(int mod)
12387	14427	{
12388	14428	MODIFIERS \|= COMMAND;
12389		- /*
	14429	+ /**/
12390	14430	if((mod&SHIFT) == SHIFT)
12391		- manipCamera.RotatePosition(-speed, 0);
12392		- else
12393	14431	manipCamera.Translate(-speed*delta, 0, getWidth());
12394		- */
	14432	+ else
	14433	+ manipCamera.RotatePosition(-speed, 0);
	14434	+ /**/
12395	14435	if ((mod & SHIFT) == SHIFT)
12396	14436	{
12397	14437	mouseMode = mouseMode;
..	..	@@ -12409,7 +14449,7 @@
12409	14449	int X, Y;
12410	14450	boolean SX, SY;
12411	14451
12412		- void drag(int x, int y, int modifiers)
	14452	+ void drag(int x, int y, int modifiers, int modifiersex)
12413	14453	{
12414	14454	if (IsFrozen())
12415	14455	{
..	..	@@ -12418,17 +14458,17 @@
12418	14458
12419	14459	drag = true; // NEW
12420	14460
12421		- boolean continuous = (modifiers & COMMAND) == COMMAND;
	14461	+ boolean continuous = (modifiersex & COMMAND) == COMMAND;
12422	14462
12423	14463	X = x;
12424	14464	Y = y;
12425	14465	// floating state for animation
12426		- MODIFIERS = modifiers;
12427		- modifiers &= ~1024;
	14466	+ MODIFIERS = modifiersex;
	14467	+ modifiersex &= ~1024;
12428	14468	if (false) // modifiers != 0)
12429	14469	{
12430	14470	//new Exception().printStackTrace();
12431		- System.out.println("mouseDragged: " + modifiers);
	14471	+ System.out.println("mouseDragged: " + modifiersex);
12432	14472	System.out.println("SHIFT = " + SHIFT);
12433	14473	System.out.println("CONTROL = " + COMMAND);
12434	14474	System.out.println("META = " + META);
..	..	@@ -12448,7 +14488,8 @@
12448	14488	info.camera = renderCamera;
12449	14489	info.x = x;
12450	14490	info.y = y;
12451		- object.editWindow.copy.doEditDrag(info);
	14491	+ object.GetWindow().copy
	14492	+ .doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
12452	14493	} else
12453	14494	{
12454	14495	if (x < startX)
..	..	@@ -12550,6 +14591,7 @@
12550	14591	{
12551	14592	manipCamera.Translate(dx, dy, getWidth());
12552	14593	}
	14594	+ else
12553	14595	if ((mouseMode & ZOOM) == 0 && (mouseMode & VR) != 0)
12554	14596	{
12555	14597	manipCamera.RotateInterest(dx, dy);
..	..	@@ -12560,7 +14602,7 @@
12560	14602
12561	14603	if (manipCamera == lightCamera)
12562	14604	{
12563		- lighttouched = true;
	14605	+ Globals.lighttouched = true;
12564	14606	}
12565	14607	/*
12566	14608	switch (mode)
..	..	@@ -12599,7 +14641,6 @@
12599	14641	public void mouseMoved(MouseEvent e)
12600	14642	{
12601	14643	//System.out.println("mouseMoved: " + e);
12602		-
12603	14644	if (isRenderer)
12604	14645	return;
12605	14646
..	..	@@ -12612,7 +14653,9 @@
12612	14653	ci.camera = renderCamera;
12613	14654	if (!isRenderer)
12614	14655	{
12615		- if (object.editWindow.copy.doEditClick(ci, 0))
	14656	+ //ObjEditor editWindow = object.editWindow;
	14657	+ //Object3D copy = editWindow.copy;
	14658	+ if (object.doEditClick(ci, 0))
12616	14659	{
12617	14660	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
12618	14661	} else
..	..	@@ -12624,7 +14667,11 @@
12624	14667
12625	14668	public void mouseReleased(MouseEvent e)
12626	14669	{
	14670	+ Globals.MOUSEDRAGGED = false;
	14671	+
12627	14672	movingcamera = false;
	14673	+ X = 0; // getBounds().width/2;
	14674	+ Y = 0; // getBounds().height/2;
12628	14675	//System.out.println("mouseReleased: " + e);
12629	14676	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
12630	14677	}
..	..	@@ -12647,9 +14694,9 @@
12647	14694	boolean control = ((modifiers & CTRL) != 0); // june 2013: for point selection
12648	14695	boolean command = ((modifiers & COMMAND) != 0); // june 2013: for multiple selection
12649	14696
12650		- if (control \|\| command \|\| IsFrozen())
	14697	+// No delay if (control \|\| command \|\| IsFrozen())
12651	14698	timeout = true;
12652		- else
	14699	+// ?? May 2019 else
12653	14700	// timer.setDelay((modifiers & 128) != 0?0:350);
12654	14701	mouseDown = false;
12655	14702	if (!control && !command) // june 2013
..	..	@@ -12759,7 +14806,7 @@
12759	14806	System.out.println("keyReleased: " + e);
12760	14807	}
12761	14808
12762		- void SetMouseMode(int modifiers)
	14809	+ void SetMouseMode(int modifiers, int modifiersex)
12763	14810	{
12764	14811	//System.out.println("SetMouseMode = " + modifiers);
12765	14812	//modifiers &= ~1024;
..	..	@@ -12771,24 +14818,27 @@
12771	14818	//if (modifiers == 0) // \|\| (modifiers == (1024 \| CONTROL)))
12772	14819	// return;
12773	14820	//System.out.println("SetMode = " + modifiers);
12774		- if ((modifiers & WHEEL) == WHEEL)
	14821	+ if ((modifiersex & WHEEL) == WHEEL)
12775	14822	{
12776	14823	mouseMode \|= ZOOM;
12777	14824	}
12778		- if ((modifiers & META) == META)
	14825	+
	14826	+ boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
	14827	+ if (capsLocked) // \|\| (modifiers & META) == META)
12779	14828	{
12780	14829	mouseMode \|= VR; // BACKFORTH;
12781	14830	}
12782		- if ((modifiers & CTRLCLICK) == CTRLCLICK)
12783		- {
12784		- mouseMode \|= SELECT; // BACKFORTH;
12785		- }
12786		- if ((modifiers & COMMAND) == COMMAND)
	14831	+ if ((modifiersex & CTRLCLICK) == CTRLCLICK)
12787	14832	{
12788	14833	mouseMode \|= SELECT;
12789	14834	}
12790		- if ((modifiers & SHIFT) == SHIFT \|\| forcetranslate)
	14835	+ if ((modifiersex & COMMAND) == COMMAND)
12791	14836	{
	14837	+ mouseMode \|= SELECT;
	14838	+ }
	14839	+ if ((modifiersex & SHIFT) == SHIFT \|\| forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
	14840	+ {
	14841	+ mouseMode &= ~VR;
12792	14842	mouseMode \|= TRANSLATE;
12793	14843	}
12794	14844	// if ((modifiers & SHIFT_META) == SHIFT_META)
..	..	@@ -12815,10 +14865,10 @@
12815	14865
12816	14866	if (isRenderer) //
12817	14867	{
12818		- SetMouseMode(modifiers);
	14868	+ SetMouseMode(0, modifiers);
12819	14869	}
12820	14870
12821		- theRenderer.keyPressed(key);
	14871	+ Globals.theRenderer.keyPressed(key);
12822	14872	}
12823	14873
12824	14874	int kompactbit = 4; // power bit
..	..	@@ -12830,7 +14880,7 @@
12830	14880	float SATPOW = 1; // 2; // 0.5f;
12831	14881	float BRIPOW = 1; // 0.5f; // 0.5f;
12832	14882
12833		- void keyPressed(int key)
	14883	+ public void keyPressed(int key)
12834	14884	{
12835	14885	if (key >= '0' && key <= '5')
12836	14886	clampbit = (key-'0');
..	..	@@ -12945,7 +14995,7 @@
12945	14995	case 'B':
12946	14996	BRISMOOTH ^= true;
12947	14997	SHADOWCULLFACE ^= true;
12948		- lighttouched = true;
	14998	+ Globals.lighttouched = true;
12949	14999	repaint();
12950	15000	break;
12951	15001	case 'b':
..	..	@@ -12962,7 +15012,9 @@
12962	15012	case 'E' : COMPACT ^= true;
12963	15013	repaint();
12964	15014	break;
12965		- case 'W' : DEBUGHSB ^= true;
	15015	+ case 'W' : // Wide Window (fullscreen)
	15016	+ //DEBUGHSB ^= true;
	15017	+ ObjEditor.theFrame.ToggleFullScreen();
12966	15018	repaint();
12967	15019	break;
12968	15020	case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
..	..	@@ -12987,8 +15039,8 @@
12987	15039	RevertCamera();
12988	15040	repaint();
12989	15041	break;
12990		- case 'L':
12991	15042	case 'l':
	15043	+ //case 'L':
12992	15044	if (lightMode)
12993	15045	{
12994	15046	lightMode = false;
..	..	@@ -13045,7 +15097,7 @@
13045	15097	repaint();
13046	15098	break;
13047	15099	case 'O':
13048		- drawMode = OCCLUSION;
	15100	+ Globals.drawMode = OCCLUSION; // WARNING
13049	15101	repaint();
13050	15102	break;
13051	15103	case 'o':
..	..	@@ -13131,12 +15183,12 @@
13131	15183	case '_':
13132	15184	kompactbit = 5;
13133	15185	break;
13134		- case '+':
13135		- kompactbit = 6;
13136		- break;
	15186	+// case '+':
	15187	+// kompactbit = 6;
	15188	+// break;
13137	15189	case ' ':
13138	15190	lightMode ^= true;
13139		- lighttouched = true;
	15191	+ Globals.lighttouched = true;
13140	15192	manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
13141	15193	targetLookAt.set(manipCamera.lookAt);
13142	15194	repaint();
..	..	@@ -13145,14 +15197,15 @@
13145	15197	case ESC:
13146	15198	RENDERPROGRAM += 1;
13147	15199	RENDERPROGRAM %= 3;
	15200	+
13148	15201	repaint();
13149	15202	break;
13150	15203	case 'Z':
13151		- RESIZETEXTURE ^= true;
13152		- break;
	15204	+ //RESIZETEXTURE ^= true;
	15205	+ //break;
13153	15206	case 'z':
13154		- RENDERSHADOW ^= true;
13155		- lighttouched = true;
	15207	+ Globals.RENDERSHADOW ^= true;
	15208	+ Globals.lighttouched = true;
13156	15209	repaint();
13157	15210	break;
13158	15211	//case UP:
..	..	@@ -13178,13 +15231,15 @@
13178	15231	FlipTransform();
13179	15232	break;
13180	15233	case ENTER:
13181		- object.editWindow.ScreenFit(); // Edit();
	15234	+ // object.editWindow.ScreenFit(); // Edit();
	15235	+ ToggleLive();
13182	15236	break;
13183	15237	case DELETE:
13184	15238	ClearSelection();
13185	15239	break;
13186		- /*
13187	15240	case '+':
	15241	+
	15242	+ /*
13188	15243	//fontsize += 1;
13189	15244	bbzoom *= 2;
13190	15245	repaint();
..	..	@@ -13201,17 +15256,17 @@
13201	15256	case '=':
13202	15257	IncDepth();
13203	15258	//fontsize += 1;
13204		- object.editWindow.refreshContents(true);
	15259	+ object.GetWindow().refreshContents(true);
13205	15260	maskbit = 6;
13206	15261	break;
13207	15262	case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
13208	15263	DecDepth();
13209	15264	maskbit = 5;
13210	15265	//if(fontsize > 1) fontsize -= 1;
13211		- if (object.editWindow == null)
13212		- new Exception().printStackTrace();
13213		- else
13214		- object.editWindow.refreshContents(true);
	15266	+// if (object.editWindow == null)
	15267	+// new Exception().printStackTrace();
	15268	+// else
	15269	+ object.GetWindow().refreshContents(true);
13215	15270	break;
13216	15271	case '{':
13217	15272	manipCamera.shaper_fovy /= 1.1;
..	..	@@ -13266,6 +15321,7 @@
13266	15321	}
13267	15322	//System.out.println("shaper_fovy = " + manipCamera.shaper_fovy);
13268	15323	}
	15324	+
13269	15325	static double OCCLUSIONBOOST = 1; // 0.5;
13270	15326
13271	15327	void keyReleased(int key, int modifiers)
..	..	@@ -13273,11 +15329,11 @@
13273	15329	//mode = ROTATE;
13274	15330	if ((MODIFIERS & COMMAND) == 0) // VR??
13275	15331	{
13276		- SetMouseMode(modifiers);
	15332	+ SetMouseMode(0, modifiers);
13277	15333	}
13278	15334	}
13279	15335
13280		- protected void processKeyEvent(KeyEvent e)
	15336	+ public void processKeyEvent(KeyEvent e)
13281	15337	{
13282	15338	switch (e.getID())
13283	15339	{
..	..	@@ -13407,8 +15463,9 @@
13407	15463
13408	15464	protected void processMouseMotionEvent(MouseEvent e)
13409	15465	{
13410		- //System.out.println("processMouseMotionEvent: " + mouseMode);
13411		- if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
	15466	+ //System.out.println("processMouseMotionEvent: " + mouseMode + " " + e.getModifiers() + " " + e.getModifiersEx() + " " + e.getButton());
	15467	+ //if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
	15468	+ if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (e.getModifiers() & MouseEvent.BUTTON3_MASK) == 0 && (mouseMode & SELECT) == 0)
13412	15469	{
13413	15470	mouseMoved(e);
13414	15471	} else
..	..	@@ -13433,11 +15490,12 @@
13433	15490	}
13434	15491	*/
13435	15492
13436		- object.editWindow.EditSelection();
	15493	+ object.GetWindow().EditSelection(false);
13437	15494	}
13438	15495
13439	15496	void SelectParent()
13440	15497	{
	15498	+ new Exception().printStackTrace();
13441	15499	System.exit(0);
13442	15500	Composite group = (Composite) object;
13443	15501	java.util.Vector selectees = new java.util.Vector(group.selection);
..	..	@@ -13449,10 +15507,10 @@
13449	15507	{
13450	15508	//selectees.remove(i);
13451	15509	System.out.println("select parent of " + elem);
13452		- group.editWindow.Select(elem.parent.GetTreePath(), first, true);
	15510	+ group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
13453	15511	} else
13454	15512	{
13455		- group.editWindow.Select(elem.GetTreePath(), first, true);
	15513	+ group.GetWindow().Select(elem.GetTreePath(), first, true);
13456	15514	}
13457	15515
13458	15516	first = false;
..	..	@@ -13461,6 +15519,7 @@
13461	15519
13462	15520	void SelectChildren()
13463	15521	{
	15522	+ new Exception().printStackTrace();
13464	15523	System.exit(0);
13465	15524	/*
13466	15525	Composite group = (Composite) object;
..	..	@@ -13493,12 +15552,12 @@
13493	15552	for (int j = 0; j < group.children.size(); j++)
13494	15553	{
13495	15554	elem = (Object3D) group.children.elementAt(j);
13496		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15555	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
13497	15556	first = false;
13498	15557	}
13499	15558	} else
13500	15559	{
13501		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15560	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
13502	15561	}
13503	15562
13504	15563	first = false;
..	..	@@ -13509,21 +15568,21 @@
13509	15568	{
13510	15569	//Composite group = (Composite) object;
13511	15570	Object3D group = object;
13512		- group.editWindow.loadClipboard(true); // ClearSelection(false);
	15571	+ group.GetWindow().loadClipboard(true); // ClearSelection(false);
13513	15572	}
13514	15573
13515	15574	void ResetTransform(int mask)
13516	15575	{
13517	15576	//Composite group = (Composite) object;
13518	15577	Object3D group = object;
13519		- group.editWindow.ResetTransform(mask);
	15578	+ group.GetWindow().ResetTransform(mask);
13520	15579	}
13521	15580
13522	15581	void FlipTransform()
13523	15582	{
13524	15583	//Composite group = (Composite) object;
13525	15584	Object3D group = object;
13526		- group.editWindow.FlipTransform();
	15585	+ group.GetWindow().FlipTransform();
13527	15586	// group.editWindow.ReduceMesh(true);
13528	15587	}
13529	15588
..	..	@@ -13531,7 +15590,7 @@
13531	15590	{
13532	15591	//Composite group = (Composite) object;
13533	15592	Object3D group = object;
13534		- group.editWindow.PrintMemory();
	15593	+ group.GetWindow().PrintMemory();
13535	15594	// group.editWindow.ReduceMesh(true);
13536	15595	}
13537	15596
..	..	@@ -13539,7 +15598,7 @@
13539	15598	{
13540	15599	//Composite group = (Composite) object;
13541	15600	Object3D group = object;
13542		- group.editWindow.ResetCentroid();
	15601	+ group.GetWindow().ResetCentroid();
13543	15602	}
13544	15603
13545	15604	void IncDepth()
..	..	@@ -13625,7 +15684,9 @@
13625	15684	info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
13626	15685	//Image img = CreateImage(width, height);
13627	15686	//System.out.println("width = " + width + "; height = " + height + "\n");
	15687	+
13628	15688	Graphics gr = g; // img.getGraphics();
	15689	+
13629	15690	if (!hasMarquee)
13630	15691	{
13631	15692	if (Xmin < Xmax) // !locked)
..	..	@@ -13713,6 +15774,7 @@
13713	15774	info.bounds.y += (height - desired) / 2;
13714	15775	}
13715	15776	}
	15777	+
13716	15778	info.g = gr;
13717	15779	info.camera = renderCamera;
13718	15780	/*
..	..	@@ -13722,15 +15784,55 @@
13722	15784	*/
13723	15785	if (!isRenderer)
13724	15786	{
13725		- object.drawEditHandles(info, 0);
	15787	+ Grafreed.Assert(object != null);
	15788	+ Grafreed.Assert(object.selection != null);
	15789	+ if (object.selection.Size() > 0)
	15790	+ {
	15791	+ int hitSomething = object.selection.get(0).hitSomething;
	15792	+
	15793	+ info.DX = 0;
	15794	+ info.DY = 0;
	15795	+ info.W = 1;
	15796	+ if (hitSomething == Object3D.hitCenter)
	15797	+ {
	15798	+ info.DX = X;
	15799	+ if (X != 0)
	15800	+ info.DX -= info.bounds.width/2;
	15801	+
	15802	+ info.DY = Y;
	15803	+ if (Y != 0)
	15804	+ info.DY -= info.bounds.height/2;
	15805	+ }
	15806	+
	15807	+ object.drawEditHandles(info, 0);
	15808	+
	15809	+ if (drag && (X != 0 \|\| Y != 0))
	15810	+ {
	15811	+ switch (hitSomething)
	15812	+ {
	15813	+ case Object3D.hitCenter: gr.setColor(Color.pink);
	15814	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15815	+ break;
	15816	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	15817	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15818	+ break;
	15819	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	15820	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15821	+ break;
	15822	+ }
	15823	+
	15824	+ }
	15825	+ }
13726	15826	}
13727	15827	}
	15828	+
13728	15829	if (isRenderer)
13729	15830	{
13730	15831	//gr.setColor(Color.black);
13731	15832	//gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
13732	15833	//gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
13733	15834	}
	15835	+
13734	15836	if (hasMarquee)
13735	15837	{
13736	15838	gr.setXORMode(Color.white);
..	..	@@ -13753,6 +15855,7 @@
13753	15855	//if (g != gr) g.drawImage(img, 0, 0, width, height, null);
13754	15856	}
13755	15857
	15858	+ // To avoid clear.
13756	15859	public void update(Graphics g)
13757	15860	{
13758	15861	paint(g);
..	..	@@ -13842,6 +15945,7 @@
13842	15945	public boolean mouseDown(Event evt, int x, int y)
13843	15946	{
13844	15947	System.out.println("mouseDown: " + evt);
	15948	+ System.exit(0);
13845	15949	/*
13846	15950	locked = true;
13847	15951	drag = false;
..	..	@@ -13885,7 +15989,7 @@
13885	15989	{
13886	15990	keyPressed(0, modifiers);
13887	15991	}
13888		- clickStart(x, y, modifiers);
	15992	+ // clickStart(x, y, modifiers);
13889	15993	return true;
13890	15994	}
13891	15995
..	..	@@ -14003,7 +16107,7 @@
14003	16107	{
14004	16108	keyReleased(0, 0);
14005	16109	}
14006		- drag(x, y, modifiers);
	16110	+ drag(x, y, 0, modifiers);
14007	16111	return true;
14008	16112	}
14009	16113
..	..	@@ -14135,7 +16239,7 @@
14135	16239	Object3D object;
14136	16240	static Object3D trackedobject;
14137	16241	Camera renderCamera; // Light or Eye (or Occlusion)
14138		- /static/ Camera manipCamera; // Light or Eye
	16242	+ /static/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
14139	16243	/static/ Camera eyeCamera;
14140	16244	/static/ Camera lightCamera;
14141	16245	int cameracount;
..	..	@@ -14355,7 +16459,7 @@
14355	16459	gl.glPushAttrib(GL.GL_ALL_ATTRIB_BITS);
14356	16460	gl.glPushMatrix();
14357	16461	gl.glLoadIdentity();
14358		- PushMatrix(checker.toParent);
	16462	+ //PushMatrix(checker.toParent);
14359	16463
14360	16464	gl.glMatrixMode(GL.GL_TEXTURE);
14361	16465	gl.glPushMatrix();
..	..	@@ -14378,8 +16482,8 @@
14378	16482
14379	16483	gl.glNormal3f(0.0f, 0.0f, 1.0f);
14380	16484
14381		- float step = 0.1666f; //0.25f;
14382		- float stepv = step * 1652 / 998;
	16485	+ float step = 2; // 0.1666f; //0.25f;
	16486	+ float stepv = 2; // step * 1652 / 998;
14383	16487
14384	16488	int i0 = 0;
14385	16489	/*
..	..	@@ -14415,20 +16519,21 @@
14415	16519	/**/
14416	16520	//checker.GetMaterial().opacity = 1.1f;
14417	16521	////checker.GetMaterial().ambient = 0.99f;
14418		- Object3D.materialstack[Object3D.materialdepth] = checker.material;
14419		- Object3D.selectedstack[Object3D.materialdepth] = false;
14420		- cStatic.objectstack[Object3D.materialdepth++] = checker;
	16522	+ materialstack[materialdepth] = checker.material;
	16523	+ selectedstack[materialdepth] = false;
	16524	+ cStatic.objectstack[materialdepth++] = checker;
14421	16525	//System.out.println("material " + material);
14422	16526	//Applet3D.tracein(this, selected);
14423		- vector2buffer = checker.projectedVertices;
	16527	+ //vector2buffer = checker.projectedVertices;
14424	16528
14425		- checker.GetMaterial().Draw(this, false); // true);
	16529	+ //checker.GetMaterial().Draw(this, false); // true);
	16530	+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
14426	16531
14427		- Object3D.materialdepth -= 1;
14428		- if (Object3D.materialdepth > 0)
	16532	+ materialdepth -= 1;
	16533	+ if (materialdepth > 0)
14429	16534	{
14430		- vector2buffer = cStatic.objectstack[Object3D.materialdepth - 1].projectedVertices;
14431		- Object3D.materialstack[Object3D.materialdepth - 1].Draw(this, Object3D.selectedstack[Object3D.materialdepth - 1]);
	16535	+ //vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	16536	+ DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
14432	16537	}
14433	16538	//checker.GetMaterial().opacity = 1f;
14434	16539	////checker.GetMaterial().ambient = 1f;
..	..	@@ -14449,15 +16554,27 @@
14449	16554
14450	16555	//float u = (i+1)/2;
14451	16556	//float v = (j+1)/2;
14452		- gl.glTexCoord2f((i + 1) / 2, (j + 1) / 2); // (1,0) // (i+1+step)/2,(j+1)/2);
	16557	+ if (checker.flipV)
	16558	+ gl.glTexCoord2f((i + 1) / 2, 1 - (j + 1) / 2);
	16559	+ else
	16560	+ gl.glTexCoord2f((i + 1) / 2, (j + 1) / 2); // (1,0) // (i+1+step)/2,(j+1)/2);
14453	16561	gl.glVertex3f(i, j, -0.5f);
14454	16562
	16563	+ if (checker.flipV)
	16564	+ gl.glTexCoord2f((i + 1 + step) / 2, 1 - (j + 1) / 2); // (1,1) // (i+1+step)/2,(j+1+step)/2);
	16565	+ else
14455	16566	gl.glTexCoord2f((i + 1 + step) / 2, (j + 1) / 2); // (1,1) // (i+1+step)/2,(j+1+step)/2);
14456	16567	gl.glVertex3f(i + step, j, -0.5f);
14457	16568
	16569	+ if (checker.flipV)
	16570	+ gl.glTexCoord2f((i + 1 + step) / 2, 1 - (j + 1 + stepv) / 2); // (0,1) //(i+1)/2,(j+1+step)/2);
	16571	+ else
14458	16572	gl.glTexCoord2f((i + 1 + step) / 2, (j + 1 + stepv) / 2); // (0,1) //(i+1)/2,(j+1+step)/2);
14459	16573	gl.glVertex3f(i + step, j + stepv, -0.5f);
14460	16574
	16575	+ if (checker.flipV)
	16576	+ gl.glTexCoord2f((i + 1) / 2, 1 - (j + 1 + stepv) / 2); // (0,0) //(i+1)/2,(j+1)/2);
	16577	+ else
14461	16578	gl.glTexCoord2f((i + 1) / 2, (j + 1 + stepv) / 2); // (0,0) //(i+1)/2,(j+1)/2);
14462	16579	gl.glVertex3f(i, j + stepv, -0.5f);
14463	16580	}
..	..	@@ -14469,7 +16586,7 @@
14469	16586	gl.glMatrixMode(GL.GL_PROJECTION);
14470	16587	gl.glPopMatrix();
14471	16588	gl.glMatrixMode(GL.GL_MODELVIEW);
14472		- PopMatrix(null); // checker.toParent); // null);
	16589	+ //PopMatrix(null); // checker.toParent); // null);
14473	16590	gl.glPopMatrix();
14474	16591	PopTextureMatrix(checker.toParent);
14475	16592	gl.glMatrixMode(GL.GL_TEXTURE);
..	..	@@ -14502,6 +16619,14 @@
14502	16619	}
14503	16620	}
14504	16621
	16622	+ private Object3D GetFolder()
	16623	+ {
	16624	+ Object3D folder = object.GetWindow().copy;
	16625	+ if (object.GetWindow().copy.selection.Size() > 0)
	16626	+ folder = object.GetWindow().copy.selection.elementAt(0);
	16627	+ return folder;
	16628	+ }
	16629	+
14505	16630	class SelectBuffer implements GLEventListener
14506	16631	{
14507	16632
..	..	@@ -14560,6 +16685,7 @@
14560	16685	{
14561	16686	if (!selection)
14562	16687	{
	16688	+ new Exception().printStackTrace();
14563	16689	System.exit(0);
14564	16690	return;
14565	16691	}
..	..	@@ -14580,17 +16706,39 @@
14580	16706
14581	16707	//gl.glDisable(GL.GL_POLYGON_OFFSET_FILL);
14582	16708
	16709	+ if (PAINTMODE)
	16710	+ {
	16711	+ if (object.GetWindow().copy.selection.Size() > 0)
	16712	+ {
	16713	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	16714	+
	16715	+ // Make what you paint not selectable.
	16716	+ paintobj.ResetSelectable();
	16717	+ }
	16718	+ }
	16719	+
14583	16720	//int tmp = selection_view;
14584	16721	//selection_view = -1;
14585		- int temp = drawMode;
14586		- drawMode = SELECTION;
	16722	+ int temp = DrawMode();
	16723	+ Globals.drawMode = SELECTION; // WARNING
14587	16724	indexcount = 0;
14588	16725	parent.display(drawable);
14589	16726	//selection_view = tmp;
14590	16727	//if (temp == SELECTION)
14591	16728	// temp = DEFAULT; // patch for selection debug
14592		- drawMode = temp;
	16729	+ Globals.drawMode = temp; // WARNING
14593	16730
	16731	+ if (PAINTMODE)
	16732	+ {
	16733	+ if (object.GetWindow().copy.selection.Size() > 0)
	16734	+ {
	16735	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	16736	+
	16737	+ // Revert.
	16738	+ paintobj.RestoreSelectable();
	16739	+ }
	16740	+ }
	16741	+
14594	16742	//gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
14595	16743
14596	16744	// trying different ways of getting the depth info over
..	..	@@ -14639,6 +16787,13 @@
14639	16787	// System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
14640	16788	// System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
14641	16789
	16790	+ CreateSelectedPoint();
	16791	+
	16792	+ // Will fit the mesh !!!
	16793	+ selectedpoint.toParent[0][0] = 0.0001;
	16794	+ selectedpoint.toParent[1][1] = 0.0001;
	16795	+ selectedpoint.toParent[2][2] = 0.0001;
	16796	+
14642	16797	glu.gluUnProject(x,y,depth,view,0,tempmat2,0,viewport,0,selectedpoint.toParent[3],0);
14643	16798
14644	16799	// if (object.selection != null && object.selection.Size() > 0)
..	..	@@ -14682,34 +16837,36 @@
14682	16837	System.out.println("; fromto " + sel + " " + Trunk(previousselectedpoint.toParent[3][0]) + " " + Trunk(previousselectedpoint.toParent[3][2]) + " " + Trunk(selectedpoint.toParent[3][0]) + " " + Trunk(selectedpoint.toParent[3][2]));
14683	16838	}
14684	16839
14685		- previousselectedpoint = (Sphere) GraphreeD.clone(selectedpoint);
	16840	+ previousselectedpoint = (Sphere) Grafreed.clone(selectedpoint);
14686	16841	}
14687	16842	}
14688	16843
14689	16844	if (!movingcamera && !PAINTMODE)
14690		- object.editWindow.ScreenFitPoint(); // fev 2014
	16845	+ object.GetWindow().ScreenFitPoint(); // fev 2014
14691	16846
14692		- if (PAINTMODE && GraphreeD.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	16847	+ if (PAINTMODE) // && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
14693	16848	{
14694		- Object3D paintobj = GraphreeD.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
	16849	+ //Object3D paintobj; // = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
14695	16850
14696		- Object3D group = new Object3D("inst" + paintcount++);
	16851	+ if (object.GetWindow().copy.selection.Size() > 0)
	16852	+ {
	16853	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
14697	16854
14698		- group.CreateMaterial(); // use a void leaf to select instances
14699		-
14700		- group.add(paintobj); // link
14701		-
14702		- object.editWindow.SnapObject(group);
14703		-
14704		- Object3D folder = object.editWindow.copy;
14705		-
14706		- if (object.editWindow.copy.selection.Size() > 0)
14707		- folder = object.editWindow.copy.selection.elementAt(0);
14708		-
14709		- folder.add(group);
14710		-
14711		- object.editWindow.ResetModel();
14712		- object.editWindow.refreshContents();
	16855	+ Object3D inst = new Object3D("inst" + paintcount++);
	16856	+
	16857	+ inst.CreateMaterial(); // use a void leaf to select instances
	16858	+
	16859	+ inst.add(paintobj); // link
	16860	+
	16861	+ object.GetWindow().SnapObject(inst);
	16862	+
	16863	+ Object3D folder = paintFolder; // GetFolder();
	16864	+
	16865	+ folder.add(inst);
	16866	+
	16867	+ object.GetWindow().ResetModel();
	16868	+ object.GetWindow().refreshContents();
	16869	+ }
14713	16870	}
14714	16871	else
14715	16872	paintcount = 0;
..	..	@@ -14748,6 +16905,11 @@
14748	16905	//System.out.println("objects[color] = " + objects[color]);
14749	16906	//objects[color].Select();
14750	16907	indexcount = 0;
	16908	+ ObjEditor window = object.GetWindow();
	16909	+ if (window != null && deselect)
	16910	+ {
	16911	+ window.Select(null, deselect, true);
	16912	+ }
14751	16913	object.Select(color, deselect);
14752	16914	}
14753	16915
..	..	@@ -14847,7 +17009,7 @@
14847	17009	gl.glDisable(gl.GL_CULL_FACE);
14848	17010	}
14849	17011
14850		- if (!RENDERSHADOW)
	17012	+ if (!Globals.RENDERSHADOW)
14851	17013	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
14852	17014
14853	17015	// SB gl.glPolygonOffset(2.5f, 10);
..	..	@@ -14857,14 +17019,14 @@
14857	17019	//gl.glColorMask(false, false, false, false);
14858	17020
14859	17021	//render_scene_from_light_view(gl, drawable, 0, 0);
14860		- if (RENDERSHADOW && lighttouched && !movingcamera) // && !parent.IsFreezed())
	17022	+ if (Globals.RENDERSHADOW && Globals.lighttouched && (!movingcamera \|\| !Globals.FREEZEONMOVE)) // && !parent.IsFreezed())
14861	17023	{
14862	17024	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
14863	17025
14864		- int temp = drawMode;
14865		- drawMode = SHADOW;
	17026	+ int temp = DrawMode();
	17027	+ Globals.drawMode = SHADOW; // WARNING
14866	17028	parent.display(drawable);
14867		- drawMode = temp;
	17029	+ Globals.drawMode = temp; // WARNING
14868	17030	}
14869	17031
14870	17032	gl.glCullFace(gl.GL_BACK);
..	..	@@ -14917,7 +17079,6 @@
14917	17079
14918	17080	class AntialiasBuffer implements GLEventListener
14919	17081	{
14920		-
14921	17082	CameraPane parent = null;
14922	17083
14923	17084	AntialiasBuffer(CameraPane p)
..	..	@@ -15027,13 +17188,19 @@
15027	17188	gl.glFlush();
15028	17189
15029	17190	/**/
15030		- gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_BGRA, GL.GL_UNSIGNED_INT_8_8_8_8_REV, occlusionsizebuffer);
	17191	+ gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusionsizebuffer);
15031	17192
15032		- int[] pixels = occlusionsizebuffer.array();
	17193	+ float[] pixels = occlusionsizebuffer.array();
15033	17194
15034	17195	double r = 0, g = 0, b = 0;
15035	17196
15036	17197	double count = 0;
	17198	+
	17199	+ gl.glGetDoublev(gl.GL_PROJECTION_MATRIX, tempmat2, 0);
	17200	+
	17201	+ float mindepth = 1;
	17202	+
	17203	+ double FACTOR = 1;
15037	17204
15038	17205	for (int i = 0; i < pixels.length; i++)
15039	17206	{
..	..	@@ -15118,7 +17285,7 @@
15118	17285
15119	17286	double scale = ray.z; // 1; // cos
15120	17287
15121		- int p = pixels[newindex];
	17288	+ float depth = pixels[newindex];
15122	17289
15123	17290	/*
15124	17291	int newindex2 = (x + 1) * OCCLUSION_SIZE + y;
..	..	@@ -15142,10 +17309,23 @@
15142	17309	scale = (1 - modu) * modv;
15143	17310	*/
15144	17311
15145		- r += ((p >> 16) & 0xFF) * scale / 255;
15146		- g += ((p >> 8) & 0xFF) * scale / 255;
15147		- b += (p & 0xFF) * scale / 255;
	17312	+ //r += ((p >> 16) & 0xFF) * scale / 255;
	17313	+ //g += ((p >> 8) & 0xFF) * scale / 255;
	17314	+ //b += (p & 0xFF) * scale / 255;
	17315	+
	17316	+ if (mindepth > depth)
	17317	+ {
	17318	+ mindepth = depth;
	17319	+ }
15148	17320
	17321	+ double z_eye = tempmat2[34 + 2] / (depth -2.0 + 1.0 - tempmat2[2*4 + 2]);
	17322	+
	17323	+ double factor = 1 - Math.exp(-z_eye * z_eye / FACTOR);
	17324	+
	17325	+ r += factor * scale;
	17326	+ g += factor * scale;
	17327	+ b += factor * scale;
	17328	+
15149	17329	count += scale;
15150	17330	}
15151	17331
..	..	@@ -15243,12 +17423,6 @@
15243	17423	GLUT glut = new GLUT();
15244	17424
15245	17425
15246		- static final public int DEFAULT = 0;
15247		- static final public int SELECTION = 1;
15248		- static final public int SHADOW = 2;
15249		- static final public int OCCLUSION = 3;
15250		- static
15251		- public int drawMode = DEFAULT;
15252	17426	public boolean spherical = false;
15253	17427	static boolean DEBUG_OCCLUSION = false;
15254	17428	static boolean DEBUG_SELECTION = false;
..	..	@@ -15261,21 +17435,15 @@
15261	17435	int AAbuffersize = 0;
15262	17436
15263	17437	//double[] selectedpoint = new double[3];
15264		- static Sphere selectedpoint = new Sphere();
	17438	+ static Superellipsoid selectedpoint;
15265	17439	static Sphere previousselectedpoint = null;
15266		- static Sphere debugpoint = new Sphere();
15267		- static Sphere debugpoint2 = new Sphere();
	17440	+ static Sphere debugpointG;
	17441	+ static Sphere debugpointP;
	17442	+ static Sphere debugpointC;
	17443	+ static Sphere debugpointR;
15268	17444
15269	17445	static Sphere debugpoints[] = new Sphere[8];
15270	17446
15271		- static
15272		- {
15273		- for (int i=0; i<8; i++)
15274		- {
15275		- debugpoints[i] = new Sphere();
15276		- }
15277		- }
15278		-
15279	17447	static void InitPoints(float radius)
15280	17448	{
15281	17449	for (int i=0; i<8; i++)
..	..	@@ -15295,7 +17463,7 @@
15295	17463	}
15296	17464	}
15297	17465
15298		- static void DrawPoints(CameraPane cpane)
	17466	+ static void DrawPoints(iCameraPane cpane)
15299	17467	{
15300	17468	for (int i=0; i<8; i++) // first and last are red
15301	17469	{
..	..	@@ -15317,7 +17485,8 @@
15317	17485	static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
15318	17486	static IntBuffer selectsizebuffer = IntBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
15319	17487	static java.nio.FloatBuffer pointselectsizebuffer = java.nio.FloatBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
15320		- static IntBuffer occlusionsizebuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17488	+ //static IntBuffer occlusionsizebuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17489	+ static java.nio.FloatBuffer occlusionsizebuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
15321	17490	static BufferedImage bufimage = new BufferedImage(TEX_SIZE, TEX_SIZE, BufferedImage.TYPE_INT_RGB);
15322	17491	static BufferedImage textest = new cBufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB);
15323	17492	static java.util.Vector<BufferedImage> billboards = new java.util.Vector<BufferedImage>();
..	..	@@ -15326,10 +17495,11 @@
15326	17495	static IntBuffer textbuffer = null; // IntBuffer.allocate(TEXT_WIDTH88 * TEXT_HEIGHT);
15327	17496	// Depth buffer format
15328	17497	//private int depth_format;
15329		- static public void NextIndex(Object3D o, GL gl)
	17498	+
	17499	+ public void NextIndex()
15330	17500	{
15331	17501	indexcount+=16;
15332		- gl.glColor3d(((indexcount >>> 16) & 255) / 255.0, ((indexcount >>> 8) & 255) / 255.0, ((indexcount) & 255) / 255.0);
	17502	+ GetGL().glColor3d(((indexcount >>> 16) & 255) / 255.0, ((indexcount >>> 8) & 255) / 255.0, ((indexcount) & 255) / 255.0);
15333	17503	//objects[indexcount] = o;
15334	17504	//System.out.println("indexcount = " + indexcount);
15335	17505	}