~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,40 @@
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()
	48	+ private static BufferedImage CreateBim(byte[] bytes, int width, int height)
51	49	{
52		- return LIVE \|\| ONESTEP;
	50	+ int[] pixels = new int[bytes.length/3];
	51	+ for (int i=pixels.length; --i>=0;)
	52	+ {
	53	+ int i3 = i*3;
	54	+ pixels[i] = 0xFF;
	55	+ pixels[i] <<= 8;
	56	+ pixels[i] \|= bytes[i3+2] & 0xFF;
	57	+ pixels[i] <<= 8;
	58	+ pixels[i] \|= bytes[i3+1] & 0xFF;
	59	+ pixels[i] <<= 8;
	60	+ pixels[i] \|= bytes[i3] & 0xFF;
	61	+ }
	62	+ /*
	63	+ int r=0,g=0,b=0,a=0;
	64	+ for (int i=0; i<width; i++)
	65	+ for (int j=0; j<height; j++)
	66	+ {
	67	+ int index = j*width+i;
	68	+ int p = pixels[index];
	69	+ a = ((p>>24) & 0xFF);
	70	+ r = ((p>>16) & 0xFF);
	71	+ g = ((p>>8) & 0xFF);
	72	+ b = (p & 0xFF);
	73	+ pixels[index] = (a<<24) \| (b<<16) \| (g<<8) \| r;
	74	+ }
	75	+ /**/
	76	+ BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
	77	+ rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
	78	+ return rendImage;
53	79	}
54	80
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;
	81	+ /static/ private boolean CULLFACE = false; // true;
64	82	/static/ boolean NEAREST = false; // true;
65	83	/static/ boolean WIREFRAME = false; // true;
66	84
..	..	@@ -70,14 +88,12 @@
70	88	static int CURRENTANTIALIAS = 0; // 1;
71	89	/static/ boolean RENDERSHADOW = true;
72	90	/static/ int RENDERPROGRAM = 2; // 0 == none, 1 == fast, 2 == normal
73		- static boolean ANIMATION = false;
74		- static String filename;
75	91
76	92	boolean DISPLAYTEXT = false;
77	93	//boolean REDUCETEXTURE = true;
78	94	boolean CACHETEXTURE = true;
79	95	boolean CLEANCACHE = false; // true;
80		- boolean MIPMAP = false; // true;
	96	+ boolean MIPMAP = true; // false; // true;
81	97	boolean COMPRESSTEXTURE = false;
82	98	boolean KOMPACTTEXTURE = false; // true;
83	99	boolean RESIZETEXTURE = false;
..	..	@@ -97,10 +113,8 @@
97	113
98	114	static boolean textureon = true;
99	115	static boolean LOCALTRANSFORM = false;
100		-private static boolean LIVE = false;
101	116	static boolean FULLSCREEN = false;
102	117	static boolean SUPPORT = true;
103		-static boolean CROWD = false;
104	118	static boolean INERTIA = true;
105	119	static boolean FAST = false;
106	120	static boolean SLOWPOSE = false;
..	..	@@ -108,6 +122,8 @@
108	122
109	123	static int tickcount = 0; // slow pose issue
110	124
	125	+static boolean BUTTONLESSWHEEL = false;
	126	+static boolean ZOOMBOXMODE = false;
111	127	static boolean BOXMODE = false;
112	128	static boolean IMAGEFLIP = false;
113	129	static boolean SMOOTHFOCUS = false;
..	..	@@ -122,7 +138,7 @@
122	138	static boolean OEIL = true;
123	139	static boolean OEILONCE = false; // do oeilon then oeiloff
124	140	static boolean LOOKAT = true;
125		-static boolean RANDOM = true; // false;
	141	+static boolean SWITCH = true; // false;
126	142	static boolean HANDLES = false; // selection doesn't work!!
127	143	static boolean PAINTMODE = false;
128	144
..	..	@@ -165,12 +181,41 @@
165	181	defaultcaps.setAccumBlueBits(16);
166	182	defaultcaps.setAccumAlphaBits(16);
167	183	}
168		- static CameraPane theRenderer;
169		-
	184	+
	185	+ private File defaultDirectory = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory();
	186	+
170	187	void SetAsGLRenderer(boolean b)
171	188	{
172	189	isRenderer = b;
173		- theRenderer = this;
	190	+ Globals.theRenderer = this;
	191	+ }
	192	+
	193	+ CameraPane(Object3D o, Camera cam, boolean withcontext)
	194	+ {
	195	+ super(defaultcaps, null, withcontext?glcontext:null, null);
	196	+
	197	+ //System.out.println("AMERICA AREA = " + (9458886 + 9210755 + 8480395 + 2736391 + 1943018 + 1289475 + 1141569 + 1069350 + 911559 + 721229 + 395886 + 377972 + 246700 + 211156 + 173985 + 141133 + 118279 + 112079 + 108523));
	198	+ glcontext = getContext();
	199	+
	200	+ cameras = new Camera[2];
	201	+ targetLookAts = new cVector[2];
	202	+
	203	+ SetCamera(cam);
	204	+
	205	+ SetLight(new Camera(new cVector(10, 10, -20)));
	206	+
	207	+ object = o;
	208	+
	209	+ setBackground(Color.white);
	210	+
	211	+ addKeyListener(this);
	212	+ addMouseListener(this);
	213	+ addMouseMotionListener(this);
	214	+ addMouseWheelListener(this);
	215	+ //System.out.println("addGLEventListener: " + this);
	216	+ addGLEventListener(this);
	217	+
	218	+// pingthread.start(); // may 2013
174	219	}
175	220
176	221	static boolean AntialiasingEnabled()
..	..	@@ -178,12 +223,53 @@
178	223	return CURRENTANTIALIAS > 0;
179	224	}
180	225
181		- void ClearDepth()
	226	+ /// INTERFACE
	227	+
	228	+ public javax.media.opengl.GL GetGL0()
	229	+ {
	230	+ return null;
	231	+ }
	232	+
	233	+ public int GenList()
	234	+ {
	235	+ javax.media.opengl.GL gl = GetGL();
	236	+ return gl.glGenLists(1);
	237	+ }
	238	+
	239	+ public void NewList(int id)
	240	+ {
	241	+ javax.media.opengl.GL gl = GetGL();
	242	+ gl.glNewList(id, gl.GL_COMPILE); //_AND_EXECUTE);
	243	+ }
	244	+
	245	+ public void CallList(int id)
	246	+ {
	247	+ javax.media.opengl.GL gl = GetGL();
	248	+ gl.glCallList(id);
	249	+ }
	250	+
	251	+ public void EndList()
	252	+ {
	253	+ javax.media.opengl.GL gl = GetGL();
	254	+ gl.glEndList();
	255	+ }
	256	+
	257	+ public boolean IsBoxMode()
	258	+ {
	259	+ return BOXMODE;
	260	+ }
	261	+
	262	+ public boolean IsZoomBoxMode()
	263	+ {
	264	+ return ZOOMBOXMODE;
	265	+ }
	266	+
	267	+ public void ClearDepth()
182	268	{
183	269	GetGL().glClear(GetGL().GL_DEPTH_BUFFER_BIT);
184	270	}
185	271
186		- void DepthTest(boolean depthtest)
	272	+ public void DepthTest(boolean depthtest)
187	273	{
188	274	if (depthtest)
189	275	GetGL().glDepthFunc(GL.GL_LEQUAL);
..	..	@@ -191,7 +277,7 @@
191	277	GetGL().glDepthFunc(GL.GL_ALWAYS);
192	278	}
193	279
194		- void DepthWrite(boolean depthwrite)
	280	+ public void DepthWrite(boolean depthwrite)
195	281	{
196	282	if (depthwrite)
197	283	GetGL().glDepthMask(true);
..	..	@@ -199,12 +285,1616 @@
199	285	GetGL().glDepthMask(false);
200	286	}
201	287
202		- void BackFaceCull(boolean bfc)
	288	+ public void BackFaceCull(boolean bfc)
203	289	{
204	290	if (bfc)
205	291	GetGL().glEnable(GetGL().GL_CULL_FACE);
206	292	else
207	293	GetGL().glDisable(GetGL().GL_CULL_FACE);
	294	+ }
	295	+
	296	+ public boolean BackFaceCullMode()
	297	+ {
	298	+ return this.CULLFACE;
	299	+ }
	300	+
	301	+ public boolean IsAmbientOcclusionOn()
	302	+ {
	303	+ return this.ambientOcclusion;
	304	+ }
	305	+
	306	+ public boolean IsDebugSelection()
	307	+ {
	308	+ return DEBUG_SELECTION;
	309	+ }
	310	+
	311	+ public boolean IsFrozen()
	312	+ {
	313	+ boolean selectmode = this.DrawMode() == SELECTION \|\| this.IsDebugSelection();
	314	+
	315	+ return !selectmode && cameracount == 0; // != 0;
	316	+ }
	317	+
	318	+ // Currently in Globals
	319	+ public int DrawMode()
	320	+ {
	321	+ return Globals.DrawMode();
	322	+ }
	323	+
	324	+ public Camera EyeCamera()
	325	+ {
	326	+ return eyeCamera;
	327	+ }
	328	+
	329	+ public Camera LightCamera()
	330	+ {
	331	+ return lightCamera;
	332	+ }
	333	+
	334	+ public Camera ManipCamera()
	335	+ {
	336	+ return manipCamera;
	337	+ }
	338	+
	339	+ public Camera RenderCamera()
	340	+ {
	341	+ return renderCamera;
	342	+ }
	343	+
	344	+ public Camera[] Cameras()
	345	+ {
	346	+ return cameras;
	347	+ }
	348	+
	349	+ public void PushMaterial(Object3D obj, boolean selected)
	350	+ {
	351	+ CameraPane display = this;
	352	+ javax.media.opengl.GL gl = display.GetGL();
	353	+ cMaterial material = obj.material;
	354	+
	355	+ if (material != null)
	356	+ {
	357	+ materialstack[materialdepth] = material;
	358	+ selectedstack[materialdepth] = selected;
	359	+ cStatic.objectstack[materialdepth++] = obj;
	360	+ //System.out.println("material " + material);
	361	+ //Applet3D.tracein(this, selected);
	362	+ //display.vector2buffer = obj.projectedVertices;
	363	+ if (obj instanceof Camera)
	364	+ {
	365	+ display.options1[0] = material.shift;
	366	+ //System.out.println("shift " + material.shift);
	367	+ display.options1[1] = material.lightarea;
	368	+ display.options1[2] = material.shadowbias;
	369	+ display.options1[3] = material.aniso;
	370	+ display.options1[4] = material.anisoV;
	371	+// System.out.println("display.options1[0] " + display.options1[0]);
	372	+// System.out.println("display.options1[1] " + display.options1[1]);
	373	+// System.out.println("display.options1[2] " + display.options1[2]);
	374	+// System.out.println("display.options1[3] " + display.options1[3]);
	375	+// System.out.println("display.options1[4] " + display.options1[4]);
	376	+ display.options2[0] = material.opacity;
	377	+ display.options2[1] = material.diffuse;
	378	+ display.options2[2] = material.factor;
	379	+// System.out.println("display.options2[0] " + display.options2[0]);
	380	+// System.out.println("display.options2[1] " + display.options2[1]);
	381	+// System.out.println("display.options2[2] " + display.options2[2]);
	382	+
	383	+ cColor.HSBtoRGB(material.color, material.modulation, 1, display.options3);
	384	+// System.out.println("display.options3[0] " + display.options3[0]);
	385	+// System.out.println("display.options3[1] " + display.options3[1]);
	386	+// System.out.println("display.options3[2] " + display.options3[2]);
	387	+ display.options4[0] = material.cameralight/0.2f;
	388	+ display.options4[1] = material.subsurface;
	389	+ display.options4[2] = material.sheen;
	390	+// System.out.println("display.options4[0] " + display.options4[0]);
	391	+// System.out.println("display.options4[1] " + display.options4[1]);
	392	+// System.out.println("display.options4[2] " + display.options4[2]);
	393	+
	394	+ // if (display.CURRENTANTIALIAS > 0)
	395	+ // display.options3[3] /= 4;
	396	+
	397	+ /*
	398	+ System.out.println("Focus = " + display.options1[0]);
	399	+ System.out.println("Aperture = " + display.options1[1]);
	400	+ System.out.println("ShadowBlur = " + display.options1[2]);
	401	+ System.out.println("Antialiasing = " + display.options1[3]);
	402	+ System.out.println("Fog = " + display.options2[0]);
	403	+ System.out.println("Intensity = " + display.options2[1]);
	404	+ System.out.println("Elevation = " + display.options2[2]);
	405	+ /**/
	406	+ } else
	407	+ {
	408	+ DrawMaterial(material, selected, obj.projectedVertices);
	409	+ }
	410	+ } else
	411	+ {
	412	+ if (selected && CameraPane.flash)
	413	+ {
	414	+ display.modelParams4[1] = 100;
	415	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 4, display.modelParams4, 0);
	416	+ }
	417	+ }
	418	+ }
	419	+
	420	+ public void PushMaterial2(Object3D obj, boolean selected)
	421	+ {
	422	+ CameraPane display = this;
	423	+ cMaterial material = obj.material;
	424	+
	425	+ if (material != null)
	426	+ {
	427	+ materialstack[materialdepth] = material;
	428	+ selectedstack[materialdepth] = selected;
	429	+ cStatic.objectstack[materialdepth++] = obj;
	430	+ //System.out.println("material " + material);
	431	+ //Applet3D.tracein("selected ", selected);
	432	+ //display.vector2buffer = obj.projectedVertices;
	433	+ display.DrawMaterial(material, selected, obj.projectedVertices);
	434	+ }
	435	+ }
	436	+
	437	+ public void PopMaterial(Object3D obj, boolean selected)
	438	+ {
	439	+ CameraPane display = this;
	440	+ javax.media.opengl.GL gl = display.GetGL();
	441	+ cMaterial material = obj.material;
	442	+
	443	+ //if (parent != null && parent.GetMaterial() != null)
	444	+ // parent.GetMaterial().Draw(display, parent.IsSelected(this));
	445	+ if (material != null)
	446	+ {
	447	+ materialdepth -= 1;
	448	+ if (materialdepth > 0)
	449	+ {
	450	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	451	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
	452	+ }
	453	+ //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
	454	+ } else if (selected && CameraPane.flash && obj.GetMaterial() != null)
	455	+ {
	456	+ display.modelParams4[1] = obj.GetMaterial().cameralight;
	457	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 4, display.modelParams4, 0);
	458	+ }
	459	+ }
	460	+
	461	+ public void PopMaterial2(Object3D obj)
	462	+ {
	463	+ CameraPane display = this;
	464	+ cMaterial material = obj.material;
	465	+
	466	+ if (material != null)
	467	+ {
	468	+ materialdepth -= 1;
	469	+ if (materialdepth > 0)
	470	+ {
	471	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	472	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
	473	+ }
	474	+ //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
	475	+ //else
	476	+ //material.Draw(display, false);
	477	+ }
	478	+ }
	479	+
	480	+ public void DrawFace(Object3D obj, Vertex pv, Vertex qv, Vertex rv, Face face)
	481	+ {
	482	+ CameraPane display = this;
	483	+
	484	+ if (pv.y == -10000 \|\|
	485	+ qv.y == -10000 \|\|
	486	+ rv.y == -10000)
	487	+ return;
	488	+
	489	+// float b = f.nbiterations & 1;
	490	+// float g = (f.nbiterations>>1) & 1;
	491	+// float r = (f.nbiterations>>2) & 1;
	492	+//
	493	+// //if (f.weight == 10000)
	494	+// //{
	495	+// // r = 1; g = b = 0;
	496	+// //}
	497	+// //else
	498	+// //{
	499	+// // assert(f.weight < 10000);
	500	+// r = g = b = (float)bRep.FaceWeight(f)*100;
	501	+// if (r<0)
	502	+// assert(r>=0);
	503	+// //}
	504	+
	505	+ javax.media.opengl.GL gl = display.GetGL();
	506	+
	507	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
	508	+
	509	+ //System.out.println("p = " + pv + "; q = " + qv + "; r = " + rv);
	510	+ if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
	511	+ {
	512	+ //gl.glBegin(gl.GL_TRIANGLES);
	513	+ boolean hasnorm = pv.norm != null && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0)
	514	+ // TEST LIVE NORMALS && !obj.dontselect
	515	+ ;
	516	+ if (!hasnorm)
	517	+ {
	518	+ // System.out.println("Mesh normal");
	519	+ LA.vecSub(pv/.pos/, qv/.pos/, obj.v0);
	520	+ LA.vecSub(pv/.pos/, rv/.pos/, obj.v1);
	521	+ LA.vecCross(obj.v0, obj.v1, obj.v2);
	522	+ LA.vecNormalize(obj.v2);
	523	+ gl.glNormal3f((float) obj.v2.x, (float) obj.v2.y, (float) obj.v2.z);
	524	+ }
	525	+
	526	+ // P
	527	+ float x = (float)pv.x;
	528	+ float y = (float)pv.y;
	529	+ float z = (float)pv.z;
	530	+
	531	+ if (hasnorm)
	532	+ {
	533	+// if (!pv.norm.normalized())
	534	+// assert(pv.norm.normalized());
	535	+
	536	+ //System.out.println("normalp = " + pv.norm.x + ", " + pv.norm.y + ", " + pv.norm.z);
	537	+ float nx = (float)pv.norm.x;
	538	+ float ny = (float)pv.norm.y;
	539	+ float nz = (float)pv.norm.z;
	540	+
	541	+ x += nx * obj.NORMALPUSH;
	542	+ y += ny * obj.NORMALPUSH;
	543	+ z += nz * obj.NORMALPUSH;
	544	+
	545	+ gl.glNormal3f(nx, ny, nz);
	546	+ }
	547	+ gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
	548	+ SetColor(obj, pv);
	549	+ //gl.glColor4f(r, g, b, 1);
	550	+ //gl.glColor4f(pv.boundary, pv.boundary, pv.boundary, 1);
	551	+ if (obj.flipV)
	552	+ gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
	553	+ else
	554	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	555	+ //System.out.println("vertexp = " + pv.x + ", " + pv.y + ", " + pv.z);
	556	+
	557	+ gl.glVertex3f(x, y, z);
	558	+
	559	+ // Q
	560	+ x = (float)qv.x;
	561	+ y = (float)qv.y;
	562	+ z = (float)qv.z;
	563	+
	564	+// Print(pv);
	565	+ if (hasnorm)
	566	+ {
	567	+// assert(qv.norm.normalized());
	568	+ //System.out.println("normalq = " + qv.norm.x + ", " + qv.norm.y + ", " + qv.norm.z);
	569	+ float nx = (float)qv.norm.x;
	570	+ float ny = (float)qv.norm.y;
	571	+ float nz = (float)qv.norm.z;
	572	+
	573	+ x += nx * obj.NORMALPUSH;
	574	+ y += ny * obj.NORMALPUSH;
	575	+ z += nz * obj.NORMALPUSH;
	576	+
	577	+ gl.glNormal3f(nx, ny, nz);
	578	+ }
	579	+ //System.out.println("vertexq = " + qv.s + ", " + qv.t);
	580	+ // boolean locked = false;
	581	+ // float eps = 0.1f;
	582	+ // boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
	583	+
	584	+ // int dot = 0; //*/ (int)f.dot;
	585	+
	586	+ // if ((dot&1) == 0)
	587	+ // dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
	588	+
	589	+ // if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
	590	+ if (obj.flipV)
	591	+ gl.glTexCoord2f((float) qv.s, 1-(float) qv.t);
	592	+ else
	593	+ gl.glTexCoord2f((float) qv.s, (float) qv.t);
	594	+ // else
	595	+ // {
	596	+ // locked = true;
	597	+ // gl.glTexCoord2f((float) pv.s, (float) pv.t);
	598	+ // }
	599	+ gl.glColor4f(qv.AO, qv.AO, qv.AO, 1);
	600	+ SetColor(obj, qv);
	601	+
	602	+ gl.glVertex3f(x, y, z);
	603	+ //gl.glColor4f(r, g, b, 1);
	604	+ //gl.glColor4f(qv.boundary, qv.boundary, qv.boundary, 1);
	605	+ //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
	606	+// Print(qv);
	607	+
	608	+ // R
	609	+ x = (float)rv.x;
	610	+ y = (float)rv.y;
	611	+ z = (float)rv.z;
	612	+
	613	+ if (hasnorm)
	614	+ {
	615	+// assert(rv.norm.normalized());
	616	+ //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
	617	+ float nx = (float)rv.norm.x;
	618	+ float ny = (float)rv.norm.y;
	619	+ float nz = (float)rv.norm.z;
	620	+
	621	+ x += nx * obj.NORMALPUSH;
	622	+ y += ny * obj.NORMALPUSH;
	623	+ z += nz * obj.NORMALPUSH;
	624	+
	625	+ gl.glNormal3f(nx, ny, nz);
	626	+ }
	627	+
	628	+ // if ((dot&4) == 0)
	629	+ // dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
	630	+
	631	+ // if (wrap \|\| !locked && (dot&8) != 0)
	632	+ if (obj.flipV)
	633	+ gl.glTexCoord2f((float) rv.s, 1-(float) rv.t);
	634	+ else
	635	+ gl.glTexCoord2f((float) rv.s, (float) rv.t);
	636	+ // else
	637	+ // gl.glTexCoord2f((float) pv.s, (float) pv.t);
	638	+
	639	+ // f.dot = dot;
	640	+
	641	+ gl.glColor4f(rv.AO, rv.AO, rv.AO, 1);
	642	+ SetColor(obj, rv);
	643	+ //gl.glColor4f(r, g, b, 1);
	644	+ //gl.glColor4f(rv.boundary, rv.boundary, rv.boundary, 1);
	645	+ //System.out.println("vertexr = " + rv.x + ", " + rv.y + ", " + rv.z);
	646	+ gl.glVertex3f(x, y, z);
	647	+// Print(rv);
	648	+ //gl.glEnd();
	649	+ }
	650	+ else
	651	+ {
	652	+ gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
	653	+ gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
	654	+ gl.glVertex3f((float) rv.x, (float) rv.y, (float) rv.z);
	655	+
	656	+ }
	657	+
	658	+ if (false) // (attributes & WIREFRAME) != 0)
	659	+ {
	660	+ gl.glDisable(gl.GL_LIGHTING);
	661	+
	662	+ gl.glBegin(gl.GL_LINE_LOOP);
	663	+ gl.glVertex3d(pv./pos./x, pv./pos./y, pv./pos./z);
	664	+ gl.glVertex3d(qv./pos./x, qv./pos./y, qv./pos./z);
	665	+ gl.glVertex3d(rv./pos./x, rv./pos./y, rv./pos./z);
	666	+ gl.glEnd();
	667	+
	668	+ gl.glEnable(gl.GL_LIGHTING);
	669	+ }
	670	+ }
	671	+
	672	+ /**
	673	+ * <code>draw</code> renders a <code>TriMesh</code> object including
	674	+ * it's normals, colors, textures and vertices.
	675	+ *
	676	+ * @see Renderer#draw(TriMesh)
	677	+ * @param tris
	678	+ * the mesh to render.
	679	+ */
	680	+ public void DrawParticles(TriMesh geo, Object3D shape, boolean selected, boolean rotate) // TriMesh tris)
	681	+ {
	682	+ CameraPane display = this;
	683	+
	684	+ float r = display.modelParams0[0];
	685	+ float g = display.modelParams0[1];
	686	+ float b = display.modelParams0[2];
	687	+ float opacity = display.modelParams5[1];
	688	+
	689	+ //final GL gl = GLU.getCurrentGL();
	690	+ GL gl = display.GetGL(); // getGL();
	691	+
	692	+ FloatBuffer vertBuf = geo.vertBuf;
	693	+
	694	+ int v = vertBuf.capacity();
	695	+
	696	+ int count = 0;
	697	+
	698	+ boolean cf = gl.glIsEnabled(gl.GL_CULL_FACE);
	699	+ gl.glEnable(gl.GL_CULL_FACE);
	700	+ // gl.glScalef(1.0f/1024,1.0f/1024,1.0f/1024);
	701	+ for (int i=0; i<v/3; i++)
	702	+ {
	703	+ int index3 = i*3;
	704	+
	705	+ if (geo.sizeBuf.get(index3+1) == 0)
	706	+ continue;
	707	+
	708	+ count++;
	709	+
	710	+ int index4 = i*4;
	711	+
	712	+ float tx = vertBuf.get(index3);
	713	+ float ty = vertBuf.get(index3+1);
	714	+ float tz = vertBuf.get(index3+2);
	715	+
	716	+ // if (tx == 0 && ty == 0 && tz == 0)
	717	+ // continue;
	718	+
	719	+ gl.glMatrixMode(gl.GL_TEXTURE);
	720	+ gl.glPushMatrix();
	721	+
	722	+ float[] texmat = geo.texmat;
	723	+ texmat[12] = texmat[13] = texmat[14] = i;
	724	+
	725	+ gl.glMultMatrixf(texmat, 0);
	726	+
	727	+ gl.glMatrixMode(gl.GL_MODELVIEW);
	728	+ gl.glPushMatrix();
	729	+
	730	+ gl.glTranslatef(tx,ty,tz);
	731	+
	732	+ if (rotate)
	733	+ gl.glRotatef(i, 0, 1, 0);
	734	+
	735	+ float size = geo.sizeBuf.get(index3) / 100;
	736	+ gl.glScalef(size,size,size);
	737	+
	738	+ float cr = geo.colorBuf.get(index4);
	739	+ float cg = geo.colorBuf.get(index4+1);
	740	+ float cb = geo.colorBuf.get(index4+2);
	741	+ float ca = geo.colorBuf.get(index4+3);
	742	+
	743	+ display.modelParams0[0] = r * cr;
	744	+ display.modelParams0[1] = g * cg;
	745	+ display.modelParams0[2] = b * cb;
	746	+
	747	+ display.modelParams5[1] = opacity * ca;
	748	+
	749	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 0, display.modelParams0, 0);
	750	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 5, display.modelParams5, 0);
	751	+
	752	+ RandomNode.globalseed = (int)geo.sizeBuf.get(index3+2); // i;
	753	+ RandomNode.globalseed2 = RandomNode.globalseed;
	754	+
	755	+// gl.glColor4f(cr,cg,cb,ca);
	756	+ // gl.glScalef(1024/16,1024/16,1024/16);
	757	+ shape.Draw/Node/(display,null,selected,false); // blocked
	758	+ // gl.glScalef(16.0f/1024,16.0f/1024,16.0f/1024);
	759	+ //gl.glTranslatef(-tx,-ty,-tz);
	760	+ gl.glPopMatrix();
	761	+
	762	+ gl.glMatrixMode(gl.GL_TEXTURE);
	763	+ gl.glPopMatrix();
	764	+ }
	765	+ // gl.glScalef(1024,1024,1024);
	766	+ if (!cf)
	767	+ gl.glDisable(gl.GL_CULL_FACE);
	768	+
	769	+ display.modelParams0[0] = r;
	770	+ display.modelParams0[1] = g;
	771	+ display.modelParams0[2] = b;
	772	+
	773	+ display.modelParams5[1] = opacity;
	774	+
	775	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 0, display.modelParams0, 0);
	776	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 5, display.modelParams5, 0);
	777	+
	778	+ gl.glMatrixMode(gl.GL_MODELVIEW);
	779	+
	780	+// System.err.println("total = " + v/3 + "; displayed = " + count);
	781	+ if (true)
	782	+ return;
	783	+
	784	+//// if (!tris.predraw(this))
	785	+//// {
	786	+//// return;
	787	+//// }
	788	+//// if (Debug.stats)
	789	+//// {
	790	+//// StatCollector.addStat(StatType.STAT_TRIANGLE_COUNT, tris.getTriangleCount());
	791	+//// StatCollector.addStat(StatType.STAT_VERTEX_COUNT, tris.getVertexCount());
	792	+//// StatCollector.addStat(StatType.STAT_GEOM_COUNT, 1);
	793	+//// }
	794	+////
	795	+//// if (tris.getDisplayListID() != -1)
	796	+//// {
	797	+//// renderDisplayList(tris);
	798	+//// return;
	799	+//// }
	800	+////
	801	+//// if (!generatingDisplayList)
	802	+//// {
	803	+//// applyStates(tris.states, tris);
	804	+//// }
	805	+//// if (Debug.stats)
	806	+//// {
	807	+//// StatCollector.startStat(StatType.STAT_RENDER_TIMER);
	808	+//// }
	809	+//// boolean transformed = doTransforms(tris);
	810	+//
	811	+// int glMode = GL.GL_TRIANGLES;
	812	+// switch (getMode())
	813	+// {
	814	+// case Triangles:
	815	+// glMode = GL.GL_TRIANGLES;
	816	+// break;
	817	+// case Strip:
	818	+// glMode = GL.GL_TRIANGLE_STRIP;
	819	+// break;
	820	+// case Fan:
	821	+// glMode = GL.GL_TRIANGLE_FAN;
	822	+// break;
	823	+// }
	824	+//
	825	+// if (!predrawGeometry(gl))
	826	+// {
	827	+// // make sure only the necessary indices are sent through on old
	828	+// // cards.
	829	+// IntBuffer indices = this.getIndexBuffer();
	830	+// if (indices == null)
	831	+// {
	832	+// logger.severe("missing indices on geometry object: " + this.toString());
	833	+// } else
	834	+// {
	835	+// indices.rewind();
	836	+// indices.limit(this.getMaxIndex());
	837	+//
	838	+// gl.glDrawElements(glMode, indices.limit(), GL.GL_UNSIGNED_INT, indices); // TODO Check <count> and assumed <type> of GL_UNSIGNED_INT
	839	+//
	840	+// indices.clear();
	841	+// }
	842	+// } else
	843	+// {
	844	+// gl.glDrawElements(glMode, this.getIndexBuffer().limit(),
	845	+// GL.GL_UNSIGNED_INT, 0);
	846	+// }
	847	+//
	848	+//// postdrawGeometry(tris);
	849	+//// if (transformed)
	850	+//// {
	851	+//// undoTransforms(tris);
	852	+//// }
	853	+////
	854	+//// if (Debug.stats)
	855	+//// {
	856	+//// StatCollector.endStat(StatType.STAT_RENDER_TIMER);
	857	+//// }
	858	+//// tris.postdraw(this);
	859	+ }
	860	+
	861	+ static Camera localcamera = new Camera();
	862	+ static cVector from = new cVector();
	863	+ static cVector to = new cVector();
	864	+
	865	+ public void PrepOcclusion(BoundaryRep br, double[][] transform)
	866	+ {
	867	+ CameraPane cp = this;
	868	+
	869	+ Camera keep = cp.RenderCamera();
	870	+ cp.renderCamera = localcamera;
	871	+
	872	+ if (br.trimmed)
	873	+ {
	874	+ float[] colors = new float[br.positions.length / 3];
	875	+
	876	+ int i3 = 0;
	877	+ for (int i = 0; i < br.positions.length / 3; i++, i3 += 3)
	878	+ {
	879	+ if (br.normals[i3] == 0 && br.normals[i3+1] == 0 && br.normals[i3+2] == 0)
	880	+ continue;
	881	+
	882	+ from.set(br.positions[i3], br.positions[i3 + 1], br.positions[i3 + 2]);
	883	+ to.set(br.positions[i3] + br.normals[i3],
	884	+ br.positions[i3 + 1] + br.normals[i3 + 1],
	885	+ br.positions[i3 + 2] + br.normals[i3 + 2]);
	886	+ LA.xformPos(from, transform, from);
	887	+ LA.xformPos(to, transform, to); // RIGID ONLY
	888	+ localcamera.setAim(from, to);
	889	+
	890	+ CameraPane.occlusionbuffer.display();
	891	+
	892	+ if (CameraPane.DEBUG_OCCLUSION)
	893	+ cp.display(); // debug
	894	+
	895	+ colors[i] = cp.vertexOcclusion.r;
	896	+ //colors[i3 + 1] = cp.vertexOcclusion.g;
	897	+ //colors[i3 + 2] = cp.vertexOcclusion.b;
	898	+
	899	+ if ((i % 100) == 0 && i != 0)
	900	+ {
	901	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	902	+ //System.out.println("Color = " + cp.vertexOcclusion.r + ", " + cp.vertexOcclusion.g + ", " + cp.vertexOcclusion.b + "; " + (int)(100.0*i/(positions.length/3)) + "% done");
	903	+ System.out.println((int) (100.0 * i / (br.positions.length / 3)) + "% (" + i + " of " + (br.positions.length / 3) + ")");
	904	+ }
	905	+ }
	906	+
	907	+ br.colors = colors;
	908	+ }
	909	+ else
	910	+ {
	911	+ for (int i = 0; i < br.VertexCount(); i++)
	912	+ {
	913	+ Vertex v = br.GetVertex(i);
	914	+
	915	+ if (v.norm == null \|\| v.norm.x == 0 && v.norm.y == 0 && v.norm.z == 0)
	916	+ continue;
	917	+
	918	+ from.set(v.x, v.y, v.z);
	919	+ to.set(v.x+v.norm.x, v.y+v.norm.y, v.z+v.norm.z);
	920	+ LA.xformPos(from, transform, from);
	921	+ LA.xformPos(to, transform, to); // RIGID ONLY
	922	+ localcamera.setAim(from, to);
	923	+
	924	+ CameraPane.occlusionbuffer.display();
	925	+
	926	+ if (CameraPane.DEBUG_OCCLUSION)
	927	+ cp.display(); // debug
	928	+
	929	+ v.AO = cp.vertexOcclusion.r;
	930	+
	931	+ if ((i % 100) == 0 && i != 0)
	932	+ {
	933	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	934	+ //System.out.println("Color = " + cp.vertexOcclusion.r + ", " + cp.vertexOcclusion.g + ", " + cp.vertexOcclusion.b + "; " + (int)(100.0*i/(positions.length/3)) + "% done");
	935	+ System.out.println((int) (100.0 * i / br.VertexCount()) + "% (" + i + " of " + br.VertexCount() + ")");
	936	+ }
	937	+ }
	938	+ }
	939	+
	940	+ //System.out.println("done.");
	941	+
	942	+ cp.renderCamera = keep;
	943	+ }
	944	+
	945	+ void DrawPointFLow(PointFlow pointFlow, Object3D /Composite/ root, boolean selected, boolean blocked)
	946	+ {
	947	+ CameraPane display = this;
	948	+ pointFlow.CreateHT();
	949	+
	950	+ float r = display.modelParams0[0];
	951	+ float g = display.modelParams0[1];
	952	+ float b = display.modelParams0[2];
	953	+ float opacity = display.modelParams5[1];
	954	+
	955	+ //final GL gl = GLU.getCurrentGL();
	956	+ GL gl = display.GetGL(); // getGL();
	957	+
	958	+ int s = pointFlow.points.size();
	959	+
	960	+ boolean cf = gl.glIsEnabled(gl.GL_CULL_FACE);
	961	+ gl.glEnable(gl.GL_CULL_FACE);
	962	+
	963	+ for (int i=s; --i>=0;)
	964	+ //for (int i=0; i<s; i++)
	965	+ {
	966	+ cVector v = pointFlow.points.get(i);
	967	+
	968	+ double mindist = Double.MAX_VALUE;
	969	+
	970	+ double size = pointFlow.minimumSize;
	971	+
	972	+ double distancenext = 0;
	973	+
	974	+ if (i > 0)
	975	+ {
	976	+ cVector w = pointFlow.points.get(i-1);
	977	+
	978	+ double dist = w.distance(v);
	979	+
	980	+ distancenext = dist;
	981	+
	982	+ if (mindist > dist)
	983	+ {
	984	+ mindist = dist;
	985	+ size = mindist*pointFlow.resizefactor;
	986	+ }
	987	+ }
	988	+
	989	+ if (i < s-1)
	990	+ {
	991	+ cVector w = pointFlow.points.get(i+1);
	992	+
	993	+ double dist = w.distance(v);
	994	+
	995	+ if (mindist > dist)
	996	+ {
	997	+ mindist = dist;
	998	+ size = mindist*pointFlow.resizefactor;
	999	+ }
	1000	+ }
	1001	+
	1002	+ if (size < pointFlow.minimumSize)
	1003	+ size = pointFlow.minimumSize;
	1004	+ if (size > pointFlow.maximumSize)
	1005	+ size = pointFlow.maximumSize;
	1006	+
	1007	+ double tx = v.x;
	1008	+ double ty = v.y;
	1009	+ double tz = v.z;
	1010	+
	1011	+ // if (tx == 0 && ty == 0 && tz == 0)
	1012	+ // continue;
	1013	+
	1014	+ gl.glMatrixMode(gl.GL_TEXTURE);
	1015	+ gl.glPushMatrix();
	1016	+ pointFlow.texmat[12] = pointFlow.texmat[13] = pointFlow.texmat[14] = i;
	1017	+
	1018	+ gl.glMultMatrixf(pointFlow.texmat, 0);
	1019	+
	1020	+ gl.glMatrixMode(gl.GL_MODELVIEW);
	1021	+ gl.glPushMatrix();
	1022	+
	1023	+ gl.glTranslated(tx,ty,tz);
	1024	+
	1025	+ gl.glScaled(size,size,size);
	1026	+
	1027	+// float cr = colorBuf.get(index4);
	1028	+// float cg = colorBuf.get(index4+1);
	1029	+// float cb = colorBuf.get(index4+2);
	1030	+// float ca = colorBuf.get(index4+3);
	1031	+//
	1032	+// display.modelParams0[0] = r * cr;
	1033	+// display.modelParams0[1] = g * cg;
	1034	+// display.modelParams0[2] = b * cb;
	1035	+//
	1036	+// display.modelParams5[1] = opacity * ca;
	1037	+//
	1038	+// gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 0, display.modelParams0, 0);
	1039	+// gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 5, display.modelParams5, 0);
	1040	+//
	1041	+// RandomNode.globalseed = (int)sizeBuf.get(index3+2); // i;
	1042	+// RandomNode.globalseed2 = RandomNode.globalseed;
	1043	+//
	1044	+//// gl.glColor4f(cr,cg,cb,ca);
	1045	+// // gl.glScalef(1024/16,1024/16,1024/16);
	1046	+ pointFlow.geo.Draw/Node/(display,null,selected, blocked);
	1047	+
	1048	+ gl.glPopMatrix();
	1049	+
	1050	+ double step = size/4; //
	1051	+
	1052	+ if (i == 0 \|\| size == 0 \|\| distancenext > 8*size \|\| distancenext < step)
	1053	+ continue;
	1054	+
	1055	+ int nbsteps = (int)(distancenext/step);
	1056	+
	1057	+ step = distancenext/nbsteps;
	1058	+
	1059	+ cVector next = pointFlow.points.get(i-1);
	1060	+
	1061	+ tmp.set(next);
	1062	+ tmp.sub(v);
	1063	+ tmp.normalize();
	1064	+ tmp.mul(step);
	1065	+
	1066	+ // calculate next size
	1067	+ mindist = Double.MAX_VALUE;
	1068	+
	1069	+ double nextsize = pointFlow.minimumSize;
	1070	+
	1071	+ if (i > 1)
	1072	+ {
	1073	+ cVector w = pointFlow.points.get(i-2);
	1074	+
	1075	+ double dist = w.distance(next);
	1076	+
	1077	+ if (mindist > dist)
	1078	+ {
	1079	+ mindist = dist;
	1080	+ nextsize = mindist*pointFlow.resizefactor;
	1081	+ }
	1082	+ }
	1083	+
	1084	+ double dist = v.distance(next);
	1085	+
	1086	+ if (mindist > dist)
	1087	+ {
	1088	+ mindist = dist;
	1089	+ nextsize = mindist*pointFlow.resizefactor;
	1090	+ }
	1091	+
	1092	+ if (nextsize < pointFlow.minimumSize)
	1093	+ nextsize = pointFlow.minimumSize;
	1094	+ if (nextsize > pointFlow.maximumSize)
	1095	+ nextsize = pointFlow.maximumSize;
	1096	+ //
	1097	+
	1098	+ double count = 0;
	1099	+
	1100	+ while (distancenext > 0.000000001) // step
	1101	+ {
	1102	+ gl.glPushMatrix();
	1103	+
	1104	+ gl.glTranslated(tx + tmp.xcount, ty + tmp.ycount, tz + tmp.z*count);
	1105	+
	1106	+ double K = count/nbsteps;
	1107	+
	1108	+ double intersize = Knextsize + (1-K)size;
	1109	+
	1110	+ gl.glScaled(intersize,intersize,intersize);
	1111	+
	1112	+ pointFlow.geo.Draw/Node/(display,null,selected,blocked);
	1113	+
	1114	+ count++;
	1115	+
	1116	+ distancenext -= step;
	1117	+
	1118	+ gl.glPopMatrix();
	1119	+ }
	1120	+
	1121	+ if (count != nbsteps)
	1122	+ assert(count == nbsteps);
	1123	+
	1124	+ // gl.glScalef(16.0f/1024,16.0f/1024,16.0f/1024);
	1125	+ //gl.glTranslatef(-tx,-ty,-tz);
	1126	+
	1127	+ gl.glMatrixMode(gl.GL_TEXTURE);
	1128	+ gl.glPopMatrix();
	1129	+ }
	1130	+
	1131	+ if (!cf)
	1132	+ gl.glDisable(gl.GL_CULL_FACE);
	1133	+
	1134	+// display.modelParams0[0] = r;
	1135	+// display.modelParams0[1] = g;
	1136	+// display.modelParams0[2] = b;
	1137	+//
	1138	+// display.modelParams5[1] = opacity;
	1139	+//
	1140	+// gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 0, display.modelParams0, 0);
	1141	+// gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 5, display.modelParams5, 0);
	1142	+
	1143	+ gl.glMatrixMode(gl.GL_MODELVIEW);
	1144	+ }
	1145	+
	1146	+ public void DrawBox(cVector min, cVector max)
	1147	+ {
	1148	+ javax.media.opengl.GL gl = GetGL();
	1149	+ gl.glBegin(gl.GL_LINES);
	1150	+
	1151	+ gl.glVertex3d(min.x, min.y, min.z);
	1152	+ gl.glVertex3d(min.x, min.y, max.z);
	1153	+ gl.glVertex3d(min.x, min.y, min.z);
	1154	+ gl.glVertex3d(min.x, max.y, min.z);
	1155	+ gl.glVertex3d(min.x, min.y, min.z);
	1156	+ gl.glVertex3d(max.x, min.y, min.z);
	1157	+
	1158	+ gl.glVertex3d(max.x, max.y, max.z);
	1159	+ gl.glVertex3d(min.x, max.y, max.z);
	1160	+ gl.glVertex3d(max.x, max.y, max.z);
	1161	+ gl.glVertex3d(max.x, min.y, max.z);
	1162	+ gl.glVertex3d(max.x, max.y, max.z);
	1163	+ gl.glVertex3d(max.x, max.y, min.z);
	1164	+
	1165	+ gl.glEnd();
	1166	+ }
	1167	+
	1168	+ public void DrawGeometry(BoundaryRep bRep, boolean flipV, boolean selectmode)
	1169	+ {
	1170	+ int[] strips = bRep.getRawIndices();
	1171	+
	1172	+ javax.media.opengl.GL gl = GetGL();
	1173	+
	1174	+ // TRIANGLE STRIP ARRAY
	1175	+ if (bRep.trimmed)
	1176	+ {
	1177	+ float[] v = bRep.getRawVertices();
	1178	+ float[] n = bRep.getRawNormals();
	1179	+ float[] c = bRep.getRawColors();
	1180	+ float[] uv = bRep.getRawUVMap();
	1181	+
	1182	+ int count2 = 0;
	1183	+ int count3 = 0;
	1184	+
	1185	+ if (n.length > 0)
	1186	+ {
	1187	+ for (int i = 0; i < strips.length; i++)
	1188	+ {
	1189	+ gl.glBegin(gl.GL_TRIANGLE_STRIP);
	1190	+
	1191	+ /*
	1192	+ boolean locked = false;
	1193	+ float eps = 0.1f;
	1194	+ boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
	1195	+
	1196	+ int dot = 0;
	1197	+
	1198	+ if ((dot&1) == 0)
	1199	+ dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
	1200	+
	1201	+ if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
	1202	+ gl.glTexCoord2f((float) qv.s, (float) qv.t);
	1203	+ else
	1204	+ {
	1205	+ locked = true;
	1206	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	1207	+ }
	1208	+ //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
	1209	+ gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
	1210	+ if (hasnorm)
	1211	+ {
	1212	+ //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
	1213	+ gl.glNormal3f((float) rv.norm.x, (float) rv.norm.y, (float) rv.norm.z);
	1214	+ }
	1215	+
	1216	+ if ((dot&4) == 0)
	1217	+ dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
	1218	+
	1219	+ if (wrap \|\| !locked && (dot&8) != 0)
	1220	+ gl.glTexCoord2f((float) rv.s, (float) rv.t);
	1221	+ else
	1222	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	1223	+
	1224	+ f.dot = dot;
	1225	+ */
	1226	+
	1227	+ if (!selectmode)
	1228	+ {
	1229	+ if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
	1230	+ {
	1231	+ gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1232	+ } else
	1233	+ {
	1234	+ gl.glNormal3f(0, 0, 1);
	1235	+ }
	1236	+
	1237	+ if (c != null)
	1238	+ //System.out.println("glcolor = " + c[count3] + ", " + c[count3+1] + ", " + c[count3+2]);
	1239	+ {
	1240	+ gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
	1241	+ }
	1242	+ }
	1243	+
	1244	+ if (flipV)
	1245	+ gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
	1246	+ else
	1247	+ gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1248	+
	1249	+ //System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
	1250	+ gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1251	+
	1252	+ count2 += 2;
	1253	+ count3 += 3;
	1254	+ if (!selectmode)
	1255	+ {
	1256	+ if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
	1257	+ {
	1258	+ gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1259	+ } else
	1260	+ {
	1261	+ gl.glNormal3f(0, 0, 1);
	1262	+ }
	1263	+ if (c != null)
	1264	+ {
	1265	+ gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
	1266	+ }
	1267	+ }
	1268	+
	1269	+ if (flipV)
	1270	+ gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
	1271	+ else
	1272	+ gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1273	+
	1274	+ //System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
	1275	+ gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1276	+
	1277	+ count2 += 2;
	1278	+ count3 += 3;
	1279	+ for (int j = 0; j < strips[i] - 2; j++)
	1280	+ {
	1281	+ //gl.glTexCoord2d(...);
	1282	+ if (!selectmode)
	1283	+ {
	1284	+ if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
	1285	+ {
	1286	+ gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1287	+ } else
	1288	+ {
	1289	+ gl.glNormal3f(0, 0, 1);
	1290	+ }
	1291	+ if (c != null)
	1292	+ {
	1293	+ gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
	1294	+ }
	1295	+ }
	1296	+
	1297	+ if (flipV)
	1298	+ gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
	1299	+ else
	1300	+ gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1301	+
	1302	+ //System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
	1303	+ gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1304	+
	1305	+ count2 += 2;
	1306	+ count3 += 3;
	1307	+ }
	1308	+
	1309	+ gl.glEnd();
	1310	+ }
	1311	+ }
	1312	+
	1313	+ assert count3 == v.length;
	1314	+ }
	1315	+ else // !trimmed
	1316	+ {
	1317	+ int count = 0;
	1318	+ for (int i = 0; i < strips.length; i++)
	1319	+ {
	1320	+ gl.glBegin(gl.GL_TRIANGLE_STRIP);
	1321	+
	1322	+ Vertex p = bRep.GetVertex(bRep.indices[count++]);
	1323	+ Vertex q = bRep.GetVertex(bRep.indices[count++]);
	1324	+
	1325	+ drawVertex(gl, p, flipV, selectmode);
	1326	+ drawVertex(gl, q, flipV, selectmode);
	1327	+
	1328	+ for (int j = 0; j < strips[i] - 2; j++)
	1329	+ {
	1330	+ Vertex r = bRep.GetVertex(bRep.indices[count++]);
	1331	+
	1332	+ // if (j%2 == 0)
	1333	+ // drawFace(p, q, r, display, null);
	1334	+ // else
	1335	+ // drawFace(p, r, q, display, null);
	1336	+
	1337	+ // p = q;
	1338	+ // q = r;
	1339	+ drawVertex(gl, r, flipV, selectmode);
	1340	+ }
	1341	+
	1342	+ gl.glEnd();
	1343	+ }
	1344	+ }
	1345	+ }
	1346	+
	1347	+ static cSpring.Point3D temp = new cSpring.Point3D();
	1348	+ static cSpring.Point3D temp2 = new cSpring.Point3D();
	1349	+ static cSpring.Point3D temp3 = new cSpring.Point3D();
	1350	+
	1351	+ public void DrawDynamicMesh(cMesh mesh)
	1352	+ {
	1353	+ GL gl = GetGL(); // getGL();
	1354	+
	1355	+ cSpring.PhysicsController3D Phys = mesh.Phys;
	1356	+
	1357	+ gl.glDisable(gl.GL_LIGHTING);
	1358	+
	1359	+ gl.glLineWidth(1);
	1360	+ gl.glColor3f(1,1,1);
	1361	+ gl.glBegin(gl.GL_LINES);
	1362	+ double scale = 0;
	1363	+ int count = 0;
	1364	+ for (int s=0; s<Phys.allSprings.size(); s++)
	1365	+ {
	1366	+ cSpring.Spring spring = Phys.allSprings.get(s);
	1367	+ if(s == 0)
	1368	+ {
	1369	+ //System.out.println(" spring : " + spring.a.position + "; " + spring.b.position);
	1370	+ }
	1371	+ if (mesh.showsprings)
	1372	+ {
	1373	+ temp.set(spring.a.position);
	1374	+ temp.add(spring.b.position);
	1375	+ temp.mul(0.5);
	1376	+ temp2.set(spring.a.position);
	1377	+ temp2.sub(spring.b.position);
	1378	+ temp2.mul(spring.restLength/2);
	1379	+ temp.sub(temp2);
	1380	+ gl.glVertex3f((float)temp.x, (float)temp.y, (float)temp.z);
	1381	+ temp.add(temp2);
	1382	+ temp.add(temp2);
	1383	+ gl.glVertex3f((float)temp.x, (float)temp.y, (float)temp.z);
	1384	+ }
	1385	+
	1386	+ if (spring.isHandle)
	1387	+ continue;
	1388	+
	1389	+ //if (scale < spring.restLength)
	1390	+ scale += spring.restLength;
	1391	+ count++;
	1392	+ }
	1393	+ gl.glEnd();
	1394	+
	1395	+ if (count == 0)
	1396	+ scale = 0.01;
	1397	+ else
	1398	+ scale /= count * 3;
	1399	+
	1400	+ //scale = 0.25;
	1401	+
	1402	+ if (mesh.ShowInfo())
	1403	+ {
	1404	+ gl.glLineWidth(4);
	1405	+ for (int s=0; s<Phys.allNodes.size(); s++)
	1406	+ {
	1407	+ cSpring.DynamicNode node = Phys.allNodes.get(s);
	1408	+ if (node.mass == 0)
	1409	+ continue;
	1410	+
	1411	+ int i = node.springs==null?-1:node.springs.size();
	1412	+ gl.glColor3f((i>>2)&1,(i>>1)&1,i&1);
	1413	+ //temp.set(node.springForce.x, node.springForce.y, node.springForce.z);
	1414	+ //temp.normalize();
	1415	+ //gl.glColor3d((temp.x+1)/2, (temp.y+1)/2, (temp.z+1)/2);
	1416	+ gl.glBegin(gl.GL_LINES);
	1417	+ gl.glVertex3d(node.position.x, node.position.y, node.position.z);
	1418	+ //gl.glVertex3d(node.position.x + node.normal.xscale, node.position.y + node.normal.yscale, node.position.z + node.normal.z*scale);
	1419	+ gl.glVertex3d(node.position.x + mesh.bRep.GetVertex(s).norm.x*scale,
	1420	+ node.position.y + mesh.bRep.GetVertex(s).norm.y*scale,
	1421	+ node.position.z + mesh.bRep.GetVertex(s).norm.z*scale);
	1422	+ gl.glEnd();
	1423	+ }
	1424	+
	1425	+ gl.glLineWidth(8);
	1426	+ for (int s=0; s<Phys.allNodes.size(); s++)
	1427	+ {
	1428	+ cSpring.DynamicNode node = Phys.allNodes.get(s);
	1429	+
	1430	+ if (node.springs != null)
	1431	+ {
	1432	+ for (int i=0; i<node.springs.size(); i+=1)
	1433	+ {
	1434	+ cSpring.DynamicNode f = node.springs.get(i).GetOther(node);
	1435	+
	1436	+ int c = i+1;
	1437	+ // c = node.springs.get(i).nbcopies;
	1438	+
	1439	+ gl.glColor3f((c>>2)&1,(c>>1)&1,c&1);
	1440	+ gl.glBegin(gl.GL_LINES);
	1441	+ gl.glVertex3d(node.position.x, node.position.y, node.position.z);
	1442	+ 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);
	1443	+ gl.glEnd();
	1444	+ }
	1445	+ }
	1446	+ }
	1447	+
	1448	+ gl.glLineWidth(1);
	1449	+ }
	1450	+
	1451	+ gl.glEnable(gl.GL_LIGHTING);
	1452	+ }
	1453	+
	1454	+ /// INTERFACE
	1455	+
	1456	+ public void StartTriangles()
	1457	+ {
	1458	+ javax.media.opengl.GL gl = GetGL();
	1459	+ gl.glBegin(gl.GL_TRIANGLES);
	1460	+ }
	1461	+
	1462	+ public void EndTriangles()
	1463	+ {
	1464	+ GetGL().glEnd();
	1465	+ }
	1466	+
	1467	+ void drawVertex(javax.media.opengl.GL gl, Vertex pv, boolean flipV, boolean selectmode)
	1468	+ {
	1469	+ if (!selectmode)
	1470	+ {
	1471	+ gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
	1472	+ gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
	1473	+
	1474	+ if (flipV)
	1475	+ gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
	1476	+ else
	1477	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	1478	+ }
	1479	+
	1480	+ gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
	1481	+ }
	1482	+
	1483	+ void SetColor(Object3D obj, Vertex p0)
	1484	+ {
	1485	+ CameraPane display = this;
	1486	+ BoundaryRep bRep = obj.bRep;
	1487	+
	1488	+ if (RENDERPROGRAM == 0)
	1489	+ {
	1490	+ float r = 0;
	1491	+ if (bRep != null)
	1492	+ {
	1493	+ if (bRep.stripified)
	1494	+ {
	1495	+ r = 1;
	1496	+ }
	1497	+ }
	1498	+ float g = 0;
	1499	+ if (bRep != null)
	1500	+ {
	1501	+ if (bRep.trimmed)
	1502	+ {
	1503	+ g = 1;
	1504	+ }
	1505	+ }
	1506	+ float b = 0;
	1507	+ if (obj.support != null && obj.link2master)
	1508	+ {
	1509	+ b = 1;
	1510	+ }
	1511	+ display.GetGL().glColor3f(rp0.AO, gp0.AO, b*p0.AO);
	1512	+ return;
	1513	+ }
	1514	+
	1515	+ if (display.DrawMode() != CameraPane.SHADOW)
	1516	+ return;
	1517	+
	1518	+ javax.media.opengl.GL gl = display.GetGL();
	1519	+// if (true) return;
	1520	+// float ao = p.AO;
	1521	+//
	1522	+// // if (ao == 0 && !bRep.AOdone) // transient problem!
	1523	+// // ao = 1;
	1524	+//
	1525	+// gl.glColor4f(ao, ao, ao, 1);
	1526	+
	1527	+// CameraPane.selectedpoint.
	1528	+// getAverage(cStatic.point1, true);
	1529	+ if (CameraPane.pointflow == null) // !random) // live)
	1530	+ {
	1531	+ return;
	1532	+ }
	1533	+
	1534	+ cStatic.point1.set(0,0,0);
	1535	+ LA.xformPos(cStatic.point1, CameraPane.selectedpoint.toParent, cStatic.point1);
	1536	+
	1537	+ cStatic.point1.sub(p0);
	1538	+
	1539	+
	1540	+// if (marked && (p0.vertexlinks == null \|\| support == null \|\| support.bRep == null)) // no position delta?
	1541	+// {
	1542	+// return;
	1543	+// }
	1544	+
	1545	+ //if (true)
	1546	+ if (cStatic.point1.dot(cStatic.point1) > 0.000001)
	1547	+ {
	1548	+ return;
	1549	+ }
	1550	+
	1551	+ float[] colorV = new float[3];
	1552	+
	1553	+ if (false) // marked)
	1554	+ {
	1555	+ // debug rigging weights
	1556	+ for (int object = 0; object < p0.vertexlinks.length; object++)
	1557	+ {
	1558	+ float weight = p0.weights[object] / p0.totalweight;
	1559	+
	1560	+ // if (weight < 0.1)
	1561	+ // {
	1562	+ // assert(weight == 0);
	1563	+ // continue;
	1564	+ // }
	1565	+
	1566	+ if (p0.vertexlinks[object] == -1)
	1567	+ continue;
	1568	+
	1569	+ Vertex q = obj.support.bRep.GetVertex(p0.vertexlinks[object]);
	1570	+
	1571	+ int color = //1 << object; //
	1572	+ //p.vertexlinks.length;
	1573	+ obj.support.bRep.supports[p0.closestsupport].links[object];
	1574	+ colorV[2] += (color & 1) * weight;
	1575	+ colorV[1] += ((color & 2) >> 1) * weight;
	1576	+ colorV[0] += ((color & 4) >> 2) * weight;
	1577	+ }
	1578	+ }
	1579	+ else
	1580	+ {
	1581	+ if (obj.drawingstarted)
	1582	+ {
	1583	+ // find next point
	1584	+ if (bRep.GetVertex(0).faceindices == null)
	1585	+ {
	1586	+ bRep.InitFaceIndices();
	1587	+ }
	1588	+
	1589	+ double ymin = p0.y;
	1590	+
	1591	+ Vertex newp = p0;
	1592	+
	1593	+ for (int fii = 0; fii < p0.faceindices.length; fii++)
	1594	+ {
	1595	+ int fi = p0.faceindices[fii];
	1596	+
	1597	+ if (fi == -1)
	1598	+ break;
	1599	+
	1600	+ Face f = bRep.GetFace(fi);
	1601	+
	1602	+ Vertex p = bRep.GetVertex(f.p);
	1603	+ Vertex q = bRep.GetVertex(f.q);
	1604	+ Vertex r = bRep.GetVertex(f.r);
	1605	+
	1606	+ int swap = (int)(Math.random()*3);
	1607	+
	1608	+// for (int s=swap; --s>=0;)
	1609	+// {
	1610	+// Vertex t = p;
	1611	+// p = q;
	1612	+// q = r;
	1613	+// r = t;
	1614	+// }
	1615	+ if (ymin > p.y)
	1616	+ {
	1617	+ ymin = p.y;
	1618	+ newp = p;
	1619	+// break;
	1620	+ }
	1621	+ if (ymin > q.y)
	1622	+ {
	1623	+ ymin = q.y;
	1624	+ newp = q;
	1625	+// break;
	1626	+ }
	1627	+ if (ymin > r.y)
	1628	+ {
	1629	+ ymin = r.y;
	1630	+ newp = r;
	1631	+// break;
	1632	+ }
	1633	+ }
	1634	+
	1635	+ CameraPane.selectedpoint.toParent[3][0] = newp.x;
	1636	+ CameraPane.selectedpoint.toParent[3][1] = newp.y;
	1637	+ CameraPane.selectedpoint.toParent[3][2] = newp.z;
	1638	+
	1639	+ obj.drawingstarted = false;
	1640	+
	1641	+ // return;
	1642	+ }
	1643	+
	1644	+ if (false) // CameraPane.DRAW
	1645	+ {
	1646	+ p0.AO = colorV[0] = 2;
	1647	+ colorV[1] = 2;
	1648	+ colorV[2] = 2;
	1649	+ }
	1650	+
	1651	+ CameraPane.pointflow.add(p0);
	1652	+ CameraPane.pointflow.Touch();
	1653	+ }
	1654	+
	1655	+// gl.glColor3f(colorV[0], colorV[1], colorV[2]);
	1656	+// gl.glMaterialfv(gl.GL_FRONT, gl.GL_DIFFUSE, colorV, 0);
	1657	+// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
	1658	+ }
	1659	+
	1660	+ void DrawMaterial(cMaterial material, boolean selected, Object3D.cVector2[] others)
	1661	+ {
	1662	+ CameraPane display = this;
	1663	+ //new Exception().printStackTrace();
	1664	+
	1665	+ if (display.IsFrozen() && !selected \|\| display.IsAmbientOcclusionOn()) // \|\| display.drawMode == display.SHADOW)
	1666	+ {
	1667	+ return;
	1668	+ }
	1669	+
	1670	+ javax.media.opengl.GL gl = display.GetGL();
	1671	+
	1672	+ //Color col = Color.getHSBColor(color,modulation,1);
	1673	+ //col.getColorComponents(ColorSpace.getInstance(ColorSpace.CS_LINEAR_RGB), CameraPane.modelParams0);
	1674	+ if (!material.multiply)
	1675	+ {
	1676	+ display.color = material.color;
	1677	+ display.saturation = material.modulation;
	1678	+ }
	1679	+ else
	1680	+ {
	1681	+ display.color = material.color2;
	1682	+ display.saturation = material.modulation2;
	1683	+ }
	1684	+
	1685	+ cColor.HSBtoRGB(display.color, display.saturation, 1, display.modelParams0);
	1686	+
	1687	+ float[] colorV = Grafreed.colorV;
	1688	+
	1689	+ /**/
	1690	+ if (display.DrawMode() == display.DEFAULT) // && display.RENDERPROGRAM == 0)
	1691	+ {
	1692	+ colorV[0] = display.modelParams0[0] * material.diffuse;
	1693	+ colorV[1] = display.modelParams0[1] * material.diffuse;
	1694	+ colorV[2] = display.modelParams0[2] * material.diffuse;
	1695	+ colorV[3] = 1; // material.opacity;
	1696	+
	1697	+ gl.glColor4f(colorV[0], colorV[1], colorV[2], material.opacity);
	1698	+ //System.out.println("Opacity = " + opacity);
	1699	+
	1700	+ gl.glMaterialfv(gl.GL_FRONT, gl.GL_DIFFUSE, colorV, 0);
	1701	+ //color[0] /= 2; color[1] /= 2; color[2] /= 2;
	1702	+ gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
	1703	+
	1704	+ float amb = material.ambient;
	1705	+ if (amb < material.cameralight)
	1706	+ {
	1707	+ amb = material.cameralight;
	1708	+ }
	1709	+ colorV[0] = display.modelParams0[0] * material.diffuse * amb;
	1710	+ colorV[1] = display.modelParams0[1] * material.diffuse * amb;
	1711	+ colorV[2] = display.modelParams0[2] * material.diffuse * amb;
	1712	+ gl.glMaterialfv(gl.GL_FRONT, gl.GL_AMBIENT, colorV, 0);
	1713	+ //color[0] /= 2; color[1] /= 2; color[2] /= 2;
	1714	+ gl.glMaterialfv(gl.GL_BACK, gl.GL_AMBIENT, colorV, 0);
	1715	+
	1716	+ /**/
	1717	+ colorV[0] = ((1 - material.metalness) + display.modelParams0[0] * material.metalness) * material.specular;
	1718	+ colorV[1] = ((1 - material.metalness) + display.modelParams0[1] * material.metalness) * material.specular;
	1719	+ colorV[2] = ((1 - material.metalness) + display.modelParams0[2] * material.metalness) * material.specular;
	1720	+ gl.glMaterialfv(gl.GL_FRONT, gl.GL_SPECULAR, colorV, 0);
	1721	+ //color[0] /= 2; color[1] /= 2; color[2] /= 2;
	1722	+ gl.glMaterialfv(gl.GL_BACK, gl.GL_SPECULAR, colorV, 0);
	1723	+ colorV[0] = 10 / material.shininess; // 1/0.005f;
	1724	+ //System.out.println("shininess = " + colorV[0]);
	1725	+ if (colorV[0] > 128)
	1726	+ {
	1727	+ colorV[0] = 128;
	1728	+ }
	1729	+ gl.glMaterialfv(gl.GL_FRONT, gl.GL_SHININESS, colorV, 0);
	1730	+ gl.glMaterialfv(gl.GL_BACK, gl.GL_SHININESS, colorV, 0);
	1731	+ /**/
	1732	+ }
	1733	+ /**/
	1734	+
	1735	+ //selected = false;
	1736	+ selected = selected && display.flash;
	1737	+
	1738	+ //display.modelParams0[0] = 0; // pigment.r;
	1739	+ //display.modelParams0[1] = 0; // pigment.g;
	1740	+ //display.modelParams0[2] = 0; // pigment.b;
	1741	+ if (!material.multiply)
	1742	+ {
	1743	+ display.modelParams0[3] = material.metalness;
	1744	+ display.modelParams1[0] = material.diffuse;
	1745	+ display.modelParams1[1] = material.specular;
	1746	+ display.modelParams1[2] = 1 / material.shininess;
	1747	+ display.modelParams1[3] = material.shift;
	1748	+ display.modelParams2[0] = material.ambient;
	1749	+ display.modelParams2[1] = material.lightarea;
	1750	+ //System.out.println("light area = " + lightarea);
	1751	+ display.modelParams2[2] = 1 / material.factor; // diffuseness
	1752	+ display.modelParams2[3] = material.velvet;
	1753	+ display.modelParams3[0] = material.sheen;
	1754	+ display.modelParams3[1] = material.subsurface;
	1755	+ display.modelParams3[2] = material.bump; // backlit
	1756	+ display.modelParams3[3] = material.aniso;
	1757	+ display.modelParams4[0] = material.anisoV;
	1758	+ display.modelParams4[1] = selected ? 100 : material.cameralight;
	1759	+ //System.out.println("selected = " + selected);
	1760	+ display.modelParams4[2] = material.diffuseness;
	1761	+ display.modelParams4[3] = material.shadow;
	1762	+ display.modelParams5[0] = material.texture;
	1763	+ display.modelParams5[1] = material.opacity;
	1764	+ display.modelParams5[2] = material.fakedepth;
	1765	+ display.modelParams5[3] = CameraPane.SHADOWCULLFACE ? 0f : (material.shadowbias - 0.005f) / 10;
	1766	+ }
	1767	+ else
	1768	+ {
	1769	+ display.modelParams0[3] = material.metalness2;
	1770	+ display.modelParams1[0] = material.diffuse2;
	1771	+ display.modelParams1[1] = material.specular2;
	1772	+ display.modelParams1[2] = material.shininess2;
	1773	+ display.modelParams1[3] = material.shift2;
	1774	+ display.modelParams2[0] = material.ambient2;
	1775	+ display.modelParams2[1] = material.lightarea2;
	1776	+ display.modelParams2[2] = material.factor2;
	1777	+ display.modelParams2[3] = material.velvet2;
	1778	+ display.modelParams3[0] = material.sheen2;
	1779	+ display.modelParams3[1] = material.subsurface2;
	1780	+ display.modelParams3[2] = material.bump2;
	1781	+ display.modelParams3[3] = material.aniso2;
	1782	+ display.modelParams4[0] = material.anisoV2;
	1783	+ display.modelParams4[1] = material.cameralight2;
	1784	+ //System.out.println("selected = " + selected);
	1785	+ display.modelParams4[2] = material.diffuseness2;
	1786	+ display.modelParams4[3] = material.shadow2;
	1787	+ display.modelParams5[0] = material.texture2;
	1788	+ display.modelParams5[1] = material.opacity2;
	1789	+ display.modelParams5[2] = material.fakedepth2;
	1790	+ display.modelParams5[3] = material.shadowbias2;
	1791	+ }
	1792	+
	1793	+ display.modelParams6[0] = 0;
	1794	+ display.modelParams6[1] = 0;
	1795	+ display.modelParams6[2] = 0;
	1796	+ display.modelParams6[3] = 0;
	1797	+
	1798	+ display.modelParams7[0] = 0;
	1799	+ display.modelParams7[1] = 1000;
	1800	+ display.modelParams7[2] = 0;
	1801	+ display.modelParams7[3] = 0;
	1802	+
	1803	+ //display.modelParams6[0] = 100; // criss de bug de bump
	1804	+
	1805	+ Object3D.cVector2[] extparams = others; // display.vector2buffer;
	1806	+ if (extparams != null && extparams.length > 0 && extparams[0] != null)
	1807	+ {
	1808	+ display.modelParams6[0] = extparams[0].x / 1000.0f; // bump
	1809	+ display.modelParams6[1] = extparams[0].y / 1000.0f; // noise
	1810	+ if (extparams.length > 1)
	1811	+ {
	1812	+ display.modelParams6[2] = extparams[1].x / 1000.0f; // borderfade
	1813	+ display.modelParams6[3] = extparams[1].y / 1000.0f; // (float)Math.exp(-extparams[1].y / 1000.0f); // fog punchthrough
	1814	+ if (extparams.length > 2)
	1815	+ {
	1816	+ display.modelParams7[0] = extparams[2].x / 1000.0f; // noise power
	1817	+ float x = extparams[2].y / 1000.0f;
	1818	+ //if (x == 0)
	1819	+ // x = 1f;
	1820	+ 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
	1821	+ if (extparams[2].y > 0)
	1822	+ {
	1823	+ //System.out.println("extparams[1].y = " + extparams[1].y);
	1824	+ //System.out.println("extparams[2].y = " + extparams[2].y);
	1825	+ //System.out.println("opacity power = " + display.modelParams7[1]);
	1826	+ }
	1827	+ }
	1828	+ }
	1829	+ }
	1830	+
	1831	+ //if (display.modelParams6[2] != 0)
	1832	+ /*
	1833	+ System.out.println("modelParams0[0] = " + display.modelParams0[0]);
	1834	+ System.out.println("modelParams0[1] = " + display.modelParams0[1]);
	1835	+ System.out.println("modelParams0[2] = " + display.modelParams0[2]);
	1836	+ System.out.println("modelParams0[3] = " + display.modelParams0[3]);
	1837	+ System.out.println("modelParams1[0] = " + display.modelParams1[0]);
	1838	+ System.out.println("modelParams1[1] = " + display.modelParams1[1]);
	1839	+ System.out.println("modelParams1[2] = " + display.modelParams1[2]);
	1840	+ System.out.println("modelParams1[3] = " + display.modelParams1[3]);
	1841	+ System.out.println("modelParams2[0] = " + display.modelParams2[0]);
	1842	+ System.out.println("modelParams2[1] = " + display.modelParams2[1]);
	1843	+ System.out.println("modelParams2[2] = " + display.modelParams2[2]);
	1844	+ System.out.println("modelParams2[3] = " + display.modelParams2[3]);
	1845	+ System.out.println("modelParams3[0] = " + display.modelParams3[0]);
	1846	+ System.out.println("modelParams3[1] = " + display.modelParams3[1]);
	1847	+ System.out.println("modelParams3[2] = " + display.modelParams3[2]);
	1848	+ System.out.println("modelParams3[3] = " + display.modelParams3[3]);
	1849	+ System.out.println("modelParams4[0] = " + display.modelParams4[0]);
	1850	+ System.out.println("modelParams4[1] = " + display.modelParams4[1]);
	1851	+ System.out.println("modelParams4[2] = " + display.modelParams4[2]);
	1852	+ System.out.println("modelParams4[3] = " + display.modelParams4[3]);
	1853	+ System.out.println("modelParams5[0] = " + display.modelParams5[0]);
	1854	+ System.out.println("modelParams5[1] = " + display.modelParams5[1]);
	1855	+ System.out.println("modelParams5[2] = " + display.modelParams5[2]);
	1856	+ System.out.println("modelParams5[3] = " + display.modelParams5[3]);
	1857	+ System.out.println("modelParams6[0] = " + display.modelParams6[0]);
	1858	+ System.out.println("modelParams6[1] = " + display.modelParams6[1]);
	1859	+ System.out.println("modelParams6[2] = " + display.modelParams6[2]);
	1860	+ System.out.println("modelParams6[3] = " + display.modelParams6[3]);
	1861	+ System.out.println("modelParams7[0] = " + display.modelParams7[0]);
	1862	+ System.out.println("modelParams7[1] = " + display.modelParams7[1]);
	1863	+ System.out.println("modelParams7[2] = " + display.modelParams7[2]);
	1864	+ System.out.println("modelParams7[3] = " + display.modelParams7[3]);
	1865	+ /**/
	1866	+ //assert (display.modelParams6[2] == 0);
	1867	+
	1868	+ //System.out.println("noise power = " + display.modelParams7[0]);
	1869	+ //System.out.println("shadowbias = " + shadowbias);
	1870	+
	1871	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 0, display.modelParams0, 0);
	1872	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 1, display.modelParams1, 0);
	1873	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 2, display.modelParams2, 0);
	1874	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 3, display.modelParams3, 0);
	1875	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 4, display.modelParams4, 0);
	1876	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 5, display.modelParams5, 0);
	1877	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 6, display.modelParams6, 0);
	1878	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 7, display.modelParams7, 0);
	1879	+
	1880	+ int mode = display.FP_SHADER;
	1881	+
	1882	+ if (material.aniso != material.anisoV \|\| material.aniso > 0.002)
	1883	+ {
	1884	+ mode \|= display.FP_ANISO;
	1885	+ }
	1886	+
	1887	+ display.EnableProgram(mode);
	1888	+
	1889	+ //System.out.println("opacity power = " + display.modelParams7[1]);
	1890	+
	1891	+ if (!material.multiply)
	1892	+ {
	1893	+ if (Globals.drawMode == CameraPane.SHADOW)
	1894	+ gl.glDepthMask(material.opacity >= 0.9 && display.modelParams7[1] > 0.1);
	1895	+ else
	1896	+ gl.glDepthMask(material.opacity >= 0.99);
	1897	+ }
208	1898	}
209	1899
210	1900	int matrixdepth = 0; // 10000; // CONFLICT WITH cMESH... WARNING WARNING WARNING WARNING WARNING WARNING !!!!!!!!!!!! 0;
..	..	@@ -225,7 +1915,7 @@
225	1915	currentGL.glMultMatrixd(model, 0);
226	1916	}
227	1917
228		- void PushMatrix(double[][] matrix, int count)
	1918	+ public void PushMatrix(double[][] matrix, int count) // INTERFACE
229	1919	{
230	1920	matrixdepth++;
231	1921	// GrafreeD.tracein(matrix);
..	..	@@ -254,7 +1944,7 @@
254	1944	void PushMatrix(double[][] matrix)
255	1945	{
256	1946	// GrafreeD.tracein(matrix);
257		- PushMatrix(matrix,1);
	1947	+ PushMatrix(matrix, 1);
258	1948	}
259	1949
260	1950	void PushMatrix()
..	..	@@ -270,7 +1960,7 @@
270	1960
271	1961	double[][] tmpmat = new double[4][4];
272	1962
273		- void PopMatrix(double[][] inverse)
	1963	+ public void PopMatrix(double[][] inverse) // INTERFACE
274	1964	{
275	1965	--matrixdepth;
276	1966
..	..	@@ -310,7 +2000,7 @@
310	2000	PushTextureMatrix(matrix, 1);
311	2001	}
312	2002
313		- void PushTextureMatrix(double[][] matrix, int count)
	2003	+ public void PushTextureMatrix(double[][] matrix, int count) // INTERFACE
314	2004	{
315	2005	currentGL.glActiveTexture(GetGL().GL_TEXTURE0);
316	2006
..	..	@@ -324,7 +2014,7 @@
324	2014	currentGL.glMatrixMode(GetGL().GL_MODELVIEW);
325	2015	}
326	2016
327		- void PopTextureMatrix(double[][] inverse)
	2017	+ public void PopTextureMatrix(double[][] inverse) // INTERFACE
328	2018	{
329	2019	currentGL.glActiveTexture(GetGL().GL_TEXTURE0);
330	2020	currentGL.glMatrixMode(GetGL().GL_TEXTURE);
..	..	@@ -351,15 +2041,15 @@
351	2041
352	2042	static int camerachangeframe;
353	2043
354		- boolean SetCamera(Camera cam)
	2044	+ public boolean SetCamera(Camera cam)
355	2045	{
356	2046	// may 2014 if (cam == cameras[0] \|\| cam == cameras[1])
357	2047	// return false;
358	2048
359		- if (REFUSEMODE && isLIVE() && camerachangeframe != 0 && camerachangeframe != framecount)
	2049	+ if (REFUSEMODE && Globals.isLIVE() && camerachangeframe != 0 && camerachangeframe != Globals.framecount)
360	2050	{
361	2051	// check for last change
362		- if (framecount < camerachangeframe + 400) // 120 == 1 second
	2052	+ if (Globals.framecount < camerachangeframe + 400) // 120 == 1 second
363	2053	{
364	2054	// refuse the camera change
365	2055	System.err.println("Camera " + cam + " REFUSED");
..	..	@@ -367,7 +2057,7 @@
367	2057	}
368	2058	}
369	2059
370		- camerachangeframe = framecount;
	2060	+ camerachangeframe = Globals.framecount;
371	2061
372	2062	cam.hAspect = -1; // Read only
373	2063
..	..	@@ -398,7 +2088,7 @@
398	2088	{
399	2089	//System.err.println("Oeil on");
400	2090	TRACK = true;
401		-// JUNE 2014 if (TRACK && trackedobject != null && drawMode == SHADOW) // && !lightMode)
	2091	+// JUNE 2014 if (TRACK && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
402	2092	// object.editWindow.ScreenFit(trackedobject);
403	2093	//pingthread.StepToTarget(true);
404	2094	}
..	..	@@ -407,8 +2097,8 @@
407	2097	{
408	2098	//System.err.println("Oeil on");
409	2099	OEIL = true;
410		- if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && drawMode == SHADOW) // && !lightMode)
411		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	2100	+ if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
	2101	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
412	2102	//pingthread.StepToTarget(true);
413	2103	}
414	2104
..	..	@@ -471,39 +2161,12 @@
471	2161	{
472	2162	frozen ^= true;
473	2163	// Weird...
474		- lighttouched = true;
	2164	+ Globals.lighttouched = true;
475	2165	}
476	2166
477	2167	void ToggleDL()
478	2168	{
479	2169	mainDL ^= true;
480		- }
481		-
482		- void ToggleTexture()
483		- {
484		- textureon ^= true;
485		- }
486		-
487		- void ToggleLive()
488		- {
489		- setLIVE(isLIVE() ^ true);
490		-
491		- System.err.println("LIVE = " + isLIVE());
492		-
493		- if (!isLIVE()) // save sound
494		- GrafreeD.savesound = true; // wav.save();
495		- // else
496		- repaint(); // start loop // may 2013
497		- }
498		-
499		- void ToggleSupport()
500		- {
501		- SUPPORT ^= true;
502		- }
503		-
504		- void ToggleAbort()
505		- {
506		- ABORTMODE ^= true;
507	2170	}
508	2171
509	2172	void ToggleFullScreen()
..	..	@@ -513,12 +2176,7 @@
513	2176
514	2177	void ToggleCrowd()
515	2178	{
516		- CROWD ^= true;
517		- }
518		-
519		- void ToggleInertia()
520		- {
521		- INERTIA ^= true;
	2179	+ Globals.CROWD ^= true;
522	2180	}
523	2181
524	2182	void ToggleLocal()
..	..	@@ -526,62 +2184,89 @@
526	2184	LOCALTRANSFORM ^= true;
527	2185	}
528	2186
529		- void ToggleFast()
	2187	+ public void ToggleTexture()
	2188	+ {
	2189	+ textureon ^= true;
	2190	+ }
	2191	+
	2192	+ public void ToggleLive()
	2193	+ {
	2194	+ Globals.setLIVE(Globals.isLIVE() ^ true);
	2195	+
	2196	+ System.err.println("LIVE = " + Globals.isLIVE());
	2197	+
	2198	+ if (!Globals.isLIVE()) // save sound
	2199	+ Grafreed.savesound = true; // wav.save();
	2200	+ // else
	2201	+ repaint(); // start loop // may 2013
	2202	+ }
	2203	+
	2204	+ public void ToggleSupport()
	2205	+ {
	2206	+ SUPPORT ^= true;
	2207	+ }
	2208	+
	2209	+ public void ToggleAbort()
	2210	+ {
	2211	+ ABORTMODE ^= true;
	2212	+ }
	2213	+
	2214	+ public void ToggleInertia()
	2215	+ {
	2216	+ INERTIA ^= true;
	2217	+ }
	2218	+
	2219	+ public void ToggleFast()
530	2220	{
531	2221	FAST ^= true;
532	2222	}
533	2223
534		- void ToggleSlowPose()
	2224	+ public void ToggleSlowPose()
535	2225	{
536	2226	SLOWPOSE ^= true;
537	2227	}
538	2228
539		- void ToggleFootContact()
540		- {
541		- FOOTCONTACT ^= true;
542		- }
543		-
544		- void ToggleBoxMode()
	2229	+ public void ToggleBoxMode()
545	2230	{
546	2231	BOXMODE ^= true;
547	2232	}
548	2233
549		- void ToggleSmoothFocus()
	2234	+ public void ToggleZoomBoxMode()
	2235	+ {
	2236	+ ZOOMBOXMODE ^= true;
	2237	+ }
	2238	+
	2239	+ public void ToggleSmoothFocus()
550	2240	{
551	2241	SMOOTHFOCUS ^= true;
552	2242	}
553	2243
554		- void ToggleImageFlip()
	2244	+ public void ToggleImageFlip()
555	2245	{
556	2246	IMAGEFLIP ^= true;
557	2247	}
558	2248
559		- void ToggleSpeakerMocap()
	2249	+ public void ToggleSpeakerMocap()
560	2250	{
561	2251	SPEAKERMOCAP ^= true;
562	2252	}
563	2253
564		- void ToggleSpeakerCamera()
	2254	+ public void ToggleSpeakerCamera()
565	2255	{
566	2256	SPEAKERCAMERA ^= true;
567	2257	}
568	2258
569		- void ToggleSpeakerFocus()
	2259	+ public void ToggleSpeakerFocus()
570	2260	{
571	2261	SPEAKERFOCUS ^= true;
572	2262	}
573	2263
574		- void ToggleDebug()
575		- {
576		- DEBUG ^= true;
577		- }
578		-
579		- void ToggleFrustum()
	2264	+ public void ToggleFrustum()
580	2265	{
581	2266	FRUSTUM ^= true;
582	2267	}
583	2268
584		- void ToggleTrack()
	2269	+ public void ToggleTrack()
585	2270	{
586	2271	TRACK ^= true;
587	2272	if (TRACK)
..	..	@@ -600,25 +2285,35 @@
600	2285	repaint();
601	2286	}
602	2287
603		- void ToggleTrackOnce()
	2288	+ public void ToggleTrackOnce()
604	2289	{
605	2290	TRACKONCE ^= true;
606	2291	}
607	2292
608		- void ToggleShadowTrack()
	2293	+ public void ToggleShadowTrack()
609	2294	{
610	2295	SHADOWTRACK ^= true;
611	2296	repaint();
612	2297	}
613	2298
614		- void ToggleOeil()
	2299	+ public void ToggleOeil()
615	2300	{
616	2301	OEIL ^= true;
617	2302	}
618	2303
619		- void ToggleOeilOnce()
	2304	+ public void ToggleOeilOnce()
620	2305	{
621	2306	OEILONCE ^= true;
	2307	+ }
	2308	+
	2309	+ void ToggleFootContact()
	2310	+ {
	2311	+ FOOTCONTACT ^= true;
	2312	+ }
	2313	+
	2314	+ void ToggleDebug()
	2315	+ {
	2316	+ Globals.DEBUG ^= true;
622	2317	}
623	2318
624	2319	void ToggleLookAt()
..	..	@@ -626,9 +2321,9 @@
626	2321	LOOKAT ^= true;
627	2322	}
628	2323
629		- void ToggleRandom()
	2324	+ void ToggleSwitch()
630	2325	{
631		- RANDOM ^= true;
	2326	+ SWITCH ^= true;
632	2327	}
633	2328
634	2329	void ToggleHandles()
..	..	@@ -636,10 +2331,17 @@
636	2331	HANDLES ^= true;
637	2332	}
638	2333
	2334	+ Object3D paintFolder;
	2335	+
639	2336	void TogglePaint()
640	2337	{
641	2338	PAINTMODE ^= true;
642	2339	paintcount = 0;
	2340	+
	2341	+ if (PAINTMODE)
	2342	+ {
	2343	+ paintFolder = GetFolder();
	2344	+ }
643	2345	}
644	2346
645	2347	void SwapCamera(int a, int b)
..	..	@@ -672,34 +2374,6 @@
672	2374	//assert (cam.hAspect == 0);
673	2375	cam.hAspect = 0;
674	2376	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	2377	}
704	2378
705	2379	private static void ApplyTransform(GL gl, Mat4f xform)
..	..	@@ -759,11 +2433,26 @@
759	2433
760	2434	GL currentGL;
761	2435
762		- GL GetGL()
	2436	+ public GL GetGL() // INTERFACE
763	2437	{
764	2438	return currentGL;
765	2439	}
766		-
	2440	+
	2441	+ static private BufferedImage CreateBim(TextureData texturedata)
	2442	+ {
	2443	+ Grafreed.Assert(texturedata != null);
	2444	+
	2445	+ int width = texturedata.getWidth();
	2446	+ int height = texturedata.getHeight();
	2447	+
	2448	+ Buffer buffer = texturedata.getBuffer();
	2449	+ ByteBuffer bytebuf = (ByteBuffer)buffer;
	2450	+
	2451	+ byte[] bytes = bytebuf.array();
	2452	+
	2453	+ return CreateBim(bytes, width, height);
	2454	+ }
	2455	+
767	2456	/**/
768	2457	class CacheTexture
769	2458	{
..	..	@@ -772,28 +2461,31 @@
772	2461
773	2462	int resolution;
774	2463
775		- CacheTexture(com.sun.opengl.util.texture.Texture tex, int res)
	2464	+ CacheTexture(com.sun.opengl.util.texture.TextureData texdata, int res)
776	2465	{
777		- texture = tex;
	2466	+ texture = com.sun.opengl.util.texture.TextureIO.newTexture(texdata);
	2467	+ texturedata = texdata;
778	2468	resolution = res;
779	2469	}
780	2470	}
781	2471	/**/
782	2472
783	2473	// TEXTURE static Texture texture;
784		- static public java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/> textures
785		- = new java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/>();
786		- static public java.util.Hashtable<String, String> usedtextures = new java.util.Hashtable<String, String>();
	2474	+ static public Hashtable<cTexture, CacheTexture> texturepigment = new Hashtable<cTexture, CacheTexture>();
	2475	+ static public Hashtable<cTexture, CacheTexture> texturebump = new Hashtable<cTexture, CacheTexture>();
	2476	+ static public Hashtable<byte[], CacheTexture> bimtextures = new Hashtable<byte[], CacheTexture>();
	2477	+ static public java.util.HashSet<cTexture> usedtextures = new java.util.HashSet<cTexture>();
	2478	+
787	2479	int pigmentdepth = 0;
788	2480	public com.sun.opengl.util.texture.Texture[] pigmentstack = new com.sun.opengl.util.texture.Texture[65536];
789	2481	int bumpdepth = 0;
790	2482	public com.sun.opengl.util.texture.Texture[] bumpstack = new com.sun.opengl.util.texture.Texture[65536];
791	2483	//public static String DEFAULT_TEXTURE = "DEFAULT_TEXTURE";
792	2484	public static cTexture DEFAULT_TEXTURES = new cTexture("DEFAULT_TEXTURE" + ":" + "DEFAULT_TEXTURE_BUMP");
793		- public static String NOISE_TEXTURE = "WHITE_NOISE";
	2485	+ public static cTexture NOISE_TEXTURE = new cTexture("WHITE_NOISE:");
794	2486	// public static cTexture IMMORTAL_TEXTURE = new cTexture("IMMORTAL");
795	2487
796		- com.sun.opengl.util.texture.Texture GetResourceTexture(String name, boolean bump)
	2488	+ com.sun.opengl.util.texture.TextureData GetResourceTexture(String name, boolean bump)
797	2489	{
798	2490	TextureData texturedata = null;
799	2491
..	..	@@ -812,13 +2504,34 @@
812	2504	if (bump)
813	2505	texturedata = ConvertBump(texturedata, false);
814	2506
815		- com.sun.opengl.util.texture.Texture texture =
816		- com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
	2507	+// com.sun.opengl.util.texture.Texture texture =
	2508	+// com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
817	2509
818		- texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
819		- texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
	2510	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
	2511	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
820	2512
821		- return texture;
	2513	+ return texturedata;
	2514	+ }
	2515	+
	2516	+ com.sun.opengl.util.texture.TextureData GetBimTexture(BufferedImage bim, boolean bump)
	2517	+ {
	2518	+ TextureData texturedata = null;
	2519	+
	2520	+ try
	2521	+ {
	2522	+ texturedata =
	2523	+ com.sun.opengl.util.texture.TextureIO.newTextureData(
	2524	+ bim,
	2525	+ true);
	2526	+ } catch (Exception e)
	2527	+ {
	2528	+ throw new javax.media.opengl.GLException(e);
	2529	+ }
	2530	+
	2531	+ if (bump)
	2532	+ texturedata = ConvertBump(texturedata, false);
	2533	+
	2534	+ return texturedata;
822	2535	}
823	2536
824	2537	boolean HUESMOOTH = true; // wrap around bug... true;
..	..	@@ -1891,6 +3604,8 @@
1891	3604
1892	3605	System.out.println("LOADING TEXTURE : " + name);
1893	3606
	3607	+ Object x = texturedata.getMipmapData(); // .getBuffer();
	3608	+
1894	3609	//
1895	3610	if (false) // compressbit > 0)
1896	3611	{
..	..	@@ -2000,10 +3715,12 @@
2000	3715	*/
2001	3716	TextureData ReduceTexture(TextureData texturedata, int resolution) // String name)
2002	3717	{
	3718	+ int pixelformat = texturedata.getPixelFormat();
	3719	+
2003	3720	int stride = 1;
2004		- if (texturedata.getPixelFormat() == GetGL().GL_RGB \|\| texturedata.getPixelFormat() == GetGL().GL_BGR) // \|\| texturedata.getPixelFormat() == GL.GL_LUMINANCE)
	3721	+ if (pixelformat == GetGL().GL_RGB \|\| pixelformat == GetGL().GL_BGR) // \|\| texturedata.getPixelFormat() == GL.GL_LUMINANCE)
2005	3722	stride = 3;
2006		- if (texturedata.getPixelFormat() == GetGL().GL_RGBA \|\| texturedata.getPixelFormat() == GetGL().GL_BGRA) // \|\| texturedata.getPixelFormat() == GL.GL_LUMINANCE_ALPHA)
	3723	+ if (pixelformat == GetGL().GL_RGBA \|\| pixelformat == GetGL().GL_BGRA) // \|\| texturedata.getPixelFormat() == GL.GL_LUMINANCE_ALPHA)
2007	3724	stride = 4;
2008	3725
2009	3726	int width = texturedata.getWidth();
..	..	@@ -2593,6 +4310,7 @@
2593	4310
2594	4311	com.sun.opengl.util.texture.Texture CompressTexture2(String name)
2595	4312	{
	4313	+ new Exception().printStackTrace();
2596	4314	System.exit(0);
2597	4315	com.sun.opengl.util.texture.Texture texture = null;
2598	4316
..	..	@@ -6269,7 +7987,7 @@
6269	7987	return null;
6270	7988	}
6271	7989
6272		- void ReleaseTextures(cTexture tex)
	7990	+ public void ReleaseTextures(cTexture tex) // INTERFACE
6273	7991	{
6274	7992	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
6275	7993	{
..	..	@@ -6286,7 +8004,7 @@
6286	8004	String pigment = Object3D.GetPigment(tex);
6287	8005	String bump = Object3D.GetBump(tex);
6288	8006
6289		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8007	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
6290	8008	{
6291	8009	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
6292	8010	// System.out.println("; bump = " + bump);
..	..	@@ -6301,13 +8019,71 @@
6301	8019	pigment = null;
6302	8020	}
6303	8021
6304		- ReleaseTexture(bump, true);
6305		- ReleaseTexture(pigment, false);
	8022	+ ReleaseTexture(tex, true);
	8023	+ ReleaseTexture(tex, false);
6306	8024	}
6307	8025
6308		- void ReleaseTexture(String tex, boolean bump)
	8026	+ public void ReleasePigmentTexture(cTexture tex) // INTERFACE
6309	8027	{
6310		- if (// drawMode != 0 \|\| /tex == null \|\|/
	8028	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	8029	+ {
	8030	+ return;
	8031	+ }
	8032	+
	8033	+ if (tex == null)
	8034	+ {
	8035	+ ReleaseTexture(null, false);
	8036	+ return;
	8037	+ }
	8038	+
	8039	+ String pigment = Object3D.GetPigment(tex);
	8040	+
	8041	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8042	+ {
	8043	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	8044	+ // System.out.println("; bump = " + bump);
	8045	+ }
	8046	+
	8047	+ if (pigment.equals(""))
	8048	+ {
	8049	+ pigment = null;
	8050	+ }
	8051	+
	8052	+ ReleaseTexture(tex, false);
	8053	+ }
	8054	+
	8055	+ public void ReleaseBumpTexture(cTexture tex) // INTERFACE
	8056	+ {
	8057	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	8058	+ {
	8059	+ return;
	8060	+ }
	8061	+
	8062	+ if (tex == null)
	8063	+ {
	8064	+ ReleaseTexture(null, true);
	8065	+ return;
	8066	+ }
	8067	+
	8068	+ String bump = Object3D.GetBump(tex);
	8069	+
	8070	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8071	+ {
	8072	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	8073	+ // System.out.println("; bump = " + bump);
	8074	+ }
	8075	+
	8076	+ if (bump.equals(""))
	8077	+ {
	8078	+ bump = null;
	8079	+ }
	8080	+
	8081	+ ReleaseTexture(tex, true);
	8082	+ }
	8083	+
	8084	+ void ReleaseTexture(cTexture tex, boolean bump)
	8085	+ {
	8086	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
6311	8087	ambientOcclusion ) // \|\| !textureon)
6312	8088	{
6313	8089	return;
..	..	@@ -6316,7 +8092,7 @@
6316	8092	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
6317	8093
6318	8094	if (tex != null)
6319		- texture = textures.get(tex);
	8095	+ texture = bump ? texturebump.get(tex) : texturepigment.get(tex);
6320	8096
6321	8097	// //assert( texture != null );
6322	8098	// if (texture == null)
..	..	@@ -6408,9 +8184,57 @@
6408	8184	}
6409	8185	}
6410	8186
6411		- /boolean/ void BindTextures(cTexture tex, int resolution)
	8187	+ /boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
6412	8188	{
6413		- if (// drawMode != 0 \|\| /tex == null \|\|/
	8189	+// if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8190	+// ambientOcclusion ) // \|\| !textureon)
	8191	+// {
	8192	+// return; // false;
	8193	+// }
	8194	+//
	8195	+// if (tex == null)
	8196	+// {
	8197	+// BindTexture(null,false,resolution);
	8198	+// BindTexture(null,true,resolution);
	8199	+// return;
	8200	+// }
	8201	+//
	8202	+// String pigment = Object3D.GetPigment(tex);
	8203	+// String bump = Object3D.GetBump(tex);
	8204	+//
	8205	+// usedtextures.add(pigment);
	8206	+// usedtextures.add(bump);
	8207	+//
	8208	+// //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8209	+// {
	8210	+// // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8211	+// // System.out.println("; bump = " + bump);
	8212	+// }
	8213	+//
	8214	+// if (bump.equals(""))
	8215	+// {
	8216	+// bump = null;
	8217	+// }
	8218	+// if (pigment.equals(""))
	8219	+// {
	8220	+// pigment = null;
	8221	+// }
	8222	+//
	8223	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8224	+// BindTexture(pigment, false, resolution);
	8225	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
	8226	+// BindTexture(bump, true, resolution);
	8227	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8228	+//
	8229	+// return; // true;
	8230	+
	8231	+ BindPigmentTexture(tex, resolution);
	8232	+ BindBumpTexture(tex, resolution);
	8233	+ }
	8234	+
	8235	+ /boolean/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8236	+ {
	8237	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
6414	8238	ambientOcclusion ) // \|\| !textureon)
6415	8239	{
6416	8240	return; // false;
..	..	@@ -6419,17 +8243,47 @@
6419	8243	if (tex == null)
6420	8244	{
6421	8245	BindTexture(null,false,resolution);
6422		- BindTexture(null,true,resolution);
6423	8246	return;
6424	8247	}
6425	8248
6426	8249	String pigment = Object3D.GetPigment(tex);
	8250	+
	8251	+ usedtextures.add(tex);
	8252	+
	8253	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8254	+ {
	8255	+ // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8256	+ // System.out.println("; bump = " + bump);
	8257	+ }
	8258	+
	8259	+ if (pigment.equals(""))
	8260	+ {
	8261	+ pigment = null;
	8262	+ }
	8263	+
	8264	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8265	+ BindTexture(tex, false, resolution);
	8266	+ }
	8267	+
	8268	+ /boolean/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8269	+ {
	8270	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8271	+ ambientOcclusion ) // \|\| !textureon)
	8272	+ {
	8273	+ return; // false;
	8274	+ }
	8275	+
	8276	+ if (tex == null)
	8277	+ {
	8278	+ BindTexture(null,true,resolution);
	8279	+ return;
	8280	+ }
	8281	+
6427	8282	String bump = Object3D.GetBump(tex);
6428	8283
6429		- usedtextures.put(pigment, pigment);
6430		- usedtextures.put(bump, bump);
	8284	+ usedtextures.add(tex);
6431	8285
6432		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8286	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
6433	8287	{
6434	8288	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
6435	8289	// System.out.println("; bump = " + bump);
..	..	@@ -6439,43 +8293,82 @@
6439	8293	{
6440	8294	bump = null;
6441	8295	}
6442		- if (pigment.equals(""))
6443		- {
6444		- pigment = null;
6445		- }
6446	8296
6447		- GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
6448		- BindTexture(pigment, false, resolution);
6449	8297	GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
6450		- BindTexture(bump, true, resolution);
	8298	+ BindTexture(tex, true, resolution);
6451	8299	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
6452		-
6453		- return; // true;
6454	8300	}
6455	8301
6456		- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution)
	8302	+ java.util.HashSet<String> missingTextures = new java.util.HashSet<String>();
	8303	+
	8304	+ private boolean FileExists(String tex)
6457	8305	{
6458		- CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
	8306	+ if (missingTextures.contains(tex))
	8307	+ {
	8308	+ return false;
	8309	+ }
	8310	+
	8311	+ boolean fileExists = new File(tex).exists();
	8312	+
	8313	+ if (!fileExists)
	8314	+ {
	8315	+ // If file exists, the "new File()" is not executed sgain
	8316	+ missingTextures.add(tex);
	8317	+ }
	8318	+
	8319	+ return fileExists;
	8320	+ }
	8321	+
	8322	+ CacheTexture GetCacheTexture(cTexture tex, boolean bump, int resolution) throws Exception
	8323	+ {
	8324	+ CacheTexture texturecache = null;
6459	8325
6460	8326	if (tex != null)
6461	8327	{
6462		- String texname = tex;
	8328	+ String texname = bump ? Object3D.GetBump(tex) : Object3D.GetPigment(tex);
	8329	+ byte[] texdata = bump ? tex.bumpdata : tex.pigmentdata;
6463	8330
6464		- String[] split = tex.split("Textures");
6465		- if (split.length > 1)
6466		- texname = "/Users/nbriere/Textures" + split[split.length-1];
6467		- else
6468		- if (!texname.startsWith("/"))
6469		- texname = "/Users/nbriere/Textures/" + texname;
	8331	+ if (texname.equals("") && texdata == null)
	8332	+ {
	8333	+ return null;
	8334	+ }
	8335	+
	8336	+ String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
	8337	+
	8338	+// String[] split = tex.split("Textures");
	8339	+// if (split.length > 1)
	8340	+// texname = "/Users/nbriere/Textures" + split[split.length-1];
	8341	+// else
	8342	+// if (!texname.startsWith("/"))
	8343	+// texname = "/Users/nbriere/Textures/" + texname;
	8344	+ if (!FileExists(texname))
	8345	+ {
	8346	+ texname = fallbackTextureName;
	8347	+ }
6470	8348
6471	8349	if (CACHETEXTURE)
6472		- texture = textures.get(texname); // TEXTURE CACHE
6473		-
6474		- TextureData texturedata = null;
6475		-
6476		- if (texture == null \|\| texture.resolution < resolution)
6477	8350	{
6478		- if (tex.equals("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
	8351	+ if (texdata == null)
	8352	+ texturecache = bump ? texturebump.get(tex) : texturepigment.get(tex);
	8353	+ else
	8354	+ texturecache = bimtextures.get(texdata);
	8355	+ }
	8356	+
	8357	+ if (texturecache == null \|\| texturecache.resolution != -1 && texturecache.resolution < resolution)
	8358	+ {
	8359	+ TextureData texturedata = null;
	8360	+
	8361	+ if (texdata != null)
	8362	+ {
	8363	+ BufferedImage bim = //new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
	8364	+
	8365	+ CreateBim(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8366	+
	8367	+ texturecache = new CacheTexture(GetBimTexture(bim, bump), -1);
	8368	+ bimtextures.put(texdata, texturecache);
	8369	+ }
	8370	+ else
	8371	+ if (texname.endsWith("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
6479	8372	{
6480	8373	assert(!bump);
6481	8374	// if (bump)
..	..	@@ -6486,19 +8379,23 @@
6486	8379	// }
6487	8380	// else
6488	8381	// {
6489		- texture = textures.get(tex);
6490		- if (texture == null)
	8382	+ // texturecache = textures.get(texname); // suspicious
	8383	+ if (texturecache == null)
6491	8384	{
6492		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8385	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
6493	8386	}
	8387	+ else
	8388	+ new Exception().printStackTrace();
6494	8389	// }
6495	8390	} else
6496		- if (tex.equals("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
	8391	+ if (texname.endsWith("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
6497	8392	{
6498	8393	assert(bump);
6499		- texture = textures.get(tex);
6500		- if (texture == null)
6501		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8394	+ // texturecache = textures.get(texname); // suspicious
	8395	+ if (texturecache == null)
	8396	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8397	+ else
	8398	+ new Exception().printStackTrace();
6502	8399	} else
6503	8400	{
6504	8401	//if (tex.equals("IMMORTAL"))
..	..	@@ -6506,11 +8403,13 @@
6506	8403	// texture = GetResourceTexture("default.png");
6507	8404	//} else
6508	8405	//{
6509		- if (tex.equals("WHITE_NOISE"))
	8406	+ if (texname.endsWith("WHITE_NOISE"))
6510	8407	{
6511		- texture = textures.get(tex);
6512		- if (texture == null)
6513		- texture = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8408	+ // texturecache = textures.get(texname); // suspicious
	8409	+ if (texturecache == null)
	8410	+ texturecache = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8411	+ else
	8412	+ new Exception().printStackTrace();
6514	8413	} else
6515	8414	{
6516	8415	if (textureon)
..	..	@@ -6535,7 +8434,7 @@
6535	8434	}
6536	8435
6537	8436	cachename = texname.substring(0, texname.length()-4)+ext+".jpg";
6538		- if (!new File(cachename).exists())
	8437	+ if (!FileExists(cachename))
6539	8438	cachename = texname;
6540	8439	else
6541	8440	processbump = false; // don't process bump map again
..	..	@@ -6557,7 +8456,7 @@
6557	8456	}
6558	8457
6559	8458	cachename = texname.substring(0, texname.length()-4)+ext+".png";
6560		- if (!new File(cachename).exists())
	8459	+ if (!FileExists(cachename))
6561	8460	cachename = texname;
6562	8461	else
6563	8462	processbump = false; // don't process bump map again
..	..	@@ -6566,20 +8465,22 @@
6566	8465	texturedata = GetFileTexture(cachename, processbump, resolution);
6567	8466
6568	8467
6569		- if (texturedata != null)
6570		- texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
	8468	+ if (texturedata == null)
	8469	+ throw new Exception();
	8470	+
	8471	+ texturecache = new CacheTexture(texturedata,resolution);
6571	8472	//texture = GetTexture(tex, bump);
6572	8473	}
6573	8474	}
6574	8475	//}
6575	8476	}
6576	8477
6577		- if (/CACHETEXTURE &&/ texture != null && textureon)
	8478	+ if (texdata == null && /CACHETEXTURE &&/ texturecache != null && textureon)
6578	8479	{
6579	8480	//return false;
6580	8481
6581	8482	// System.out.println("CACHE +++++++++++++++ TEXTURE : " + texname + " (" + texture.getEstimatedMemorySize() + ")");
6582		- if (texturedata != null && (texname.endsWith(".jpg") \|\| texname.endsWith(".JPG")))
	8483	+ if (texturedata != null && texname.toLowerCase().endsWith(".jpg"))
6583	8484	{
6584	8485	// String ext = "_highres";
6585	8486	// if (REDUCETEXTURE)
..	..	@@ -6596,52 +8497,17 @@
6596	8497	File cachefile = new File(texname.substring(0, texname.length()-4)+ext+".jpg");
6597	8498	if (!cachefile.exists())
6598	8499	{
6599		- // cache to disk
6600		- Buffer buffer = texturedata.getBuffer(); // getMipmapData();
6601		- //buffers[0].
6602		-
6603		- ByteBuffer bytebuf = (ByteBuffer)buffer; // ).asIntBuffer();
6604		- int[] pixels = new int[bytebuf.capacity()/3];
6605		-
6606		- // squared size heuristic...
6607		- if ((int)Math.sqrt(pixels.length) == Math.sqrt(pixels.length))
	8500	+ //if (texturedata.getWidth() == texturedata.getHeight())
6608	8501	{
6609		- for (int i=pixels.length; --i>=0;)
6610		- {
6611		- int i3 = i*3;
6612		- pixels[i] = 0xFF;
6613		- pixels[i] <<= 8;
6614		- pixels[i] \|= bytebuf.get(i3+2) & 0xFF;
6615		- pixels[i] <<= 8;
6616		- pixels[i] \|= bytebuf.get(i3+1) & 0xFF;
6617		- pixels[i] <<= 8;
6618		- pixels[i] \|= bytebuf.get(i3) & 0xFF;
6619		- }
6620		-
6621		- /*
6622		- int r=0,g=0,b=0,a=0;
6623		- for (int i=0; i<width; i++)
6624		- for (int j=0; j<height; j++)
6625		- {
6626		- int index = j*width+i;
6627		- int p = pixels[index];
6628		- a = ((p>>24) & 0xFF);
6629		- r = ((p>>16) & 0xFF);
6630		- g = ((p>>8) & 0xFF);
6631		- b = (p & 0xFF);
6632		- pixels[index] = (a<<24) \| (b<<16) \| (g<<8) \| r;
6633		- }
6634		- /**/
6635		- int width = (int)Math.sqrt(pixels.length); // squared
6636		- int height = width;
6637		- BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
6638		- rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
	8502	+ BufferedImage rendImage = CreateBim(texturedata);
	8503	+
6639	8504	ImageWriter writer = null;
6640	8505	Iterator iter = ImageIO.getImageWritersByFormatName("jpg");
6641	8506	if (iter.hasNext()) {
6642	8507	writer = (ImageWriter)iter.next();
6643	8508	}
6644		- float compressionQuality = 0.9f;
	8509	+
	8510	+ float compressionQuality = 0.85f;
6645	8511	try
6646	8512	{
6647	8513	ImageOutputStream ios = ImageIO.createImageOutputStream(cachefile);
..	..	@@ -6658,18 +8524,20 @@
6658	8524	}
6659	8525	}
6660	8526	}
6661		-
	8527	+
	8528	+ Hashtable<cTexture, CacheTexture> textures = bump ? texturebump : texturepigment;
	8529	+
6662	8530	//System.out.println("Texture = " + tex);
6663		- if (textures.containsKey(texname))
	8531	+ if (textures.containsKey(tex))
6664	8532	{
6665		- CacheTexture thetex = textures.get(texname);
	8533	+ CacheTexture thetex = textures.get(tex);
6666	8534	thetex.texture.disable();
6667	8535	thetex.texture.dispose();
6668		- textures.remove(texname);
	8536	+ textures.remove(tex);
6669	8537	}
6670	8538
6671		- texture.texturedata = texturedata;
6672		- textures.put(texname, texture);
	8539	+ //texture.texturedata = texturedata;
	8540	+ textures.put(tex, texturecache);
6673	8541
6674	8542	// newtex = true;
6675	8543	}
..	..	@@ -6685,10 +8553,41 @@
6685	8553	}
6686	8554	}
6687	8555
6688		- return texture;
	8556	+ return texturecache;
6689	8557	}
6690	8558
6691		- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution)
	8559	+ static void EmbedTextures(cTexture tex)
	8560	+ {
	8561	+ if (tex.pigmentdata == null)
	8562	+ {
	8563	+ String texname = Object3D.GetPigment(tex);
	8564	+
	8565	+ CacheTexture texturecache = texturepigment.get(tex);
	8566	+
	8567	+ if (texturecache != null)
	8568	+ {
	8569	+ tex.pigmentdata = ((ByteBuffer)texturecache.texturedata.getBuffer()).array();
	8570	+ tex.pw = texturecache.texturedata.getWidth();
	8571	+ tex.ph = texturecache.texturedata.getHeight();
	8572	+ }
	8573	+ }
	8574	+
	8575	+ if (tex.bumpdata == null)
	8576	+ {
	8577	+ String texname = Object3D.GetBump(tex);
	8578	+
	8579	+ CacheTexture texturecache = texturebump.get(tex);
	8580	+
	8581	+ if (texturecache != null)
	8582	+ {
	8583	+ tex.bumpdata = ((ByteBuffer)texturecache.texturedata.getBuffer()).array();
	8584	+ tex.bw = texturecache.texturedata.getWidth();
	8585	+ tex.bh = texturecache.texturedata.getHeight();
	8586	+ }
	8587	+ }
	8588	+ }
	8589	+
	8590	+ com.sun.opengl.util.texture.Texture GetTexture(cTexture tex, boolean bump, int resolution) throws Exception
6692	8591	{
6693	8592	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
6694	8593
..	..	@@ -6706,21 +8605,21 @@
6706	8605	return texture!=null?texture.texture:null;
6707	8606	}
6708	8607
6709		- com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution)
	8608	+ public com.sun.opengl.util.texture.TextureData GetTextureData(cTexture tex, boolean bump, int resolution) throws Exception
6710	8609	{
6711	8610	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
6712	8611
6713	8612	return texture!=null?texture.texturedata:null;
6714	8613	}
6715	8614
6716		- boolean BindTexture(String tex, boolean bump, int resolution)
	8615	+ boolean BindTexture(cTexture tex, boolean bump, int resolution) throws Exception
6717	8616	{
6718	8617	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
6719	8618	{
6720	8619	return false;
6721	8620	}
6722	8621
6723		- boolean newtex = false;
	8622	+ //boolean newtex = false;
6724	8623
6725	8624	com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
6726	8625
..	..	@@ -6752,7 +8651,7 @@
6752	8651	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_S, GetGL().GL_REPEAT);
6753	8652	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_T, GetGL().GL_REPEAT);
6754	8653
6755		- return newtex;
	8654	+ return true; // Warning: not used.
6756	8655	}
6757	8656
6758	8657	ShadowBuffer shadowPBuf;
..	..	@@ -7310,9 +9209,9 @@
7310	9209	static boolean occlusionInitialized = false;
7311	9210	boolean selection = false;
7312	9211	boolean pointselection = false;
7313		- /static/ boolean lighttouched = true;
	9212	+ ///static/ boolean lighttouched = true;
7314	9213	boolean deselect;
7315		- boolean ambientOcclusion = false;
	9214	+ private boolean ambientOcclusion = false;
7316	9215	static boolean flash = false;
7317	9216	/static/ boolean wait = false;
7318	9217	boolean displaydone = false; // after repaint() calls
..	..	@@ -7442,6 +9341,8 @@
7442	9341	//gl.glFrustum(-0.5scale, 0.5scale, -0.5scale, 0.5scale, 1, 100);
7443	9342	//glu.gluPerspective(lightshaper_fovy, 1, lightshaper_zNear, lightshaper_zFar);
7444	9343	double scale = lightCamera.SCALE / lightCamera.Distance();
	9344	+// PATCH FILLE AUX JEANS
	9345	+ //scale *= lightCamera.shaper_fovy / 25;
7445	9346	gl.glScaled(2 * scale, 2 * scale, -scale);
7446	9347	gl.glTranslated(0, 0, lightCamera.DECAL);
7447	9348
..	..	@@ -7588,17 +9489,40 @@
7588	9489	jy8[3] = 0.5f;
7589	9490	}
7590	9491
7591		- float[] options1 = new float[]{1000, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
	9492	+ float[] options1 = new float[]{100, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
7592	9493	float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
7593		- float[] options3 = new float[]{1, 1, 1, 1}; // fog color. image intensity
	9494	+ float[] options3 = new float[]{1, 1, 1, 0}; // fog color
	9495	+ float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
7594	9496
	9497	+ void ResetOptions()
	9498	+ {
	9499	+ options1[0] = 100;
	9500	+ options1[1] = 0.025f;
	9501	+ options1[2] = 0.01f;
	9502	+ options1[3] = 0;
	9503	+ options1[4] = 0;
	9504	+
	9505	+ options2[0] = 0;
	9506	+ options2[1] = 0.75f;
	9507	+ options2[2] = 0;
	9508	+ options2[3] = 0;
	9509	+
	9510	+ options3[0] = 1;
	9511	+ options3[1] = 1;
	9512	+ options3[2] = 1;
	9513	+ options3[3] = 0;
	9514	+
	9515	+ options4[0] = 1;
	9516	+ options4[1] = 0;
	9517	+ options4[2] = 1;
	9518	+ options4[3] = 0;
	9519	+ }
	9520	+
7595	9521	static int imagecount = 0; // movie generation
7596	9522
7597	9523	static int jitter = 0;
7598	9524
7599	9525	boolean restartframe = false;
7600		-
7601		- static int framecount = 0; // general-purpose global count
7602	9526
7603	9527	void displayAntiAliased(javax.media.opengl.GL gl)
7604	9528	{
..	..	@@ -7630,7 +9554,7 @@
7630	9554	gl.glClear(gl.GL_ACCUM_BUFFER_BIT);
7631	9555	for (jitter = 0; jitter < ACSIZE; jitter++) //, GrafreeD.wav.cursor += LIVE ? 735 : 0)
7632	9556	{
7633		- framecount++;
	9557	+ Globals.framecount++;
7634	9558
7635	9559	if (CameraPane.tickcount > 0)
7636	9560	CameraPane.tickcount--;
..	..	@@ -7668,7 +9592,7 @@
7668	9592
7669	9593	gl.glLightfv(gl.GL_LIGHT0, gl.GL_POSITION, pos, 0);
7670	9594	*/
7671		- lighttouched = true;
	9595	+ Globals.lighttouched = true;
7672	9596	//System.err.println(" shadowbuffer: " + jitter);
7673	9597	shadowbuffer.display();
7674	9598
..	..	@@ -7689,8 +9613,8 @@
7689	9613	assert (parentcam != renderCamera);
7690	9614
7691	9615	if (renderCamera != lightCamera)
7692		- for (int count = parentcam.GetTransformCount(); --count>=0;)
7693		- LA.matConcat(parentcam.toParent, matrix, matrix);
	9616	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9617	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
7694	9618
7695	9619	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
7696	9620
..	..	@@ -7705,8 +9629,8 @@
7705	9629	LA.matCopy(renderCamera.fromScreen, matrix);
7706	9630
7707	9631	if (renderCamera != lightCamera)
7708		- for (int count = parentcam.GetTransformCount(); --count>=0;)
7709		- LA.matConcat(matrix, parentcam.fromParent, matrix);
	9632	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9633	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
7710	9634
7711	9635	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
7712	9636
..	..	@@ -7778,7 +9702,7 @@
7778	9702	//gl.glFlush();
7779	9703	gl.glAccum(gl.GL_ACCUM, 1.0f / ACSIZE);
7780	9704
7781		- if (ANIMATION && ABORTED)
	9705	+ if (Globals.ANIMATION && ABORTED)
7782	9706	{
7783	9707	System.err.println(" ABORTED FRAME");
7784	9708	break;
..	..	@@ -7808,7 +9732,7 @@
7808	9732	setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
7809	9733
7810	9734	// save image
7811		- if (ANIMATION && !ABORTED)
	9735	+ if (Globals.ANIMATION && !ABORTED)
7812	9736	{
7813	9737	VPwidth = viewport[2];
7814	9738	VPheight = viewport[3];
..	..	@@ -7919,11 +9843,11 @@
7919	9843
7920	9844	// imagecount++;
7921	9845
7922		- String fullname = filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
	9846	+ String fullname = Globals.filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
7923	9847
7924	9848	if (!BOXMODE)
7925	9849	{
7926		- System.out.println("image: " + fullname + " (" + (GrafreeD.wav.cursor / 735 / 4) + ")");
	9850	+ System.out.println("image: " + fullname + " (wav cursor=" + (Grafreed.wav.cursor / 735 / 4) + ")");
7927	9851	}
7928	9852
7929	9853	if (!BOXMODE)
..	..	@@ -7961,7 +9885,7 @@
7961	9885	ABORTED = false;
7962	9886	}
7963	9887	else
7964		- GrafreeD.wav.cursor += 735 * ACSIZE;
	9888	+ Grafreed.wav.cursor += 735 * ACSIZE;
7965	9889
7966	9890	if (false)
7967	9891	{
..	..	@@ -8615,13 +10539,6 @@
8615	10539	}
8616	10540	}
8617	10541
8618		- boolean IsFrozen()
8619		- {
8620		- boolean selectmode = drawMode == SELECTION \|\| CameraPane.DEBUG_SELECTION;
8621		-
8622		- return !selectmode && cameracount == 0; // != 0;
8623		- }
8624		-
8625	10542	boolean niceon = false;
8626	10543	javax.swing.Timer AAtimer = new javax.swing.Timer(750, this);
8627	10544	boolean currentlydrawing = false;
..	..	@@ -8631,16 +10548,16 @@
8631	10548
8632	10549	public void display(GLAutoDrawable drawable)
8633	10550	{
8634		- if (GrafreeD.savesound && GrafreeD.hassound)
	10551	+ if (Grafreed.savesound && Grafreed.hassound)
8635	10552	{
8636		- GrafreeD.wav.save();
8637		- GrafreeD.savesound = false;
8638		- GrafreeD.hassound = false;
	10553	+ Grafreed.wav.save();
	10554	+ Grafreed.savesound = false;
	10555	+ Grafreed.hassound = false;
8639	10556	}
8640	10557	// if (DEBUG_SELECTION)
8641	10558	// {
8642		-// if (drawMode != SELECTION)
8643		-// drawMode = SELECTION;
	10559	+// if (DrawMode() != SELECTION)
	10560	+// DrawMode() = SELECTION;
8644	10561	// }
8645	10562
8646	10563	if (!isRenderer)
..	..	@@ -8696,9 +10613,9 @@
8696	10613
8697	10614	//ANTIALIAS = 0;
8698	10615
8699		- if (drawMode == DEFAULT) // && CURRENTANTIALIAS > 0)
	10616	+ if (DrawMode() == DEFAULT) // && CURRENTANTIALIAS > 0)
8700	10617	{
8701		- if (niceon \|\| isLIVE())
	10618	+ if (niceon \|\| Globals.isLIVE())
8702	10619	{
8703	10620	//if(active == 0)
8704	10621	// antialiaser = null;
..	..	@@ -8711,6 +10628,7 @@
8711	10628	ANTIALIAS = 0;
8712	10629	//System.out.println("RESTART");
8713	10630	AAtimer.restart();
	10631	+ Globals.TIMERRUNNING = true;
8714	10632	}
8715	10633	}
8716	10634	}
..	..	@@ -8723,7 +10641,7 @@
8723	10641	assert eyeCamera.shaper_zFar == 1E5f; // 500.0f;
8724	10642	*/
8725	10643
8726		- if (drawMode == DEFAULT)
	10644	+ if (DrawMode() == DEFAULT)
8727	10645	{
8728	10646	currentlydrawing = true;
8729	10647	}
..	..	@@ -8754,18 +10672,18 @@
8754	10672
8755	10673	// if(Applet3D.clipboard != null)
8756	10674	// System.out.println("Clipboard = " + Applet3D.clipboard); //.get(0).parent);
8757		-//drawMode = SELECTION;
	10675	+//DrawMode() = SELECTION;
8758	10676	indexcount = 0;
8759	10677
8760		- if (drawMode == OCCLUSION)
	10678	+ if (DrawMode() == OCCLUSION)
8761	10679	{
8762		- drawMode = DEFAULT;
	10680	+ Globals.drawMode = DEFAULT; // WARNING
8763	10681	ambientOcclusion = true;
8764	10682	setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
8765	10683	Object3D theobject = object;
8766	10684	Object3D theparent = object.parent;
8767	10685	object.parent = null;
8768		- object = (Object3D)GrafreeD.clone(object);
	10686	+ object = (Object3D)Grafreed.clone(object);
8769	10687	object.Stripify();
8770	10688	if (theobject.selection == null \|\| theobject.selection.Size() == 0)
8771	10689	theobject.PreprocessOcclusion(this);
..	..	@@ -8778,19 +10696,20 @@
8778	10696	ambientOcclusion = false;
8779	10697	}
8780	10698
8781		- if (lighttouched && drawMode == DEFAULT && !lightMode) // && !FROZEN)
	10699	+ if (//Globals.lighttouched &&
	10700	+ DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
8782	10701	{
8783	10702	//if (RENDERSHADOW) // ?
8784	10703	if (!IsFrozen())
8785	10704	{
8786	10705	// dec 2012
8787		- if (!(!flash && !lightMode && drawMode == DEFAULT && ANTIALIAS > 0))
	10706	+ if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
8788	10707	{
8789		- framecount++;
	10708	+ Globals.framecount++;
8790	10709	shadowbuffer.display();
8791	10710	}
8792	10711	}
8793		- lighttouched = false; // ??
	10712	+ Globals.lighttouched = false; // ??
8794	10713	//drawing = true;
8795	10714	//lighttouched = true;
8796	10715	}
..	..	@@ -8811,9 +10730,9 @@
8811	10730	//eyeCamera.shaper_fovy = 1;
8812	10731	}
8813	10732
8814		- if ((RENDERPROGRAM != 0 \|\| ambientOcclusion \|\| spherical) && drawMode == DEFAULT) // SELECTION)
	10733	+ if ((RENDERPROGRAM != 0 \|\| ambientOcclusion \|\| spherical) && DrawMode() == DEFAULT) // SELECTION)
8815	10734	{
8816		- //System.out.println("drawMode = " + drawMode);
	10735	+ //System.out.println("DrawMode() = " + DrawMode());
8817	10736	vertexMode \|= VP_PASS;
8818	10737	//vertexMode \|= VP_PROJECTION;
8819	10738	if (!ambientOcclusion)
..	..	@@ -8873,7 +10792,7 @@
8873	10792	Camera cam = renderCamera; // lightMode?lightCamera:eyeCamera;
8874	10793	//Camera lightcam = new Camera(light0);
8875	10794
8876		- if (drawMode == SHADOW)
	10795	+ if (DrawMode() == SHADOW)
8877	10796	{
8878	10797	/*
8879	10798	gl.glMatrixMode(GL.GL_MODELVIEW);
..	..	@@ -8911,8 +10830,8 @@
8911	10830
8912	10831	// if (parentcam != renderCamera) // not a light
8913	10832	if (cam != lightCamera)
8914		- for (int count = parentcam.GetTransformCount(); --count>=0;)
8915		- LA.matConcat(parentcam.toParent, matrix, matrix);
	10833	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10834	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
8916	10835
8917	10836	for (int j = 0; j < 4; j++)
8918	10837	{
..	..	@@ -8926,8 +10845,8 @@
8926	10845
8927	10846	// if (parentcam != renderCamera) // not a light
8928	10847	if (cam != lightCamera)
8929		- for (int count = parentcam.GetTransformCount(); --count>=0;)
8930		- LA.matConcat(matrix, parentcam.fromParent, matrix);
	10848	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10849	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
8931	10850
8932	10851	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
8933	10852
..	..	@@ -8963,7 +10882,7 @@
8963	10882	gl.glClear(gl.GL_DEPTH_BUFFER_BIT);
8964	10883	} else
8965	10884	{
8966		- if (drawMode != DEFAULT)
	10885	+ if (DrawMode() != DEFAULT)
8967	10886	{
8968	10887	gl.glClearColor(1, 1, 1, 0);
8969	10888	} // 1);
..	..	@@ -9028,7 +10947,7 @@
9028	10947
9029	10948	fast &= !ambientOcclusion;
9030	10949
9031		- if (drawMode == DEFAULT)
	10950	+ if (DrawMode() == DEFAULT)
9032	10951	{
9033	10952	//gl.glEnable(gl.GL_ALPHA_TEST);
9034	10953	//gl.glActiveTexture(GL.GL_TEXTURE0);
..	..	@@ -9089,6 +11008,8 @@
9089	11008	//gl.glFrustum(-0.5scale, 0.5scale, -0.5scale, 0.5scale, 1, 100);
9090	11009	//glu.gluPerspective(lightshaper_fovy, 1, lightshaper_zNear, lightshaper_zFar);
9091	11010	double scale = lightCamera.SCALE / lightCamera.Distance();
	11011	+// PATCH FILLE AUX JEANS
	11012	+ //scale *= lightCamera.shaper_fovy / 25;
9092	11013	gl.glScaled(2 * scale, 2 * scale, -scale);
9093	11014	gl.glTranslated(0, 0, lightCamera.DECAL);
9094	11015
..	..	@@ -9184,7 +11105,16 @@
9184	11105	// Bump noise
9185	11106	gl.glActiveTexture(GL.GL_TEXTURE6);
9186	11107	//gl.glBindTexture(GL.GL_TEXTURE_2D, bump_noise);
9187		- BindTexture(NOISE_TEXTURE, false, 2);
	11108	+
	11109	+ try
	11110	+ {
	11111	+ BindTexture(NOISE_TEXTURE, false, 2);
	11112	+ }
	11113	+ catch (Exception e)
	11114	+ {
	11115	+ System.err.println("FAILED: " + NOISE_TEXTURE);
	11116	+ }
	11117	+
9188	11118
9189	11119	gl.glActiveTexture(GL.GL_TEXTURE0);
9190	11120	gl.glEnable(GL.GL_TEXTURE_2D);
..	..	@@ -9207,9 +11137,9 @@
9207	11137
9208	11138	gl.glMatrixMode(GL.GL_MODELVIEW);
9209	11139
9210		-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
9211		-//gl.glEnable(gl.GL_POLYGON_SMOOTH);
9212		-//gl.glEnable(gl.GL_MULTISAMPLE);
	11140	+gl.glEnable(gl.GL_POLYGON_SMOOTH);
	11141	+gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
	11142	+gl.glEnable(gl.GL_MULTISAMPLE);
9213	11143	} else
9214	11144	{
9215	11145	//gl.glDisable(GL.GL_TEXTURE_2D);
..	..	@@ -9220,14 +11150,16 @@
9220	11150	//System.out.println("BLENDING ON");
9221	11151	gl.glEnable(GL.GL_BLEND);
9222	11152	gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
9223		-
	11153	+// gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
9224	11154	gl.glMatrixMode(gl.GL_PROJECTION);
9225	11155	gl.glLoadIdentity();
9226	11156
9227		- if (drawMode == SHADOW \|\| cam == lightCamera) // \|\| (vertexMode&VP_PROJECTION) != 0)
	11157	+ if (DrawMode() == SHADOW \|\| cam == lightCamera) // \|\| (vertexMode&VP_PROJECTION) != 0)
9228	11158	{
9229	11159	//glu.gluPerspective(lightshaper_fovy, 1, lightshaper_zNear, lightshaper_zFar);
9230	11160	double scale = lightCamera.SCALE / lightCamera.Distance();
	11161	+// PATCH FILLE AUX JEANS
	11162	+ //scale *= lightCamera.shaper_fovy / 25;
9231	11163	gl.glScaled(2 * scale, 2 * scale, -scale);
9232	11164	gl.glTranslated(0, 0, lightCamera.DECAL);
9233	11165	//System.out.println("DECAL = " + LIGHTDECAL + "; SCALE = " + LIGHTSCALE);
..	..	@@ -9280,7 +11212,7 @@
9280	11212	//gl.glPushMatrix();
9281	11213	gl.glLoadIdentity();
9282	11214
9283		- if (!ambientOcclusion) // drawMode != OCCLUSION)
	11215	+ if (!ambientOcclusion) // DrawMode() != OCCLUSION)
9284	11216	{
9285	11217	//LA.xformPos(light0, lightCamera.fromScreen, light);
9286	11218	LA.xformDir(dirlight, lightCamera.fromScreen, lightposition);
..	..	@@ -9307,8 +11239,8 @@
9307	11239	System.err.println("parentcam != renderCamera");
9308	11240
9309	11241	// if (cam != lightCamera)
9310		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9311		- LA.xformDir(lightposition, parentcam.toParent, lightposition); // may 2013
	11242	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11243	+ LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
9312	11244	}
9313	11245
9314	11246	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -9329,8 +11261,8 @@
9329	11261	if (true) // TODO
9330	11262	{
9331	11263	if (cam != lightCamera)
9332		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9333		- LA.xformDir(light0, parentcam.toParent, light0); // may 2013
	11264	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11265	+ LA.xformDir(light0, parentcam.GlobalTransform(), light0); // may 2013
9334	11266	}
9335	11267
9336	11268	LA.xformPos(light0, cam.toScreen, light0);
..	..	@@ -9367,7 +11299,7 @@
9367	11299	}
9368	11300
9369	11301	/**/
9370		- if (true) // drawMode == SELECTION) // != DEFAULT)
	11302	+ if (true) // DrawMode() == SELECTION) // != DEFAULT)
9371	11303	gl.glDisable(gl.GL_LIGHTING);
9372	11304	else
9373	11305	gl.glEnable(gl.GL_LIGHTING);
..	..	@@ -9379,12 +11311,13 @@
9379	11311
9380	11312	gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 63, options2, 0);
9381	11313	gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 62, options3, 0);
	11314	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 61, options4, 0);
9382	11315
9383	11316	options2[0] *= renderCamera.Distance();
9384	11317
9385	11318	lightslot = 64;
9386	11319
9387		- if (!frozen && !ambientOcclusion && isRenderer && drawMode == DEFAULT)
	11320	+ if (!frozen && !ambientOcclusion && isRenderer && DrawMode() == DEFAULT)
9388	11321	{
9389	11322	DrawLights(object);
9390	11323	}
..	..	@@ -9395,7 +11328,7 @@
9395	11328	fragmentMode \|= (lightslot - 64) << 2; // 1; // first bit is available for aniso
9396	11329	//System.out.println("fragmentMode = " + fragmentMode);
9397	11330
9398		- if (drawMode == DEFAULT \|\| drawMode == SELECTION \|\| DEBUG_SELECTION)
	11331	+ if (DrawMode() == DEFAULT \|\| DrawMode() == SELECTION \|\| IsDebugSelection())
9399	11332	{
9400	11333	/*
9401	11334	if (CULLFACE \|\| (ambientOcclusion && OCCLUSION_CULLING))
..	..	@@ -9428,7 +11361,7 @@
9428	11361	}
9429	11362	}
9430	11363
9431		- if (drawMode == DEFAULT)
	11364	+ if (DrawMode() == DEFAULT)
9432	11365	{
9433	11366	if (WIREFRAME && !ambientOcclusion)
9434	11367	{
..	..	@@ -9446,7 +11379,7 @@
9446	11379	gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9447	11380	gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9448	11381
9449		- if (!fast/RENDERPROGRAM != 0/ && (drawMode == DEFAULT \|\| drawMode == SHADOW)) // && !WIREFRAME) //
	11382	+ if (!fast/RENDERPROGRAM != 0/ && (DrawMode() == DEFAULT \|\| DrawMode() == SHADOW)) // && !WIREFRAME) //
9450	11383	{
9451	11384	if (vertexMode != 0) // && !fast)
9452	11385	{
..	..	@@ -9466,7 +11399,7 @@
9466	11399	}
9467	11400	}
9468	11401
9469		- if (false) // fast && !IsFreezed() && drawMode != SELECTION && !ambientOcclusion)
	11402	+ if (false) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
9470	11403	{
9471	11404	//gl.glDepthFunc(GL.GL_LEQUAL);
9472	11405	//gl.glClear(gl.GL_COLOR_BUFFER_BIT \| gl.GL_DEPTH_BUFFER_BIT);
..	..	@@ -9494,7 +11427,7 @@
9494	11427	//gl.glDepthMask(false);
9495	11428	}
9496	11429
9497		- if (false) // drawMode == SHADOW)
	11430	+ if (false) // DrawMode() == SHADOW)
9498	11431	{
9499	11432	//SetColumnMajorData(cameraInverseTransform, view_1);
9500	11433	//System.out.println("light = " + cameraInverseTransform);
..	..	@@ -9508,16 +11441,16 @@
9508	11441	//System.out.println("object = " + object);
9509	11442	if (!frozen && !imageLocked)
9510	11443	{
9511		- if (!flash && !lightMode && drawMode == DEFAULT && ANTIALIAS > 0)
	11444	+ if (!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0)
9512	11445	{
9513	11446	displayAntiAliased(gl);
9514	11447	} else
9515	11448	{
9516	11449	programcount = 0;
9517		- int keepmode = drawMode;
	11450	+ int keepmode = DrawMode();
9518	11451	// if (DEBUG_SELECTION)
9519	11452	// {
9520		-// drawMode = SELECTION;
	11453	+// DrawMode() = SELECTION;
9521	11454	// }
9522	11455	// for point selection
9523	11456	// gl.glGetDoublev(gl.GL_MODELVIEW_MATRIX, tempmat, 0);
..	..	@@ -9527,10 +11460,10 @@
9527	11460	DrawObject(gl);
9528	11461
9529	11462	// jan 2013 System.err.println("RESET ABORT (display)");
9530		- // if (drawMode == DEFAULT)
	11463	+ // if (DrawMode() == DEFAULT)
9531	11464	// ABORTED = false;
9532	11465	fullreset = false;
9533		- drawMode = keepmode;
	11466	+ Globals.drawMode = keepmode; // WARNING
9534	11467	//System.out.println("PROGRAM SWITCH " + programcount);
9535	11468	}
9536	11469	}
..	..	@@ -9538,11 +11471,11 @@
9538	11471	gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9539	11472	gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9540	11473
9541		- if (drawMode == DEFAULT)
	11474	+ if (DrawMode() == DEFAULT)
9542	11475	{
9543	11476	ReleaseTexture(NOISE_TEXTURE, false);
9544	11477	}
9545		- //if (drawMode == DEFAULT)
	11478	+ //if (DrawMode() == DEFAULT)
9546	11479	{
9547	11480
9548	11481	gl.glActiveTexture(GL.GL_TEXTURE1);
..	..	@@ -9554,7 +11487,7 @@
9554	11487	//else
9555	11488	//gl.glDisable(gl.GL_TEXTURE_2D);
9556	11489	//gl.glPopMatrix();
9557		- if (imageCompleted && ANTIALIAS > 0 && drawMode == DEFAULT && cam != lightCamera && !ambientOcclusion)
	11490	+ if (imageCompleted && ANTIALIAS > 0 && DrawMode() == DEFAULT && cam != lightCamera && !ambientOcclusion)
9558	11491	{
9559	11492	//new Exception().printStackTrace();
9560	11493	//System.out.println("Draw image " + width + ", " + height);
..	..	@@ -9596,7 +11529,7 @@
9596	11529	//gl.glFlush();
9597	11530	}
9598	11531
9599		- if (flash && drawMode == DEFAULT)
	11532	+ if (flash && DrawMode() == DEFAULT)
9600	11533	{
9601	11534	flash = false;
9602	11535	wait = true;
..	..	@@ -9604,9 +11537,9 @@
9604	11537	}
9605	11538
9606	11539	//drawing = false;
9607		- //if(drawMode == DEFAULT)
	11540	+ //if(DrawMode() == DEFAULT)
9608	11541	// niceon = false;
9609		- if (drawMode == DEFAULT)
	11542	+ if (DrawMode() == DEFAULT)
9610	11543	{
9611	11544	currentlydrawing = false;
9612	11545	}
..	..	@@ -9626,7 +11559,7 @@
9626	11559	repaint();
9627	11560	}
9628	11561
9629		- if (isLIVE() && drawMode == DEFAULT) // may 2013
	11562	+ if (Globals.isLIVE() && DrawMode() == DEFAULT) // may 2013
9630	11563	repaint();
9631	11564
9632	11565	displaydone = true;
..	..	@@ -9645,8 +11578,14 @@
9645	11578	{
9646	11579	renderpass++;
9647	11580	// System.out.println("Draw object... ");
	11581	+ STEP = 1;
9648	11582	if (FAST) // in case there is no script
9649		- STEP = 16;
	11583	+ STEP = 8;
	11584	+
	11585	+ if (CURRENTANTIALIAS == 0 \|\| ACSIZE == 1)
	11586	+ {
	11587	+ STEP *= 4;
	11588	+ }
9650	11589
9651	11590	//object.FullInvariants();
9652	11591
..	..	@@ -9660,23 +11599,44 @@
9660	11599	e.printStackTrace();
9661	11600	}
9662	11601
9663		- if (GrafreeD.RENDERME > 0)
9664		- GrafreeD.RENDERME--; // mechante magouille
	11602	+ if (Grafreed.RENDERME > 0)
	11603	+ Grafreed.RENDERME--; // mechante magouille
9665	11604
9666		- ONESTEP = false;
	11605	+ Globals.ONESTEP = false;
9667	11606	}
9668	11607
9669	11608	static boolean zoomonce = false;
9670	11609
	11610	+ static void CreateSelectedPoint()
	11611	+ {
	11612	+ if (selectedpoint == null)
	11613	+ {
	11614	+ debugpointG = new Sphere();
	11615	+ debugpointP = new Sphere();
	11616	+ debugpointC = new Sphere();
	11617	+ debugpointR = new Sphere();
	11618	+
	11619	+ selectedpoint = new Superellipsoid();
	11620	+
	11621	+ for (int i=0; i<8; i++)
	11622	+ {
	11623	+ debugpoints[i] = new Sphere();
	11624	+ }
	11625	+ }
	11626	+ }
	11627	+
9671	11628	void DrawObject(GL gl, boolean draw)
9672	11629	{
	11630	+ // To clear camera values
	11631	+ ResetOptions();
	11632	+
9673	11633	//System.out.println("DRAW OBJECT " + mouseDown);
9674		-// drawMode = SELECTION;
	11634	+// DrawMode() = SELECTION;
9675	11635	//GL gl = getGL();
9676	11636	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
9677	11637	{
9678		- if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && drawMode == SHADOW) // && !lightMode)
9679		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	11638	+ if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
	11639	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
9680	11640	pingthread.StepToTarget(true); // true);
9681	11641	// zoomonce = false;
9682	11642	}
..	..	@@ -9696,9 +11656,9 @@
9696	11656	callist = gl.glGenLists(1);
9697	11657	}
9698	11658
9699		- boolean selectmode = drawMode == SELECTION \|\| CameraPane.DEBUG_SELECTION;
	11659	+ boolean selectmode = DrawMode() == SELECTION \|\| IsDebugSelection();
9700	11660
9701		- boolean active = !selectmode; // drawMode != SELECTION; // mouseDown;
	11661	+ boolean active = !selectmode; // DrawMode() != SELECTION; // mouseDown;
9702	11662
9703	11663	if (!mainDL \|\| !active \|\| touched)
9704	11664	{
..	..	@@ -9725,13 +11685,20 @@
9725	11685	PushMatrix(ClickInfo.matbuffer);
9726	11686	}
9727	11687
9728		- if (drawMode == 0)
	11688	+ if (DrawMode() == 0)
9729	11689	{
9730	11690	// System.out.println("CLEAR +++++++++++++++ +++++++++++++++ +++++++++++++++ +++++++++++++++");
9731	11691
9732	11692	usedtextures.clear();
9733	11693
9734		- BindTextures(DEFAULT_TEXTURES, 2);
	11694	+ try
	11695	+ {
	11696	+ BindTextures(DEFAULT_TEXTURES, 2);
	11697	+ }
	11698	+ catch (Exception e)
	11699	+ {
	11700	+ System.err.println("FAILED: " + DEFAULT_TEXTURES);
	11701	+ }
9735	11702	}
9736	11703	//System.out.println("--> " + stackdepth);
9737	11704	// GrafreeD.traceon();
..	..	@@ -9739,10 +11706,11 @@
9739	11706	// DRAW
9740	11707	object.draw(this, /(Composite)/ object, false, false);
9741	11708
9742		- if (drawMode == DEFAULT)
	11709	+ if (DrawMode() == DEFAULT)
9743	11710	{
9744		- if (DEBUG)
	11711	+ if (Globals.DEBUG)
9745	11712	{
	11713	+ CreateSelectedPoint();
9746	11714	float radius = 0.05f;
9747	11715	if (selectedpoint.radius != radius)
9748	11716	{
..	..	@@ -9750,40 +11718,40 @@
9750	11718	selectedpoint.radius = radius;
9751	11719	selectedpoint.recalculate();
9752	11720	selectedpoint.material = new cMaterial();
9753		- selectedpoint.material.color = 0.25f;
	11721	+ selectedpoint.material.color = 0.15f; // Yellow
9754	11722	selectedpoint.material.modulation = 0.75f;
9755	11723
9756		- debugpoint.radius = radius;
9757		- debugpoint.recalculate();
9758		- debugpoint.material = new cMaterial();
9759		- debugpoint.material.color = 0.25f;
9760		- debugpoint.material.modulation = 0.75f;
	11724	+ debugpointG.radius = radius;
	11725	+ debugpointG.recalculate();
	11726	+ debugpointG.material = new cMaterial();
	11727	+ debugpointG.material.color = 0.25f; // Green
	11728	+ debugpointG.material.modulation = 0.75f;
9761	11729
9762		- debugpoint2.radius = radius;
9763		- debugpoint2.recalculate();
9764		- debugpoint2.material = new cMaterial();
9765		- debugpoint2.material.color = 0.75f;
9766		- debugpoint2.material.modulation = 0.75f;
	11730	+ debugpointP.radius = radius;
	11731	+ debugpointP.recalculate();
	11732	+ debugpointP.material = new cMaterial();
	11733	+ debugpointP.material.color = 0.75f; // Purple
	11734	+ debugpointP.material.modulation = 0.75f;
9767	11735
9768		- debugpoint3.radius = radius;
9769		- debugpoint3.recalculate();
9770		- debugpoint3.material = new cMaterial();
9771		- debugpoint3.material.color = 0.5f;
9772		- debugpoint3.material.modulation = 0.75f;
	11736	+ debugpointC.radius = radius;
	11737	+ debugpointC.recalculate();
	11738	+ debugpointC.material = new cMaterial();
	11739	+ debugpointC.material.color = 0.5f; // Cyan
	11740	+ debugpointC.material.modulation = 0.75f;
9773	11741
9774		- debugpoint4.radius = radius;
9775		- debugpoint4.recalculate();
9776		- debugpoint4.material = new cMaterial();
9777		- debugpoint4.material.color = 0f;
9778		- debugpoint4.material.modulation = 0.75f;
	11742	+ debugpointR.radius = radius;
	11743	+ debugpointR.recalculate();
	11744	+ debugpointR.material = new cMaterial();
	11745	+ debugpointR.material.color = 0f; // Red
	11746	+ debugpointR.material.modulation = 0.75f;
9779	11747
9780	11748	InitPoints(radius);
9781	11749	}
9782	11750	selectedpoint.draw(this, /(Composite)/ null, false, false);
9783		- debugpoint.draw(this, /(Composite)/ null, false,false);
9784		- debugpoint2.draw(this, /(Composite)/ null, false,false);
9785		- debugpoint3.draw(this, /(Composite)/ null, false,false);
9786		- debugpoint4.draw(this, /(Composite)/ null, false,false);
	11751	+ debugpointG.draw(this, /(Composite)/ null, false,false);
	11752	+ debugpointP.draw(this, /(Composite)/ null, false,false);
	11753	+ debugpointC.draw(this, /(Composite)/ null, false,false);
	11754	+ debugpointR.draw(this, /(Composite)/ null, false,false);
9787	11755	// DrawPoints(this);
9788	11756	}
9789	11757
..	..	@@ -9791,42 +11759,63 @@
9791	11759	}
9792	11760	// GrafreeD.traceoff();
9793	11761	//System.out.println(stackdepth);
9794		- if (drawMode == 0)
	11762	+ if (DrawMode() == 0)
9795	11763	{
9796	11764	ReleaseTextures(DEFAULT_TEXTURES);
9797	11765
9798	11766	if (CLEANCACHE)
9799		- for (java.util.Enumeration<String> e = textures.keys() ; e.hasMoreElements();)
	11767	+ for (java.util.Enumeration<cTexture> e = texturepigment.keys() ; e.hasMoreElements();)
9800	11768	{
9801		- String tex = e.nextElement();
	11769	+ cTexture tex = e.nextElement();
9802	11770
9803	11771	// System.out.println("Texture --------- " + tex);
9804	11772
9805		- if (tex.equals("WHITE_NOISE"))
	11773	+ if (tex.equals("WHITE_NOISE:"))
9806	11774	continue;
9807	11775
9808		- if (!usedtextures.containsKey(tex))
	11776	+ if (!usedtextures.contains(tex))
9809	11777	{
	11778	+ CacheTexture gettex = texturepigment.get(tex);
9810	11779	// System.out.println("DISPOSE +++++++++++++++ " + tex);
9811		- textures.get(tex).texture.dispose();
9812		- textures.remove(tex);
	11780	+ if (gettex != null)
	11781	+ {
	11782	+ gettex.texture.dispose();
	11783	+ texturepigment.remove(tex);
	11784	+ }
	11785	+
	11786	+ gettex = texturebump.get(tex);
	11787	+ // System.out.println("DISPOSE +++++++++++++++ " + tex);
	11788	+ if (gettex != null)
	11789	+ {
	11790	+ gettex.texture.dispose();
	11791	+ texturebump.remove(tex);
	11792	+ }
9813	11793	}
9814	11794	}
9815	11795	}
9816	11796
9817	11797	checker = null;
9818	11798
9819		- if (!ambientOcclusion && !IsFrozen() && drawMode == DEFAULT)
	11799	+ if (!ambientOcclusion && !IsFrozen() && DrawMode() == DEFAULT)
9820	11800	FindChecker(object);
9821	11801
9822		- if (checker != null && drawMode == DEFAULT)
	11802	+ if (checker != null && DrawMode() == DEFAULT)
9823	11803	{
9824		- // BindTexture(IMMORTAL_TEXTURE);
	11804	+ //BindTexture(IMMORTAL_TEXTURE);
	11805	+ try
	11806	+ {
	11807	+ BindTextures(checker.GetTextures(), checker.texres);
	11808	+ }
	11809	+ catch (Exception e)
	11810	+ {
	11811	+ System.err.println("FAILED: " + checker.GetTextures());
	11812	+ }
9825	11813	// NEAREST
9826	11814	GetGL().glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST); // GL.GL_LINEAR);
9827	11815	DrawChecker(gl);
9828	11816	//checker.Draw(this, null, false);
9829	11817	// ReleaseTexture(IMMORTAL_TEXTURE);
	11818	+ ReleaseTextures(checker.GetTextures());
9830	11819	}
9831	11820
9832	11821	if (object.parent != null)
..	..	@@ -9839,7 +11828,7 @@
9839	11828	//gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9840	11829	//gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9841	11830
9842		- if (DISPLAYTEXT && drawMode == DEFAULT)
	11831	+ if (DISPLAYTEXT && DrawMode() == DEFAULT)
9843	11832	{
9844	11833	// Draw it once, then use the raster
9845	11834	Balloon(gl, balloon.createGraphics());
..	..	@@ -9895,14 +11884,14 @@
9895	11884	int[] xs = new int[3];
9896	11885	int[] ys = new int[3];
9897	11886
9898		- void DrawString(Object3D obj) // String string)
	11887	+ public void DrawString(Object3D obj) // String string) // INTERFACE
9899	11888	{
9900		- if (!DISPLAYTEXT \|\| drawMode != DEFAULT)
	11889	+ if (!DISPLAYTEXT \|\| DrawMode() != DEFAULT)
9901	11890	{
9902	11891	return;
9903	11892	}
9904	11893
9905		- String string = obj.GetToolTip();
	11894	+ String string = obj.toString(); //.GetToolTip();
9906	11895
9907	11896	GL gl = GetGL();
9908	11897
..	..	@@ -10219,8 +12208,8 @@
10219	12208	//obj.TransformToWorld(light, light);
10220	12209	for (int i = tp.size(); --i >= 0;)
10221	12210	{
10222		- for (int count = tp.get(i).GetTransformCount(); --count>=0;)
10223		- LA.xformPos(light, tp.get(i).toParent, light);
	12211	+ //for (int count = tp.get(i).GetTransformCount(); --count>=0;)
	12212	+ LA.xformPos(light, tp.get(i).GlobalTransformInv(), light);
10224	12213	}
10225	12214
10226	12215
..	..	@@ -10237,8 +12226,8 @@
10237	12226	parentcam = cameras[0];
10238	12227	}
10239	12228
10240		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10241		- LA.xformPos(light, parentcam.toParent, light); // may 2013
	12229	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	12230	+ LA.xformPos(light, parentcam.GlobalTransform(), light); // may 2013
10242	12231
10243	12232	LA.xformPos(light, renderCamera.toScreen, light);
10244	12233
..	..	@@ -10357,11 +12346,13 @@
10357	12346	"PARAM params6 = program.env[6];" + // bump, noise, borderfade, fog punchthrough
10358	12347	"PARAM params7 = program.env[7];" + // noise power, opacity power
10359	12348	"PARAM options0 = program.env[63];" + // fog density, intensity, elevation
10360		- "PARAM options1 = program.env[62];" + // fog rgb color, image intensity
	12349	+ "PARAM options1 = program.env[62];" + // fog rgb color
	12350	+ "PARAM options2 = program.env[61];" + // image intensity, subsurface, lightsheen
10361	12351	"PARAM pointlight = program.env[127];" + // ...
10362	12352	"PARAM zero = { 0.0, 0.0, 0.0, 0.0 };" +
10363	12353	"PARAM halfhalf = { 0.25, 0.25, 0.25, 1.0 };" +
10364	12354	"PARAM half = { 0.5, 0.5, 0.5, 1.0 };" +
	12355	+ "PARAM threequarter = { 0.75, 0.75, 0.75, 1.0 };" +
10365	12356	"PARAM two = { 2.0, 2.0, 2.0, 1.0 };" +
10366	12357	"PARAM ten = { 10, 10, 10, 1.0 };" +
10367	12358	"PARAM one3rd = { 0.5, 0.33333333333, 0.333333333, 1.0 };" +
..	..	@@ -10382,6 +12373,7 @@
10382	12373	"PARAM lodbias = { 10,10,10,10 };" + // 20, -2, -20, 1.0 };" +
10383	12374	"PARAM infinity = { 100000000, 100000000, 100000000, 1.0 };" +
10384	12375	"PARAM one2048th = { 0.00048828125, 0.00048828125, 0.00048828125, 1.0 };" +
	12376	+ "PARAM ninetenth = { 0.9, 0.9, 0.9, 1.0 };" +
10385	12377	"PARAM almostone = { 0.999, 0.999, 0.999, 1.0 };" +
10386	12378	"PARAM c256 = { 256, 256, 256, 1.0 };" +
10387	12379	"PARAM c256i = { 0.00390625, 0.00390625, 0.00390625, 1.0 };" +
..	..	@@ -10422,6 +12414,10 @@
10422	12414	"TEMP R1;" +
10423	12415	"TEMP R2;" +
10424	12416	"TEMP R3;" +
	12417	+ "TEMP min;" +
	12418	+ "TEMP max;" +
	12419	+ "TEMP average;" +
	12420	+ "TEMP saturation;" +
10425	12421	"TEMP keep1;" +
10426	12422	"TEMP keep2;" +
10427	12423	"TEMP keep3;" +
..	..	@@ -10845,8 +12841,8 @@
10845	12841
10846	12842	// display shadow only (bump == 0)
10847	12843	"SUB temp.x, half.x, shadow.x;" +
10848		- "MOV temp.y, -params6.x;" +
10849		- "SLT temp.z, temp.y, zero.x;" +
	12844	+ "MOV temp.y, -params5.z;" + // params6.x;" +
	12845	+ "SLT temp.z, temp.y, -one2048th.x;" +
10850	12846	"SUB temp.y, one.x, temp.z;" +
10851	12847	"MUL temp.x, temp.x, temp.y;" +
10852	12848	"KIL temp.x;" +
..	..	@@ -10952,10 +12948,42 @@
10952	12948
10953	12949	// skin?
10954	12950	// Saturation for skin
10955		- /**/ // c'est ici
10956		- (Skinshader? "DP3 temp.x, final,one;" +
	12951	+ /**/
	12952	+ (Skinshader?
	12953	+ "DP3 average.x, final,one;" +
	12954	+ "MUL average, one3rd.xxxx,average.xxxx;" +
	12955	+
	12956	+ "MIN min.x, final.x,final.y;" +
	12957	+ "MIN min.x, min.x,final.z;" +
	12958	+
	12959	+ "MAX max.x, final.x,final.y;" +
	12960	+ "MAX max.x, max.x,final.z;" +
	12961	+ "MOV max, max.xxxx;" +
	12962	+
	12963	+ "SUB saturation, max, final;" +
	12964	+
	12965	+ "ADD temp.x, max.x, one10th.x;" +
	12966	+ "RCP temp.x, temp.x;" +
	12967	+ "MUL temp.x, temp.x, half.x;" +
	12968	+ "MUL saturation, saturation, temp.xxxx;" +
	12969	+
	12970	+ "DP3 ndotl.x, normald, light;" +
	12971	+ "MAX ndotl.x, ndotl.x, -ndotl.x;" +
	12972	+
	12973	+ "SUB temp.x, one.x, ndotl.x;" +
	12974	+ // Tuning for default skin
	12975	+ //"ADD temp.x, temp.x, options2.z;" + // lightsheen
	12976	+ "MAD temp.x, options2.z, half.y, temp.x;" + // lightsheen
	12977	+ "ADD temp.y, one.y, options2.y;" + // subsurface
	12978	+ "MUL temp.x, temp.x, temp.y;" +
	12979	+
	12980	+ "MUL saturation, saturation, temp.xxxx;" +
	12981	+ "SUB_SAT temp, max, saturation;" +
	12982	+/**
	12983	+ "DP3 temp.x, final,one;" +
10957	12984	"MUL R2, one3rd.xxxx,temp.xxxx;" +
10958		- "SUB temp, final,R2;" +
	12985	+ "SUB temp, final, R2;" +
	12986	+
10959	12987	// using light angle
10960	12988	"DP3 ndotl.x, normald,light;" +
10961	12989	//"SLT ndotl.y, ndotl.x, zero.x;" +
..	..	@@ -10968,7 +12996,6 @@
10968	12996	// using light intensity
10969	12997	"MOV ndotl.z, R2.x;" +
10970	12998	"MUL ndotl.z, ndotl.z, ndotl.z;" + // tuning...
10971		-
10972	12999	// june 2014
10973	13000	"MAD R1.x, ndotl.z,slope.y,one.x;" +
10974	13001	// "SUB ndotl.x, one.x, ndotl.x;" +
..	..	@@ -10980,6 +13007,7 @@
10980	13007	//"MUL R2.y, shadow.x,R2.y;" + // avril 2014
10981	13008
10982	13009	"MAD temp.x, R2.y, ndotl.y, temp.x;" + // red shift (skin)
	13010	+/**/
10983	13011
10984	13012	// "ADD final, R2,temp;" +
10985	13013	"MOV final, temp;"
..	..	@@ -11069,7 +13097,7 @@
11069	13097	/**/
11070	13098	// HDR
11071	13099	"MOV temp.z, final.a;" +
11072		- "MUL final, final,options1.w;" +
	13100	+ "MUL final, final,options2.x;" +
11073	13101	"MOV final.a, temp.z;" +
11074	13102	/**/
11075	13103
..	..	@@ -11145,7 +13173,7 @@
11145	13173	//once = true;
11146	13174	}
11147	13175
11148		- System.out.print("Program #" + mode + "; length = " + program.length());
	13176	+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
11149	13177	System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
11150	13178	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
11151	13179
..	..	@@ -11262,6 +13290,7 @@
11262	13290	String Shadow(String depth, String shadow)
11263	13291	{
11264	13292	return "MAX temp.x, ndotl.x, one64th.x;" +
	13293	+ "MIN temp.x, temp.x, ninetenth.x;" +
11265	13294	/**/
11266	13295	// Sine
11267	13296	"MUL temp.y, temp.x, temp.x;" +
..	..	@@ -11277,12 +13306,16 @@
11277	13306
11278	13307	"ADD " + depth + ".z, " + depth + ".z, temp.x;" +
11279	13308	//"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing!
	13309	+
	13310	+ // Compare fragment depth in light space with shadowmap.
11280	13311	"SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" +
11281	13312	"SGE temp.y, temp.x, zero.x;" +
11282		- "SUB " + shadow + ".y, one.x, temp.y;" +
	13313	+ "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded
	13314	+
	13315	+ // Reverse comparison
11283	13316	"SUB temp.x, one.x, temp.x;" +
11284	13317	"MUL " + shadow + ".x, temp.x, temp.y;" +
11285		- "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded
	13318	+ "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse
11286	13319	"POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth
11287	13320
11288	13321	"SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" +
..	..	@@ -11296,6 +13329,10 @@
11296	13329	// No shadow for backface
11297	13330	"DP3 temp.x, normal, lightd;" +
11298	13331	"SLT temp.x, temp.x, zero.x;" + // shadoweps
	13332	+ "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
	13333	+
	13334	+ // No shadow when out of frustrum
	13335	+ "SGE temp.x, " + depth + ".z, one.z;" +
11299	13336	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
11300	13337	"";
11301	13338	}
..	..	@@ -11442,7 +13479,8 @@
11442	13479	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
11443	13480	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
11444	13481	/static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
11445		- Object3D.cVector2[] vector2buffer;
	13482	+
	13483	+ //Object3D.cVector2[] vector2buffer;
11446	13484
11447	13485	// IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
11448	13486	// OUT : diff, spec
..	..	@@ -11458,9 +13496,10 @@
11458	13496	"DP3 " + dest + ".z," + "normals," + "eye;" +
11459	13497	"MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
11460	13498	//"MOV " + dest + ".w," + "normal.z;" +
11461		- "MUL " + dest + ".z," + "params2.w," + dest + ".x;" +
11462		- "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
11463		- //"MOV " + dest + ".z," + "params2.w;" +
	13499	+// "MUL " + dest + ".z," + "params2.w," + dest + ".x;" + // PRETTY HEURISTIC FOR VELVET
	13500	+// "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
	13501	+
	13502	+ "MOV " + dest + ".z," + "params2.w;" + // EXACT
11464	13503	"POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
11465	13504	"RCP " + dest + ".w," + dest + ".w;" +
11466	13505	//"RSQ " + dest + ".w," + dest + ".w;" +
..	..	@@ -11854,7 +13893,7 @@
11854	13893	public void mousePressed(MouseEvent e)
11855	13894	{
11856	13895	//System.out.println("mousePressed: " + e);
11857		- clickStart(e.getX(), e.getY(), e.getModifiersEx());
	13896	+ clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
11858	13897	}
11859	13898
11860	13899	static long prevtime = 0;
..	..	@@ -11881,14 +13920,16 @@
11881	13920
11882	13921	//System.err.println("Dtime = " + Dtime + "; units = " + e.getUnitsToScroll() + "; ratio (units/ms) = " + ratio);
11883	13922
	13923	+ if (BUTTONLESSWHEEL)
11884	13924	if (Math.abs(ratio) < 0.1 \|\| Math.abs(Dtime) == 0) // < 30)
11885	13925	{
11886	13926	return;
11887	13927	}
11888	13928
	13929	+ boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
11889	13930
11890	13931	// TIMER
11891		- if (!wheeltimer.isRunning() && e.getModifiersEx() == 0) // VR
	13932	+ if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
11892	13933	{
11893	13934	keepboxmode = BOXMODE;
11894	13935	keepsupport = SUPPORT;
..	..	@@ -11928,8 +13969,8 @@
11928	13969	// mode \|= META;
11929	13970	//}
11930	13971
11931		- SetMouseMode(WHEEL \| e.getModifiersEx());
11932		- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0);
	13972	+ SetMouseMode(e.getModifiers(), WHEEL \| e.getModifiersEx());
	13973	+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
11933	13974	anchorX = ax;
11934	13975	anchorY = ay;
11935	13976	prevX = px;
..	..	@@ -11963,6 +14004,7 @@
11963	14004	else
11964	14005	if (evt.getSource() == AAtimer)
11965	14006	{
	14007	+ Globals.TIMERRUNNING = false;
11966	14008	if (mouseDown)
11967	14009	{
11968	14010	//new Exception().printStackTrace();
..	..	@@ -11988,6 +14030,10 @@
11988	14030	// LIVE = waslive;
11989	14031	// wasliveok = true;
11990	14032	// waslive = false;
	14033	+
	14034	+ // May 2019 Forget it:
	14035	+ if (true)
	14036	+ return;
11991	14037
11992	14038	// source == timer
11993	14039	if (mouseDown)
..	..	@@ -12017,8 +14063,8 @@
12017	14063	// ObjEditor.tweenManager.update(1f / 60f);
12018	14064
12019	14065	// fev 2014???
12020		- if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && drawMode == SHADOW) // && !lightMode)
12021		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	14066	+ if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
	14067	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
12022	14068	pingthread.StepToTarget(true); // true);
12023	14069	}
12024	14070	// if (!LIVE)
..	..	@@ -12027,12 +14073,13 @@
12027	14073
12028	14074	javax.swing.Timer timer = new javax.swing.Timer(350, this);
12029	14075
12030		- void clickStart(int x, int y, int modifiers)
	14076	+ void clickStart(int x, int y, int modifiers, int modifiersex)
12031	14077	{
12032	14078	if (!wasliveok)
12033	14079	return;
12034	14080
12035	14081	AAtimer.restart(); //
	14082	+ Globals.TIMERRUNNING = true;
12036	14083
12037	14084	// waslive = LIVE;
12038	14085	// LIVE = false;
..	..	@@ -12044,7 +14091,7 @@
12044	14091	// touched = true; // main DL
12045	14092	if (isRenderer)
12046	14093	{
12047		- SetMouseMode(modifiers);
	14094	+ SetMouseMode(modifiers, modifiersex);
12048	14095	}
12049	14096
12050	14097	selectX = anchorX = x;
..	..	@@ -12057,7 +14104,7 @@
12057	14104	clicked = true;
12058	14105	hold = false;
12059	14106
12060		- if (((modifiers & ~1024) & ~0) == 0) // Single or multiple selection
	14107	+ if (((modifiersex & ~1024) & ~0) == 0) // Single or multiple selection
12061	14108	// june 2013 means CTRL_CLICK: if (((modifiers & ~1024) & ~128) == 0) // Single or multiple selection
12062	14109	{
12063	14110	// System.out.println("RESTART II " + modifiers);
..	..	@@ -12088,7 +14135,7 @@
12088	14135	info.camera = renderCamera;
12089	14136	info.x = x;
12090	14137	info.y = y;
12091		- info.modifiers = modifiers;
	14138	+ info.modifiers = modifiersex;
12092	14139	editObj = object.doEditClick(info, 0);
12093	14140	if (!editObj)
12094	14141	{
..	..	@@ -12105,11 +14152,14 @@
12105	14152
12106	14153	public void mouseDragged(MouseEvent e)
12107	14154	{
	14155	+ Globals.MOUSEDRAGGED = true;
	14156	+
	14157	+ //System.out.println("mouseDragged: " + e);
12108	14158	if (isRenderer)
12109	14159	movingcamera = true;
	14160	+
12110	14161	//if (drawing)
12111	14162	//return;
12112		- //System.out.println("mouseDragged: " + e);
12113	14163	if ((e.getModifiersEx() & CTRL) != 0
12114	14164	\|\| (e.getModifiersEx() & COMMAND) != 0) // \|\| IsFrozen())
12115	14165	{
..	..	@@ -12117,7 +14167,7 @@
12117	14167	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
12118	14168	}
12119	14169	else
12120		- drag(e.getX(), e.getY(), e.getModifiersEx());
	14170	+ drag(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
12121	14171
12122	14172	//try { Thread.sleep(1); } catch (Exception ex) {}
12123	14173	}
..	..	@@ -12129,6 +14179,11 @@
12129	14179	cVector tmp = new cVector();
12130	14180	cVector tmp2 = new cVector();
12131	14181	boolean isMoving;
	14182	+
	14183	+ public cVector TargetLookAt()
	14184	+ {
	14185	+ return targetLookAt;
	14186	+ }
12132	14187
12133	14188	class PingThread extends Thread
12134	14189	{
..	..	@@ -12268,7 +14323,7 @@
12268	14323	//System.out.println("---------------- ---------- Paint " + tmp.length2());
12269	14324	if (lightMode)
12270	14325	{
12271		- lighttouched = true;
	14326	+ Globals.lighttouched = true;
12272	14327	}
12273	14328
12274	14329	if (OEILONCE && OEIL)
..	..	@@ -12285,6 +14340,7 @@
12285	14340
12286	14341	public void run()
12287	14342	{
	14343	+ new Exception().printStackTrace();
12288	14344	System.exit(0);
12289	14345	for (;;)
12290	14346	{
..	..	@@ -12326,7 +14382,7 @@
12326	14382	mouseDown = false;
12327	14383	if (lightMode)
12328	14384	{
12329		- lighttouched = true;
	14385	+ Globals.lighttouched = true;
12330	14386	}
12331	14387	repaint();
12332	14388	alreadypainted = true;
..	..	@@ -12334,7 +14390,7 @@
12334	14390	isMoving = false;
12335	14391	} //??
12336	14392
12337		- if (isLIVE() && !alreadypainted)
	14393	+ if (Globals.isLIVE() && !alreadypainted)
12338	14394	{
12339	14395	// FOR DEBUG BREAKPOINT USING PAUSE: while (true)
12340	14396	repaint();
..	..	@@ -12346,9 +14402,9 @@
12346	14402	{
12347	14403	if (lightMode)
12348	14404	{
12349		- lighttouched = true;
	14405	+ Globals.lighttouched = true;
12350	14406	}
12351		- drag(X, (mouseMode != 0) ? Y : anchorY, MODIFIERS);
	14407	+ drag(X, (mouseMode != 0) ? Y : anchorY, 0, MODIFIERS);
12352	14408	}
12353	14409	//else
12354	14410	}
..	..	@@ -12362,12 +14418,12 @@
12362	14418	void GoDown(int mod)
12363	14419	{
12364	14420	MODIFIERS \|= COMMAND;
12365		- /*
	14421	+ /**/
12366	14422	if((mod&SHIFT) == SHIFT)
12367	14423	manipCamera.RotatePosition(0, -speed);
12368	14424	else
12369		- manipCamera.BackForth(0, -speed*delta, getWidth());
12370		- */
	14425	+ manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
	14426	+ /**/
12371	14427	if ((mod & SHIFT) == SHIFT)
12372	14428	{
12373	14429	mouseMode = mouseMode; // VR??
..	..	@@ -12383,12 +14439,12 @@
12383	14439	void GoUp(int mod)
12384	14440	{
12385	14441	MODIFIERS \|= COMMAND;
12386		- /*
	14442	+ /**/
12387	14443	if((mod&SHIFT) == SHIFT)
12388	14444	manipCamera.RotatePosition(0, speed);
12389	14445	else
12390		- manipCamera.BackForth(0, speed*delta, getWidth());
12391		- */
	14446	+ manipCamera.BackForth(0, speed*delta, 0); // getWidth());
	14447	+ /**/
12392	14448	if ((mod & SHIFT) == SHIFT)
12393	14449	{
12394	14450	mouseMode = mouseMode;
..	..	@@ -12404,12 +14460,12 @@
12404	14460	void GoLeft(int mod)
12405	14461	{
12406	14462	MODIFIERS \|= COMMAND;
12407		- /*
	14463	+ /**/
12408	14464	if((mod&SHIFT) == SHIFT)
12409		- manipCamera.RotatePosition(speed, 0);
12410		- else
12411	14465	manipCamera.Translate(speed*delta, 0, getWidth());
12412		- */
	14466	+ else
	14467	+ manipCamera.RotatePosition(speed, 0);
	14468	+ /**/
12413	14469	if ((mod & SHIFT) == SHIFT)
12414	14470	{
12415	14471	mouseMode = mouseMode;
..	..	@@ -12425,12 +14481,12 @@
12425	14481	void GoRight(int mod)
12426	14482	{
12427	14483	MODIFIERS \|= COMMAND;
12428		- /*
	14484	+ /**/
12429	14485	if((mod&SHIFT) == SHIFT)
12430		- manipCamera.RotatePosition(-speed, 0);
12431		- else
12432	14486	manipCamera.Translate(-speed*delta, 0, getWidth());
12433		- */
	14487	+ else
	14488	+ manipCamera.RotatePosition(-speed, 0);
	14489	+ /**/
12434	14490	if ((mod & SHIFT) == SHIFT)
12435	14491	{
12436	14492	mouseMode = mouseMode;
..	..	@@ -12448,7 +14504,7 @@
12448	14504	int X, Y;
12449	14505	boolean SX, SY;
12450	14506
12451		- void drag(int x, int y, int modifiers)
	14507	+ void drag(int x, int y, int modifiers, int modifiersex)
12452	14508	{
12453	14509	if (IsFrozen())
12454	14510	{
..	..	@@ -12457,17 +14513,17 @@
12457	14513
12458	14514	drag = true; // NEW
12459	14515
12460		- boolean continuous = (modifiers & COMMAND) == COMMAND;
	14516	+ boolean continuous = (modifiersex & COMMAND) == COMMAND;
12461	14517
12462	14518	X = x;
12463	14519	Y = y;
12464	14520	// floating state for animation
12465		- MODIFIERS = modifiers;
12466		- modifiers &= ~1024;
	14521	+ MODIFIERS = modifiersex;
	14522	+ modifiersex &= ~1024;
12467	14523	if (false) // modifiers != 0)
12468	14524	{
12469	14525	//new Exception().printStackTrace();
12470		- System.out.println("mouseDragged: " + modifiers);
	14526	+ System.out.println("mouseDragged: " + modifiersex);
12471	14527	System.out.println("SHIFT = " + SHIFT);
12472	14528	System.out.println("CONTROL = " + COMMAND);
12473	14529	System.out.println("META = " + META);
..	..	@@ -12487,7 +14543,8 @@
12487	14543	info.camera = renderCamera;
12488	14544	info.x = x;
12489	14545	info.y = y;
12490		- object.editWindow.copy.doEditDrag(info);
	14546	+ object.GetWindow().copy
	14547	+ .doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
12491	14548	} else
12492	14549	{
12493	14550	if (x < startX)
..	..	@@ -12589,6 +14646,7 @@
12589	14646	{
12590	14647	manipCamera.Translate(dx, dy, getWidth());
12591	14648	}
	14649	+ else
12592	14650	if ((mouseMode & ZOOM) == 0 && (mouseMode & VR) != 0)
12593	14651	{
12594	14652	manipCamera.RotateInterest(dx, dy);
..	..	@@ -12599,7 +14657,7 @@
12599	14657
12600	14658	if (manipCamera == lightCamera)
12601	14659	{
12602		- lighttouched = true;
	14660	+ Globals.lighttouched = true;
12603	14661	}
12604	14662	/*
12605	14663	switch (mode)
..	..	@@ -12638,7 +14696,6 @@
12638	14696	public void mouseMoved(MouseEvent e)
12639	14697	{
12640	14698	//System.out.println("mouseMoved: " + e);
12641		-
12642	14699	if (isRenderer)
12643	14700	return;
12644	14701
..	..	@@ -12651,7 +14708,9 @@
12651	14708	ci.camera = renderCamera;
12652	14709	if (!isRenderer)
12653	14710	{
12654		- if (object.editWindow.copy.doEditClick(ci, 0))
	14711	+ //ObjEditor editWindow = object.editWindow;
	14712	+ //Object3D copy = editWindow.copy;
	14713	+ if (object.doEditClick(ci, 0))
12655	14714	{
12656	14715	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
12657	14716	} else
..	..	@@ -12663,7 +14722,11 @@
12663	14722
12664	14723	public void mouseReleased(MouseEvent e)
12665	14724	{
	14725	+ Globals.MOUSEDRAGGED = false;
	14726	+
12666	14727	movingcamera = false;
	14728	+ X = 0; // getBounds().width/2;
	14729	+ Y = 0; // getBounds().height/2;
12667	14730	//System.out.println("mouseReleased: " + e);
12668	14731	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
12669	14732	}
..	..	@@ -12686,9 +14749,9 @@
12686	14749	boolean control = ((modifiers & CTRL) != 0); // june 2013: for point selection
12687	14750	boolean command = ((modifiers & COMMAND) != 0); // june 2013: for multiple selection
12688	14751
12689		- if (control \|\| command \|\| IsFrozen())
	14752	+// No delay if (control \|\| command \|\| IsFrozen())
12690	14753	timeout = true;
12691		- else
	14754	+// ?? May 2019 else
12692	14755	// timer.setDelay((modifiers & 128) != 0?0:350);
12693	14756	mouseDown = false;
12694	14757	if (!control && !command) // june 2013
..	..	@@ -12798,7 +14861,7 @@
12798	14861	System.out.println("keyReleased: " + e);
12799	14862	}
12800	14863
12801		- void SetMouseMode(int modifiers)
	14864	+ void SetMouseMode(int modifiers, int modifiersex)
12802	14865	{
12803	14866	//System.out.println("SetMouseMode = " + modifiers);
12804	14867	//modifiers &= ~1024;
..	..	@@ -12810,24 +14873,27 @@
12810	14873	//if (modifiers == 0) // \|\| (modifiers == (1024 \| CONTROL)))
12811	14874	// return;
12812	14875	//System.out.println("SetMode = " + modifiers);
12813		- if ((modifiers & WHEEL) == WHEEL)
	14876	+ if ((modifiersex & WHEEL) == WHEEL)
12814	14877	{
12815	14878	mouseMode \|= ZOOM;
12816	14879	}
12817		- if ((modifiers & META) == META)
	14880	+
	14881	+ boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
	14882	+ if (capsLocked) // \|\| (modifiers & META) == META)
12818	14883	{
12819	14884	mouseMode \|= VR; // BACKFORTH;
12820	14885	}
12821		- if ((modifiers & CTRLCLICK) == CTRLCLICK)
12822		- {
12823		- mouseMode \|= SELECT; // BACKFORTH;
12824		- }
12825		- if ((modifiers & COMMAND) == COMMAND)
	14886	+ if ((modifiersex & CTRLCLICK) == CTRLCLICK)
12826	14887	{
12827	14888	mouseMode \|= SELECT;
12828	14889	}
12829		- if ((modifiers & SHIFT) == SHIFT \|\| forcetranslate)
	14890	+ if ((modifiersex & COMMAND) == COMMAND)
12830	14891	{
	14892	+ mouseMode \|= SELECT;
	14893	+ }
	14894	+ if ((modifiersex & SHIFT) == SHIFT \|\| forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
	14895	+ {
	14896	+ mouseMode &= ~VR;
12831	14897	mouseMode \|= TRANSLATE;
12832	14898	}
12833	14899	// if ((modifiers & SHIFT_META) == SHIFT_META)
..	..	@@ -12854,10 +14920,10 @@
12854	14920
12855	14921	if (isRenderer) //
12856	14922	{
12857		- SetMouseMode(modifiers);
	14923	+ SetMouseMode(0, modifiers);
12858	14924	}
12859	14925
12860		- theRenderer.keyPressed(key);
	14926	+ Globals.theRenderer.keyPressed(key);
12861	14927	}
12862	14928
12863	14929	int kompactbit = 4; // power bit
..	..	@@ -12869,7 +14935,7 @@
12869	14935	float SATPOW = 1; // 2; // 0.5f;
12870	14936	float BRIPOW = 1; // 0.5f; // 0.5f;
12871	14937
12872		- void keyPressed(int key)
	14938	+ public void keyPressed(int key)
12873	14939	{
12874	14940	if (key >= '0' && key <= '5')
12875	14941	clampbit = (key-'0');
..	..	@@ -12916,7 +14982,8 @@
12916	14982	// break;
12917	14983	case 'T':
12918	14984	CACHETEXTURE ^= true;
12919		- textures.clear();
	14985	+ texturepigment.clear();
	14986	+ texturebump.clear();
12920	14987	// repaint();
12921	14988	break;
12922	14989	case 'Y':
..	..	@@ -12984,7 +15051,7 @@
12984	15051	case 'B':
12985	15052	BRISMOOTH ^= true;
12986	15053	SHADOWCULLFACE ^= true;
12987		- lighttouched = true;
	15054	+ Globals.lighttouched = true;
12988	15055	repaint();
12989	15056	break;
12990	15057	case 'b':
..	..	@@ -13001,7 +15068,9 @@
13001	15068	case 'E' : COMPACT ^= true;
13002	15069	repaint();
13003	15070	break;
13004		- case 'W' : DEBUGHSB ^= true;
	15071	+ case 'W' : // Wide Window (fullscreen)
	15072	+ //DEBUGHSB ^= true;
	15073	+ ObjEditor.theFrame.ToggleFullScreen();
13005	15074	repaint();
13006	15075	break;
13007	15076	case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
..	..	@@ -13026,8 +15095,8 @@
13026	15095	RevertCamera();
13027	15096	repaint();
13028	15097	break;
13029		- case 'L':
13030	15098	case 'l':
	15099	+ //case 'L':
13031	15100	if (lightMode)
13032	15101	{
13033	15102	lightMode = false;
..	..	@@ -13084,7 +15153,7 @@
13084	15153	repaint();
13085	15154	break;
13086	15155	case 'O':
13087		- drawMode = OCCLUSION;
	15156	+ Globals.drawMode = OCCLUSION; // WARNING
13088	15157	repaint();
13089	15158	break;
13090	15159	case 'o':
..	..	@@ -13170,12 +15239,12 @@
13170	15239	case '_':
13171	15240	kompactbit = 5;
13172	15241	break;
13173		- case '+':
13174		- kompactbit = 6;
13175		- break;
	15242	+// case '+':
	15243	+// kompactbit = 6;
	15244	+// break;
13176	15245	case ' ':
13177	15246	lightMode ^= true;
13178		- lighttouched = true;
	15247	+ Globals.lighttouched = true;
13179	15248	manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
13180	15249	targetLookAt.set(manipCamera.lookAt);
13181	15250	repaint();
..	..	@@ -13184,14 +15253,15 @@
13184	15253	case ESC:
13185	15254	RENDERPROGRAM += 1;
13186	15255	RENDERPROGRAM %= 3;
	15256	+
13187	15257	repaint();
13188	15258	break;
13189	15259	case 'Z':
13190		- RESIZETEXTURE ^= true;
13191		- break;
	15260	+ //RESIZETEXTURE ^= true;
	15261	+ //break;
13192	15262	case 'z':
13193		- RENDERSHADOW ^= true;
13194		- lighttouched = true;
	15263	+ Globals.RENDERSHADOW ^= true;
	15264	+ Globals.lighttouched = true;
13195	15265	repaint();
13196	15266	break;
13197	15267	//case UP:
..	..	@@ -13217,13 +15287,15 @@
13217	15287	FlipTransform();
13218	15288	break;
13219	15289	case ENTER:
13220		- object.editWindow.ScreenFit(); // Edit();
	15290	+ // object.editWindow.ScreenFit(); // Edit();
	15291	+ ToggleLive();
13221	15292	break;
13222	15293	case DELETE:
13223	15294	ClearSelection();
13224	15295	break;
13225		- /*
13226	15296	case '+':
	15297	+
	15298	+ /*
13227	15299	//fontsize += 1;
13228	15300	bbzoom *= 2;
13229	15301	repaint();
..	..	@@ -13240,17 +15312,17 @@
13240	15312	case '=':
13241	15313	IncDepth();
13242	15314	//fontsize += 1;
13243		- object.editWindow.refreshContents(true);
	15315	+ object.GetWindow().refreshContents(true);
13244	15316	maskbit = 6;
13245	15317	break;
13246	15318	case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
13247	15319	DecDepth();
13248	15320	maskbit = 5;
13249	15321	//if(fontsize > 1) fontsize -= 1;
13250		- if (object.editWindow == null)
13251		- new Exception().printStackTrace();
13252		- else
13253		- object.editWindow.refreshContents(true);
	15322	+// if (object.editWindow == null)
	15323	+// new Exception().printStackTrace();
	15324	+// else
	15325	+ object.GetWindow().refreshContents(true);
13254	15326	break;
13255	15327	case '{':
13256	15328	manipCamera.shaper_fovy /= 1.1;
..	..	@@ -13305,6 +15377,7 @@
13305	15377	}
13306	15378	//System.out.println("shaper_fovy = " + manipCamera.shaper_fovy);
13307	15379	}
	15380	+
13308	15381	static double OCCLUSIONBOOST = 1; // 0.5;
13309	15382
13310	15383	void keyReleased(int key, int modifiers)
..	..	@@ -13312,11 +15385,11 @@
13312	15385	//mode = ROTATE;
13313	15386	if ((MODIFIERS & COMMAND) == 0) // VR??
13314	15387	{
13315		- SetMouseMode(modifiers);
	15388	+ SetMouseMode(0, modifiers);
13316	15389	}
13317	15390	}
13318	15391
13319		- protected void processKeyEvent(KeyEvent e)
	15392	+ public void processKeyEvent(KeyEvent e)
13320	15393	{
13321	15394	switch (e.getID())
13322	15395	{
..	..	@@ -13446,8 +15519,9 @@
13446	15519
13447	15520	protected void processMouseMotionEvent(MouseEvent e)
13448	15521	{
13449		- //System.out.println("processMouseMotionEvent: " + mouseMode);
13450		- if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
	15522	+ //System.out.println("processMouseMotionEvent: " + mouseMode + " " + e.getModifiers() + " " + e.getModifiersEx() + " " + e.getButton());
	15523	+ //if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
	15524	+ if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (e.getModifiers() & MouseEvent.BUTTON3_MASK) == 0 && (mouseMode & SELECT) == 0)
13451	15525	{
13452	15526	mouseMoved(e);
13453	15527	} else
..	..	@@ -13472,11 +15546,12 @@
13472	15546	}
13473	15547	*/
13474	15548
13475		- object.editWindow.EditSelection();
	15549	+ object.GetWindow().EditSelection(false);
13476	15550	}
13477	15551
13478	15552	void SelectParent()
13479	15553	{
	15554	+ new Exception().printStackTrace();
13480	15555	System.exit(0);
13481	15556	Composite group = (Composite) object;
13482	15557	java.util.Vector selectees = new java.util.Vector(group.selection);
..	..	@@ -13488,10 +15563,10 @@
13488	15563	{
13489	15564	//selectees.remove(i);
13490	15565	System.out.println("select parent of " + elem);
13491		- group.editWindow.Select(elem.parent.GetTreePath(), first, true);
	15566	+ group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
13492	15567	} else
13493	15568	{
13494		- group.editWindow.Select(elem.GetTreePath(), first, true);
	15569	+ group.GetWindow().Select(elem.GetTreePath(), first, true);
13495	15570	}
13496	15571
13497	15572	first = false;
..	..	@@ -13500,6 +15575,7 @@
13500	15575
13501	15576	void SelectChildren()
13502	15577	{
	15578	+ new Exception().printStackTrace();
13503	15579	System.exit(0);
13504	15580	/*
13505	15581	Composite group = (Composite) object;
..	..	@@ -13532,12 +15608,12 @@
13532	15608	for (int j = 0; j < group.children.size(); j++)
13533	15609	{
13534	15610	elem = (Object3D) group.children.elementAt(j);
13535		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15611	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
13536	15612	first = false;
13537	15613	}
13538	15614	} else
13539	15615	{
13540		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15616	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
13541	15617	}
13542	15618
13543	15619	first = false;
..	..	@@ -13548,21 +15624,21 @@
13548	15624	{
13549	15625	//Composite group = (Composite) object;
13550	15626	Object3D group = object;
13551		- group.editWindow.loadClipboard(true); // ClearSelection(false);
	15627	+ group.GetWindow().loadClipboard(true); // ClearSelection(false);
13552	15628	}
13553	15629
13554	15630	void ResetTransform(int mask)
13555	15631	{
13556	15632	//Composite group = (Composite) object;
13557	15633	Object3D group = object;
13558		- group.editWindow.ResetTransform(mask);
	15634	+ group.GetWindow().ResetTransform(mask);
13559	15635	}
13560	15636
13561	15637	void FlipTransform()
13562	15638	{
13563	15639	//Composite group = (Composite) object;
13564	15640	Object3D group = object;
13565		- group.editWindow.FlipTransform();
	15641	+ group.GetWindow().FlipTransform();
13566	15642	// group.editWindow.ReduceMesh(true);
13567	15643	}
13568	15644
..	..	@@ -13570,7 +15646,7 @@
13570	15646	{
13571	15647	//Composite group = (Composite) object;
13572	15648	Object3D group = object;
13573		- group.editWindow.PrintMemory();
	15649	+ group.GetWindow().PrintMemory();
13574	15650	// group.editWindow.ReduceMesh(true);
13575	15651	}
13576	15652
..	..	@@ -13578,7 +15654,7 @@
13578	15654	{
13579	15655	//Composite group = (Composite) object;
13580	15656	Object3D group = object;
13581		- group.editWindow.ResetCentroid();
	15657	+ group.GetWindow().ResetCentroid();
13582	15658	}
13583	15659
13584	15660	void IncDepth()
..	..	@@ -13664,7 +15740,9 @@
13664	15740	info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
13665	15741	//Image img = CreateImage(width, height);
13666	15742	//System.out.println("width = " + width + "; height = " + height + "\n");
	15743	+
13667	15744	Graphics gr = g; // img.getGraphics();
	15745	+
13668	15746	if (!hasMarquee)
13669	15747	{
13670	15748	if (Xmin < Xmax) // !locked)
..	..	@@ -13752,6 +15830,7 @@
13752	15830	info.bounds.y += (height - desired) / 2;
13753	15831	}
13754	15832	}
	15833	+
13755	15834	info.g = gr;
13756	15835	info.camera = renderCamera;
13757	15836	/*
..	..	@@ -13761,15 +15840,55 @@
13761	15840	*/
13762	15841	if (!isRenderer)
13763	15842	{
13764		- object.drawEditHandles(info, 0);
	15843	+ Grafreed.Assert(object != null);
	15844	+ Grafreed.Assert(object.selection != null);
	15845	+ if (object.selection.Size() > 0)
	15846	+ {
	15847	+ int hitSomething = object.selection.get(0).hitSomething;
	15848	+
	15849	+ info.DX = 0;
	15850	+ info.DY = 0;
	15851	+ info.W = 1;
	15852	+ if (hitSomething == Object3D.hitCenter)
	15853	+ {
	15854	+ info.DX = X;
	15855	+ if (X != 0)
	15856	+ info.DX -= info.bounds.width/2;
	15857	+
	15858	+ info.DY = Y;
	15859	+ if (Y != 0)
	15860	+ info.DY -= info.bounds.height/2;
	15861	+ }
	15862	+
	15863	+ object.drawEditHandles(info, 0);
	15864	+
	15865	+ if (drag && (X != 0 \|\| Y != 0))
	15866	+ {
	15867	+ switch (hitSomething)
	15868	+ {
	15869	+ case Object3D.hitCenter: gr.setColor(Color.pink);
	15870	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15871	+ break;
	15872	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	15873	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15874	+ break;
	15875	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	15876	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15877	+ break;
	15878	+ }
	15879	+
	15880	+ }
	15881	+ }
13765	15882	}
13766	15883	}
	15884	+
13767	15885	if (isRenderer)
13768	15886	{
13769	15887	//gr.setColor(Color.black);
13770	15888	//gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
13771	15889	//gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
13772	15890	}
	15891	+
13773	15892	if (hasMarquee)
13774	15893	{
13775	15894	gr.setXORMode(Color.white);
..	..	@@ -13792,6 +15911,7 @@
13792	15911	//if (g != gr) g.drawImage(img, 0, 0, width, height, null);
13793	15912	}
13794	15913
	15914	+ // To avoid clear.
13795	15915	public void update(Graphics g)
13796	15916	{
13797	15917	paint(g);
..	..	@@ -13881,6 +16001,7 @@
13881	16001	public boolean mouseDown(Event evt, int x, int y)
13882	16002	{
13883	16003	System.out.println("mouseDown: " + evt);
	16004	+ System.exit(0);
13884	16005	/*
13885	16006	locked = true;
13886	16007	drag = false;
..	..	@@ -13924,7 +16045,7 @@
13924	16045	{
13925	16046	keyPressed(0, modifiers);
13926	16047	}
13927		- clickStart(x, y, modifiers);
	16048	+ // clickStart(x, y, modifiers);
13928	16049	return true;
13929	16050	}
13930	16051
..	..	@@ -14042,7 +16163,7 @@
14042	16163	{
14043	16164	keyReleased(0, 0);
14044	16165	}
14045		- drag(x, y, modifiers);
	16166	+ drag(x, y, 0, modifiers);
14046	16167	return true;
14047	16168	}
14048	16169
..	..	@@ -14174,7 +16295,7 @@
14174	16295	Object3D object;
14175	16296	static Object3D trackedobject;
14176	16297	Camera renderCamera; // Light or Eye (or Occlusion)
14177		- /static/ Camera manipCamera; // Light or Eye
	16298	+ /static/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
14178	16299	/static/ Camera eyeCamera;
14179	16300	/static/ Camera lightCamera;
14180	16301	int cameracount;
..	..	@@ -14394,7 +16515,7 @@
14394	16515	gl.glPushAttrib(GL.GL_ALL_ATTRIB_BITS);
14395	16516	gl.glPushMatrix();
14396	16517	gl.glLoadIdentity();
14397		- PushMatrix(checker.toParent);
	16518	+ //PushMatrix(checker.toParent);
14398	16519
14399	16520	gl.glMatrixMode(GL.GL_TEXTURE);
14400	16521	gl.glPushMatrix();
..	..	@@ -14417,8 +16538,8 @@
14417	16538
14418	16539	gl.glNormal3f(0.0f, 0.0f, 1.0f);
14419	16540
14420		- float step = 0.1666f; //0.25f;
14421		- float stepv = step * 1652 / 998;
	16541	+ float step = 2; // 0.1666f; //0.25f;
	16542	+ float stepv = 2; // step * 1652 / 998;
14422	16543
14423	16544	int i0 = 0;
14424	16545	/*
..	..	@@ -14454,20 +16575,21 @@
14454	16575	/**/
14455	16576	//checker.GetMaterial().opacity = 1.1f;
14456	16577	////checker.GetMaterial().ambient = 0.99f;
14457		- Object3D.materialstack[Object3D.materialdepth] = checker.material;
14458		- Object3D.selectedstack[Object3D.materialdepth] = false;
14459		- cStatic.objectstack[Object3D.materialdepth++] = checker;
	16578	+ materialstack[materialdepth] = checker.material;
	16579	+ selectedstack[materialdepth] = false;
	16580	+ cStatic.objectstack[materialdepth++] = checker;
14460	16581	//System.out.println("material " + material);
14461	16582	//Applet3D.tracein(this, selected);
14462		- vector2buffer = checker.projectedVertices;
	16583	+ //vector2buffer = checker.projectedVertices;
14463	16584
14464		- checker.GetMaterial().Draw(this, false); // true);
	16585	+ //checker.GetMaterial().Draw(this, false); // true);
	16586	+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
14465	16587
14466		- Object3D.materialdepth -= 1;
14467		- if (Object3D.materialdepth > 0)
	16588	+ materialdepth -= 1;
	16589	+ if (materialdepth > 0)
14468	16590	{
14469		- vector2buffer = cStatic.objectstack[Object3D.materialdepth - 1].projectedVertices;
14470		- Object3D.materialstack[Object3D.materialdepth - 1].Draw(this, Object3D.selectedstack[Object3D.materialdepth - 1]);
	16591	+ //vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	16592	+ DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
14471	16593	}
14472	16594	//checker.GetMaterial().opacity = 1f;
14473	16595	////checker.GetMaterial().ambient = 1f;
..	..	@@ -14488,15 +16610,27 @@
14488	16610
14489	16611	//float u = (i+1)/2;
14490	16612	//float v = (j+1)/2;
14491		- gl.glTexCoord2f((i + 1) / 2, (j + 1) / 2); // (1,0) // (i+1+step)/2,(j+1)/2);
	16613	+ if (checker.flipV)
	16614	+ gl.glTexCoord2f((i + 1) / 2, 1 - (j + 1) / 2);
	16615	+ else
	16616	+ gl.glTexCoord2f((i + 1) / 2, (j + 1) / 2); // (1,0) // (i+1+step)/2,(j+1)/2);
14492	16617	gl.glVertex3f(i, j, -0.5f);
14493	16618
	16619	+ if (checker.flipV)
	16620	+ gl.glTexCoord2f((i + 1 + step) / 2, 1 - (j + 1) / 2); // (1,1) // (i+1+step)/2,(j+1+step)/2);
	16621	+ else
14494	16622	gl.glTexCoord2f((i + 1 + step) / 2, (j + 1) / 2); // (1,1) // (i+1+step)/2,(j+1+step)/2);
14495	16623	gl.glVertex3f(i + step, j, -0.5f);
14496	16624
	16625	+ if (checker.flipV)
	16626	+ gl.glTexCoord2f((i + 1 + step) / 2, 1 - (j + 1 + stepv) / 2); // (0,1) //(i+1)/2,(j+1+step)/2);
	16627	+ else
14497	16628	gl.glTexCoord2f((i + 1 + step) / 2, (j + 1 + stepv) / 2); // (0,1) //(i+1)/2,(j+1+step)/2);
14498	16629	gl.glVertex3f(i + step, j + stepv, -0.5f);
14499	16630
	16631	+ if (checker.flipV)
	16632	+ gl.glTexCoord2f((i + 1) / 2, 1 - (j + 1 + stepv) / 2); // (0,0) //(i+1)/2,(j+1)/2);
	16633	+ else
14500	16634	gl.glTexCoord2f((i + 1) / 2, (j + 1 + stepv) / 2); // (0,0) //(i+1)/2,(j+1)/2);
14501	16635	gl.glVertex3f(i, j + stepv, -0.5f);
14502	16636	}
..	..	@@ -14508,7 +16642,7 @@
14508	16642	gl.glMatrixMode(GL.GL_PROJECTION);
14509	16643	gl.glPopMatrix();
14510	16644	gl.glMatrixMode(GL.GL_MODELVIEW);
14511		- PopMatrix(null); // checker.toParent); // null);
	16645	+ //PopMatrix(null); // checker.toParent); // null);
14512	16646	gl.glPopMatrix();
14513	16647	PopTextureMatrix(checker.toParent);
14514	16648	gl.glMatrixMode(GL.GL_TEXTURE);
..	..	@@ -14541,6 +16675,14 @@
14541	16675	}
14542	16676	}
14543	16677
	16678	+ private Object3D GetFolder()
	16679	+ {
	16680	+ Object3D folder = object.GetWindow().copy;
	16681	+ if (object.GetWindow().copy.selection.Size() > 0)
	16682	+ folder = object.GetWindow().copy.selection.elementAt(0);
	16683	+ return folder;
	16684	+ }
	16685	+
14544	16686	class SelectBuffer implements GLEventListener
14545	16687	{
14546	16688
..	..	@@ -14599,6 +16741,7 @@
14599	16741	{
14600	16742	if (!selection)
14601	16743	{
	16744	+ new Exception().printStackTrace();
14602	16745	System.exit(0);
14603	16746	return;
14604	16747	}
..	..	@@ -14619,17 +16762,39 @@
14619	16762
14620	16763	//gl.glDisable(GL.GL_POLYGON_OFFSET_FILL);
14621	16764
	16765	+ if (PAINTMODE)
	16766	+ {
	16767	+ if (object.GetWindow().copy.selection.Size() > 0)
	16768	+ {
	16769	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	16770	+
	16771	+ // Make what you paint not selectable.
	16772	+ paintobj.ResetSelectable();
	16773	+ }
	16774	+ }
	16775	+
14622	16776	//int tmp = selection_view;
14623	16777	//selection_view = -1;
14624		- int temp = drawMode;
14625		- drawMode = SELECTION;
	16778	+ int temp = DrawMode();
	16779	+ Globals.drawMode = SELECTION; // WARNING
14626	16780	indexcount = 0;
14627	16781	parent.display(drawable);
14628	16782	//selection_view = tmp;
14629	16783	//if (temp == SELECTION)
14630	16784	// temp = DEFAULT; // patch for selection debug
14631		- drawMode = temp;
	16785	+ Globals.drawMode = temp; // WARNING
14632	16786
	16787	+ if (PAINTMODE)
	16788	+ {
	16789	+ if (object.GetWindow().copy.selection.Size() > 0)
	16790	+ {
	16791	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	16792	+
	16793	+ // Revert.
	16794	+ paintobj.RestoreSelectable();
	16795	+ }
	16796	+ }
	16797	+
14633	16798	//gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
14634	16799
14635	16800	// trying different ways of getting the depth info over
..	..	@@ -14678,6 +16843,13 @@
14678	16843	// System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
14679	16844	// System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
14680	16845
	16846	+ CreateSelectedPoint();
	16847	+
	16848	+ // Will fit the mesh !!!
	16849	+ selectedpoint.toParent[0][0] = 0.0001;
	16850	+ selectedpoint.toParent[1][1] = 0.0001;
	16851	+ selectedpoint.toParent[2][2] = 0.0001;
	16852	+
14681	16853	glu.gluUnProject(x,y,depth,view,0,tempmat2,0,viewport,0,selectedpoint.toParent[3],0);
14682	16854
14683	16855	// if (object.selection != null && object.selection.Size() > 0)
..	..	@@ -14721,34 +16893,36 @@
14721	16893	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]));
14722	16894	}
14723	16895
14724		- previousselectedpoint = (Sphere) GrafreeD.clone(selectedpoint);
	16896	+ previousselectedpoint = (Sphere) Grafreed.clone(selectedpoint);
14725	16897	}
14726	16898	}
14727	16899
14728	16900	if (!movingcamera && !PAINTMODE)
14729		- object.editWindow.ScreenFitPoint(); // fev 2014
	16901	+ object.GetWindow().ScreenFitPoint(); // fev 2014
14730	16902
14731		- if (PAINTMODE && GrafreeD.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	16903	+ if (PAINTMODE) // && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
14732	16904	{
14733		- Object3D paintobj = GrafreeD.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
	16905	+ //Object3D paintobj; // = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
14734	16906
14735		- Object3D group = new Object3D("inst" + paintcount++);
	16907	+ if (object.GetWindow().copy.selection.Size() > 0)
	16908	+ {
	16909	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
14736	16910
14737		- group.CreateMaterial(); // use a void leaf to select instances
14738		-
14739		- group.add(paintobj); // link
14740		-
14741		- object.editWindow.SnapObject(group);
14742		-
14743		- Object3D folder = object.editWindow.copy;
14744		-
14745		- if (object.editWindow.copy.selection.Size() > 0)
14746		- folder = object.editWindow.copy.selection.elementAt(0);
14747		-
14748		- folder.add(group);
14749		-
14750		- object.editWindow.ResetModel();
14751		- object.editWindow.refreshContents();
	16911	+ Object3D inst = new Object3D("inst" + paintcount++);
	16912	+
	16913	+ inst.CreateMaterial(); // use a void leaf to select instances
	16914	+
	16915	+ inst.add(paintobj); // link
	16916	+
	16917	+ object.GetWindow().SnapObject(inst);
	16918	+
	16919	+ Object3D folder = paintFolder; // GetFolder();
	16920	+
	16921	+ folder.add(inst);
	16922	+
	16923	+ object.GetWindow().ResetModel();
	16924	+ object.GetWindow().refreshContents();
	16925	+ }
14752	16926	}
14753	16927	else
14754	16928	paintcount = 0;
..	..	@@ -14787,6 +16961,11 @@
14787	16961	//System.out.println("objects[color] = " + objects[color]);
14788	16962	//objects[color].Select();
14789	16963	indexcount = 0;
	16964	+ ObjEditor window = object.GetWindow();
	16965	+ if (window != null && deselect)
	16966	+ {
	16967	+ window.Select(null, deselect, true);
	16968	+ }
14790	16969	object.Select(color, deselect);
14791	16970	}
14792	16971
..	..	@@ -14886,7 +17065,7 @@
14886	17065	gl.glDisable(gl.GL_CULL_FACE);
14887	17066	}
14888	17067
14889		- if (!RENDERSHADOW)
	17068	+ if (!Globals.RENDERSHADOW)
14890	17069	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
14891	17070
14892	17071	// SB gl.glPolygonOffset(2.5f, 10);
..	..	@@ -14896,14 +17075,14 @@
14896	17075	//gl.glColorMask(false, false, false, false);
14897	17076
14898	17077	//render_scene_from_light_view(gl, drawable, 0, 0);
14899		- if (RENDERSHADOW && lighttouched && !movingcamera) // && !parent.IsFreezed())
	17078	+ if (Globals.RENDERSHADOW && Globals.lighttouched && (!movingcamera \|\| !Globals.FREEZEONMOVE)) // && !parent.IsFreezed())
14900	17079	{
14901	17080	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
14902	17081
14903		- int temp = drawMode;
14904		- drawMode = SHADOW;
	17082	+ int temp = DrawMode();
	17083	+ Globals.drawMode = SHADOW; // WARNING
14905	17084	parent.display(drawable);
14906		- drawMode = temp;
	17085	+ Globals.drawMode = temp; // WARNING
14907	17086	}
14908	17087
14909	17088	gl.glCullFace(gl.GL_BACK);
..	..	@@ -14956,7 +17135,6 @@
14956	17135
14957	17136	class AntialiasBuffer implements GLEventListener
14958	17137	{
14959		-
14960	17138	CameraPane parent = null;
14961	17139
14962	17140	AntialiasBuffer(CameraPane p)
..	..	@@ -15066,13 +17244,19 @@
15066	17244	gl.glFlush();
15067	17245
15068	17246	/**/
15069		- gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_BGRA, GL.GL_UNSIGNED_INT_8_8_8_8_REV, occlusionsizebuffer);
	17247	+ gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusionsizebuffer);
15070	17248
15071		- int[] pixels = occlusionsizebuffer.array();
	17249	+ float[] pixels = occlusionsizebuffer.array();
15072	17250
15073	17251	double r = 0, g = 0, b = 0;
15074	17252
15075	17253	double count = 0;
	17254	+
	17255	+ gl.glGetDoublev(gl.GL_PROJECTION_MATRIX, tempmat2, 0);
	17256	+
	17257	+ float mindepth = 1;
	17258	+
	17259	+ double FACTOR = 1;
15076	17260
15077	17261	for (int i = 0; i < pixels.length; i++)
15078	17262	{
..	..	@@ -15157,7 +17341,7 @@
15157	17341
15158	17342	double scale = ray.z; // 1; // cos
15159	17343
15160		- int p = pixels[newindex];
	17344	+ float depth = pixels[newindex];
15161	17345
15162	17346	/*
15163	17347	int newindex2 = (x + 1) * OCCLUSION_SIZE + y;
..	..	@@ -15181,10 +17365,23 @@
15181	17365	scale = (1 - modu) * modv;
15182	17366	*/
15183	17367
15184		- r += ((p >> 16) & 0xFF) * scale / 255;
15185		- g += ((p >> 8) & 0xFF) * scale / 255;
15186		- b += (p & 0xFF) * scale / 255;
	17368	+ //r += ((p >> 16) & 0xFF) * scale / 255;
	17369	+ //g += ((p >> 8) & 0xFF) * scale / 255;
	17370	+ //b += (p & 0xFF) * scale / 255;
	17371	+
	17372	+ if (mindepth > depth)
	17373	+ {
	17374	+ mindepth = depth;
	17375	+ }
15187	17376
	17377	+ double z_eye = tempmat2[34 + 2] / (depth -2.0 + 1.0 - tempmat2[2*4 + 2]);
	17378	+
	17379	+ double factor = 1 - Math.exp(-z_eye * z_eye / FACTOR);
	17380	+
	17381	+ r += factor * scale;
	17382	+ g += factor * scale;
	17383	+ b += factor * scale;
	17384	+
15188	17385	count += scale;
15189	17386	}
15190	17387
..	..	@@ -15282,12 +17479,6 @@
15282	17479	GLUT glut = new GLUT();
15283	17480
15284	17481
15285		- static final public int DEFAULT = 0;
15286		- static final public int SELECTION = 1;
15287		- static final public int SHADOW = 2;
15288		- static final public int OCCLUSION = 3;
15289		- static
15290		- public int drawMode = DEFAULT;
15291	17482	public boolean spherical = false;
15292	17483	static boolean DEBUG_OCCLUSION = false;
15293	17484	static boolean DEBUG_SELECTION = false;
..	..	@@ -15300,23 +17491,15 @@
15300	17491	int AAbuffersize = 0;
15301	17492
15302	17493	//double[] selectedpoint = new double[3];
15303		- static Sphere selectedpoint = new Sphere();
	17494	+ static Superellipsoid selectedpoint;
15304	17495	static Sphere previousselectedpoint = null;
15305		- static Sphere debugpoint = new Sphere();
15306		- static Sphere debugpoint2 = new Sphere();
15307		- static Sphere debugpoint3 = new Sphere();
15308		- static Sphere debugpoint4 = new Sphere();
	17496	+ static Sphere debugpointG;
	17497	+ static Sphere debugpointP;
	17498	+ static Sphere debugpointC;
	17499	+ static Sphere debugpointR;
15309	17500
15310	17501	static Sphere debugpoints[] = new Sphere[8];
15311	17502
15312		- static
15313		- {
15314		- for (int i=0; i<8; i++)
15315		- {
15316		- debugpoints[i] = new Sphere();
15317		- }
15318		- }
15319		-
15320	17503	static void InitPoints(float radius)
15321	17504	{
15322	17505	for (int i=0; i<8; i++)
..	..	@@ -15336,7 +17519,7 @@
15336	17519	}
15337	17520	}
15338	17521
15339		- static void DrawPoints(CameraPane cpane)
	17522	+ static void DrawPoints(iCameraPane cpane)
15340	17523	{
15341	17524	for (int i=0; i<8; i++) // first and last are red
15342	17525	{
..	..	@@ -15358,7 +17541,8 @@
15358	17541	static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
15359	17542	static IntBuffer selectsizebuffer = IntBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
15360	17543	static java.nio.FloatBuffer pointselectsizebuffer = java.nio.FloatBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
15361		- static IntBuffer occlusionsizebuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17544	+ //static IntBuffer occlusionsizebuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17545	+ static java.nio.FloatBuffer occlusionsizebuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
15362	17546	static BufferedImage bufimage = new BufferedImage(TEX_SIZE, TEX_SIZE, BufferedImage.TYPE_INT_RGB);
15363	17547	static BufferedImage textest = new cBufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB);
15364	17548	static java.util.Vector<BufferedImage> billboards = new java.util.Vector<BufferedImage>();
..	..	@@ -15367,10 +17551,11 @@
15367	17551	static IntBuffer textbuffer = null; // IntBuffer.allocate(TEXT_WIDTH88 * TEXT_HEIGHT);
15368	17552	// Depth buffer format
15369	17553	//private int depth_format;
15370		- static public void NextIndex(Object3D o, GL gl)
	17554	+
	17555	+ public void NextIndex()
15371	17556	{
15372	17557	indexcount+=16;
15373		- gl.glColor3d(((indexcount >>> 16) & 255) / 255.0, ((indexcount >>> 8) & 255) / 255.0, ((indexcount) & 255) / 255.0);
	17558	+ GetGL().glColor3d(((indexcount >>> 16) & 255) / 255.0, ((indexcount >>> 8) & 255) / 255.0, ((indexcount) & 255) / 255.0);
15374	17559	//objects[indexcount] = o;
15375	17560	//System.out.println("indexcount = " + indexcount);
15376	17561	}