~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -18,7 +18,10 @@
18	18	import javax.imageio.ImageIO;
19	19	import javax.imageio.ImageWriteParam;
20	20	import javax.imageio.ImageWriter;
	21	+import javax.imageio.ImageReadParam;
	22	+import javax.imageio.ImageReader;
21	23	import javax.imageio.plugins.jpeg.JPEGImageWriteParam;
	24	+import javax.imageio.stream.ImageInputStream;
22	25	import javax.imageio.stream.ImageOutputStream;
23	26	import javax.imageio.ImageWriteParam;
24	27
..	..	@@ -30,10 +33,14 @@
30	33	import java.nio.*;
31	34
32	35	import gleem.linalg.Mat4f;
	36	+import javax.imageio.ImageTypeSpecifier;
33	37
34		-class CameraPane extends GLCanvas implements Runnable, GLEventListener, ActionListener, MouseWheelListener, MouseMotionListener, MouseListener, KeyListener
	38	+class CameraPane extends GLCanvas implements iCameraPane, Runnable, GLEventListener, ActionListener, MouseWheelListener, MouseMotionListener, MouseListener, KeyListener
35	39	{
36		- static boolean DEBUG = false;
	40	+ static cMaterial[] materialstack = new cMaterial[65536];
	41	+ static boolean[] selectedstack = new boolean[65536];
	42	+ static int materialdepth = 0;
	43	+
37	44	static boolean FRUSTUM = false; // still bogus true; // frustum culling
38	45
39	46	// camera change fix
..	..	@@ -42,25 +49,40 @@
42	49
43	50	static int STEP = 1;
44	51
45		- static boolean ONESTEP = false; // do LIVE once
46		-
47		- /**
48		- * @return the LIVE
49		- */
50		- public static boolean isLIVE()
	52	+ private static BufferedImage CreateBim(byte[] bytes, int width, int height)
51	53	{
52		- return LIVE \|\| ONESTEP;
	54	+ int[] pixels = new int[bytes.length/3];
	55	+ for (int i=pixels.length; --i>=0;)
	56	+ {
	57	+ int i3 = i*3;
	58	+ pixels[i] = 0xFF;
	59	+ pixels[i] <<= 8;
	60	+ pixels[i] \|= bytes[i3+2] & 0xFF;
	61	+ pixels[i] <<= 8;
	62	+ pixels[i] \|= bytes[i3+1] & 0xFF;
	63	+ pixels[i] <<= 8;
	64	+ pixels[i] \|= bytes[i3] & 0xFF;
	65	+ }
	66	+ /*
	67	+ int r=0,g=0,b=0,a=0;
	68	+ for (int i=0; i<width; i++)
	69	+ for (int j=0; j<height; j++)
	70	+ {
	71	+ int index = j*width+i;
	72	+ int p = pixels[index];
	73	+ a = ((p>>24) & 0xFF);
	74	+ r = ((p>>16) & 0xFF);
	75	+ g = ((p>>8) & 0xFF);
	76	+ b = (p & 0xFF);
	77	+ pixels[index] = (a<<24) \| (b<<16) \| (g<<8) \| r;
	78	+ }
	79	+ /**/
	80	+ BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
	81	+ rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
	82	+ return rendImage;
53	83	}
54	84
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;
	85	+ /static/ private boolean CULLFACE = false; // true;
64	86	/static/ boolean NEAREST = false; // true;
65	87	/static/ boolean WIREFRAME = false; // true;
66	88
..	..	@@ -70,14 +92,12 @@
70	92	static int CURRENTANTIALIAS = 0; // 1;
71	93	/static/ boolean RENDERSHADOW = true;
72	94	/static/ int RENDERPROGRAM = 2; // 0 == none, 1 == fast, 2 == normal
73		- static boolean ANIMATION = false;
74		- static String filename;
75	95
76	96	boolean DISPLAYTEXT = false;
77	97	//boolean REDUCETEXTURE = true;
78	98	boolean CACHETEXTURE = true;
79	99	boolean CLEANCACHE = false; // true;
80		- boolean MIPMAP = false; // true;
	100	+ boolean MIPMAP = false; // true; // never works...
81	101	boolean COMPRESSTEXTURE = false;
82	102	boolean KOMPACTTEXTURE = false; // true;
83	103	boolean RESIZETEXTURE = false;
..	..	@@ -97,10 +117,8 @@
97	117
98	118	static boolean textureon = true;
99	119	static boolean LOCALTRANSFORM = false;
100		-private static boolean LIVE = false;
101	120	static boolean FULLSCREEN = false;
102	121	static boolean SUPPORT = true;
103		-static boolean CROWD = false;
104	122	static boolean INERTIA = true;
105	123	static boolean FAST = false;
106	124	static boolean SLOWPOSE = false;
..	..	@@ -108,6 +126,8 @@
108	126
109	127	static int tickcount = 0; // slow pose issue
110	128
	129	+static boolean BUTTONLESSWHEEL = false;
	130	+static boolean ZOOMBOXMODE = false;
111	131	static boolean BOXMODE = false;
112	132	static boolean IMAGEFLIP = false;
113	133	static boolean SMOOTHFOCUS = false;
..	..	@@ -122,7 +142,7 @@
122	142	static boolean OEIL = true;
123	143	static boolean OEILONCE = false; // do oeilon then oeiloff
124	144	static boolean LOOKAT = true;
125		-static boolean RANDOM = true; // false;
	145	+static boolean SWITCH = true; // false;
126	146	static boolean HANDLES = false; // selection doesn't work!!
127	147	static boolean PAINTMODE = false;
128	148
..	..	@@ -165,12 +185,42 @@
165	185	defaultcaps.setAccumBlueBits(16);
166	186	defaultcaps.setAccumAlphaBits(16);
167	187	}
168		- static CameraPane theRenderer;
169		-
	188	+
	189	+ private File defaultDirectory = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory();
	190	+
170	191	void SetAsGLRenderer(boolean b)
171	192	{
172	193	isRenderer = b;
173		- theRenderer = this;
	194	+ Globals.theRenderer = this;
	195	+ }
	196	+
	197	+ CameraPane(Object3D o, Camera cam, boolean withcontext)
	198	+ {
	199	+ super(defaultcaps, null, withcontext?glcontext:null, null);
	200	+
	201	+ //System.out.println("AMERICA AREA = " + (9458886 + 9210755 + 8480395 + 2736391 + 1943018 + 1289475 + 1141569 + 1069350 + 911559 + 721229 + 395886 + 377972 + 246700 + 211156 + 173985 + 141133 + 118279 + 112079 + 108523));
	202	+ glcontext = getContext();
	203	+
	204	+ cameras = new Camera[2];
	205	+ targetLookAts = new cVector[2];
	206	+
	207	+ SetCamera(cam);
	208	+
	209	+ // Warning: not used.
	210	+ SetLight(new Camera(new cVector(15, 10, -20)));
	211	+
	212	+ object = o;
	213	+
	214	+ setBackground(Color.white);
	215	+
	216	+ addKeyListener(this);
	217	+ addMouseListener(this);
	218	+ addMouseMotionListener(this);
	219	+ addMouseWheelListener(this);
	220	+ //System.out.println("addGLEventListener: " + this);
	221	+ addGLEventListener(this);
	222	+
	223	+// pingthread.start(); // may 2013
174	224	}
175	225
176	226	static boolean AntialiasingEnabled()
..	..	@@ -178,12 +228,53 @@
178	228	return CURRENTANTIALIAS > 0;
179	229	}
180	230
181		- void ClearDepth()
	231	+ /// INTERFACE
	232	+
	233	+ public javax.media.opengl.GL GetGL0()
	234	+ {
	235	+ return null;
	236	+ }
	237	+
	238	+ public int GenList()
	239	+ {
	240	+ javax.media.opengl.GL gl = GetGL();
	241	+ return gl.glGenLists(1);
	242	+ }
	243	+
	244	+ public void NewList(int id)
	245	+ {
	246	+ javax.media.opengl.GL gl = GetGL();
	247	+ gl.glNewList(id, gl.GL_COMPILE); //_AND_EXECUTE);
	248	+ }
	249	+
	250	+ public void CallList(int id)
	251	+ {
	252	+ javax.media.opengl.GL gl = GetGL();
	253	+ gl.glCallList(id);
	254	+ }
	255	+
	256	+ public void EndList()
	257	+ {
	258	+ javax.media.opengl.GL gl = GetGL();
	259	+ gl.glEndList();
	260	+ }
	261	+
	262	+ public boolean IsBoxMode()
	263	+ {
	264	+ return BOXMODE;
	265	+ }
	266	+
	267	+ public boolean IsZoomBoxMode()
	268	+ {
	269	+ return ZOOMBOXMODE;
	270	+ }
	271	+
	272	+ public void ClearDepth()
182	273	{
183	274	GetGL().glClear(GetGL().GL_DEPTH_BUFFER_BIT);
184	275	}
185	276
186		- void DepthTest(boolean depthtest)
	277	+ public void DepthTest(boolean depthtest)
187	278	{
188	279	if (depthtest)
189	280	GetGL().glDepthFunc(GL.GL_LEQUAL);
..	..	@@ -191,7 +282,7 @@
191	282	GetGL().glDepthFunc(GL.GL_ALWAYS);
192	283	}
193	284
194		- void DepthWrite(boolean depthwrite)
	285	+ public void DepthWrite(boolean depthwrite)
195	286	{
196	287	if (depthwrite)
197	288	GetGL().glDepthMask(true);
..	..	@@ -199,12 +290,1616 @@
199	290	GetGL().glDepthMask(false);
200	291	}
201	292
202		- void BackFaceCull(boolean bfc)
	293	+ public void BackFaceCull(boolean bfc)
203	294	{
204	295	if (bfc)
205	296	GetGL().glEnable(GetGL().GL_CULL_FACE);
206	297	else
207	298	GetGL().glDisable(GetGL().GL_CULL_FACE);
	299	+ }
	300	+
	301	+ public boolean BackFaceCullMode()
	302	+ {
	303	+ return this.CULLFACE;
	304	+ }
	305	+
	306	+ public boolean IsAmbientOcclusionOn()
	307	+ {
	308	+ return this.ambientOcclusion;
	309	+ }
	310	+
	311	+ public boolean IsDebugSelection()
	312	+ {
	313	+ return DEBUG_SELECTION;
	314	+ }
	315	+
	316	+ public boolean IsFrozen()
	317	+ {
	318	+ boolean selectmode = this.DrawMode() == SELECTION \|\| this.IsDebugSelection();
	319	+
	320	+ return !selectmode && cameracount == 0; // != 0;
	321	+ }
	322	+
	323	+ // Currently in Globals
	324	+ public int DrawMode()
	325	+ {
	326	+ return Globals.DrawMode();
	327	+ }
	328	+
	329	+ public Camera EyeCamera()
	330	+ {
	331	+ return eyeCamera;
	332	+ }
	333	+
	334	+ public Camera LightCamera()
	335	+ {
	336	+ return lightCamera;
	337	+ }
	338	+
	339	+ public Camera ManipCamera()
	340	+ {
	341	+ return manipCamera;
	342	+ }
	343	+
	344	+ public Camera RenderCamera()
	345	+ {
	346	+ return renderCamera;
	347	+ }
	348	+
	349	+ public Camera[] Cameras()
	350	+ {
	351	+ return cameras;
	352	+ }
	353	+
	354	+ public void PushMaterial(Object3D obj, boolean selected)
	355	+ {
	356	+ CameraPane display = this;
	357	+ javax.media.opengl.GL gl = display.GetGL();
	358	+ cMaterial material = obj.material;
	359	+
	360	+ if (material != null)
	361	+ {
	362	+ materialstack[materialdepth] = material;
	363	+ selectedstack[materialdepth] = selected;
	364	+ cStatic.objectstack[materialdepth++] = obj;
	365	+ //System.out.println("material " + material);
	366	+ //Applet3D.tracein(this, selected);
	367	+ //display.vector2buffer = obj.projectedVertices;
	368	+ if (obj instanceof Camera)
	369	+ {
	370	+ display.options1[0] = material.shift;
	371	+ //System.out.println("shift " + material.shift);
	372	+ display.options1[1] = material.lightarea;
	373	+ display.options1[2] = material.shadowbias;
	374	+ display.options1[3] = material.aniso;
	375	+ display.options1[4] = material.anisoV;
	376	+// System.out.println("display.options1[0] " + display.options1[0]);
	377	+// System.out.println("display.options1[1] " + display.options1[1]);
	378	+// System.out.println("display.options1[2] " + display.options1[2]);
	379	+// System.out.println("display.options1[3] " + display.options1[3]);
	380	+// System.out.println("display.options1[4] " + display.options1[4]);
	381	+ display.options2[0] = material.opacity;
	382	+ display.options2[1] = material.diffuse;
	383	+ display.options2[2] = material.factor;
	384	+// System.out.println("display.options2[0] " + display.options2[0]);
	385	+// System.out.println("display.options2[1] " + display.options2[1]);
	386	+// System.out.println("display.options2[2] " + display.options2[2]);
	387	+
	388	+ cColor.HSBtoRGB(material.color, material.modulation, 1, display.options3);
	389	+// System.out.println("display.options3[0] " + display.options3[0]);
	390	+// System.out.println("display.options3[1] " + display.options3[1]);
	391	+// System.out.println("display.options3[2] " + display.options3[2]);
	392	+ display.options4[0] = material.cameralight/0.2f;
	393	+ display.options4[1] = material.subsurface;
	394	+ display.options4[2] = material.sheen;
	395	+// System.out.println("display.options4[0] " + display.options4[0]);
	396	+// System.out.println("display.options4[1] " + display.options4[1]);
	397	+// System.out.println("display.options4[2] " + display.options4[2]);
	398	+
	399	+ // if (display.CURRENTANTIALIAS > 0)
	400	+ // display.options3[3] /= 4;
	401	+
	402	+ /*
	403	+ System.out.println("Focus = " + display.options1[0]);
	404	+ System.out.println("Aperture = " + display.options1[1]);
	405	+ System.out.println("ShadowBlur = " + display.options1[2]);
	406	+ System.out.println("Antialiasing = " + display.options1[3]);
	407	+ System.out.println("Fog = " + display.options2[0]);
	408	+ System.out.println("Intensity = " + display.options2[1]);
	409	+ System.out.println("Elevation = " + display.options2[2]);
	410	+ /**/
	411	+ } else
	412	+ {
	413	+ DrawMaterial(material, selected, obj.projectedVertices);
	414	+ }
	415	+ } else
	416	+ {
	417	+ if (selected && CameraPane.flash)
	418	+ {
	419	+ display.modelParams4[1] = 100;
	420	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 4, display.modelParams4, 0);
	421	+ }
	422	+ }
	423	+ }
	424	+
	425	+ public void PushMaterial2(Object3D obj, boolean selected)
	426	+ {
	427	+ CameraPane display = this;
	428	+ cMaterial material = obj.material;
	429	+
	430	+ if (material != null)
	431	+ {
	432	+ materialstack[materialdepth] = material;
	433	+ selectedstack[materialdepth] = selected;
	434	+ cStatic.objectstack[materialdepth++] = obj;
	435	+ //System.out.println("material " + material);
	436	+ //Applet3D.tracein("selected ", selected);
	437	+ //display.vector2buffer = obj.projectedVertices;
	438	+ display.DrawMaterial(material, selected, obj.projectedVertices);
	439	+ }
	440	+ }
	441	+
	442	+ public void PopMaterial(Object3D obj, boolean selected)
	443	+ {
	444	+ CameraPane display = this;
	445	+ javax.media.opengl.GL gl = display.GetGL();
	446	+ cMaterial material = obj.material;
	447	+
	448	+ //if (parent != null && parent.GetMaterial() != null)
	449	+ // parent.GetMaterial().Draw(display, parent.IsSelected(this));
	450	+ if (material != null)
	451	+ {
	452	+ materialdepth -= 1;
	453	+ if (materialdepth > 0)
	454	+ {
	455	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	456	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
	457	+ }
	458	+ //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
	459	+ } else if (selected && CameraPane.flash && obj.GetMaterial() != null)
	460	+ {
	461	+ display.modelParams4[1] = obj.GetMaterial().cameralight;
	462	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 4, display.modelParams4, 0);
	463	+ }
	464	+ }
	465	+
	466	+ public void PopMaterial2(Object3D obj)
	467	+ {
	468	+ CameraPane display = this;
	469	+ cMaterial material = obj.material;
	470	+
	471	+ if (material != null)
	472	+ {
	473	+ materialdepth -= 1;
	474	+ if (materialdepth > 0)
	475	+ {
	476	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	477	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
	478	+ }
	479	+ //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
	480	+ //else
	481	+ //material.Draw(display, false);
	482	+ }
	483	+ }
	484	+
	485	+ public void DrawFace(Object3D obj, Vertex pv, Vertex qv, Vertex rv, Face face)
	486	+ {
	487	+ CameraPane display = this;
	488	+
	489	+ if (pv.y == -10000 \|\|
	490	+ qv.y == -10000 \|\|
	491	+ rv.y == -10000)
	492	+ return;
	493	+
	494	+// float b = f.nbiterations & 1;
	495	+// float g = (f.nbiterations>>1) & 1;
	496	+// float r = (f.nbiterations>>2) & 1;
	497	+//
	498	+// //if (f.weight == 10000)
	499	+// //{
	500	+// // r = 1; g = b = 0;
	501	+// //}
	502	+// //else
	503	+// //{
	504	+// // assert(f.weight < 10000);
	505	+// r = g = b = (float)bRep.FaceWeight(f)*100;
	506	+// if (r<0)
	507	+// assert(r>=0);
	508	+// //}
	509	+
	510	+ javax.media.opengl.GL gl = display.GetGL();
	511	+
	512	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
	513	+
	514	+ //System.out.println("p = " + pv + "; q = " + qv + "; r = " + rv);
	515	+ if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
	516	+ {
	517	+ //gl.glBegin(gl.GL_TRIANGLES);
	518	+ boolean hasnorm = pv.norm != null && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0)
	519	+ // TEST LIVE NORMALS && !obj.dontselect
	520	+ ;
	521	+ if (!hasnorm)
	522	+ {
	523	+ // System.out.println("Mesh normal");
	524	+ LA.vecSub(pv/.pos/, qv/.pos/, obj.v0);
	525	+ LA.vecSub(pv/.pos/, rv/.pos/, obj.v1);
	526	+ LA.vecCross(obj.v0, obj.v1, obj.v2);
	527	+ LA.vecNormalize(obj.v2);
	528	+ gl.glNormal3f((float) obj.v2.x, (float) obj.v2.y, (float) obj.v2.z);
	529	+ }
	530	+
	531	+ // P
	532	+ float x = (float)pv.x;
	533	+ float y = (float)pv.y;
	534	+ float z = (float)pv.z;
	535	+
	536	+ if (hasnorm)
	537	+ {
	538	+// if (!pv.norm.normalized())
	539	+// assert(pv.norm.normalized());
	540	+
	541	+ //System.out.println("normalp = " + pv.norm.x + ", " + pv.norm.y + ", " + pv.norm.z);
	542	+ float nx = (float)pv.norm.x;
	543	+ float ny = (float)pv.norm.y;
	544	+ float nz = (float)pv.norm.z;
	545	+
	546	+ x += nx * obj.NORMALPUSH;
	547	+ y += ny * obj.NORMALPUSH;
	548	+ z += nz * obj.NORMALPUSH;
	549	+
	550	+ gl.glNormal3f(nx, ny, nz);
	551	+ }
	552	+ gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
	553	+ SetColor(obj, pv);
	554	+ //gl.glColor4f(r, g, b, 1);
	555	+ //gl.glColor4f(pv.boundary, pv.boundary, pv.boundary, 1);
	556	+ if (obj.flipV)
	557	+ gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
	558	+ else
	559	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	560	+ //System.out.println("vertexp = " + pv.x + ", " + pv.y + ", " + pv.z);
	561	+
	562	+ gl.glVertex3f(x, y, z);
	563	+
	564	+ // Q
	565	+ x = (float)qv.x;
	566	+ y = (float)qv.y;
	567	+ z = (float)qv.z;
	568	+
	569	+// Print(pv);
	570	+ if (hasnorm)
	571	+ {
	572	+// assert(qv.norm.normalized());
	573	+ //System.out.println("normalq = " + qv.norm.x + ", " + qv.norm.y + ", " + qv.norm.z);
	574	+ float nx = (float)qv.norm.x;
	575	+ float ny = (float)qv.norm.y;
	576	+ float nz = (float)qv.norm.z;
	577	+
	578	+ x += nx * obj.NORMALPUSH;
	579	+ y += ny * obj.NORMALPUSH;
	580	+ z += nz * obj.NORMALPUSH;
	581	+
	582	+ gl.glNormal3f(nx, ny, nz);
	583	+ }
	584	+ //System.out.println("vertexq = " + qv.s + ", " + qv.t);
	585	+ // boolean locked = false;
	586	+ // float eps = 0.1f;
	587	+ // boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
	588	+
	589	+ // int dot = 0; //*/ (int)f.dot;
	590	+
	591	+ // if ((dot&1) == 0)
	592	+ // dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
	593	+
	594	+ // if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
	595	+ if (obj.flipV)
	596	+ gl.glTexCoord2f((float) qv.s, 1-(float) qv.t);
	597	+ else
	598	+ gl.glTexCoord2f((float) qv.s, (float) qv.t);
	599	+ // else
	600	+ // {
	601	+ // locked = true;
	602	+ // gl.glTexCoord2f((float) pv.s, (float) pv.t);
	603	+ // }
	604	+ gl.glColor4f(qv.AO, qv.AO, qv.AO, 1);
	605	+ SetColor(obj, qv);
	606	+
	607	+ gl.glVertex3f(x, y, z);
	608	+ //gl.glColor4f(r, g, b, 1);
	609	+ //gl.glColor4f(qv.boundary, qv.boundary, qv.boundary, 1);
	610	+ //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
	611	+// Print(qv);
	612	+
	613	+ // R
	614	+ x = (float)rv.x;
	615	+ y = (float)rv.y;
	616	+ z = (float)rv.z;
	617	+
	618	+ if (hasnorm)
	619	+ {
	620	+// assert(rv.norm.normalized());
	621	+ //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
	622	+ float nx = (float)rv.norm.x;
	623	+ float ny = (float)rv.norm.y;
	624	+ float nz = (float)rv.norm.z;
	625	+
	626	+ x += nx * obj.NORMALPUSH;
	627	+ y += ny * obj.NORMALPUSH;
	628	+ z += nz * obj.NORMALPUSH;
	629	+
	630	+ gl.glNormal3f(nx, ny, nz);
	631	+ }
	632	+
	633	+ // if ((dot&4) == 0)
	634	+ // dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
	635	+
	636	+ // if (wrap \|\| !locked && (dot&8) != 0)
	637	+ if (obj.flipV)
	638	+ gl.glTexCoord2f((float) rv.s, 1-(float) rv.t);
	639	+ else
	640	+ gl.glTexCoord2f((float) rv.s, (float) rv.t);
	641	+ // else
	642	+ // gl.glTexCoord2f((float) pv.s, (float) pv.t);
	643	+
	644	+ // f.dot = dot;
	645	+
	646	+ gl.glColor4f(rv.AO, rv.AO, rv.AO, 1);
	647	+ SetColor(obj, rv);
	648	+ //gl.glColor4f(r, g, b, 1);
	649	+ //gl.glColor4f(rv.boundary, rv.boundary, rv.boundary, 1);
	650	+ //System.out.println("vertexr = " + rv.x + ", " + rv.y + ", " + rv.z);
	651	+ gl.glVertex3f(x, y, z);
	652	+// Print(rv);
	653	+ //gl.glEnd();
	654	+ }
	655	+ else
	656	+ {
	657	+ gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
	658	+ gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
	659	+ gl.glVertex3f((float) rv.x, (float) rv.y, (float) rv.z);
	660	+
	661	+ }
	662	+
	663	+ if (false) // (attributes & WIREFRAME) != 0)
	664	+ {
	665	+ gl.glDisable(gl.GL_LIGHTING);
	666	+
	667	+ gl.glBegin(gl.GL_LINE_LOOP);
	668	+ gl.glVertex3d(pv./pos./x, pv./pos./y, pv./pos./z);
	669	+ gl.glVertex3d(qv./pos./x, qv./pos./y, qv./pos./z);
	670	+ gl.glVertex3d(rv./pos./x, rv./pos./y, rv./pos./z);
	671	+ gl.glEnd();
	672	+
	673	+ gl.glEnable(gl.GL_LIGHTING);
	674	+ }
	675	+ }
	676	+
	677	+ /**
	678	+ * <code>draw</code> renders a <code>TriMesh</code> object including
	679	+ * it's normals, colors, textures and vertices.
	680	+ *
	681	+ * @see Renderer#draw(TriMesh)
	682	+ * @param tris
	683	+ * the mesh to render.
	684	+ */
	685	+ public void DrawParticles(TriMesh geo, Object3D shape, boolean selected, boolean rotate) // TriMesh tris)
	686	+ {
	687	+ CameraPane display = this;
	688	+
	689	+ float r = display.modelParams0[0];
	690	+ float g = display.modelParams0[1];
	691	+ float b = display.modelParams0[2];
	692	+ float opacity = display.modelParams5[1];
	693	+
	694	+ //final GL gl = GLU.getCurrentGL();
	695	+ GL gl = display.GetGL(); // getGL();
	696	+
	697	+ FloatBuffer vertBuf = geo.vertBuf;
	698	+
	699	+ int v = vertBuf.capacity();
	700	+
	701	+ int count = 0;
	702	+
	703	+ boolean cf = gl.glIsEnabled(gl.GL_CULL_FACE);
	704	+ gl.glEnable(gl.GL_CULL_FACE);
	705	+ // gl.glScalef(1.0f/1024,1.0f/1024,1.0f/1024);
	706	+ for (int i=0; i<v/3; i++)
	707	+ {
	708	+ int index3 = i*3;
	709	+
	710	+ if (geo.sizeBuf.get(index3+1) == 0)
	711	+ continue;
	712	+
	713	+ count++;
	714	+
	715	+ int index4 = i*4;
	716	+
	717	+ float tx = vertBuf.get(index3);
	718	+ float ty = vertBuf.get(index3+1);
	719	+ float tz = vertBuf.get(index3+2);
	720	+
	721	+ // if (tx == 0 && ty == 0 && tz == 0)
	722	+ // continue;
	723	+
	724	+ gl.glMatrixMode(gl.GL_TEXTURE);
	725	+ gl.glPushMatrix();
	726	+
	727	+ float[] texmat = geo.texmat;
	728	+ texmat[12] = texmat[13] = texmat[14] = i;
	729	+
	730	+ gl.glMultMatrixf(texmat, 0);
	731	+
	732	+ gl.glMatrixMode(gl.GL_MODELVIEW);
	733	+ gl.glPushMatrix();
	734	+
	735	+ gl.glTranslatef(tx,ty,tz);
	736	+
	737	+ if (rotate)
	738	+ gl.glRotatef(i, 0, 1, 0);
	739	+
	740	+ float size = geo.sizeBuf.get(index3) / 100;
	741	+ gl.glScalef(size,size,size);
	742	+
	743	+ float cr = geo.colorBuf.get(index4);
	744	+ float cg = geo.colorBuf.get(index4+1);
	745	+ float cb = geo.colorBuf.get(index4+2);
	746	+ float ca = geo.colorBuf.get(index4+3);
	747	+
	748	+ display.modelParams0[0] = r * cr;
	749	+ display.modelParams0[1] = g * cg;
	750	+ display.modelParams0[2] = b * cb;
	751	+
	752	+ display.modelParams5[1] = opacity * ca;
	753	+
	754	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 0, display.modelParams0, 0);
	755	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 5, display.modelParams5, 0);
	756	+
	757	+ RandomNode.globalseed = (int)geo.sizeBuf.get(index3+2); // i;
	758	+ RandomNode.globalseed2 = RandomNode.globalseed;
	759	+
	760	+// gl.glColor4f(cr,cg,cb,ca);
	761	+ // gl.glScalef(1024/16,1024/16,1024/16);
	762	+ shape.Draw/Node/(display,null,selected,false); // blocked
	763	+ // gl.glScalef(16.0f/1024,16.0f/1024,16.0f/1024);
	764	+ //gl.glTranslatef(-tx,-ty,-tz);
	765	+ gl.glPopMatrix();
	766	+
	767	+ gl.glMatrixMode(gl.GL_TEXTURE);
	768	+ gl.glPopMatrix();
	769	+ }
	770	+ // gl.glScalef(1024,1024,1024);
	771	+ if (!cf)
	772	+ gl.glDisable(gl.GL_CULL_FACE);
	773	+
	774	+ display.modelParams0[0] = r;
	775	+ display.modelParams0[1] = g;
	776	+ display.modelParams0[2] = b;
	777	+
	778	+ display.modelParams5[1] = opacity;
	779	+
	780	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 0, display.modelParams0, 0);
	781	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 5, display.modelParams5, 0);
	782	+
	783	+ gl.glMatrixMode(gl.GL_MODELVIEW);
	784	+
	785	+// System.err.println("total = " + v/3 + "; displayed = " + count);
	786	+ if (true)
	787	+ return;
	788	+
	789	+//// if (!tris.predraw(this))
	790	+//// {
	791	+//// return;
	792	+//// }
	793	+//// if (Debug.stats)
	794	+//// {
	795	+//// StatCollector.addStat(StatType.STAT_TRIANGLE_COUNT, tris.getTriangleCount());
	796	+//// StatCollector.addStat(StatType.STAT_VERTEX_COUNT, tris.getVertexCount());
	797	+//// StatCollector.addStat(StatType.STAT_GEOM_COUNT, 1);
	798	+//// }
	799	+////
	800	+//// if (tris.getDisplayListID() != -1)
	801	+//// {
	802	+//// renderDisplayList(tris);
	803	+//// return;
	804	+//// }
	805	+////
	806	+//// if (!generatingDisplayList)
	807	+//// {
	808	+//// applyStates(tris.states, tris);
	809	+//// }
	810	+//// if (Debug.stats)
	811	+//// {
	812	+//// StatCollector.startStat(StatType.STAT_RENDER_TIMER);
	813	+//// }
	814	+//// boolean transformed = doTransforms(tris);
	815	+//
	816	+// int glMode = GL.GL_TRIANGLES;
	817	+// switch (getMode())
	818	+// {
	819	+// case Triangles:
	820	+// glMode = GL.GL_TRIANGLES;
	821	+// break;
	822	+// case Strip:
	823	+// glMode = GL.GL_TRIANGLE_STRIP;
	824	+// break;
	825	+// case Fan:
	826	+// glMode = GL.GL_TRIANGLE_FAN;
	827	+// break;
	828	+// }
	829	+//
	830	+// if (!predrawGeometry(gl))
	831	+// {
	832	+// // make sure only the necessary indices are sent through on old
	833	+// // cards.
	834	+// IntBuffer indices = this.getIndexBuffer();
	835	+// if (indices == null)
	836	+// {
	837	+// logger.severe("missing indices on geometry object: " + this.toString());
	838	+// } else
	839	+// {
	840	+// indices.rewind();
	841	+// indices.limit(this.getMaxIndex());
	842	+//
	843	+// gl.glDrawElements(glMode, indices.limit(), GL.GL_UNSIGNED_INT, indices); // TODO Check <count> and assumed <type> of GL_UNSIGNED_INT
	844	+//
	845	+// indices.clear();
	846	+// }
	847	+// } else
	848	+// {
	849	+// gl.glDrawElements(glMode, this.getIndexBuffer().limit(),
	850	+// GL.GL_UNSIGNED_INT, 0);
	851	+// }
	852	+//
	853	+//// postdrawGeometry(tris);
	854	+//// if (transformed)
	855	+//// {
	856	+//// undoTransforms(tris);
	857	+//// }
	858	+////
	859	+//// if (Debug.stats)
	860	+//// {
	861	+//// StatCollector.endStat(StatType.STAT_RENDER_TIMER);
	862	+//// }
	863	+//// tris.postdraw(this);
	864	+ }
	865	+
	866	+ static Camera localcamera = new Camera();
	867	+ static cVector from = new cVector();
	868	+ static cVector to = new cVector();
	869	+
	870	+ public void PrepOcclusion(BoundaryRep br, double[][] transform)
	871	+ {
	872	+ CameraPane cp = this;
	873	+
	874	+ Camera keep = cp.RenderCamera();
	875	+ cp.renderCamera = localcamera;
	876	+
	877	+ if (br.trimmed)
	878	+ {
	879	+ float[] colors = new float[br.positions.length / 3];
	880	+
	881	+ int i3 = 0;
	882	+ for (int i = 0; i < br.positions.length / 3; i++, i3 += 3)
	883	+ {
	884	+ if (br.normals[i3] == 0 && br.normals[i3+1] == 0 && br.normals[i3+2] == 0)
	885	+ continue;
	886	+
	887	+ from.set(br.positions[i3], br.positions[i3 + 1], br.positions[i3 + 2]);
	888	+ to.set(br.positions[i3] + br.normals[i3],
	889	+ br.positions[i3 + 1] + br.normals[i3 + 1],
	890	+ br.positions[i3 + 2] + br.normals[i3 + 2]);
	891	+ LA.xformPos(from, transform, from);
	892	+ LA.xformPos(to, transform, to); // RIGID ONLY
	893	+ localcamera.setAim(from, to);
	894	+
	895	+ CameraPane.occlusionbuffer.display();
	896	+
	897	+ if (CameraPane.DEBUG_OCCLUSION)
	898	+ cp.display(); // debug
	899	+
	900	+ colors[i] = cp.vertexOcclusion.r;
	901	+ //colors[i3 + 1] = cp.vertexOcclusion.g;
	902	+ //colors[i3 + 2] = cp.vertexOcclusion.b;
	903	+
	904	+ if ((i % 100) == 0 && i != 0)
	905	+ {
	906	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	907	+ //System.out.println("Color = " + cp.vertexOcclusion.r + ", " + cp.vertexOcclusion.g + ", " + cp.vertexOcclusion.b + "; " + (int)(100.0*i/(positions.length/3)) + "% done");
	908	+ System.out.println((int) (100.0 * i / (br.positions.length / 3)) + "% (" + i + " of " + (br.positions.length / 3) + ")");
	909	+ }
	910	+ }
	911	+
	912	+ br.colors = colors;
	913	+ }
	914	+ else
	915	+ {
	916	+ for (int i = 0; i < br.VertexCount(); i++)
	917	+ {
	918	+ Vertex v = br.GetVertex(i);
	919	+
	920	+ if (v.norm == null \|\| v.norm.x == 0 && v.norm.y == 0 && v.norm.z == 0)
	921	+ continue;
	922	+
	923	+ from.set(v.x, v.y, v.z);
	924	+ to.set(v.x+v.norm.x, v.y+v.norm.y, v.z+v.norm.z);
	925	+ LA.xformPos(from, transform, from);
	926	+ LA.xformPos(to, transform, to); // RIGID ONLY
	927	+ localcamera.setAim(from, to);
	928	+
	929	+ CameraPane.occlusionbuffer.display();
	930	+
	931	+ if (CameraPane.DEBUG_OCCLUSION)
	932	+ cp.display(); // debug
	933	+
	934	+ v.AO = cp.vertexOcclusion.r;
	935	+
	936	+ if ((i % 100) == 0 && i != 0)
	937	+ {
	938	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	939	+ //System.out.println("Color = " + cp.vertexOcclusion.r + ", " + cp.vertexOcclusion.g + ", " + cp.vertexOcclusion.b + "; " + (int)(100.0*i/(positions.length/3)) + "% done");
	940	+ System.out.println((int) (100.0 * i / br.VertexCount()) + "% (" + i + " of " + br.VertexCount() + ")");
	941	+ }
	942	+ }
	943	+ }
	944	+
	945	+ //System.out.println("done.");
	946	+
	947	+ cp.renderCamera = keep;
	948	+ }
	949	+
	950	+ void DrawPointFLow(PointFlow pointFlow, Object3D /Composite/ root, boolean selected, boolean blocked)
	951	+ {
	952	+ CameraPane display = this;
	953	+ pointFlow.CreateHT();
	954	+
	955	+ float r = display.modelParams0[0];
	956	+ float g = display.modelParams0[1];
	957	+ float b = display.modelParams0[2];
	958	+ float opacity = display.modelParams5[1];
	959	+
	960	+ //final GL gl = GLU.getCurrentGL();
	961	+ GL gl = display.GetGL(); // getGL();
	962	+
	963	+ int s = pointFlow.points.size();
	964	+
	965	+ boolean cf = gl.glIsEnabled(gl.GL_CULL_FACE);
	966	+ gl.glEnable(gl.GL_CULL_FACE);
	967	+
	968	+ for (int i=s; --i>=0;)
	969	+ //for (int i=0; i<s; i++)
	970	+ {
	971	+ cVector v = pointFlow.points.get(i);
	972	+
	973	+ double mindist = Double.MAX_VALUE;
	974	+
	975	+ double size = pointFlow.minimumSize;
	976	+
	977	+ double distancenext = 0;
	978	+
	979	+ if (i > 0)
	980	+ {
	981	+ cVector w = pointFlow.points.get(i-1);
	982	+
	983	+ double dist = w.distance(v);
	984	+
	985	+ distancenext = dist;
	986	+
	987	+ if (mindist > dist)
	988	+ {
	989	+ mindist = dist;
	990	+ size = mindist*pointFlow.resizefactor;
	991	+ }
	992	+ }
	993	+
	994	+ if (i < s-1)
	995	+ {
	996	+ cVector w = pointFlow.points.get(i+1);
	997	+
	998	+ double dist = w.distance(v);
	999	+
	1000	+ if (mindist > dist)
	1001	+ {
	1002	+ mindist = dist;
	1003	+ size = mindist*pointFlow.resizefactor;
	1004	+ }
	1005	+ }
	1006	+
	1007	+ if (size < pointFlow.minimumSize)
	1008	+ size = pointFlow.minimumSize;
	1009	+ if (size > pointFlow.maximumSize)
	1010	+ size = pointFlow.maximumSize;
	1011	+
	1012	+ double tx = v.x;
	1013	+ double ty = v.y;
	1014	+ double tz = v.z;
	1015	+
	1016	+ // if (tx == 0 && ty == 0 && tz == 0)
	1017	+ // continue;
	1018	+
	1019	+ gl.glMatrixMode(gl.GL_TEXTURE);
	1020	+ gl.glPushMatrix();
	1021	+ pointFlow.texmat[12] = pointFlow.texmat[13] = pointFlow.texmat[14] = i;
	1022	+
	1023	+ gl.glMultMatrixf(pointFlow.texmat, 0);
	1024	+
	1025	+ gl.glMatrixMode(gl.GL_MODELVIEW);
	1026	+ gl.glPushMatrix();
	1027	+
	1028	+ gl.glTranslated(tx,ty,tz);
	1029	+
	1030	+ gl.glScaled(size,size,size);
	1031	+
	1032	+// float cr = colorBuf.get(index4);
	1033	+// float cg = colorBuf.get(index4+1);
	1034	+// float cb = colorBuf.get(index4+2);
	1035	+// float ca = colorBuf.get(index4+3);
	1036	+//
	1037	+// display.modelParams0[0] = r * cr;
	1038	+// display.modelParams0[1] = g * cg;
	1039	+// display.modelParams0[2] = b * cb;
	1040	+//
	1041	+// display.modelParams5[1] = opacity * ca;
	1042	+//
	1043	+// gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 0, display.modelParams0, 0);
	1044	+// gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 5, display.modelParams5, 0);
	1045	+//
	1046	+// RandomNode.globalseed = (int)sizeBuf.get(index3+2); // i;
	1047	+// RandomNode.globalseed2 = RandomNode.globalseed;
	1048	+//
	1049	+//// gl.glColor4f(cr,cg,cb,ca);
	1050	+// // gl.glScalef(1024/16,1024/16,1024/16);
	1051	+ pointFlow.geo.Draw/Node/(display,null,selected, blocked);
	1052	+
	1053	+ gl.glPopMatrix();
	1054	+
	1055	+ double step = size/4; //
	1056	+
	1057	+ if (i == 0 \|\| size == 0 \|\| distancenext > 8*size \|\| distancenext < step)
	1058	+ continue;
	1059	+
	1060	+ int nbsteps = (int)(distancenext/step);
	1061	+
	1062	+ step = distancenext/nbsteps;
	1063	+
	1064	+ cVector next = pointFlow.points.get(i-1);
	1065	+
	1066	+ tmp.set(next);
	1067	+ tmp.sub(v);
	1068	+ tmp.normalize();
	1069	+ tmp.mul(step);
	1070	+
	1071	+ // calculate next size
	1072	+ mindist = Double.MAX_VALUE;
	1073	+
	1074	+ double nextsize = pointFlow.minimumSize;
	1075	+
	1076	+ if (i > 1)
	1077	+ {
	1078	+ cVector w = pointFlow.points.get(i-2);
	1079	+
	1080	+ double dist = w.distance(next);
	1081	+
	1082	+ if (mindist > dist)
	1083	+ {
	1084	+ mindist = dist;
	1085	+ nextsize = mindist*pointFlow.resizefactor;
	1086	+ }
	1087	+ }
	1088	+
	1089	+ double dist = v.distance(next);
	1090	+
	1091	+ if (mindist > dist)
	1092	+ {
	1093	+ mindist = dist;
	1094	+ nextsize = mindist*pointFlow.resizefactor;
	1095	+ }
	1096	+
	1097	+ if (nextsize < pointFlow.minimumSize)
	1098	+ nextsize = pointFlow.minimumSize;
	1099	+ if (nextsize > pointFlow.maximumSize)
	1100	+ nextsize = pointFlow.maximumSize;
	1101	+ //
	1102	+
	1103	+ double count = 0;
	1104	+
	1105	+ while (distancenext > 0.000000001) // step
	1106	+ {
	1107	+ gl.glPushMatrix();
	1108	+
	1109	+ gl.glTranslated(tx + tmp.xcount, ty + tmp.ycount, tz + tmp.z*count);
	1110	+
	1111	+ double K = count/nbsteps;
	1112	+
	1113	+ double intersize = Knextsize + (1-K)size;
	1114	+
	1115	+ gl.glScaled(intersize,intersize,intersize);
	1116	+
	1117	+ pointFlow.geo.Draw/Node/(display,null,selected,blocked);
	1118	+
	1119	+ count++;
	1120	+
	1121	+ distancenext -= step;
	1122	+
	1123	+ gl.glPopMatrix();
	1124	+ }
	1125	+
	1126	+ if (count != nbsteps)
	1127	+ assert(count == nbsteps);
	1128	+
	1129	+ // gl.glScalef(16.0f/1024,16.0f/1024,16.0f/1024);
	1130	+ //gl.glTranslatef(-tx,-ty,-tz);
	1131	+
	1132	+ gl.glMatrixMode(gl.GL_TEXTURE);
	1133	+ gl.glPopMatrix();
	1134	+ }
	1135	+
	1136	+ if (!cf)
	1137	+ gl.glDisable(gl.GL_CULL_FACE);
	1138	+
	1139	+// display.modelParams0[0] = r;
	1140	+// display.modelParams0[1] = g;
	1141	+// display.modelParams0[2] = b;
	1142	+//
	1143	+// display.modelParams5[1] = opacity;
	1144	+//
	1145	+// gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 0, display.modelParams0, 0);
	1146	+// gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 5, display.modelParams5, 0);
	1147	+
	1148	+ gl.glMatrixMode(gl.GL_MODELVIEW);
	1149	+ }
	1150	+
	1151	+ public void DrawBox(cVector min, cVector max)
	1152	+ {
	1153	+ javax.media.opengl.GL gl = GetGL();
	1154	+ gl.glBegin(gl.GL_LINES);
	1155	+
	1156	+ gl.glVertex3d(min.x, min.y, min.z);
	1157	+ gl.glVertex3d(min.x, min.y, max.z);
	1158	+ gl.glVertex3d(min.x, min.y, min.z);
	1159	+ gl.glVertex3d(min.x, max.y, min.z);
	1160	+ gl.glVertex3d(min.x, min.y, min.z);
	1161	+ gl.glVertex3d(max.x, min.y, min.z);
	1162	+
	1163	+ gl.glVertex3d(max.x, max.y, max.z);
	1164	+ gl.glVertex3d(min.x, max.y, max.z);
	1165	+ gl.glVertex3d(max.x, max.y, max.z);
	1166	+ gl.glVertex3d(max.x, min.y, max.z);
	1167	+ gl.glVertex3d(max.x, max.y, max.z);
	1168	+ gl.glVertex3d(max.x, max.y, min.z);
	1169	+
	1170	+ gl.glEnd();
	1171	+ }
	1172	+
	1173	+ public void DrawGeometry(BoundaryRep bRep, boolean flipV, boolean selectmode)
	1174	+ {
	1175	+ int[] strips = bRep.getRawIndices();
	1176	+
	1177	+ javax.media.opengl.GL gl = GetGL();
	1178	+
	1179	+ // TRIANGLE STRIP ARRAY
	1180	+ if (bRep.trimmed)
	1181	+ {
	1182	+ float[] v = bRep.getRawVertices();
	1183	+ float[] n = bRep.getRawNormals();
	1184	+ float[] c = bRep.getRawColors();
	1185	+ float[] uv = bRep.getRawUVMap();
	1186	+
	1187	+ int count2 = 0;
	1188	+ int count3 = 0;
	1189	+
	1190	+ if (n.length > 0)
	1191	+ {
	1192	+ for (int i = 0; i < strips.length; i++)
	1193	+ {
	1194	+ gl.glBegin(gl.GL_TRIANGLE_STRIP);
	1195	+
	1196	+ /*
	1197	+ boolean locked = false;
	1198	+ float eps = 0.1f;
	1199	+ boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
	1200	+
	1201	+ int dot = 0;
	1202	+
	1203	+ if ((dot&1) == 0)
	1204	+ dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
	1205	+
	1206	+ if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
	1207	+ gl.glTexCoord2f((float) qv.s, (float) qv.t);
	1208	+ else
	1209	+ {
	1210	+ locked = true;
	1211	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	1212	+ }
	1213	+ //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
	1214	+ gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
	1215	+ if (hasnorm)
	1216	+ {
	1217	+ //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
	1218	+ gl.glNormal3f((float) rv.norm.x, (float) rv.norm.y, (float) rv.norm.z);
	1219	+ }
	1220	+
	1221	+ if ((dot&4) == 0)
	1222	+ dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
	1223	+
	1224	+ if (wrap \|\| !locked && (dot&8) != 0)
	1225	+ gl.glTexCoord2f((float) rv.s, (float) rv.t);
	1226	+ else
	1227	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	1228	+
	1229	+ f.dot = dot;
	1230	+ */
	1231	+
	1232	+ if (!selectmode)
	1233	+ {
	1234	+ if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
	1235	+ {
	1236	+ gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1237	+ } else
	1238	+ {
	1239	+ gl.glNormal3f(0, 0, 1);
	1240	+ }
	1241	+
	1242	+ if (c != null)
	1243	+ //System.out.println("glcolor = " + c[count3] + ", " + c[count3+1] + ", " + c[count3+2]);
	1244	+ {
	1245	+ gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
	1246	+ }
	1247	+ }
	1248	+
	1249	+ if (flipV)
	1250	+ gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
	1251	+ else
	1252	+ gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1253	+
	1254	+ //System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
	1255	+ gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1256	+
	1257	+ count2 += 2;
	1258	+ count3 += 3;
	1259	+ if (!selectmode)
	1260	+ {
	1261	+ if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
	1262	+ {
	1263	+ gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1264	+ } else
	1265	+ {
	1266	+ gl.glNormal3f(0, 0, 1);
	1267	+ }
	1268	+ if (c != null)
	1269	+ {
	1270	+ gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
	1271	+ }
	1272	+ }
	1273	+
	1274	+ if (flipV)
	1275	+ gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
	1276	+ else
	1277	+ gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1278	+
	1279	+ //System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
	1280	+ gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1281	+
	1282	+ count2 += 2;
	1283	+ count3 += 3;
	1284	+ for (int j = 0; j < strips[i] - 2; j++)
	1285	+ {
	1286	+ //gl.glTexCoord2d(...);
	1287	+ if (!selectmode)
	1288	+ {
	1289	+ if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
	1290	+ {
	1291	+ gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1292	+ } else
	1293	+ {
	1294	+ gl.glNormal3f(0, 0, 1);
	1295	+ }
	1296	+ if (c != null)
	1297	+ {
	1298	+ gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
	1299	+ }
	1300	+ }
	1301	+
	1302	+ if (flipV)
	1303	+ gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
	1304	+ else
	1305	+ gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1306	+
	1307	+ //System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
	1308	+ gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1309	+
	1310	+ count2 += 2;
	1311	+ count3 += 3;
	1312	+ }
	1313	+
	1314	+ gl.glEnd();
	1315	+ }
	1316	+ }
	1317	+
	1318	+ assert count3 == v.length;
	1319	+ }
	1320	+ else // !trimmed
	1321	+ {
	1322	+ int count = 0;
	1323	+ for (int i = 0; i < strips.length; i++)
	1324	+ {
	1325	+ gl.glBegin(gl.GL_TRIANGLE_STRIP);
	1326	+
	1327	+ Vertex p = bRep.GetVertex(bRep.indices[count++]);
	1328	+ Vertex q = bRep.GetVertex(bRep.indices[count++]);
	1329	+
	1330	+ drawVertex(gl, p, flipV, selectmode);
	1331	+ drawVertex(gl, q, flipV, selectmode);
	1332	+
	1333	+ for (int j = 0; j < strips[i] - 2; j++)
	1334	+ {
	1335	+ Vertex r = bRep.GetVertex(bRep.indices[count++]);
	1336	+
	1337	+ // if (j%2 == 0)
	1338	+ // drawFace(p, q, r, display, null);
	1339	+ // else
	1340	+ // drawFace(p, r, q, display, null);
	1341	+
	1342	+ // p = q;
	1343	+ // q = r;
	1344	+ drawVertex(gl, r, flipV, selectmode);
	1345	+ }
	1346	+
	1347	+ gl.glEnd();
	1348	+ }
	1349	+ }
	1350	+ }
	1351	+
	1352	+ static cSpring.Point3D temp = new cSpring.Point3D();
	1353	+ static cSpring.Point3D temp2 = new cSpring.Point3D();
	1354	+ static cSpring.Point3D temp3 = new cSpring.Point3D();
	1355	+
	1356	+ public void DrawDynamicMesh(cMesh mesh)
	1357	+ {
	1358	+ GL gl = GetGL(); // getGL();
	1359	+
	1360	+ cSpring.PhysicsController3D Phys = mesh.Phys;
	1361	+
	1362	+ gl.glDisable(gl.GL_LIGHTING);
	1363	+
	1364	+ gl.glLineWidth(1);
	1365	+ gl.glColor3f(1,1,1);
	1366	+ gl.glBegin(gl.GL_LINES);
	1367	+ double scale = 0;
	1368	+ int count = 0;
	1369	+ for (int s=0; s<Phys.allSprings.size(); s++)
	1370	+ {
	1371	+ cSpring.Spring spring = Phys.allSprings.get(s);
	1372	+ if(s == 0)
	1373	+ {
	1374	+ //System.out.println(" spring : " + spring.a.position + "; " + spring.b.position);
	1375	+ }
	1376	+ if (mesh.showsprings)
	1377	+ {
	1378	+ temp.set(spring.a.position);
	1379	+ temp.add(spring.b.position);
	1380	+ temp.mul(0.5);
	1381	+ temp2.set(spring.a.position);
	1382	+ temp2.sub(spring.b.position);
	1383	+ temp2.mul(spring.restLength/2);
	1384	+ temp.sub(temp2);
	1385	+ gl.glVertex3f((float)temp.x, (float)temp.y, (float)temp.z);
	1386	+ temp.add(temp2);
	1387	+ temp.add(temp2);
	1388	+ gl.glVertex3f((float)temp.x, (float)temp.y, (float)temp.z);
	1389	+ }
	1390	+
	1391	+ if (spring.isHandle)
	1392	+ continue;
	1393	+
	1394	+ //if (scale < spring.restLength)
	1395	+ scale += spring.restLength;
	1396	+ count++;
	1397	+ }
	1398	+ gl.glEnd();
	1399	+
	1400	+ if (count == 0)
	1401	+ scale = 0.01;
	1402	+ else
	1403	+ scale /= count * 3;
	1404	+
	1405	+ //scale = 0.25;
	1406	+
	1407	+ if (mesh.ShowInfo())
	1408	+ {
	1409	+ gl.glLineWidth(4);
	1410	+ for (int s=0; s<Phys.allNodes.size(); s++)
	1411	+ {
	1412	+ cSpring.DynamicNode node = Phys.allNodes.get(s);
	1413	+ if (node.mass == 0)
	1414	+ continue;
	1415	+
	1416	+ int i = node.springs==null?-1:node.springs.size();
	1417	+ gl.glColor3f((i>>2)&1,(i>>1)&1,i&1);
	1418	+ //temp.set(node.springForce.x, node.springForce.y, node.springForce.z);
	1419	+ //temp.normalize();
	1420	+ //gl.glColor3d((temp.x+1)/2, (temp.y+1)/2, (temp.z+1)/2);
	1421	+ gl.glBegin(gl.GL_LINES);
	1422	+ gl.glVertex3d(node.position.x, node.position.y, node.position.z);
	1423	+ //gl.glVertex3d(node.position.x + node.normal.xscale, node.position.y + node.normal.yscale, node.position.z + node.normal.z*scale);
	1424	+ gl.glVertex3d(node.position.x + mesh.bRep.GetVertex(s).norm.x*scale,
	1425	+ node.position.y + mesh.bRep.GetVertex(s).norm.y*scale,
	1426	+ node.position.z + mesh.bRep.GetVertex(s).norm.z*scale);
	1427	+ gl.glEnd();
	1428	+ }
	1429	+
	1430	+ gl.glLineWidth(8);
	1431	+ for (int s=0; s<Phys.allNodes.size(); s++)
	1432	+ {
	1433	+ cSpring.DynamicNode node = Phys.allNodes.get(s);
	1434	+
	1435	+ if (node.springs != null)
	1436	+ {
	1437	+ for (int i=0; i<node.springs.size(); i+=1)
	1438	+ {
	1439	+ cSpring.DynamicNode f = node.springs.get(i).GetOther(node);
	1440	+
	1441	+ int c = i+1;
	1442	+ // c = node.springs.get(i).nbcopies;
	1443	+
	1444	+ gl.glColor3f((c>>2)&1,(c>>1)&1,c&1);
	1445	+ gl.glBegin(gl.GL_LINES);
	1446	+ gl.glVertex3d(node.position.x, node.position.y, node.position.z);
	1447	+ 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);
	1448	+ gl.glEnd();
	1449	+ }
	1450	+ }
	1451	+ }
	1452	+
	1453	+ gl.glLineWidth(1);
	1454	+ }
	1455	+
	1456	+ gl.glEnable(gl.GL_LIGHTING);
	1457	+ }
	1458	+
	1459	+ /// INTERFACE
	1460	+
	1461	+ public void StartTriangles()
	1462	+ {
	1463	+ javax.media.opengl.GL gl = GetGL();
	1464	+ gl.glBegin(gl.GL_TRIANGLES);
	1465	+ }
	1466	+
	1467	+ public void EndTriangles()
	1468	+ {
	1469	+ GetGL().glEnd();
	1470	+ }
	1471	+
	1472	+ void drawVertex(javax.media.opengl.GL gl, Vertex pv, boolean flipV, boolean selectmode)
	1473	+ {
	1474	+ if (!selectmode)
	1475	+ {
	1476	+ gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
	1477	+ gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
	1478	+
	1479	+ if (flipV)
	1480	+ gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
	1481	+ else
	1482	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	1483	+ }
	1484	+
	1485	+ gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
	1486	+ }
	1487	+
	1488	+ void SetColor(Object3D obj, Vertex p0)
	1489	+ {
	1490	+ CameraPane display = this;
	1491	+ BoundaryRep bRep = obj.bRep;
	1492	+
	1493	+ if (RENDERPROGRAM == 0)
	1494	+ {
	1495	+ float r = 0;
	1496	+ if (bRep != null)
	1497	+ {
	1498	+ if (bRep.stripified)
	1499	+ {
	1500	+ r = 1;
	1501	+ }
	1502	+ }
	1503	+ float g = 0;
	1504	+ if (bRep != null)
	1505	+ {
	1506	+ if (bRep.trimmed)
	1507	+ {
	1508	+ g = 1;
	1509	+ }
	1510	+ }
	1511	+ float b = 0;
	1512	+ if (obj.support != null && obj.link2master)
	1513	+ {
	1514	+ b = 1;
	1515	+ }
	1516	+ display.GetGL().glColor3f(rp0.AO, gp0.AO, b*p0.AO);
	1517	+ return;
	1518	+ }
	1519	+
	1520	+ if (display.DrawMode() != CameraPane.SHADOW)
	1521	+ return;
	1522	+
	1523	+ javax.media.opengl.GL gl = display.GetGL();
	1524	+// if (true) return;
	1525	+// float ao = p.AO;
	1526	+//
	1527	+// // if (ao == 0 && !bRep.AOdone) // transient problem!
	1528	+// // ao = 1;
	1529	+//
	1530	+// gl.glColor4f(ao, ao, ao, 1);
	1531	+
	1532	+// CameraPane.selectedpoint.
	1533	+// getAverage(cStatic.point1, true);
	1534	+ if (CameraPane.pointflow == null) // !random) // live)
	1535	+ {
	1536	+ return;
	1537	+ }
	1538	+
	1539	+ cStatic.point1.set(0,0,0);
	1540	+ LA.xformPos(cStatic.point1, CameraPane.selectedpoint.toParent, cStatic.point1);
	1541	+
	1542	+ cStatic.point1.sub(p0);
	1543	+
	1544	+
	1545	+// if (marked && (p0.vertexlinks == null \|\| support == null \|\| support.bRep == null)) // no position delta?
	1546	+// {
	1547	+// return;
	1548	+// }
	1549	+
	1550	+ //if (true)
	1551	+ if (cStatic.point1.dot(cStatic.point1) > 0.000001)
	1552	+ {
	1553	+ return;
	1554	+ }
	1555	+
	1556	+ float[] colorV = new float[3];
	1557	+
	1558	+ if (false) // marked)
	1559	+ {
	1560	+ // debug rigging weights
	1561	+ for (int object = 0; object < p0.vertexlinks.length; object++)
	1562	+ {
	1563	+ float weight = p0.weights[object] / p0.totalweight;
	1564	+
	1565	+ // if (weight < 0.1)
	1566	+ // {
	1567	+ // assert(weight == 0);
	1568	+ // continue;
	1569	+ // }
	1570	+
	1571	+ if (p0.vertexlinks[object] == -1)
	1572	+ continue;
	1573	+
	1574	+ Vertex q = obj.support.bRep.GetVertex(p0.vertexlinks[object]);
	1575	+
	1576	+ int color = //1 << object; //
	1577	+ //p.vertexlinks.length;
	1578	+ obj.support.bRep.supports[p0.closestsupport].links[object];
	1579	+ colorV[2] += (color & 1) * weight;
	1580	+ colorV[1] += ((color & 2) >> 1) * weight;
	1581	+ colorV[0] += ((color & 4) >> 2) * weight;
	1582	+ }
	1583	+ }
	1584	+ else
	1585	+ {
	1586	+ if (obj.drawingstarted)
	1587	+ {
	1588	+ // find next point
	1589	+ if (bRep.GetVertex(0).faceindices == null)
	1590	+ {
	1591	+ bRep.InitFaceIndices();
	1592	+ }
	1593	+
	1594	+ double ymin = p0.y;
	1595	+
	1596	+ Vertex newp = p0;
	1597	+
	1598	+ for (int fii = 0; fii < p0.faceindices.length; fii++)
	1599	+ {
	1600	+ int fi = p0.faceindices[fii];
	1601	+
	1602	+ if (fi == -1)
	1603	+ break;
	1604	+
	1605	+ Face f = bRep.GetFace(fi);
	1606	+
	1607	+ Vertex p = bRep.GetVertex(f.p);
	1608	+ Vertex q = bRep.GetVertex(f.q);
	1609	+ Vertex r = bRep.GetVertex(f.r);
	1610	+
	1611	+ int swap = (int)(Math.random()*3);
	1612	+
	1613	+// for (int s=swap; --s>=0;)
	1614	+// {
	1615	+// Vertex t = p;
	1616	+// p = q;
	1617	+// q = r;
	1618	+// r = t;
	1619	+// }
	1620	+ if (ymin > p.y)
	1621	+ {
	1622	+ ymin = p.y;
	1623	+ newp = p;
	1624	+// break;
	1625	+ }
	1626	+ if (ymin > q.y)
	1627	+ {
	1628	+ ymin = q.y;
	1629	+ newp = q;
	1630	+// break;
	1631	+ }
	1632	+ if (ymin > r.y)
	1633	+ {
	1634	+ ymin = r.y;
	1635	+ newp = r;
	1636	+// break;
	1637	+ }
	1638	+ }
	1639	+
	1640	+ CameraPane.selectedpoint.toParent[3][0] = newp.x;
	1641	+ CameraPane.selectedpoint.toParent[3][1] = newp.y;
	1642	+ CameraPane.selectedpoint.toParent[3][2] = newp.z;
	1643	+
	1644	+ obj.drawingstarted = false;
	1645	+
	1646	+ // return;
	1647	+ }
	1648	+
	1649	+ if (false) // CameraPane.DRAW
	1650	+ {
	1651	+ p0.AO = colorV[0] = 2;
	1652	+ colorV[1] = 2;
	1653	+ colorV[2] = 2;
	1654	+ }
	1655	+
	1656	+ CameraPane.pointflow.add(p0);
	1657	+ CameraPane.pointflow.Touch();
	1658	+ }
	1659	+
	1660	+// gl.glColor3f(colorV[0], colorV[1], colorV[2]);
	1661	+// gl.glMaterialfv(gl.GL_FRONT, gl.GL_DIFFUSE, colorV, 0);
	1662	+// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
	1663	+ }
	1664	+
	1665	+ void DrawMaterial(cMaterial material, boolean selected, Object3D.cVector2[] others)
	1666	+ {
	1667	+ CameraPane display = this;
	1668	+ //new Exception().printStackTrace();
	1669	+
	1670	+ if (display.IsFrozen() && !selected \|\| display.IsAmbientOcclusionOn()) // \|\| display.drawMode == display.SHADOW)
	1671	+ {
	1672	+ return;
	1673	+ }
	1674	+
	1675	+ javax.media.opengl.GL gl = display.GetGL();
	1676	+
	1677	+ //Color col = Color.getHSBColor(color,modulation,1);
	1678	+ //col.getColorComponents(ColorSpace.getInstance(ColorSpace.CS_LINEAR_RGB), CameraPane.modelParams0);
	1679	+ if (!material.multiply)
	1680	+ {
	1681	+ display.color = material.color;
	1682	+ display.saturation = material.modulation;
	1683	+ }
	1684	+ else
	1685	+ {
	1686	+ display.color = material.color2;
	1687	+ display.saturation = material.modulation2;
	1688	+ }
	1689	+
	1690	+ cColor.HSBtoRGB(display.color, display.saturation, 1, display.modelParams0);
	1691	+
	1692	+ float[] colorV = Grafreed.colorV;
	1693	+
	1694	+ /**/
	1695	+ if (display.DrawMode() == display.DEFAULT) // && display.RENDERPROGRAM == 0)
	1696	+ {
	1697	+ colorV[0] = display.modelParams0[0] * material.diffuse;
	1698	+ colorV[1] = display.modelParams0[1] * material.diffuse;
	1699	+ colorV[2] = display.modelParams0[2] * material.diffuse;
	1700	+ colorV[3] = 1; // material.opacity;
	1701	+
	1702	+ gl.glColor4f(colorV[0], colorV[1], colorV[2], material.opacity);
	1703	+ //System.out.println("Opacity = " + opacity);
	1704	+
	1705	+ gl.glMaterialfv(gl.GL_FRONT, gl.GL_DIFFUSE, colorV, 0);
	1706	+ //color[0] /= 2; color[1] /= 2; color[2] /= 2;
	1707	+ gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
	1708	+
	1709	+ float amb = material.ambient;
	1710	+ if (amb < material.cameralight)
	1711	+ {
	1712	+ amb = material.cameralight;
	1713	+ }
	1714	+ colorV[0] = display.modelParams0[0] * material.diffuse * amb;
	1715	+ colorV[1] = display.modelParams0[1] * material.diffuse * amb;
	1716	+ colorV[2] = display.modelParams0[2] * material.diffuse * amb;
	1717	+ gl.glMaterialfv(gl.GL_FRONT, gl.GL_AMBIENT, colorV, 0);
	1718	+ //color[0] /= 2; color[1] /= 2; color[2] /= 2;
	1719	+ gl.glMaterialfv(gl.GL_BACK, gl.GL_AMBIENT, colorV, 0);
	1720	+
	1721	+ /**/
	1722	+ colorV[0] = ((1 - material.metalness) + display.modelParams0[0] * material.metalness) * material.specular;
	1723	+ colorV[1] = ((1 - material.metalness) + display.modelParams0[1] * material.metalness) * material.specular;
	1724	+ colorV[2] = ((1 - material.metalness) + display.modelParams0[2] * material.metalness) * material.specular;
	1725	+ gl.glMaterialfv(gl.GL_FRONT, gl.GL_SPECULAR, colorV, 0);
	1726	+ //color[0] /= 2; color[1] /= 2; color[2] /= 2;
	1727	+ gl.glMaterialfv(gl.GL_BACK, gl.GL_SPECULAR, colorV, 0);
	1728	+ colorV[0] = 10 / material.shininess; // 1/0.005f;
	1729	+ //System.out.println("shininess = " + colorV[0]);
	1730	+ if (colorV[0] > 128)
	1731	+ {
	1732	+ colorV[0] = 128;
	1733	+ }
	1734	+ gl.glMaterialfv(gl.GL_FRONT, gl.GL_SHININESS, colorV, 0);
	1735	+ gl.glMaterialfv(gl.GL_BACK, gl.GL_SHININESS, colorV, 0);
	1736	+ /**/
	1737	+ }
	1738	+ /**/
	1739	+
	1740	+ //selected = false;
	1741	+ selected = selected && display.flash;
	1742	+
	1743	+ //display.modelParams0[0] = 0; // pigment.r;
	1744	+ //display.modelParams0[1] = 0; // pigment.g;
	1745	+ //display.modelParams0[2] = 0; // pigment.b;
	1746	+ if (!material.multiply)
	1747	+ {
	1748	+ display.modelParams0[3] = material.metalness;
	1749	+ display.modelParams1[0] = material.diffuse;
	1750	+ display.modelParams1[1] = material.specular;
	1751	+ display.modelParams1[2] = 1 / material.shininess;
	1752	+ display.modelParams1[3] = material.shift;
	1753	+ display.modelParams2[0] = material.ambient;
	1754	+ display.modelParams2[1] = material.lightarea;
	1755	+ //System.out.println("light area = " + lightarea);
	1756	+ display.modelParams2[2] = 1 / material.factor; // diffuseness
	1757	+ display.modelParams2[3] = material.velvet;
	1758	+ display.modelParams3[0] = material.sheen;
	1759	+ display.modelParams3[1] = material.subsurface;
	1760	+ display.modelParams3[2] = material.bump; // backlit
	1761	+ display.modelParams3[3] = material.aniso;
	1762	+ display.modelParams4[0] = material.anisoV;
	1763	+ display.modelParams4[1] = selected ? 100 : material.cameralight;
	1764	+ //System.out.println("selected = " + selected);
	1765	+ display.modelParams4[2] = material.diffuseness;
	1766	+ display.modelParams4[3] = material.shadow;
	1767	+ display.modelParams5[0] = material.texture;
	1768	+ display.modelParams5[1] = material.opacity;
	1769	+ display.modelParams5[2] = material.fakedepth;
	1770	+ display.modelParams5[3] = CameraPane.SHADOWCULLFACE ? 0f : (material.shadowbias - 0.005f) / 10;
	1771	+ }
	1772	+ else
	1773	+ {
	1774	+ display.modelParams0[3] = material.metalness2;
	1775	+ display.modelParams1[0] = material.diffuse2;
	1776	+ display.modelParams1[1] = material.specular2;
	1777	+ display.modelParams1[2] = material.shininess2;
	1778	+ display.modelParams1[3] = material.shift2;
	1779	+ display.modelParams2[0] = material.ambient2;
	1780	+ display.modelParams2[1] = material.lightarea2;
	1781	+ display.modelParams2[2] = material.factor2;
	1782	+ display.modelParams2[3] = material.velvet2;
	1783	+ display.modelParams3[0] = material.sheen2;
	1784	+ display.modelParams3[1] = material.subsurface2;
	1785	+ display.modelParams3[2] = material.bump2;
	1786	+ display.modelParams3[3] = material.aniso2;
	1787	+ display.modelParams4[0] = material.anisoV2;
	1788	+ display.modelParams4[1] = material.cameralight2;
	1789	+ //System.out.println("selected = " + selected);
	1790	+ display.modelParams4[2] = material.diffuseness2;
	1791	+ display.modelParams4[3] = material.shadow2;
	1792	+ display.modelParams5[0] = material.texture2;
	1793	+ display.modelParams5[1] = material.opacity2;
	1794	+ display.modelParams5[2] = material.fakedepth2;
	1795	+ display.modelParams5[3] = material.shadowbias2;
	1796	+ }
	1797	+
	1798	+ display.modelParams6[0] = 0;
	1799	+ display.modelParams6[1] = 0;
	1800	+ display.modelParams6[2] = 0;
	1801	+ display.modelParams6[3] = 0;
	1802	+
	1803	+ display.modelParams7[0] = 0;
	1804	+ display.modelParams7[1] = 1000;
	1805	+ display.modelParams7[2] = 0;
	1806	+ display.modelParams7[3] = 0;
	1807	+
	1808	+ //display.modelParams6[0] = 100; // criss de bug de bump
	1809	+
	1810	+ Object3D.cVector2[] extparams = others; // display.vector2buffer;
	1811	+ if (extparams != null && extparams.length > 0 && extparams[0] != null)
	1812	+ {
	1813	+ display.modelParams6[0] = extparams[0].x / 1000.0f; // bump
	1814	+ display.modelParams6[1] = extparams[0].y / 1000.0f; // noise
	1815	+ if (extparams.length > 1)
	1816	+ {
	1817	+ display.modelParams6[2] = extparams[1].x / 1000.0f; // borderfade
	1818	+ display.modelParams6[3] = extparams[1].y / 1000.0f; // (float)Math.exp(-extparams[1].y / 1000.0f); // fog punchthrough
	1819	+ if (extparams.length > 2)
	1820	+ {
	1821	+ display.modelParams7[0] = extparams[2].x / 1000.0f; // noise power
	1822	+ float x = extparams[2].y / 1000.0f;
	1823	+ //if (x == 0)
	1824	+ // x = 1f;
	1825	+ 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
	1826	+ if (extparams[2].y > 0)
	1827	+ {
	1828	+ //System.out.println("extparams[1].y = " + extparams[1].y);
	1829	+ //System.out.println("extparams[2].y = " + extparams[2].y);
	1830	+ //System.out.println("opacity power = " + display.modelParams7[1]);
	1831	+ }
	1832	+ }
	1833	+ }
	1834	+ }
	1835	+
	1836	+ //if (display.modelParams6[2] != 0)
	1837	+ /*
	1838	+ System.out.println("modelParams0[0] = " + display.modelParams0[0]);
	1839	+ System.out.println("modelParams0[1] = " + display.modelParams0[1]);
	1840	+ System.out.println("modelParams0[2] = " + display.modelParams0[2]);
	1841	+ System.out.println("modelParams0[3] = " + display.modelParams0[3]);
	1842	+ System.out.println("modelParams1[0] = " + display.modelParams1[0]);
	1843	+ System.out.println("modelParams1[1] = " + display.modelParams1[1]);
	1844	+ System.out.println("modelParams1[2] = " + display.modelParams1[2]);
	1845	+ System.out.println("modelParams1[3] = " + display.modelParams1[3]);
	1846	+ System.out.println("modelParams2[0] = " + display.modelParams2[0]);
	1847	+ System.out.println("modelParams2[1] = " + display.modelParams2[1]);
	1848	+ System.out.println("modelParams2[2] = " + display.modelParams2[2]);
	1849	+ System.out.println("modelParams2[3] = " + display.modelParams2[3]);
	1850	+ System.out.println("modelParams3[0] = " + display.modelParams3[0]);
	1851	+ System.out.println("modelParams3[1] = " + display.modelParams3[1]);
	1852	+ System.out.println("modelParams3[2] = " + display.modelParams3[2]);
	1853	+ System.out.println("modelParams3[3] = " + display.modelParams3[3]);
	1854	+ System.out.println("modelParams4[0] = " + display.modelParams4[0]);
	1855	+ System.out.println("modelParams4[1] = " + display.modelParams4[1]);
	1856	+ System.out.println("modelParams4[2] = " + display.modelParams4[2]);
	1857	+ System.out.println("modelParams4[3] = " + display.modelParams4[3]);
	1858	+ System.out.println("modelParams5[0] = " + display.modelParams5[0]);
	1859	+ System.out.println("modelParams5[1] = " + display.modelParams5[1]);
	1860	+ System.out.println("modelParams5[2] = " + display.modelParams5[2]);
	1861	+ System.out.println("modelParams5[3] = " + display.modelParams5[3]);
	1862	+ System.out.println("modelParams6[0] = " + display.modelParams6[0]);
	1863	+ System.out.println("modelParams6[1] = " + display.modelParams6[1]);
	1864	+ System.out.println("modelParams6[2] = " + display.modelParams6[2]);
	1865	+ System.out.println("modelParams6[3] = " + display.modelParams6[3]);
	1866	+ System.out.println("modelParams7[0] = " + display.modelParams7[0]);
	1867	+ System.out.println("modelParams7[1] = " + display.modelParams7[1]);
	1868	+ System.out.println("modelParams7[2] = " + display.modelParams7[2]);
	1869	+ System.out.println("modelParams7[3] = " + display.modelParams7[3]);
	1870	+ /**/
	1871	+ //assert (display.modelParams6[2] == 0);
	1872	+
	1873	+ //System.out.println("noise power = " + display.modelParams7[0]);
	1874	+ //System.out.println("shadowbias = " + shadowbias);
	1875	+
	1876	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 0, display.modelParams0, 0);
	1877	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 1, display.modelParams1, 0);
	1878	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 2, display.modelParams2, 0);
	1879	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 3, display.modelParams3, 0);
	1880	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 4, display.modelParams4, 0);
	1881	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 5, display.modelParams5, 0);
	1882	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 6, display.modelParams6, 0);
	1883	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 7, display.modelParams7, 0);
	1884	+
	1885	+ int mode = display.FP_SHADER;
	1886	+
	1887	+ if (material.aniso != material.anisoV \|\| material.aniso > 0.002)
	1888	+ {
	1889	+ mode \|= display.FP_ANISO;
	1890	+ }
	1891	+
	1892	+ display.EnableProgram(mode);
	1893	+
	1894	+ //System.out.println("opacity power = " + display.modelParams7[1]);
	1895	+
	1896	+ if (!material.multiply)
	1897	+ {
	1898	+ if (Globals.drawMode == CameraPane.SHADOW)
	1899	+ gl.glDepthMask(material.opacity >= 0.9 && display.modelParams7[1] > 0.1);
	1900	+ else
	1901	+ gl.glDepthMask(material.opacity >= 0.99);
	1902	+ }
208	1903	}
209	1904
210	1905	int matrixdepth = 0; // 10000; // CONFLICT WITH cMESH... WARNING WARNING WARNING WARNING WARNING WARNING !!!!!!!!!!!! 0;
..	..	@@ -225,10 +1920,10 @@
225	1920	currentGL.glMultMatrixd(model, 0);
226	1921	}
227	1922
228		- void PushMatrix(double[][] matrix, int count)
	1923	+ public void PushMatrix(double[][] matrix, int count) // INTERFACE
229	1924	{
230	1925	matrixdepth++;
231		- // GraphreeD.tracein(matrix);
	1926	+ // GrafreeD.tracein(matrix);
232	1927	if (matrix == null)
233	1928	return; // Identity
234	1929
..	..	@@ -253,13 +1948,13 @@
253	1948
254	1949	void PushMatrix(double[][] matrix)
255	1950	{
256		- // GraphreeD.tracein(matrix);
257		- PushMatrix(matrix,1);
	1951	+ // GrafreeD.tracein(matrix);
	1952	+ PushMatrix(matrix, 1);
258	1953	}
259	1954
260	1955	void PushMatrix()
261	1956	{
262		- // GraphreeD.tracein(null);
	1957	+ // GrafreeD.tracein(null);
263	1958	if (matrixdepth++ < MAXSTACK - 1)
264	1959	{
265	1960	currentGL.glPushMatrix();
..	..	@@ -270,11 +1965,11 @@
270	1965
271	1966	double[][] tmpmat = new double[4][4];
272	1967
273		- void PopMatrix(double[][] inverse)
	1968	+ public void PopMatrix(double[][] inverse) // INTERFACE
274	1969	{
275	1970	--matrixdepth;
276	1971
277		- // GraphreeD.traceout(inverse);
	1972	+ // GrafreeD.traceout(inverse);
278	1973	if (inverse == null)
279	1974	return; // Identity
280	1975
..	..	@@ -292,7 +1987,7 @@
292	1987
293	1988	void PopMatrix()
294	1989	{
295		- // GraphreeD.traceout(null);
	1990	+ // GrafreeD.traceout(null);
296	1991	// inverse == null??
297	1992	if (--matrixdepth < MAXSTACK - 1)
298	1993	{
..	..	@@ -310,7 +2005,7 @@
310	2005	PushTextureMatrix(matrix, 1);
311	2006	}
312	2007
313		- void PushTextureMatrix(double[][] matrix, int count)
	2008	+ public void PushTextureMatrix(double[][] matrix, int count) // INTERFACE
314	2009	{
315	2010	currentGL.glActiveTexture(GetGL().GL_TEXTURE0);
316	2011
..	..	@@ -324,7 +2019,7 @@
324	2019	currentGL.glMatrixMode(GetGL().GL_MODELVIEW);
325	2020	}
326	2021
327		- void PopTextureMatrix(double[][] inverse)
	2022	+ public void PopTextureMatrix(double[][] inverse) // INTERFACE
328	2023	{
329	2024	currentGL.glActiveTexture(GetGL().GL_TEXTURE0);
330	2025	currentGL.glMatrixMode(GetGL().GL_TEXTURE);
..	..	@@ -351,15 +2046,15 @@
351	2046
352	2047	static int camerachangeframe;
353	2048
354		- boolean SetCamera(Camera cam)
	2049	+ public boolean SetCamera(Camera cam)
355	2050	{
356	2051	// may 2014 if (cam == cameras[0] \|\| cam == cameras[1])
357	2052	// return false;
358	2053
359		- if (REFUSEMODE && isLIVE() && camerachangeframe != 0 && camerachangeframe != framecount)
	2054	+ if (REFUSEMODE && Globals.isLIVE() && camerachangeframe != 0 && camerachangeframe != Globals.framecount)
360	2055	{
361	2056	// check for last change
362		- if (framecount < camerachangeframe + 400) // 120 == 1 second
	2057	+ if (Globals.framecount < camerachangeframe + 400) // 120 == 1 second
363	2058	{
364	2059	// refuse the camera change
365	2060	System.err.println("Camera " + cam + " REFUSED");
..	..	@@ -367,7 +2062,7 @@
367	2062	}
368	2063	}
369	2064
370		- camerachangeframe = framecount;
	2065	+ camerachangeframe = Globals.framecount;
371	2066
372	2067	cam.hAspect = -1; // Read only
373	2068
..	..	@@ -398,7 +2093,7 @@
398	2093	{
399	2094	//System.err.println("Oeil on");
400	2095	TRACK = true;
401		-// JUNE 2014 if (TRACK && trackedobject != null && drawMode == SHADOW) // && !lightMode)
	2096	+// JUNE 2014 if (TRACK && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
402	2097	// object.editWindow.ScreenFit(trackedobject);
403	2098	//pingthread.StepToTarget(true);
404	2099	}
..	..	@@ -407,8 +2102,8 @@
407	2102	{
408	2103	//System.err.println("Oeil on");
409	2104	OEIL = true;
410		- if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && drawMode == SHADOW) // && !lightMode)
411		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	2105	+ if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
	2106	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
412	2107	//pingthread.StepToTarget(true);
413	2108	}
414	2109
..	..	@@ -471,39 +2166,12 @@
471	2166	{
472	2167	frozen ^= true;
473	2168	// Weird...
474		- lighttouched = true;
	2169	+ Globals.lighttouched = true;
475	2170	}
476	2171
477	2172	void ToggleDL()
478	2173	{
479	2174	mainDL ^= true;
480		- }
481		-
482		- void ToggleTexture()
483		- {
484		- textureon ^= true;
485		- }
486		-
487		- void ToggleLive()
488		- {
489		- setLIVE(isLIVE() ^ true);
490		-
491		- System.err.println("LIVE = " + isLIVE());
492		-
493		- if (!isLIVE()) // save sound
494		- GraphreeD.savesound = true; // wav.save();
495		- // else
496		- repaint(); // start loop // may 2013
497		- }
498		-
499		- void ToggleSupport()
500		- {
501		- SUPPORT ^= true;
502		- }
503		-
504		- void ToggleAbort()
505		- {
506		- ABORTMODE ^= true;
507	2175	}
508	2176
509	2177	void ToggleFullScreen()
..	..	@@ -513,12 +2181,7 @@
513	2181
514	2182	void ToggleCrowd()
515	2183	{
516		- CROWD ^= true;
517		- }
518		-
519		- void ToggleInertia()
520		- {
521		- INERTIA ^= true;
	2184	+ Globals.CROWD ^= true;
522	2185	}
523	2186
524	2187	void ToggleLocal()
..	..	@@ -526,62 +2189,89 @@
526	2189	LOCALTRANSFORM ^= true;
527	2190	}
528	2191
529		- void ToggleFast()
	2192	+ public void ToggleTexture()
	2193	+ {
	2194	+ textureon ^= true;
	2195	+ }
	2196	+
	2197	+ public void ToggleLive()
	2198	+ {
	2199	+ Globals.setLIVE(Globals.isLIVE() ^ true);
	2200	+
	2201	+ System.err.println("LIVE = " + Globals.isLIVE());
	2202	+
	2203	+ if (!Globals.isLIVE()) // save sound
	2204	+ Grafreed.savesound = true; // wav.save();
	2205	+ // else
	2206	+ repaint(); // start loop // may 2013
	2207	+ }
	2208	+
	2209	+ public void ToggleSupport()
	2210	+ {
	2211	+ SUPPORT ^= true;
	2212	+ }
	2213	+
	2214	+ public void ToggleAbort()
	2215	+ {
	2216	+ ABORTMODE ^= true;
	2217	+ }
	2218	+
	2219	+ public void ToggleInertia()
	2220	+ {
	2221	+ INERTIA ^= true;
	2222	+ }
	2223	+
	2224	+ public void ToggleFast()
530	2225	{
531	2226	FAST ^= true;
532	2227	}
533	2228
534		- void ToggleSlowPose()
	2229	+ public void ToggleSlowPose()
535	2230	{
536	2231	SLOWPOSE ^= true;
537	2232	}
538	2233
539		- void ToggleFootContact()
540		- {
541		- FOOTCONTACT ^= true;
542		- }
543		-
544		- void ToggleBoxMode()
	2234	+ public void ToggleBoxMode()
545	2235	{
546	2236	BOXMODE ^= true;
547	2237	}
548	2238
549		- void ToggleSmoothFocus()
	2239	+ public void ToggleZoomBoxMode()
	2240	+ {
	2241	+ ZOOMBOXMODE ^= true;
	2242	+ }
	2243	+
	2244	+ public void ToggleSmoothFocus()
550	2245	{
551	2246	SMOOTHFOCUS ^= true;
552	2247	}
553	2248
554		- void ToggleImageFlip()
	2249	+ public void ToggleImageFlip()
555	2250	{
556	2251	IMAGEFLIP ^= true;
557	2252	}
558	2253
559		- void ToggleSpeakerMocap()
	2254	+ public void ToggleSpeakerMocap()
560	2255	{
561	2256	SPEAKERMOCAP ^= true;
562	2257	}
563	2258
564		- void ToggleSpeakerCamera()
	2259	+ public void ToggleSpeakerCamera()
565	2260	{
566	2261	SPEAKERCAMERA ^= true;
567	2262	}
568	2263
569		- void ToggleSpeakerFocus()
	2264	+ public void ToggleSpeakerFocus()
570	2265	{
571	2266	SPEAKERFOCUS ^= true;
572	2267	}
573	2268
574		- void ToggleDebug()
575		- {
576		- DEBUG ^= true;
577		- }
578		-
579		- void ToggleFrustum()
	2269	+ public void ToggleFrustum()
580	2270	{
581	2271	FRUSTUM ^= true;
582	2272	}
583	2273
584		- void ToggleTrack()
	2274	+ public void ToggleTrack()
585	2275	{
586	2276	TRACK ^= true;
587	2277	if (TRACK)
..	..	@@ -600,25 +2290,35 @@
600	2290	repaint();
601	2291	}
602	2292
603		- void ToggleTrackOnce()
	2293	+ public void ToggleTrackOnce()
604	2294	{
605	2295	TRACKONCE ^= true;
606	2296	}
607	2297
608		- void ToggleShadowTrack()
	2298	+ public void ToggleShadowTrack()
609	2299	{
610	2300	SHADOWTRACK ^= true;
611	2301	repaint();
612	2302	}
613	2303
614		- void ToggleOeil()
	2304	+ public void ToggleOeil()
615	2305	{
616	2306	OEIL ^= true;
617	2307	}
618	2308
619		- void ToggleOeilOnce()
	2309	+ public void ToggleOeilOnce()
620	2310	{
621	2311	OEILONCE ^= true;
	2312	+ }
	2313	+
	2314	+ void ToggleFootContact()
	2315	+ {
	2316	+ FOOTCONTACT ^= true;
	2317	+ }
	2318	+
	2319	+ void ToggleDebug()
	2320	+ {
	2321	+ Globals.DEBUG ^= true;
622	2322	}
623	2323
624	2324	void ToggleLookAt()
..	..	@@ -626,9 +2326,9 @@
626	2326	LOOKAT ^= true;
627	2327	}
628	2328
629		- void ToggleRandom()
	2329	+ void ToggleSwitch()
630	2330	{
631		- RANDOM ^= true;
	2331	+ SWITCH ^= true;
632	2332	}
633	2333
634	2334	void ToggleHandles()
..	..	@@ -636,10 +2336,17 @@
636	2336	HANDLES ^= true;
637	2337	}
638	2338
	2339	+ Object3D paintFolder;
	2340	+
639	2341	void TogglePaint()
640	2342	{
641	2343	PAINTMODE ^= true;
642	2344	paintcount = 0;
	2345	+
	2346	+ if (PAINTMODE)
	2347	+ {
	2348	+ paintFolder = GetFolder();
	2349	+ }
643	2350	}
644	2351
645	2352	void SwapCamera(int a, int b)
..	..	@@ -672,34 +2379,6 @@
672	2379	//assert (cam.hAspect == 0);
673	2380	cam.hAspect = 0;
674	2381	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	2382	}
704	2383
705	2384	private static void ApplyTransform(GL gl, Mat4f xform)
..	..	@@ -759,39 +2438,59 @@
759	2438
760	2439	GL currentGL;
761	2440
762		- GL GetGL()
	2441	+ public GL GetGL() // INTERFACE
763	2442	{
764	2443	return currentGL;
765	2444	}
766		-
	2445	+
	2446	+ static private BufferedImage CreateBim(TextureData texturedata)
	2447	+ {
	2448	+ Grafreed.Assert(texturedata != null);
	2449	+
	2450	+ int width = texturedata.getWidth();
	2451	+ int height = texturedata.getHeight();
	2452	+
	2453	+ Buffer buffer = texturedata.getBuffer();
	2454	+ ByteBuffer bytebuf = (ByteBuffer)buffer;
	2455	+
	2456	+ byte[] bytes = bytebuf.array();
	2457	+
	2458	+ return CreateBim(bytes, width, height);
	2459	+ }
	2460	+
767	2461	/**/
768	2462	class CacheTexture
769	2463	{
770	2464	com.sun.opengl.util.texture.Texture texture;
	2465	+ com.sun.opengl.util.texture.TextureData texturedata;
	2466	+
771	2467	int resolution;
772	2468
773		- CacheTexture(com.sun.opengl.util.texture.Texture tex, int res)
	2469	+ CacheTexture(com.sun.opengl.util.texture.TextureData texdata, int res)
774	2470	{
775		- texture = tex;
	2471	+ texture = com.sun.opengl.util.texture.TextureIO.newTexture(texdata);
	2472	+ texturedata = texdata;
776	2473	resolution = res;
777	2474	}
778	2475	}
779	2476	/**/
780	2477
781	2478	// TEXTURE static Texture texture;
782		- static public java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/> textures
783		- = new java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/>();
784		- static public java.util.Hashtable<String, String> usedtextures = new java.util.Hashtable<String, String>();
	2479	+ static public Hashtable<cTexture, CacheTexture> texturepigment = new Hashtable<cTexture, CacheTexture>();
	2480	+ static public Hashtable<cTexture, CacheTexture> texturebump = new Hashtable<cTexture, CacheTexture>();
	2481	+ static public Hashtable<byte[], CacheTexture> bimtextures = new Hashtable<byte[], CacheTexture>();
	2482	+ static public java.util.HashSet<cTexture> usedtextures = new java.util.HashSet<cTexture>();
	2483	+
785	2484	int pigmentdepth = 0;
786	2485	public com.sun.opengl.util.texture.Texture[] pigmentstack = new com.sun.opengl.util.texture.Texture[65536];
787	2486	int bumpdepth = 0;
788	2487	public com.sun.opengl.util.texture.Texture[] bumpstack = new com.sun.opengl.util.texture.Texture[65536];
789	2488	//public static String DEFAULT_TEXTURE = "DEFAULT_TEXTURE";
790	2489	public static cTexture DEFAULT_TEXTURES = new cTexture("DEFAULT_TEXTURE" + ":" + "DEFAULT_TEXTURE_BUMP");
791		- public static String NOISE_TEXTURE = "WHITE_NOISE";
	2490	+ public static cTexture NOISE_TEXTURE = new cTexture("WHITE_NOISE:");
792	2491	// public static cTexture IMMORTAL_TEXTURE = new cTexture("IMMORTAL");
793	2492
794		- com.sun.opengl.util.texture.Texture GetResourceTexture(String name, boolean bump)
	2493	+ com.sun.opengl.util.texture.TextureData GetResourceTexture(String name, boolean bump)
795	2494	{
796	2495	TextureData texturedata = null;
797	2496
..	..	@@ -810,13 +2509,34 @@
810	2509	if (bump)
811	2510	texturedata = ConvertBump(texturedata, false);
812	2511
813		- com.sun.opengl.util.texture.Texture texture =
814		- com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
	2512	+// com.sun.opengl.util.texture.Texture texture =
	2513	+// com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
815	2514
816		- texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
817		- texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
	2515	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
	2516	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
818	2517
819		- return texture;
	2518	+ return texturedata;
	2519	+ }
	2520	+
	2521	+ com.sun.opengl.util.texture.TextureData GetBimTexture(BufferedImage bim, boolean bump)
	2522	+ {
	2523	+ TextureData texturedata = null;
	2524	+
	2525	+ try
	2526	+ {
	2527	+ texturedata =
	2528	+ com.sun.opengl.util.texture.TextureIO.newTextureData(
	2529	+ bim,
	2530	+ true);
	2531	+ } catch (Exception e)
	2532	+ {
	2533	+ throw new javax.media.opengl.GLException(e);
	2534	+ }
	2535	+
	2536	+ if (bump)
	2537	+ texturedata = ConvertBump(texturedata, false);
	2538	+
	2539	+ return texturedata;
820	2540	}
821	2541
822	2542	boolean HUESMOOTH = true; // wrap around bug... true;
..	..	@@ -1889,6 +3609,8 @@
1889	3609
1890	3610	System.out.println("LOADING TEXTURE : " + name);
1891	3611
	3612	+ Object x = texturedata.getMipmapData(); // .getBuffer();
	3613	+
1892	3614	//
1893	3615	if (false) // compressbit > 0)
1894	3616	{
..	..	@@ -1998,10 +3720,12 @@
1998	3720	*/
1999	3721	TextureData ReduceTexture(TextureData texturedata, int resolution) // String name)
2000	3722	{
	3723	+ int pixelformat = texturedata.getPixelFormat();
	3724	+
2001	3725	int stride = 1;
2002		- if (texturedata.getPixelFormat() == GetGL().GL_RGB \|\| texturedata.getPixelFormat() == GetGL().GL_BGR) // \|\| texturedata.getPixelFormat() == GL.GL_LUMINANCE)
	3726	+ if (pixelformat == GetGL().GL_RGB \|\| pixelformat == GetGL().GL_BGR) // \|\| texturedata.getPixelFormat() == GL.GL_LUMINANCE)
2003	3727	stride = 3;
2004		- if (texturedata.getPixelFormat() == GetGL().GL_RGBA \|\| texturedata.getPixelFormat() == GetGL().GL_BGRA) // \|\| texturedata.getPixelFormat() == GL.GL_LUMINANCE_ALPHA)
	3728	+ if (pixelformat == GetGL().GL_RGBA \|\| pixelformat == GetGL().GL_BGRA) // \|\| texturedata.getPixelFormat() == GL.GL_LUMINANCE_ALPHA)
2005	3729	stride = 4;
2006	3730
2007	3731	int width = texturedata.getWidth();
..	..	@@ -2591,6 +4315,7 @@
2591	4315
2592	4316	com.sun.opengl.util.texture.Texture CompressTexture2(String name)
2593	4317	{
	4318	+ new Exception().printStackTrace();
2594	4319	System.exit(0);
2595	4320	com.sun.opengl.util.texture.Texture texture = null;
2596	4321
..	..	@@ -6267,7 +7992,7 @@
6267	7992	return null;
6268	7993	}
6269	7994
6270		- void ReleaseTextures(cTexture tex)
	7995	+ public void ReleaseTextures(cTexture tex) // INTERFACE
6271	7996	{
6272	7997	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
6273	7998	{
..	..	@@ -6284,7 +8009,7 @@
6284	8009	String pigment = Object3D.GetPigment(tex);
6285	8010	String bump = Object3D.GetBump(tex);
6286	8011
6287		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8012	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
6288	8013	{
6289	8014	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
6290	8015	// System.out.println("; bump = " + bump);
..	..	@@ -6299,13 +8024,71 @@
6299	8024	pigment = null;
6300	8025	}
6301	8026
6302		- ReleaseTexture(bump, true);
6303		- ReleaseTexture(pigment, false);
	8027	+ ReleaseTexture(tex, true);
	8028	+ ReleaseTexture(tex, false);
6304	8029	}
6305	8030
6306		- void ReleaseTexture(String tex, boolean bump)
	8031	+ public void ReleasePigmentTexture(cTexture tex) // INTERFACE
6307	8032	{
6308		- if (// drawMode != 0 \|\| /tex == null \|\|/
	8033	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	8034	+ {
	8035	+ return;
	8036	+ }
	8037	+
	8038	+ if (tex == null)
	8039	+ {
	8040	+ ReleaseTexture(null, false);
	8041	+ return;
	8042	+ }
	8043	+
	8044	+ String pigment = Object3D.GetPigment(tex);
	8045	+
	8046	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8047	+ {
	8048	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	8049	+ // System.out.println("; bump = " + bump);
	8050	+ }
	8051	+
	8052	+ if (pigment.equals(""))
	8053	+ {
	8054	+ pigment = null;
	8055	+ }
	8056	+
	8057	+ ReleaseTexture(tex, false);
	8058	+ }
	8059	+
	8060	+ public void ReleaseBumpTexture(cTexture tex) // INTERFACE
	8061	+ {
	8062	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	8063	+ {
	8064	+ return;
	8065	+ }
	8066	+
	8067	+ if (tex == null)
	8068	+ {
	8069	+ ReleaseTexture(null, true);
	8070	+ return;
	8071	+ }
	8072	+
	8073	+ String bump = Object3D.GetBump(tex);
	8074	+
	8075	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8076	+ {
	8077	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	8078	+ // System.out.println("; bump = " + bump);
	8079	+ }
	8080	+
	8081	+ if (bump.equals(""))
	8082	+ {
	8083	+ bump = null;
	8084	+ }
	8085	+
	8086	+ ReleaseTexture(tex, true);
	8087	+ }
	8088	+
	8089	+ void ReleaseTexture(cTexture tex, boolean bump)
	8090	+ {
	8091	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
6309	8092	ambientOcclusion ) // \|\| !textureon)
6310	8093	{
6311	8094	return;
..	..	@@ -6314,7 +8097,7 @@
6314	8097	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
6315	8098
6316	8099	if (tex != null)
6317		- texture = textures.get(tex);
	8100	+ texture = bump ? texturebump.get(tex) : texturepigment.get(tex);
6318	8101
6319	8102	// //assert( texture != null );
6320	8103	// if (texture == null)
..	..	@@ -6331,7 +8114,7 @@
6331	8114	{
6332	8115	bumpdepth--;
6333	8116
6334		- // GraphreeD.trace("POP " + tex + "(" + pigmentdepth + ")" + " : " + pigmentstack[pigmentdepth] + " vs " + texture);
	8117	+ // GrafreeD.trace("POP " + tex + "(" + pigmentdepth + ")" + " : " + pigmentstack[pigmentdepth] + " vs " + texture);
6335	8118	if (bumpstack[bumpdepth] != (texture!=null?texture.texture:null))
6336	8119	{
6337	8120	// assert (bumpstack[bumpdepth] == texture);
..	..	@@ -6361,7 +8144,7 @@
6361	8144	{
6362	8145	pigmentdepth--;
6363	8146
6364		- // GraphreeD.trace("POP " + tex + "(" + pigmentdepth + ")" + " : " + pigmentstack[pigmentdepth] + " vs " + texture);
	8147	+ // GrafreeD.trace("POP " + tex + "(" + pigmentdepth + ")" + " : " + pigmentstack[pigmentdepth] + " vs " + texture);
6365	8148	if (pigmentstack[pigmentdepth] != (texture!=null?texture.texture:null))
6366	8149	{
6367	8150	// assert (pigmentstack[pigmentdepth] == texture);
..	..	@@ -6406,9 +8189,57 @@
6406	8189	}
6407	8190	}
6408	8191
6409		- /boolean/ void BindTextures(cTexture tex, int resolution)
	8192	+ /boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
6410	8193	{
6411		- if (// drawMode != 0 \|\| /tex == null \|\|/
	8194	+// if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8195	+// ambientOcclusion ) // \|\| !textureon)
	8196	+// {
	8197	+// return; // false;
	8198	+// }
	8199	+//
	8200	+// if (tex == null)
	8201	+// {
	8202	+// BindTexture(null,false,resolution);
	8203	+// BindTexture(null,true,resolution);
	8204	+// return;
	8205	+// }
	8206	+//
	8207	+// String pigment = Object3D.GetPigment(tex);
	8208	+// String bump = Object3D.GetBump(tex);
	8209	+//
	8210	+// usedtextures.add(pigment);
	8211	+// usedtextures.add(bump);
	8212	+//
	8213	+// //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8214	+// {
	8215	+// // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8216	+// // System.out.println("; bump = " + bump);
	8217	+// }
	8218	+//
	8219	+// if (bump.equals(""))
	8220	+// {
	8221	+// bump = null;
	8222	+// }
	8223	+// if (pigment.equals(""))
	8224	+// {
	8225	+// pigment = null;
	8226	+// }
	8227	+//
	8228	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8229	+// BindTexture(pigment, false, resolution);
	8230	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
	8231	+// BindTexture(bump, true, resolution);
	8232	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8233	+//
	8234	+// return; // true;
	8235	+
	8236	+ BindPigmentTexture(tex, resolution);
	8237	+ BindBumpTexture(tex, resolution);
	8238	+ }
	8239	+
	8240	+ /boolean/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8241	+ {
	8242	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
6412	8243	ambientOcclusion ) // \|\| !textureon)
6413	8244	{
6414	8245	return; // false;
..	..	@@ -6417,17 +8248,47 @@
6417	8248	if (tex == null)
6418	8249	{
6419	8250	BindTexture(null,false,resolution);
6420		- BindTexture(null,true,resolution);
6421	8251	return;
6422	8252	}
6423	8253
6424	8254	String pigment = Object3D.GetPigment(tex);
	8255	+
	8256	+ usedtextures.add(tex);
	8257	+
	8258	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8259	+ {
	8260	+ // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8261	+ // System.out.println("; bump = " + bump);
	8262	+ }
	8263	+
	8264	+ if (pigment.equals(""))
	8265	+ {
	8266	+ pigment = null;
	8267	+ }
	8268	+
	8269	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8270	+ BindTexture(tex, false, resolution);
	8271	+ }
	8272	+
	8273	+ /boolean/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8274	+ {
	8275	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8276	+ ambientOcclusion ) // \|\| !textureon)
	8277	+ {
	8278	+ return; // false;
	8279	+ }
	8280	+
	8281	+ if (tex == null)
	8282	+ {
	8283	+ BindTexture(null,true,resolution);
	8284	+ return;
	8285	+ }
	8286	+
6425	8287	String bump = Object3D.GetBump(tex);
6426	8288
6427		- usedtextures.put(pigment, pigment);
6428		- usedtextures.put(bump, bump);
	8289	+ usedtextures.add(tex);
6429	8290
6430		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8291	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
6431	8292	{
6432	8293	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
6433	8294	// System.out.println("; bump = " + bump);
..	..	@@ -6437,43 +8298,94 @@
6437	8298	{
6438	8299	bump = null;
6439	8300	}
6440		- if (pigment.equals(""))
6441		- {
6442		- pigment = null;
6443		- }
6444	8301
6445		- GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
6446		- BindTexture(pigment, false, resolution);
6447	8302	GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
6448		- BindTexture(bump, true, resolution);
	8303	+ BindTexture(tex, true, resolution);
6449	8304	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
6450		-
6451		- return; // true;
6452	8305	}
6453	8306
6454		- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution)
	8307	+ java.util.HashSet<String> missingTextures = new java.util.HashSet<String>();
	8308	+
	8309	+ private boolean FileExists(String tex)
6455	8310	{
6456		- CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
	8311	+ if (missingTextures.contains(tex))
	8312	+ {
	8313	+ return false;
	8314	+ }
	8315	+
	8316	+ boolean fileExists = new File(tex).exists();
	8317	+
	8318	+ if (!fileExists)
	8319	+ {
	8320	+ // If file exists, the "new File()" is not executed sgain
	8321	+ missingTextures.add(tex);
	8322	+ }
	8323	+
	8324	+ return fileExists;
	8325	+ }
	8326	+
	8327	+ CacheTexture GetCacheTexture(cTexture tex, boolean bump, int resolution) throws Exception
	8328	+ {
	8329	+ CacheTexture texturecache = null;
6457	8330
6458	8331	if (tex != null)
6459	8332	{
6460		- String texname = tex;
	8333	+ String texname = bump ? Object3D.GetBump(tex) : Object3D.GetPigment(tex);
	8334	+ byte[] texdata = bump ? tex.bumpdata : tex.pigmentdata;
6461	8335
6462		- String[] split = tex.split("Textures");
6463		- if (split.length > 1)
6464		- texname = "/Users/nbriere/Textures" + split[split.length-1];
6465		- else
6466		- if (!texname.startsWith("/"))
6467		- texname = "/Users/nbriere/Textures/" + texname;
	8336	+ if (texname.equals("") && texdata == null)
	8337	+ {
	8338	+ return null;
	8339	+ }
	8340	+
	8341	+ String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
	8342	+
	8343	+// String[] split = tex.split("Textures");
	8344	+// if (split.length > 1)
	8345	+// texname = "/Users/nbriere/Textures" + split[split.length-1];
	8346	+// else
	8347	+// if (!texname.startsWith("/"))
	8348	+// texname = "/Users/nbriere/Textures/" + texname;
	8349	+ if (!FileExists(texname))
	8350	+ {
	8351	+ texname = fallbackTextureName;
	8352	+ }
6468	8353
6469	8354	if (CACHETEXTURE)
6470		- texture = textures.get(texname); // TEXTURE CACHE
6471		-
6472		- TextureData texturedata = null;
6473		-
6474		- if (texture == null \|\| texture.resolution < resolution)
6475	8355	{
6476		- if (tex.equals("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
	8356	+ if (texdata == null)
	8357	+ texturecache = bump ? texturebump.get(tex) : texturepigment.get(tex);
	8358	+ else
	8359	+ texturecache = bimtextures.get(texdata);
	8360	+ }
	8361	+
	8362	+ if (texturecache == null \|\| texturecache.resolution != -1 && texturecache.resolution < resolution)
	8363	+ {
	8364	+ TextureData texturedata = null;
	8365	+
	8366	+ if (texdata != null && textureon)
	8367	+ {
	8368	+ BufferedImage bim; // = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
	8369	+
	8370	+ try
	8371	+ {
	8372	+ bim = DecompressJPEG(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8373	+ }
	8374	+ catch (Exception e)
	8375	+ {
	8376	+ bim = CreateBim(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8377	+ }
	8378	+
	8379	+ texturecache = new CacheTexture(GetBimTexture(bim, bump), -1);
	8380	+ bimtextures.put(texdata, texturecache);
	8381	+
	8382	+ //BufferedImage bim3 = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
	8383	+
	8384	+ //Object bim2 = CreateBim(texturecache.texturedata);
	8385	+ //bim2 = bim;
	8386	+ }
	8387	+ else
	8388	+ if (texname.endsWith("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
6477	8389	{
6478	8390	assert(!bump);
6479	8391	// if (bump)
..	..	@@ -6484,19 +8396,23 @@
6484	8396	// }
6485	8397	// else
6486	8398	// {
6487		- texture = textures.get(tex);
6488		- if (texture == null)
	8399	+ // texturecache = textures.get(texname); // suspicious
	8400	+ if (texturecache == null)
6489	8401	{
6490		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8402	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
6491	8403	}
	8404	+ else
	8405	+ new Exception().printStackTrace();
6492	8406	// }
6493	8407	} else
6494		- if (tex.equals("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
	8408	+ if (texname.endsWith("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
6495	8409	{
6496	8410	assert(bump);
6497		- texture = textures.get(tex);
6498		- if (texture == null)
6499		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8411	+ // texturecache = textures.get(texname); // suspicious
	8412	+ if (texturecache == null)
	8413	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8414	+ else
	8415	+ new Exception().printStackTrace();
6500	8416	} else
6501	8417	{
6502	8418	//if (tex.equals("IMMORTAL"))
..	..	@@ -6504,11 +8420,13 @@
6504	8420	// texture = GetResourceTexture("default.png");
6505	8421	//} else
6506	8422	//{
6507		- if (tex.equals("WHITE_NOISE"))
	8423	+ if (texname.endsWith("WHITE_NOISE"))
6508	8424	{
6509		- texture = textures.get(tex);
6510		- if (texture == null)
6511		- texture = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8425	+ // texturecache = textures.get(texname); // suspicious
	8426	+ if (texturecache == null)
	8427	+ texturecache = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8428	+ else
	8429	+ new Exception().printStackTrace();
6512	8430	} else
6513	8431	{
6514	8432	if (textureon)
..	..	@@ -6533,7 +8451,7 @@
6533	8451	}
6534	8452
6535	8453	cachename = texname.substring(0, texname.length()-4)+ext+".jpg";
6536		- if (!new File(cachename).exists())
	8454	+ if (!FileExists(cachename))
6537	8455	cachename = texname;
6538	8456	else
6539	8457	processbump = false; // don't process bump map again
..	..	@@ -6555,7 +8473,7 @@
6555	8473	}
6556	8474
6557	8475	cachename = texname.substring(0, texname.length()-4)+ext+".png";
6558		- if (!new File(cachename).exists())
	8476	+ if (!FileExists(cachename))
6559	8477	cachename = texname;
6560	8478	else
6561	8479	processbump = false; // don't process bump map again
..	..	@@ -6564,20 +8482,22 @@
6564	8482	texturedata = GetFileTexture(cachename, processbump, resolution);
6565	8483
6566	8484
6567		- if (texturedata != null)
6568		- texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
	8485	+ if (texturedata == null)
	8486	+ throw new Exception();
	8487	+
	8488	+ texturecache = new CacheTexture(texturedata,resolution);
6569	8489	//texture = GetTexture(tex, bump);
6570	8490	}
6571	8491	}
6572	8492	//}
6573	8493	}
6574	8494
6575		- if (/CACHETEXTURE &&/ texture != null && textureon)
	8495	+ if (texdata == null && /CACHETEXTURE &&/ texturecache != null && textureon)
6576	8496	{
6577	8497	//return false;
6578	8498
6579	8499	// System.out.println("CACHE +++++++++++++++ TEXTURE : " + texname + " (" + texture.getEstimatedMemorySize() + ")");
6580		- if (texturedata != null && (texname.endsWith(".jpg") \|\| texname.endsWith(".JPG")))
	8500	+ if (texturedata != null && texname.toLowerCase().endsWith(".jpg"))
6581	8501	{
6582	8502	// String ext = "_highres";
6583	8503	// if (REDUCETEXTURE)
..	..	@@ -6594,52 +8514,17 @@
6594	8514	File cachefile = new File(texname.substring(0, texname.length()-4)+ext+".jpg");
6595	8515	if (!cachefile.exists())
6596	8516	{
6597		- // cache to disk
6598		- Buffer buffer = texturedata.getBuffer(); // getMipmapData();
6599		- //buffers[0].
6600		-
6601		- ByteBuffer bytebuf = (ByteBuffer)buffer; // ).asIntBuffer();
6602		- int[] pixels = new int[bytebuf.capacity()/3];
6603		-
6604		- // squared size heuristic...
6605		- if ((int)Math.sqrt(pixels.length) == Math.sqrt(pixels.length))
	8517	+ //if (texturedata.getWidth() == texturedata.getHeight())
6606	8518	{
6607		- for (int i=pixels.length; --i>=0;)
6608		- {
6609		- int i3 = i*3;
6610		- pixels[i] = 0xFF;
6611		- pixels[i] <<= 8;
6612		- pixels[i] \|= bytebuf.get(i3+2) & 0xFF;
6613		- pixels[i] <<= 8;
6614		- pixels[i] \|= bytebuf.get(i3+1) & 0xFF;
6615		- pixels[i] <<= 8;
6616		- pixels[i] \|= bytebuf.get(i3) & 0xFF;
6617		- }
6618		-
6619		- /*
6620		- int r=0,g=0,b=0,a=0;
6621		- for (int i=0; i<width; i++)
6622		- for (int j=0; j<height; j++)
6623		- {
6624		- int index = j*width+i;
6625		- int p = pixels[index];
6626		- a = ((p>>24) & 0xFF);
6627		- r = ((p>>16) & 0xFF);
6628		- g = ((p>>8) & 0xFF);
6629		- b = (p & 0xFF);
6630		- pixels[index] = (a<<24) \| (b<<16) \| (g<<8) \| r;
6631		- }
6632		- /**/
6633		- int width = (int)Math.sqrt(pixels.length); // squared
6634		- int height = width;
6635		- BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
6636		- rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
	8519	+ BufferedImage rendImage = CreateBim(texturedata);
	8520	+
6637	8521	ImageWriter writer = null;
6638	8522	Iterator iter = ImageIO.getImageWritersByFormatName("jpg");
6639	8523	if (iter.hasNext()) {
6640	8524	writer = (ImageWriter)iter.next();
6641	8525	}
6642		- float compressionQuality = 0.9f;
	8526	+
	8527	+ float compressionQuality = 0.85f;
6643	8528	try
6644	8529	{
6645	8530	ImageOutputStream ios = ImageIO.createImageOutputStream(cachefile);
..	..	@@ -6656,16 +8541,20 @@
6656	8541	}
6657	8542	}
6658	8543	}
6659		-
	8544	+
	8545	+ Hashtable<cTexture, CacheTexture> textures = bump ? texturebump : texturepigment;
	8546	+
6660	8547	//System.out.println("Texture = " + tex);
6661		- if (textures.containsKey(texname))
	8548	+ if (textures.containsKey(tex))
6662	8549	{
6663		- CacheTexture thetex = textures.get(texname);
	8550	+ CacheTexture thetex = textures.get(tex);
6664	8551	thetex.texture.disable();
6665	8552	thetex.texture.dispose();
6666		- textures.remove(texname);
	8553	+ textures.remove(tex);
6667	8554	}
6668		- textures.put(texname, texture);
	8555	+
	8556	+ //texture.texturedata = texturedata;
	8557	+ textures.put(tex, texturecache);
6669	8558
6670	8559	// newtex = true;
6671	8560	}
..	..	@@ -6681,28 +8570,76 @@
6681	8570	}
6682	8571	}
6683	8572
	8573	+ return texturecache;
	8574	+ }
	8575	+
	8576	+ static void EmbedTextures(cTexture tex)
	8577	+ {
	8578	+ if (tex.pigmentdata == null)
	8579	+ {
	8580	+ //String texname = Object3D.GetPigment(tex);
	8581	+
	8582	+ CacheTexture texturecache = texturepigment.get(tex);
	8583	+
	8584	+ if (texturecache != null)
	8585	+ {
	8586	+ tex.pw = texturecache.texturedata.getWidth();
	8587	+ tex.ph = texturecache.texturedata.getHeight();
	8588	+ tex.pigmentdata = //CompressJPEG(CreateBim
	8589	+ ((ByteBuffer)texturecache.texturedata.getBuffer()).array()
	8590	+ ;
	8591	+ //, tex.pw, tex.ph), 0.5f);
	8592	+ }
	8593	+ }
	8594	+
	8595	+ if (tex.bumpdata == null)
	8596	+ {
	8597	+ //String texname = Object3D.GetBump(tex);
	8598	+
	8599	+ CacheTexture texturecache = texturebump.get(tex);
	8600	+
	8601	+ if (texturecache != null)
	8602	+ {
	8603	+ tex.bw = texturecache.texturedata.getWidth();
	8604	+ tex.bh = texturecache.texturedata.getHeight();
	8605	+ tex.bumpdata = CompressJPEG(CreateBim(((ByteBuffer)texturecache.texturedata.getBuffer()).array(), tex.bw, tex.bh), 0.5f);
	8606	+ }
	8607	+ }
	8608	+ }
	8609	+
	8610	+ com.sun.opengl.util.texture.Texture GetTexture(cTexture tex, boolean bump, int resolution) throws Exception
	8611	+ {
	8612	+ CacheTexture texture = GetCacheTexture(tex, bump, resolution);
	8613	+
6684	8614	if (bump)
6685	8615	{
6686		- // GraphreeD.trace("PUSH BUMP " + tex + "(" + bumpdepth + ")" + " : " + texture);
	8616	+ // GrafreeD.trace("PUSH BUMP " + tex + "(" + bumpdepth + ")" + " : " + texture);
6687	8617	bumpstack[bumpdepth++] = texture!=null?texture.texture:null;
6688	8618	}
6689	8619	else
6690	8620	{
6691		- // GraphreeD.trace("PUSH PIGMENT " + tex + "(" + pigmentdepth + ")" + " : " + texture);
	8621	+ // GrafreeD.trace("PUSH PIGMENT " + tex + "(" + pigmentdepth + ")" + " : " + texture);
6692	8622	pigmentstack[pigmentdepth++] = texture!=null?texture.texture:null;
6693	8623	}
6694	8624
6695	8625	return texture!=null?texture.texture:null;
6696	8626	}
6697	8627
6698		- boolean BindTexture(String tex, boolean bump, int resolution)
	8628	+ public com.sun.opengl.util.texture.TextureData GetTextureData(cTexture tex, boolean bump, int resolution) throws Exception
	8629	+ {
	8630	+ CacheTexture texture = GetCacheTexture(tex, bump, resolution);
	8631	+
	8632	+ return texture!=null?texture.texturedata:null;
	8633	+ }
	8634	+
	8635	+ boolean BindTexture(cTexture tex, boolean bump, int resolution) throws Exception
6699	8636	{
6700	8637	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
6701	8638	{
6702	8639	return false;
6703	8640	}
6704	8641
6705		- boolean newtex = false;
	8642	+ //boolean newtex = false;
6706	8643
6707	8644	com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
6708	8645
..	..	@@ -6734,9 +8671,75 @@
6734	8671	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_S, GetGL().GL_REPEAT);
6735	8672	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_T, GetGL().GL_REPEAT);
6736	8673
6737		- return newtex;
	8674	+ return true; // Warning: not used.
6738	8675	}
6739	8676
	8677	+ public static byte[] CompressJPEG(BufferedImage image, float quality)
	8678	+ {
	8679	+ try
	8680	+ {
	8681	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	8682	+ Iterator<ImageWriter> writers = ImageIO.getImageWritersByFormatName("jpg");
	8683	+ ImageWriter writer = writers.next();
	8684	+
	8685	+ ImageWriteParam param = writer.getDefaultWriteParam();
	8686	+ param.setCompressionMode(ImageWriteParam.MODE_EXPLICIT);
	8687	+ param.setCompressionQuality(quality);
	8688	+
	8689	+ ImageOutputStream ios = ImageIO.createImageOutputStream(baos);
	8690	+ writer.setOutput(ios);
	8691	+ writer.write(null, new IIOImage(image, null, null), param);
	8692	+
	8693	+ byte[] data = baos.toByteArray();
	8694	+ writer.dispose();
	8695	+ return data;
	8696	+ }
	8697	+ catch (Exception e)
	8698	+ {
	8699	+ e.printStackTrace();
	8700	+ return null;
	8701	+ }
	8702	+ }
	8703	+
	8704	+ public static BufferedImage DecompressJPEG(byte[] image, int w, int h) throws IOException
	8705	+ {
	8706	+ ByteArrayInputStream baos = new ByteArrayInputStream(image);
	8707	+ Iterator<ImageReader> writers = ImageIO.getImageReadersByFormatName("jpg");
	8708	+ ImageReader reader = writers.next();
	8709	+
	8710	+ BufferedImage bim = new BufferedImage(w, h, BufferedImage.TYPE_INT_RGB);
	8711	+
	8712	+ ImageReadParam param = reader.getDefaultReadParam();
	8713	+ param.setDestination(bim);
	8714	+ //param.setDestinationType(ImageTypeSpecifier.createFromBufferedImageType(BufferedImage.TYPE_INT_RGB));
	8715	+
	8716	+ ImageInputStream ios = ImageIO.createImageInputStream(baos);
	8717	+ reader.setInput(ios);
	8718	+ BufferedImage bim2 = reader.read(0, param);
	8719	+ reader.dispose();
	8720	+
	8721	+// WritableRaster raster = bim2.getRaster();
	8722	+// DataBufferByte data = (DataBufferByte) raster.getDataBuffer();
	8723	+// byte[] bytes = data.getData();
	8724	+//
	8725	+// int[] pixels = new int[bytes.length/3];
	8726	+// for (int i=pixels.length; --i>=0;)
	8727	+// {
	8728	+// int i3 = i*3;
	8729	+// pixels[i] = 0xFF;
	8730	+// pixels[i] <<= 8;
	8731	+// pixels[i] \|= bytes[i3+2] & 0xFF;
	8732	+// pixels[i] <<= 8;
	8733	+// pixels[i] \|= bytes[i3+1] & 0xFF;
	8734	+// pixels[i] <<= 8;
	8735	+// pixels[i] \|= bytes[i3] & 0xFF;
	8736	+// }
	8737	+//
	8738	+// bim.setRGB(0,0,w,h, pixels, w*(h-1),-w);
	8739	+
	8740	+ return bim;
	8741	+ }
	8742	+
6740	8743	ShadowBuffer shadowPBuf;
6741	8744	AntialiasBuffer antialiasPBuf;
6742	8745	int MAXSTACK;
..	..	@@ -7292,9 +9295,9 @@
7292	9295	static boolean occlusionInitialized = false;
7293	9296	boolean selection = false;
7294	9297	boolean pointselection = false;
7295		- /static/ boolean lighttouched = true;
	9298	+ ///static/ boolean lighttouched = true;
7296	9299	boolean deselect;
7297		- boolean ambientOcclusion = false;
	9300	+ private boolean ambientOcclusion = false;
7298	9301	static boolean flash = false;
7299	9302	/static/ boolean wait = false;
7300	9303	boolean displaydone = false; // after repaint() calls
..	..	@@ -7424,6 +9427,8 @@
7424	9427	//gl.glFrustum(-0.5scale, 0.5scale, -0.5scale, 0.5scale, 1, 100);
7425	9428	//glu.gluPerspective(lightshaper_fovy, 1, lightshaper_zNear, lightshaper_zFar);
7426	9429	double scale = lightCamera.SCALE / lightCamera.Distance();
	9430	+// PATCH FILLE AUX JEANS
	9431	+ //scale *= lightCamera.shaper_fovy / 25;
7427	9432	gl.glScaled(2 * scale, 2 * scale, -scale);
7428	9433	gl.glTranslated(0, 0, lightCamera.DECAL);
7429	9434
..	..	@@ -7570,17 +9575,40 @@
7570	9575	jy8[3] = 0.5f;
7571	9576	}
7572	9577
7573		- float[] options1 = new float[]{1000, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
	9578	+ float[] options1 = new float[]{100, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
7574	9579	float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
7575		- float[] options3 = new float[]{1, 1, 1, 1}; // fog color. image intensity
	9580	+ float[] options3 = new float[]{1, 1, 1, 0}; // fog color
	9581	+ float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
7576	9582
	9583	+ void ResetOptions()
	9584	+ {
	9585	+ options1[0] = 100;
	9586	+ options1[1] = 0.025f;
	9587	+ options1[2] = 0.01f;
	9588	+ options1[3] = 0;
	9589	+ options1[4] = 0;
	9590	+
	9591	+ options2[0] = 0;
	9592	+ options2[1] = 0.75f;
	9593	+ options2[2] = 0;
	9594	+ options2[3] = 0;
	9595	+
	9596	+ options3[0] = 1;
	9597	+ options3[1] = 1;
	9598	+ options3[2] = 1;
	9599	+ options3[3] = 0;
	9600	+
	9601	+ options4[0] = 1;
	9602	+ options4[1] = 0;
	9603	+ options4[2] = 1;
	9604	+ options4[3] = 0;
	9605	+ }
	9606	+
7577	9607	static int imagecount = 0; // movie generation
7578	9608
7579	9609	static int jitter = 0;
7580	9610
7581	9611	boolean restartframe = false;
7582		-
7583		- static int framecount = 0; // general-purpose global count
7584	9612
7585	9613	void displayAntiAliased(javax.media.opengl.GL gl)
7586	9614	{
..	..	@@ -7610,14 +9638,14 @@
7610	9638
7611	9639	//System.out.println("start frame");
7612	9640	gl.glClear(gl.GL_ACCUM_BUFFER_BIT);
7613		- for (jitter = 0; jitter < ACSIZE; jitter++) //, GraphreeD.wav.cursor += LIVE ? 735 : 0)
	9641	+ for (jitter = 0; jitter < ACSIZE; jitter++) //, GrafreeD.wav.cursor += LIVE ? 735 : 0)
7614	9642	{
7615		- framecount++;
	9643	+ Globals.framecount++;
7616	9644
7617	9645	if (CameraPane.tickcount > 0)
7618	9646	CameraPane.tickcount--;
7619	9647
7620		-// GraphreeD.wav.cursor += 735; // 44100 Hz / 120 Hz * 2 (for 16 bits)
	9648	+// GrafreeD.wav.cursor += 735; // 44100 Hz / 120 Hz * 2 (for 16 bits)
7621	9649	// restartframe = true;
7622	9650	if (options1[2] > 100 && (jitter%2==0))
7623	9651	{
..	..	@@ -7650,7 +9678,7 @@
7650	9678
7651	9679	gl.glLightfv(gl.GL_LIGHT0, gl.GL_POSITION, pos, 0);
7652	9680	*/
7653		- lighttouched = true;
	9681	+ Globals.lighttouched = true;
7654	9682	//System.err.println(" shadowbuffer: " + jitter);
7655	9683	shadowbuffer.display();
7656	9684
..	..	@@ -7671,8 +9699,8 @@
7671	9699	assert (parentcam != renderCamera);
7672	9700
7673	9701	if (renderCamera != lightCamera)
7674		- for (int count = parentcam.GetTransformCount(); --count>=0;)
7675		- LA.matConcat(parentcam.toParent, matrix, matrix);
	9702	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9703	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
7676	9704
7677	9705	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
7678	9706
..	..	@@ -7687,8 +9715,8 @@
7687	9715	LA.matCopy(renderCamera.fromScreen, matrix);
7688	9716
7689	9717	if (renderCamera != lightCamera)
7690		- for (int count = parentcam.GetTransformCount(); --count>=0;)
7691		- LA.matConcat(matrix, parentcam.fromParent, matrix);
	9718	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9719	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
7692	9720
7693	9721	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
7694	9722
..	..	@@ -7760,7 +9788,7 @@
7760	9788	//gl.glFlush();
7761	9789	gl.glAccum(gl.GL_ACCUM, 1.0f / ACSIZE);
7762	9790
7763		- if (ANIMATION && ABORTED)
	9791	+ if (Globals.ANIMATION && ABORTED)
7764	9792	{
7765	9793	System.err.println(" ABORTED FRAME");
7766	9794	break;
..	..	@@ -7790,7 +9818,7 @@
7790	9818	setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
7791	9819
7792	9820	// save image
7793		- if (ANIMATION && !ABORTED)
	9821	+ if (Globals.ANIMATION && !ABORTED)
7794	9822	{
7795	9823	VPwidth = viewport[2];
7796	9824	VPheight = viewport[3];
..	..	@@ -7901,11 +9929,11 @@
7901	9929
7902	9930	// imagecount++;
7903	9931
7904		- String fullname = filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
	9932	+ String fullname = Globals.filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
7905	9933
7906	9934	if (!BOXMODE)
7907	9935	{
7908		- System.out.println("image: " + fullname + " (" + (GraphreeD.wav.cursor / 735 / 4) + ")");
	9936	+ System.out.println("image: " + fullname + " (wav cursor=" + (Grafreed.wav.cursor / 735 / 4) + ")");
7909	9937	}
7910	9938
7911	9939	if (!BOXMODE)
..	..	@@ -7933,7 +9961,7 @@
7933	9961	{
7934	9962	if (ACSIZE > 1)
7935	9963	{
7936		- // System.err.println("image #" + (GraphreeD.wav.cursor / 735 / 4));
	9964	+ // System.err.println("image #" + (GrafreeD.wav.cursor / 735 / 4));
7937	9965	}
7938	9966	}
7939	9967
..	..	@@ -7943,7 +9971,7 @@
7943	9971	ABORTED = false;
7944	9972	}
7945	9973	else
7946		- GraphreeD.wav.cursor += 735 * ACSIZE;
	9974	+ Grafreed.wav.cursor += 735 * ACSIZE;
7947	9975
7948	9976	if (false)
7949	9977	{
..	..	@@ -8597,13 +10625,6 @@
8597	10625	}
8598	10626	}
8599	10627
8600		- boolean IsFrozen()
8601		- {
8602		- boolean selectmode = drawMode == SELECTION \|\| CameraPane.DEBUG_SELECTION;
8603		-
8604		- return !selectmode && cameracount == 0; // != 0;
8605		- }
8606		-
8607	10628	boolean niceon = false;
8608	10629	javax.swing.Timer AAtimer = new javax.swing.Timer(750, this);
8609	10630	boolean currentlydrawing = false;
..	..	@@ -8613,16 +10634,16 @@
8613	10634
8614	10635	public void display(GLAutoDrawable drawable)
8615	10636	{
8616		- if (GraphreeD.savesound && GraphreeD.hassound)
	10637	+ if (Grafreed.savesound && Grafreed.hassound)
8617	10638	{
8618		- GraphreeD.wav.save();
8619		- GraphreeD.savesound = false;
8620		- GraphreeD.hassound = false;
	10639	+ Grafreed.wav.save();
	10640	+ Grafreed.savesound = false;
	10641	+ Grafreed.hassound = false;
8621	10642	}
8622	10643	// if (DEBUG_SELECTION)
8623	10644	// {
8624		-// if (drawMode != SELECTION)
8625		-// drawMode = SELECTION;
	10645	+// if (DrawMode() != SELECTION)
	10646	+// DrawMode() = SELECTION;
8626	10647	// }
8627	10648
8628	10649	if (!isRenderer)
..	..	@@ -8678,9 +10699,9 @@
8678	10699
8679	10700	//ANTIALIAS = 0;
8680	10701
8681		- if (drawMode == DEFAULT) // && CURRENTANTIALIAS > 0)
	10702	+ if (DrawMode() == DEFAULT) // && CURRENTANTIALIAS > 0)
8682	10703	{
8683		- if (niceon \|\| isLIVE())
	10704	+ if (niceon \|\| Globals.isLIVE())
8684	10705	{
8685	10706	//if(active == 0)
8686	10707	// antialiaser = null;
..	..	@@ -8693,6 +10714,7 @@
8693	10714	ANTIALIAS = 0;
8694	10715	//System.out.println("RESTART");
8695	10716	AAtimer.restart();
	10717	+ Globals.TIMERRUNNING = true;
8696	10718	}
8697	10719	}
8698	10720	}
..	..	@@ -8705,7 +10727,7 @@
8705	10727	assert eyeCamera.shaper_zFar == 1E5f; // 500.0f;
8706	10728	*/
8707	10729
8708		- if (drawMode == DEFAULT)
	10730	+ if (DrawMode() == DEFAULT)
8709	10731	{
8710	10732	currentlydrawing = true;
8711	10733	}
..	..	@@ -8736,18 +10758,18 @@
8736	10758
8737	10759	// if(Applet3D.clipboard != null)
8738	10760	// System.out.println("Clipboard = " + Applet3D.clipboard); //.get(0).parent);
8739		-//drawMode = SELECTION;
	10761	+//DrawMode() = SELECTION;
8740	10762	indexcount = 0;
8741	10763
8742		- if (drawMode == OCCLUSION)
	10764	+ if (DrawMode() == OCCLUSION)
8743	10765	{
8744		- drawMode = DEFAULT;
	10766	+ Globals.drawMode = DEFAULT; // WARNING
8745	10767	ambientOcclusion = true;
8746	10768	setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
8747	10769	Object3D theobject = object;
8748	10770	Object3D theparent = object.parent;
8749	10771	object.parent = null;
8750		- object = (Object3D)GraphreeD.clone(object);
	10772	+ object = (Object3D)Grafreed.clone(object);
8751	10773	object.Stripify();
8752	10774	if (theobject.selection == null \|\| theobject.selection.Size() == 0)
8753	10775	theobject.PreprocessOcclusion(this);
..	..	@@ -8760,19 +10782,20 @@
8760	10782	ambientOcclusion = false;
8761	10783	}
8762	10784
8763		- if (lighttouched && drawMode == DEFAULT && !lightMode) // && !FROZEN)
	10785	+ if (//Globals.lighttouched &&
	10786	+ DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
8764	10787	{
8765	10788	//if (RENDERSHADOW) // ?
8766	10789	if (!IsFrozen())
8767	10790	{
8768	10791	// dec 2012
8769		- if (!(!flash && !lightMode && drawMode == DEFAULT && ANTIALIAS > 0))
	10792	+ if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
8770	10793	{
8771		- framecount++;
	10794	+ Globals.framecount++;
8772	10795	shadowbuffer.display();
8773	10796	}
8774	10797	}
8775		- lighttouched = false; // ??
	10798	+ Globals.lighttouched = false; // ??
8776	10799	//drawing = true;
8777	10800	//lighttouched = true;
8778	10801	}
..	..	@@ -8793,9 +10816,9 @@
8793	10816	//eyeCamera.shaper_fovy = 1;
8794	10817	}
8795	10818
8796		- if ((RENDERPROGRAM != 0 \|\| ambientOcclusion \|\| spherical) && drawMode == DEFAULT) // SELECTION)
	10819	+ if ((RENDERPROGRAM != 0 \|\| ambientOcclusion \|\| spherical) && DrawMode() == DEFAULT) // SELECTION)
8797	10820	{
8798		- //System.out.println("drawMode = " + drawMode);
	10821	+ //System.out.println("DrawMode() = " + DrawMode());
8799	10822	vertexMode \|= VP_PASS;
8800	10823	//vertexMode \|= VP_PROJECTION;
8801	10824	if (!ambientOcclusion)
..	..	@@ -8855,7 +10878,7 @@
8855	10878	Camera cam = renderCamera; // lightMode?lightCamera:eyeCamera;
8856	10879	//Camera lightcam = new Camera(light0);
8857	10880
8858		- if (drawMode == SHADOW)
	10881	+ if (DrawMode() == SHADOW)
8859	10882	{
8860	10883	/*
8861	10884	gl.glMatrixMode(GL.GL_MODELVIEW);
..	..	@@ -8893,8 +10916,8 @@
8893	10916
8894	10917	// if (parentcam != renderCamera) // not a light
8895	10918	if (cam != lightCamera)
8896		- for (int count = parentcam.GetTransformCount(); --count>=0;)
8897		- LA.matConcat(parentcam.toParent, matrix, matrix);
	10919	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10920	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
8898	10921
8899	10922	for (int j = 0; j < 4; j++)
8900	10923	{
..	..	@@ -8908,8 +10931,8 @@
8908	10931
8909	10932	// if (parentcam != renderCamera) // not a light
8910	10933	if (cam != lightCamera)
8911		- for (int count = parentcam.GetTransformCount(); --count>=0;)
8912		- LA.matConcat(matrix, parentcam.fromParent, matrix);
	10934	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10935	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
8913	10936
8914	10937	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
8915	10938
..	..	@@ -8945,7 +10968,7 @@
8945	10968	gl.glClear(gl.GL_DEPTH_BUFFER_BIT);
8946	10969	} else
8947	10970	{
8948		- if (drawMode != DEFAULT)
	10971	+ if (DrawMode() != DEFAULT)
8949	10972	{
8950	10973	gl.glClearColor(1, 1, 1, 0);
8951	10974	} // 1);
..	..	@@ -9010,7 +11033,7 @@
9010	11033
9011	11034	fast &= !ambientOcclusion;
9012	11035
9013		- if (drawMode == DEFAULT)
	11036	+ if (DrawMode() == DEFAULT)
9014	11037	{
9015	11038	//gl.glEnable(gl.GL_ALPHA_TEST);
9016	11039	//gl.glActiveTexture(GL.GL_TEXTURE0);
..	..	@@ -9071,6 +11094,8 @@
9071	11094	//gl.glFrustum(-0.5scale, 0.5scale, -0.5scale, 0.5scale, 1, 100);
9072	11095	//glu.gluPerspective(lightshaper_fovy, 1, lightshaper_zNear, lightshaper_zFar);
9073	11096	double scale = lightCamera.SCALE / lightCamera.Distance();
	11097	+// PATCH FILLE AUX JEANS
	11098	+ //scale *= lightCamera.shaper_fovy / 25;
9074	11099	gl.glScaled(2 * scale, 2 * scale, -scale);
9075	11100	gl.glTranslated(0, 0, lightCamera.DECAL);
9076	11101
..	..	@@ -9166,7 +11191,16 @@
9166	11191	// Bump noise
9167	11192	gl.glActiveTexture(GL.GL_TEXTURE6);
9168	11193	//gl.glBindTexture(GL.GL_TEXTURE_2D, bump_noise);
9169		- BindTexture(NOISE_TEXTURE, false, 2);
	11194	+
	11195	+ try
	11196	+ {
	11197	+ BindTexture(NOISE_TEXTURE, false, 2);
	11198	+ }
	11199	+ catch (Exception e)
	11200	+ {
	11201	+ System.err.println("FAILED: " + NOISE_TEXTURE);
	11202	+ }
	11203	+
9170	11204
9171	11205	gl.glActiveTexture(GL.GL_TEXTURE0);
9172	11206	gl.glEnable(GL.GL_TEXTURE_2D);
..	..	@@ -9189,9 +11223,9 @@
9189	11223
9190	11224	gl.glMatrixMode(GL.GL_MODELVIEW);
9191	11225
9192		-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
9193		-//gl.glEnable(gl.GL_POLYGON_SMOOTH);
9194		-//gl.glEnable(gl.GL_MULTISAMPLE);
	11226	+gl.glEnable(gl.GL_POLYGON_SMOOTH);
	11227	+gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
	11228	+gl.glEnable(gl.GL_MULTISAMPLE);
9195	11229	} else
9196	11230	{
9197	11231	//gl.glDisable(GL.GL_TEXTURE_2D);
..	..	@@ -9202,14 +11236,16 @@
9202	11236	//System.out.println("BLENDING ON");
9203	11237	gl.glEnable(GL.GL_BLEND);
9204	11238	gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
9205		-
	11239	+// gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
9206	11240	gl.glMatrixMode(gl.GL_PROJECTION);
9207	11241	gl.glLoadIdentity();
9208	11242
9209		- if (drawMode == SHADOW \|\| cam == lightCamera) // \|\| (vertexMode&VP_PROJECTION) != 0)
	11243	+ if (DrawMode() == SHADOW \|\| cam == lightCamera) // \|\| (vertexMode&VP_PROJECTION) != 0)
9210	11244	{
9211	11245	//glu.gluPerspective(lightshaper_fovy, 1, lightshaper_zNear, lightshaper_zFar);
9212	11246	double scale = lightCamera.SCALE / lightCamera.Distance();
	11247	+// PATCH FILLE AUX JEANS
	11248	+ //scale *= lightCamera.shaper_fovy / 25;
9213	11249	gl.glScaled(2 * scale, 2 * scale, -scale);
9214	11250	gl.glTranslated(0, 0, lightCamera.DECAL);
9215	11251	//System.out.println("DECAL = " + LIGHTDECAL + "; SCALE = " + LIGHTSCALE);
..	..	@@ -9262,7 +11298,7 @@
9262	11298	//gl.glPushMatrix();
9263	11299	gl.glLoadIdentity();
9264	11300
9265		- if (!ambientOcclusion) // drawMode != OCCLUSION)
	11301	+ if (!ambientOcclusion) // DrawMode() != OCCLUSION)
9266	11302	{
9267	11303	//LA.xformPos(light0, lightCamera.fromScreen, light);
9268	11304	LA.xformDir(dirlight, lightCamera.fromScreen, lightposition);
..	..	@@ -9289,8 +11325,8 @@
9289	11325	System.err.println("parentcam != renderCamera");
9290	11326
9291	11327	// if (cam != lightCamera)
9292		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9293		- LA.xformDir(lightposition, parentcam.toParent, lightposition); // may 2013
	11328	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11329	+ LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
9294	11330	}
9295	11331
9296	11332	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -9311,8 +11347,8 @@
9311	11347	if (true) // TODO
9312	11348	{
9313	11349	if (cam != lightCamera)
9314		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9315		- LA.xformDir(light0, parentcam.toParent, light0); // may 2013
	11350	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11351	+ LA.xformDir(light0, parentcam.GlobalTransform(), light0); // may 2013
9316	11352	}
9317	11353
9318	11354	LA.xformPos(light0, cam.toScreen, light0);
..	..	@@ -9349,7 +11385,7 @@
9349	11385	}
9350	11386
9351	11387	/**/
9352		- if (true) // drawMode == SELECTION) // != DEFAULT)
	11388	+ if (true) // DrawMode() == SELECTION) // != DEFAULT)
9353	11389	gl.glDisable(gl.GL_LIGHTING);
9354	11390	else
9355	11391	gl.glEnable(gl.GL_LIGHTING);
..	..	@@ -9361,12 +11397,13 @@
9361	11397
9362	11398	gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 63, options2, 0);
9363	11399	gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 62, options3, 0);
	11400	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 61, options4, 0);
9364	11401
9365	11402	options2[0] *= renderCamera.Distance();
9366	11403
9367	11404	lightslot = 64;
9368	11405
9369		- if (!frozen && !ambientOcclusion && isRenderer && drawMode == DEFAULT)
	11406	+ if (!frozen && !ambientOcclusion && isRenderer && DrawMode() == DEFAULT)
9370	11407	{
9371	11408	DrawLights(object);
9372	11409	}
..	..	@@ -9377,7 +11414,7 @@
9377	11414	fragmentMode \|= (lightslot - 64) << 2; // 1; // first bit is available for aniso
9378	11415	//System.out.println("fragmentMode = " + fragmentMode);
9379	11416
9380		- if (drawMode == DEFAULT \|\| drawMode == SELECTION \|\| DEBUG_SELECTION)
	11417	+ if (DrawMode() == DEFAULT \|\| DrawMode() == SELECTION \|\| IsDebugSelection())
9381	11418	{
9382	11419	/*
9383	11420	if (CULLFACE \|\| (ambientOcclusion && OCCLUSION_CULLING))
..	..	@@ -9410,7 +11447,7 @@
9410	11447	}
9411	11448	}
9412	11449
9413		- if (drawMode == DEFAULT)
	11450	+ if (DrawMode() == DEFAULT)
9414	11451	{
9415	11452	if (WIREFRAME && !ambientOcclusion)
9416	11453	{
..	..	@@ -9428,7 +11465,7 @@
9428	11465	gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9429	11466	gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9430	11467
9431		- if (!fast/RENDERPROGRAM != 0/ && (drawMode == DEFAULT \|\| drawMode == SHADOW)) // && !WIREFRAME) //
	11468	+ if (!fast/RENDERPROGRAM != 0/ && (DrawMode() == DEFAULT \|\| DrawMode() == SHADOW)) // && !WIREFRAME) //
9432	11469	{
9433	11470	if (vertexMode != 0) // && !fast)
9434	11471	{
..	..	@@ -9448,7 +11485,7 @@
9448	11485	}
9449	11486	}
9450	11487
9451		- if (false) // fast && !IsFreezed() && drawMode != SELECTION && !ambientOcclusion)
	11488	+ if (false) //RENDERPROGRAM > 0 && DrawMode() == DEFAULT) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
9452	11489	{
9453	11490	//gl.glDepthFunc(GL.GL_LEQUAL);
9454	11491	//gl.glClear(gl.GL_COLOR_BUFFER_BIT \| gl.GL_DEPTH_BUFFER_BIT);
..	..	@@ -9456,27 +11493,24 @@
9456	11493
9457	11494	boolean texon = textureon;
9458	11495
9459		- if (RENDERPROGRAM > 0)
9460		- {
9461		- gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9462		- textureon = false;
9463		- }
	11496	+ gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11497	+ textureon = false;
	11498	+
9464	11499	//gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9465	11500	//System.out.println("ALLO");
9466	11501	gl.glColorMask(false, false, false, false);
9467	11502	DrawObject(gl);
9468		- if (RENDERPROGRAM > 0)
9469		- {
9470		- gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
9471		- textureon = texon;
9472		- }
	11503	+
	11504	+ gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11505	+ textureon = texon;
	11506	+
9473	11507	gl.glColorMask(true, true, true, true);
9474	11508
9475	11509	gl.glDepthFunc(GL.GL_EQUAL);
9476		- //gl.glDepthMask(false);
	11510	+ gl.glDepthMask(false);
9477	11511	}
9478	11512
9479		- if (false) // drawMode == SHADOW)
	11513	+ if (false) // DrawMode() == SHADOW)
9480	11514	{
9481	11515	//SetColumnMajorData(cameraInverseTransform, view_1);
9482	11516	//System.out.println("light = " + cameraInverseTransform);
..	..	@@ -9490,16 +11524,16 @@
9490	11524	//System.out.println("object = " + object);
9491	11525	if (!frozen && !imageLocked)
9492	11526	{
9493		- if (!flash && !lightMode && drawMode == DEFAULT && ANTIALIAS > 0)
	11527	+ if (!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0)
9494	11528	{
9495	11529	displayAntiAliased(gl);
9496	11530	} else
9497	11531	{
9498	11532	programcount = 0;
9499		- int keepmode = drawMode;
	11533	+ int keepmode = DrawMode();
9500	11534	// if (DEBUG_SELECTION)
9501	11535	// {
9502		-// drawMode = SELECTION;
	11536	+// DrawMode() = SELECTION;
9503	11537	// }
9504	11538	// for point selection
9505	11539	// gl.glGetDoublev(gl.GL_MODELVIEW_MATRIX, tempmat, 0);
..	..	@@ -9509,10 +11543,10 @@
9509	11543	DrawObject(gl);
9510	11544
9511	11545	// jan 2013 System.err.println("RESET ABORT (display)");
9512		- // if (drawMode == DEFAULT)
	11546	+ // if (DrawMode() == DEFAULT)
9513	11547	// ABORTED = false;
9514	11548	fullreset = false;
9515		- drawMode = keepmode;
	11549	+ Globals.drawMode = keepmode; // WARNING
9516	11550	//System.out.println("PROGRAM SWITCH " + programcount);
9517	11551	}
9518	11552	}
..	..	@@ -9520,11 +11554,11 @@
9520	11554	gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9521	11555	gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9522	11556
9523		- if (drawMode == DEFAULT)
	11557	+ if (DrawMode() == DEFAULT)
9524	11558	{
9525	11559	ReleaseTexture(NOISE_TEXTURE, false);
9526	11560	}
9527		- //if (drawMode == DEFAULT)
	11561	+ //if (DrawMode() == DEFAULT)
9528	11562	{
9529	11563
9530	11564	gl.glActiveTexture(GL.GL_TEXTURE1);
..	..	@@ -9536,7 +11570,7 @@
9536	11570	//else
9537	11571	//gl.glDisable(gl.GL_TEXTURE_2D);
9538	11572	//gl.glPopMatrix();
9539		- if (imageCompleted && ANTIALIAS > 0 && drawMode == DEFAULT && cam != lightCamera && !ambientOcclusion)
	11573	+ if (imageCompleted && ANTIALIAS > 0 && DrawMode() == DEFAULT && cam != lightCamera && !ambientOcclusion)
9540	11574	{
9541	11575	//new Exception().printStackTrace();
9542	11576	//System.out.println("Draw image " + width + ", " + height);
..	..	@@ -9578,7 +11612,7 @@
9578	11612	//gl.glFlush();
9579	11613	}
9580	11614
9581		- if (flash && drawMode == DEFAULT)
	11615	+ if (flash && DrawMode() == DEFAULT)
9582	11616	{
9583	11617	flash = false;
9584	11618	wait = true;
..	..	@@ -9586,9 +11620,9 @@
9586	11620	}
9587	11621
9588	11622	//drawing = false;
9589		- //if(drawMode == DEFAULT)
	11623	+ //if(DrawMode() == DEFAULT)
9590	11624	// niceon = false;
9591		- if (drawMode == DEFAULT)
	11625	+ if (DrawMode() == DEFAULT)
9592	11626	{
9593	11627	currentlydrawing = false;
9594	11628	}
..	..	@@ -9608,7 +11642,7 @@
9608	11642	repaint();
9609	11643	}
9610	11644
9611		- if (isLIVE() && drawMode == DEFAULT) // may 2013
	11645	+ if (Globals.isLIVE() && DrawMode() == DEFAULT) // may 2013
9612	11646	repaint();
9613	11647
9614	11648	displaydone = true;
..	..	@@ -9627,8 +11661,14 @@
9627	11661	{
9628	11662	renderpass++;
9629	11663	// System.out.println("Draw object... ");
	11664	+ STEP = 1;
9630	11665	if (FAST) // in case there is no script
9631		- STEP = 16;
	11666	+ STEP = 8;
	11667	+
	11668	+ if (CURRENTANTIALIAS == 0 \|\| ACSIZE == 1)
	11669	+ {
	11670	+ STEP *= 4;
	11671	+ }
9632	11672
9633	11673	//object.FullInvariants();
9634	11674
..	..	@@ -9642,23 +11682,44 @@
9642	11682	e.printStackTrace();
9643	11683	}
9644	11684
9645		- if (GraphreeD.RENDERME > 0)
9646		- GraphreeD.RENDERME--; // mechante magouille
	11685	+ if (Grafreed.RENDERME > 0)
	11686	+ Grafreed.RENDERME--; // mechante magouille
9647	11687
9648		- ONESTEP = false;
	11688	+ Globals.ONESTEP = false;
9649	11689	}
9650	11690
9651	11691	static boolean zoomonce = false;
9652	11692
	11693	+ static void CreateSelectedPoint()
	11694	+ {
	11695	+ if (selectedpoint == null)
	11696	+ {
	11697	+ debugpointG = new Sphere();
	11698	+ debugpointP = new Sphere();
	11699	+ debugpointC = new Sphere();
	11700	+ debugpointR = new Sphere();
	11701	+
	11702	+ selectedpoint = new Superellipsoid();
	11703	+
	11704	+ for (int i=0; i<8; i++)
	11705	+ {
	11706	+ debugpoints[i] = new Sphere();
	11707	+ }
	11708	+ }
	11709	+ }
	11710	+
9653	11711	void DrawObject(GL gl, boolean draw)
9654	11712	{
	11713	+ // To clear camera values
	11714	+ ResetOptions();
	11715	+
9655	11716	//System.out.println("DRAW OBJECT " + mouseDown);
9656		-// drawMode = SELECTION;
	11717	+// DrawMode() = SELECTION;
9657	11718	//GL gl = getGL();
9658	11719	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
9659	11720	{
9660		- if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && drawMode == SHADOW) // && !lightMode)
9661		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	11721	+ if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
	11722	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
9662	11723	pingthread.StepToTarget(true); // true);
9663	11724	// zoomonce = false;
9664	11725	}
..	..	@@ -9678,9 +11739,9 @@
9678	11739	callist = gl.glGenLists(1);
9679	11740	}
9680	11741
9681		- boolean selectmode = drawMode == SELECTION \|\| CameraPane.DEBUG_SELECTION;
	11742	+ boolean selectmode = DrawMode() == SELECTION \|\| IsDebugSelection();
9682	11743
9683		- boolean active = !selectmode; // drawMode != SELECTION; // mouseDown;
	11744	+ boolean active = !selectmode; // DrawMode() != SELECTION; // mouseDown;
9684	11745
9685	11746	if (!mainDL \|\| !active \|\| touched)
9686	11747	{
..	..	@@ -9707,24 +11768,32 @@
9707	11768	PushMatrix(ClickInfo.matbuffer);
9708	11769	}
9709	11770
9710		- if (drawMode == 0)
	11771	+ if (DrawMode() == 0)
9711	11772	{
9712	11773	// System.out.println("CLEAR +++++++++++++++ +++++++++++++++ +++++++++++++++ +++++++++++++++");
9713	11774
9714	11775	usedtextures.clear();
9715	11776
9716		- BindTextures(DEFAULT_TEXTURES, 2);
	11777	+ try
	11778	+ {
	11779	+ BindTextures(DEFAULT_TEXTURES, 2);
	11780	+ }
	11781	+ catch (Exception e)
	11782	+ {
	11783	+ System.err.println("FAILED: " + DEFAULT_TEXTURES);
	11784	+ }
9717	11785	}
9718	11786	//System.out.println("--> " + stackdepth);
9719		-// GraphreeD.traceon();
	11787	+// GrafreeD.traceon();
9720	11788
9721	11789	// DRAW
9722	11790	object.draw(this, /(Composite)/ object, false, false);
9723	11791
9724		- if (drawMode == DEFAULT)
	11792	+ if (DrawMode() == DEFAULT)
9725	11793	{
9726		- if (DEBUG)
	11794	+ if (Globals.DEBUG)
9727	11795	{
	11796	+ CreateSelectedPoint();
9728	11797	float radius = 0.05f;
9729	11798	if (selectedpoint.radius != radius)
9730	11799	{
..	..	@@ -9732,69 +11801,104 @@
9732	11801	selectedpoint.radius = radius;
9733	11802	selectedpoint.recalculate();
9734	11803	selectedpoint.material = new cMaterial();
9735		- selectedpoint.material.color = 0.25f;
	11804	+ selectedpoint.material.color = 0.15f; // Yellow
9736	11805	selectedpoint.material.modulation = 0.75f;
9737	11806
9738		- debugpoint.radius = radius;
9739		- debugpoint.recalculate();
9740		- debugpoint.material = new cMaterial();
9741		- debugpoint.material.color = 0.25f;
9742		- debugpoint.material.modulation = 0.75f;
	11807	+ debugpointG.radius = radius;
	11808	+ debugpointG.recalculate();
	11809	+ debugpointG.material = new cMaterial();
	11810	+ debugpointG.material.color = 0.25f; // Green
	11811	+ debugpointG.material.modulation = 0.75f;
9743	11812
9744		- debugpoint2.radius = radius;
9745		- debugpoint2.recalculate();
9746		- debugpoint2.material = new cMaterial();
9747		- debugpoint2.material.color = 0.75f;
9748		- debugpoint2.material.modulation = 0.75f;
	11813	+ debugpointP.radius = radius;
	11814	+ debugpointP.recalculate();
	11815	+ debugpointP.material = new cMaterial();
	11816	+ debugpointP.material.color = 0.75f; // Purple
	11817	+ debugpointP.material.modulation = 0.75f;
	11818	+
	11819	+ debugpointC.radius = radius;
	11820	+ debugpointC.recalculate();
	11821	+ debugpointC.material = new cMaterial();
	11822	+ debugpointC.material.color = 0.5f; // Cyan
	11823	+ debugpointC.material.modulation = 0.75f;
	11824	+
	11825	+ debugpointR.radius = radius;
	11826	+ debugpointR.recalculate();
	11827	+ debugpointR.material = new cMaterial();
	11828	+ debugpointR.material.color = 0f; // Red
	11829	+ debugpointR.material.modulation = 0.75f;
9749	11830
9750	11831	InitPoints(radius);
9751	11832	}
9752	11833	selectedpoint.draw(this, /(Composite)/ null, false, false);
9753		- //debugpoint.draw(this, /(Composite)/ null, false);
9754		- //debugpoint2.draw(this, /(Composite)/ null, false);
9755		- DrawPoints(this);
	11834	+ debugpointG.draw(this, /(Composite)/ null, false,false);
	11835	+ debugpointP.draw(this, /(Composite)/ null, false,false);
	11836	+ debugpointC.draw(this, /(Composite)/ null, false,false);
	11837	+ debugpointR.draw(this, /(Composite)/ null, false,false);
	11838	+ // DrawPoints(this);
9756	11839	}
9757	11840
9758	11841	// debugstuff.draw(this, /(Composite)/ null, false);
9759	11842	}
9760		-// GraphreeD.traceoff();
	11843	+// GrafreeD.traceoff();
9761	11844	//System.out.println(stackdepth);
9762		- if (drawMode == 0)
	11845	+ if (DrawMode() == 0)
9763	11846	{
9764	11847	ReleaseTextures(DEFAULT_TEXTURES);
9765	11848
9766	11849	if (CLEANCACHE)
9767		- for (java.util.Enumeration<String> e = textures.keys() ; e.hasMoreElements();)
	11850	+ for (java.util.Enumeration<cTexture> e = texturepigment.keys() ; e.hasMoreElements();)
9768	11851	{
9769		- String tex = e.nextElement();
	11852	+ cTexture tex = e.nextElement();
9770	11853
9771	11854	// System.out.println("Texture --------- " + tex);
9772	11855
9773		- if (tex.equals("WHITE_NOISE"))
	11856	+ if (tex.equals("WHITE_NOISE:"))
9774	11857	continue;
9775	11858
9776		- if (!usedtextures.containsKey(tex))
	11859	+ if (!usedtextures.contains(tex))
9777	11860	{
	11861	+ CacheTexture gettex = texturepigment.get(tex);
9778	11862	// System.out.println("DISPOSE +++++++++++++++ " + tex);
9779		- textures.get(tex).texture.dispose();
9780		- textures.remove(tex);
	11863	+ if (gettex != null)
	11864	+ {
	11865	+ gettex.texture.dispose();
	11866	+ texturepigment.remove(tex);
	11867	+ }
	11868	+
	11869	+ gettex = texturebump.get(tex);
	11870	+ // System.out.println("DISPOSE +++++++++++++++ " + tex);
	11871	+ if (gettex != null)
	11872	+ {
	11873	+ gettex.texture.dispose();
	11874	+ texturebump.remove(tex);
	11875	+ }
9781	11876	}
9782	11877	}
9783	11878	}
9784	11879
9785	11880	checker = null;
9786	11881
9787		- if (!ambientOcclusion && !IsFrozen() && drawMode == DEFAULT)
	11882	+ if (!ambientOcclusion && !IsFrozen() && DrawMode() == DEFAULT)
9788	11883	FindChecker(object);
9789	11884
9790		- if (checker != null && drawMode == DEFAULT)
	11885	+ if (checker != null && DrawMode() == DEFAULT)
9791	11886	{
9792		- // BindTexture(IMMORTAL_TEXTURE);
	11887	+ //BindTexture(IMMORTAL_TEXTURE);
	11888	+ try
	11889	+ {
	11890	+ BindTextures(checker.GetTextures(), checker.texres);
	11891	+ }
	11892	+ catch (Exception e)
	11893	+ {
	11894	+ System.err.println("FAILED: " + checker.GetTextures());
	11895	+ }
9793	11896	// NEAREST
9794	11897	GetGL().glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST); // GL.GL_LINEAR);
9795	11898	DrawChecker(gl);
9796	11899	//checker.Draw(this, null, false);
9797	11900	// ReleaseTexture(IMMORTAL_TEXTURE);
	11901	+ ReleaseTextures(checker.GetTextures());
9798	11902	}
9799	11903
9800	11904	if (object.parent != null)
..	..	@@ -9807,7 +11911,7 @@
9807	11911	//gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9808	11912	//gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9809	11913
9810		- if (DISPLAYTEXT && drawMode == DEFAULT)
	11914	+ if (DISPLAYTEXT && DrawMode() == DEFAULT)
9811	11915	{
9812	11916	// Draw it once, then use the raster
9813	11917	Balloon(gl, balloon.createGraphics());
..	..	@@ -9863,14 +11967,14 @@
9863	11967	int[] xs = new int[3];
9864	11968	int[] ys = new int[3];
9865	11969
9866		- void DrawString(Object3D obj) // String string)
	11970	+ public void DrawString(Object3D obj) // String string) // INTERFACE
9867	11971	{
9868		- if (!DISPLAYTEXT \|\| drawMode != DEFAULT)
	11972	+ if (!DISPLAYTEXT \|\| DrawMode() != DEFAULT)
9869	11973	{
9870	11974	return;
9871	11975	}
9872	11976
9873		- String string = obj.GetToolTip();
	11977	+ String string = obj.toString(); //.GetToolTip();
9874	11978
9875	11979	GL gl = GetGL();
9876	11980
..	..	@@ -10187,8 +12291,8 @@
10187	12291	//obj.TransformToWorld(light, light);
10188	12292	for (int i = tp.size(); --i >= 0;)
10189	12293	{
10190		- for (int count = tp.get(i).GetTransformCount(); --count>=0;)
10191		- LA.xformPos(light, tp.get(i).toParent, light);
	12294	+ //for (int count = tp.get(i).GetTransformCount(); --count>=0;)
	12295	+ LA.xformPos(light, tp.get(i).GlobalTransformInv(), light);
10192	12296	}
10193	12297
10194	12298
..	..	@@ -10205,8 +12309,8 @@
10205	12309	parentcam = cameras[0];
10206	12310	}
10207	12311
10208		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10209		- LA.xformPos(light, parentcam.toParent, light); // may 2013
	12312	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	12313	+ LA.xformPos(light, parentcam.GlobalTransform(), light); // may 2013
10210	12314
10211	12315	LA.xformPos(light, renderCamera.toScreen, light);
10212	12316
..	..	@@ -10253,7 +12357,7 @@
10253	12357	return;
10254	12358	}
10255	12359
10256		- if (obj instanceof CheckerIG)
	12360	+ if (obj instanceof Checker)
10257	12361	{
10258	12362	checker = obj;
10259	12363
..	..	@@ -10297,7 +12401,74 @@
10297	12401	//gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
10298	12402
10299	12403	String program =
	12404	+ // Min shader
10300	12405	"!!ARBfp1.0\n" +
	12406	+ "PARAM zero123 = { 0.0, 1.0, 2, 1.25 };" +
	12407	+ "PARAM pow2 = { 0.5, 0.25, 0.125, 0.0 };" +
	12408	+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
	12409	+ "PARAM eps = { 0.001, 0.001, 0.001, 1.0 };" +
	12410	+ "PARAM infinity = { 100000000, 100000000, 100000000, 1.0 };" +
	12411	+ "PARAM light2cam0 = program.env[10];" +
	12412	+ "PARAM light2cam1 = program.env[11];" +
	12413	+ "PARAM light2cam2 = program.env[12];" +
	12414	+ "TEMP temp;" +
	12415	+ "TEMP light;" +
	12416	+ "TEMP ndotl;" +
	12417	+ "TEMP normal;" +
	12418	+ "TEMP depth;" +
	12419	+ "TEMP eye;" +
	12420	+ "TEMP pos;" +
	12421	+
	12422	+ "MAD normal, fragment.color, zero123.z, -zero123.y;" +
	12423	+ Normalize("normal") +
	12424	+ "MOV light, state.light[0].position;" +
	12425	+ "DP3 ndotl.x, light, normal;" +
	12426	+
	12427	+ // shadow
	12428	+ "MOV pos, fragment.texcoord[1];" +
	12429	+ "MOV temp, pos;" +
	12430	+ ShadowTextureFetch("depth", "temp", "1") +
	12431	+ //"TEX depth, fragment.texcoord[1], texture[1], 2D;" +
	12432	+ "SLT ndotl.z, fragment.texcoord[1].z, depth.z;" +
	12433	+
	12434	+ // No shadow when out of frustum
	12435	+ //"SGE temp.y, depth.z, zero123.y;" +
	12436	+ //"LRP temp.x, temp.y, zero123.y, temp.x;" +
	12437	+
	12438	+ "MUL ndotl.x, ndotl.x, ndotl.z;" + // Shadow
	12439	+
	12440	+ // Backlit
	12441	+ "MOV pos.w, zero123.y;" +
	12442	+ "DP4 eye.x, pos, light2cam0;" +
	12443	+ "DP4 eye.y, pos, light2cam1;" +
	12444	+ "DP4 eye.z, pos, light2cam2;" +
	12445	+ Normalize("eye") +
	12446	+
	12447	+ "DP3 ndotl.y, -eye, normal;" +
	12448	+ //"MUL ndotl.y, ndotl.y, pow2.x;" +
	12449	+ "POW ndotl.y, ndotl.y, pow2.z;" + // backlit
	12450	+ "SUB ndotl.y, zero123.y, ndotl.y;" +
	12451	+ //"SUB ndotl.y, zero123.y, ndotl.y;" +
	12452	+ //"MUL ndotl.y, ndotl.y, pow2.z;" +
	12453	+
	12454	+ "MAX ndotl.x, ndotl.x, ndotl.y;" + // Ambient
	12455	+
	12456	+ // Pigment
	12457	+ "TEX temp, fragment.texcoord[0], texture[0], 2D;" +
	12458	+ "LRP temp, zero123.w, temp, one;" + // texture proportion
	12459	+ "MUL temp, temp, ndotl.x;" +
	12460	+
	12461	+ "MUL temp, temp, zero123.z;" +
	12462	+
	12463	+ //"MUL temp, temp, ndotl.y;" +
	12464	+
	12465	+ "MOV temp.w, zero123.y;" + // reset alpha
	12466	+ "MOV result.color, temp;" +
	12467	+ "END";
	12468	+
	12469	+ String program2 =
	12470	+ "!!ARBfp1.0\n" +
	12471	+
10301	12472	//"OPTION ARB_fragment_program_shadow;" +
10302	12473	"PARAM light2cam0 = program.env[10];" +
10303	12474	"PARAM light2cam1 = program.env[11];" +
..	..	@@ -10325,11 +12496,13 @@
10325	12496	"PARAM params6 = program.env[6];" + // bump, noise, borderfade, fog punchthrough
10326	12497	"PARAM params7 = program.env[7];" + // noise power, opacity power
10327	12498	"PARAM options0 = program.env[63];" + // fog density, intensity, elevation
10328		- "PARAM options1 = program.env[62];" + // fog rgb color, image intensity
	12499	+ "PARAM options1 = program.env[62];" + // fog rgb color
	12500	+ "PARAM options2 = program.env[61];" + // image intensity, subsurface, lightsheen
10329	12501	"PARAM pointlight = program.env[127];" + // ...
10330	12502	"PARAM zero = { 0.0, 0.0, 0.0, 0.0 };" +
10331	12503	"PARAM halfhalf = { 0.25, 0.25, 0.25, 1.0 };" +
10332	12504	"PARAM half = { 0.5, 0.5, 0.5, 1.0 };" +
	12505	+ "PARAM threequarter = { 0.75, 0.75, 0.75, 1.0 };" +
10333	12506	"PARAM two = { 2.0, 2.0, 2.0, 1.0 };" +
10334	12507	"PARAM ten = { 10, 10, 10, 1.0 };" +
10335	12508	"PARAM one3rd = { 0.5, 0.33333333333, 0.333333333, 1.0 };" +
..	..	@@ -10350,6 +12523,7 @@
10350	12523	"PARAM lodbias = { 10,10,10,10 };" + // 20, -2, -20, 1.0 };" +
10351	12524	"PARAM infinity = { 100000000, 100000000, 100000000, 1.0 };" +
10352	12525	"PARAM one2048th = { 0.00048828125, 0.00048828125, 0.00048828125, 1.0 };" +
	12526	+ "PARAM ninetenth = { 0.9, 0.9, 0.9, 1.0 };" +
10353	12527	"PARAM almostone = { 0.999, 0.999, 0.999, 1.0 };" +
10354	12528	"PARAM c256 = { 256, 256, 256, 1.0 };" +
10355	12529	"PARAM c256i = { 0.00390625, 0.00390625, 0.00390625, 1.0 };" +
..	..	@@ -10390,6 +12564,10 @@
10390	12564	"TEMP R1;" +
10391	12565	"TEMP R2;" +
10392	12566	"TEMP R3;" +
	12567	+ "TEMP min;" +
	12568	+ "TEMP max;" +
	12569	+ "TEMP average;" +
	12570	+ "TEMP saturation;" +
10393	12571	"TEMP keep1;" +
10394	12572	"TEMP keep2;" +
10395	12573	"TEMP keep3;" +
..	..	@@ -10405,8 +12583,7 @@
10405	12583	"TEMP shininess;" +
10406	12584	"\n" +
10407	12585	"MOV texSamp, one;" +
10408		- //"TEX texSamp, fragment.texcoord[0], texture[0], 2D;" +
10409		-
	12586	+
10410	12587	"MOV mapgrid.x, one2048th.x;" +
10411	12588	"MOV temp, fragment.texcoord[1];" +
10412	12589	/*
..	..	@@ -10427,20 +12604,20 @@
10427	12604	"MUL temp, floor, mapgrid.x;" +
10428	12605	//"TEX depth0, temp, texture[1], 2D;" +
10429	12606	(((mode & FP_SOFTSHADOW) == 0) ? "" :
10430		- TextureFetch("depth0", "temp", "1") +
	12607	+ ShadowTextureFetch("depth0", "temp", "1") +
10431	12608	"") +
10432	12609	"ADD temp.x, temp.x, mapgrid.x;" +
10433	12610	//"TEX depth1, temp, texture[1], 2D;" +
10434	12611	(((mode & FP_SOFTSHADOW) == 0) ? "" :
10435		- TextureFetch("depth1", "temp", "1") +
	12612	+ ShadowTextureFetch("depth1", "temp", "1") +
10436	12613	"") +
10437	12614	"ADD temp.y, temp.y, mapgrid.x;" +
10438	12615	//"TEX depth2, temp, texture[1], 2D;" +
10439		- TextureFetch("depth2", "temp", "1") +
	12616	+ ShadowTextureFetch("depth2", "temp", "1") +
10440	12617	"SUB temp.x, temp.x, mapgrid.x;" +
10441	12618	//"TEX depth3, temp, texture[1], 2D;" +
10442	12619	(((mode & FP_SOFTSHADOW) == 0) ? "" :
10443		- TextureFetch("depth3", "temp", "1") +
	12620	+ ShadowTextureFetch("depth3", "temp", "1") +
10444	12621	"") +
10445	12622	//"MUL texSamp0, texSamp0, state.material.front.diffuse;" +
10446	12623	//"MOV params, material;" +
..	..	@@ -10811,10 +12988,10 @@
10811	12988	"MAD shadow.x, buffer.x, frac.y, shadow.x;" +
10812	12989	"") +
10813	12990
10814		- // display shadow only (bump == 0)
	12991	+ // display shadow only (fakedepth == 0)
10815	12992	"SUB temp.x, half.x, shadow.x;" +
10816		- "MOV temp.y, -params6.x;" +
10817		- "SLT temp.z, temp.y, zero.x;" +
	12993	+ "MOV temp.y, -params5.z;" + // params6.x;" +
	12994	+ "SLT temp.z, temp.y, -one2048th.x;" +
10818	12995	"SUB temp.y, one.x, temp.z;" +
10819	12996	"MUL temp.x, temp.x, temp.y;" +
10820	12997	"KIL temp.x;" +
..	..	@@ -10920,10 +13097,42 @@
10920	13097
10921	13098	// skin?
10922	13099	// Saturation for skin
10923		- /**/ // c'est ici
10924		- (Skinshader? "DP3 temp.x, final,one;" +
	13100	+ /**/
	13101	+ (Skinshader?
	13102	+ "DP3 average.x, final,one;" +
	13103	+ "MUL average, one3rd.xxxx,average.xxxx;" +
	13104	+
	13105	+ "MIN min.x, final.x,final.y;" +
	13106	+ "MIN min.x, min.x,final.z;" +
	13107	+
	13108	+ "MAX max.x, final.x,final.y;" +
	13109	+ "MAX max.x, max.x,final.z;" +
	13110	+ "MOV max, max.xxxx;" +
	13111	+
	13112	+ "SUB saturation, max, final;" +
	13113	+
	13114	+ "ADD temp.x, max.x, one10th.x;" +
	13115	+ "RCP temp.x, temp.x;" +
	13116	+ "MUL temp.x, temp.x, half.x;" +
	13117	+ "MUL saturation, saturation, temp.xxxx;" +
	13118	+
	13119	+ "DP3 ndotl.x, normald, light;" +
	13120	+ "MAX ndotl.x, ndotl.x, -ndotl.x;" +
	13121	+
	13122	+ "SUB temp.x, one.x, ndotl.x;" +
	13123	+ // Tuning for default skin
	13124	+ //"ADD temp.x, temp.x, options2.z;" + // lightsheen
	13125	+ "MAD temp.x, options2.z, half.y, temp.x;" + // lightsheen
	13126	+ "ADD temp.y, one.y, options2.y;" + // subsurface
	13127	+ "MUL temp.x, temp.x, temp.y;" +
	13128	+
	13129	+ "MUL saturation, saturation, temp.xxxx;" +
	13130	+ "SUB_SAT temp, max, saturation;" +
	13131	+/**
	13132	+ "DP3 temp.x, final,one;" +
10925	13133	"MUL R2, one3rd.xxxx,temp.xxxx;" +
10926		- "SUB temp, final,R2;" +
	13134	+ "SUB temp, final, R2;" +
	13135	+
10927	13136	// using light angle
10928	13137	"DP3 ndotl.x, normald,light;" +
10929	13138	//"SLT ndotl.y, ndotl.x, zero.x;" +
..	..	@@ -10936,7 +13145,6 @@
10936	13145	// using light intensity
10937	13146	"MOV ndotl.z, R2.x;" +
10938	13147	"MUL ndotl.z, ndotl.z, ndotl.z;" + // tuning...
10939		-
10940	13148	// june 2014
10941	13149	"MAD R1.x, ndotl.z,slope.y,one.x;" +
10942	13150	// "SUB ndotl.x, one.x, ndotl.x;" +
..	..	@@ -10948,6 +13156,7 @@
10948	13156	//"MUL R2.y, shadow.x,R2.y;" + // avril 2014
10949	13157
10950	13158	"MAD temp.x, R2.y, ndotl.y, temp.x;" + // red shift (skin)
	13159	+/**/
10951	13160
10952	13161	// "ADD final, R2,temp;" +
10953	13162	"MOV final, temp;"
..	..	@@ -11037,7 +13246,7 @@
11037	13246	/**/
11038	13247	// HDR
11039	13248	"MOV temp.z, final.a;" +
11040		- "MUL final, final,options1.w;" +
	13249	+ "MUL final, final,options2.x;" +
11041	13250	"MOV final.a, temp.z;" +
11042	13251	/**/
11043	13252
..	..	@@ -11074,10 +13283,17 @@
11074	13283	"MOV final.z, zero.x;" +
11075	13284	"MOV final.a, one.w;":""
11076	13285	) +
	13286	+ /*
11077	13287	(NORMALdebug?"MOV final.x, normal.x;" +
11078	13288	"MOV final.y, normal.y;" +
11079	13289	"MOV final.z, normal.z;" +
11080	13290	"MOV final.a, one.w;":""
	13291	+ ) +
	13292	+ */
	13293	+ (NORMALdebug?"SUB final.x, one.x, final.x;" +
	13294	+ "SUB final.y, one.x, final.y;" +
	13295	+ "SUB final.z, one.x, final.z;" +
	13296	+ "MOV final.a, final.a;":""
11081	13297	) +
11082	13298	// "MOV final, bumpmap;" +
11083	13299	"MOV result.color, final;" +
..	..	@@ -11106,7 +13322,7 @@
11106	13322	//once = true;
11107	13323	}
11108	13324
11109		- System.out.print("Program #" + mode + "; length = " + program.length());
	13325	+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
11110	13326	System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
11111	13327	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
11112	13328
..	..	@@ -11199,30 +13415,32 @@
11199	13415	return out;
11200	13416	}
11201	13417
11202		- String TextureFetch(String dest, String src, String unit)
	13418	+ // Also does frustum culling
	13419	+ String ShadowTextureFetch(String dest, String src, String unit)
11203	13420	{
11204	13421	return "TEX " + dest + ", " + src + ", texture[" + unit + "], 2D;" +
11205	13422	"SGE " + src + ".w, " + src + ".x, eps.x;" +
11206	13423	"SGE " + src + ".z, " + src + ".y, eps.x;" +
	13424	+ "SLT " + dest + ".x, " + src + ".x, one.x;" +
	13425	+ "SLT " + dest + ".y, " + src + ".y, one.x;" +
11207	13426	"MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
11208		- "SLT " + src + ".z, " + src + ".x, one.x;" +
11209		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
11210		- "SLT " + src + ".z, " + src + ".y, one.x;" +
11211		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
	13427	+ "MUL " + src + ".w, " + dest + ".x, " + src + ".w;" +
	13428	+ "MUL " + src + ".w, " + dest + ".y, " + src + ".w;" +
11212	13429	//"SWZ buffer, temp, w,w,w,w;";
11213		- "MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
	13430	+ //"MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
11214	13431	"SUB " + src + ".z, " + "one.x, " + src + ".w;" +
11215	13432	//"MUL " + src + ".z, " + src + ".z, infinity.x;" +
11216	13433	//"ADD " + dest + ".z, " + dest + ".z, " + src + ".z;";
11217		- "MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
	13434	+ //"MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
11218	13435
11219		- //"LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
11220		- //"LRP " + dest + ".z" + ", " + src + ".w, infinity.x," + dest + ".z;";
	13436	+ //?? "LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
	13437	+ "LRP " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
11221	13438	}
11222	13439
11223	13440	String Shadow(String depth, String shadow)
11224	13441	{
11225	13442	return "MAX temp.x, ndotl.x, one64th.x;" +
	13443	+ "MIN temp.x, temp.x, ninetenth.x;" +
11226	13444	/**/
11227	13445	// Sine
11228	13446	"MUL temp.y, temp.x, temp.x;" +
..	..	@@ -11238,12 +13456,16 @@
11238	13456
11239	13457	"ADD " + depth + ".z, " + depth + ".z, temp.x;" +
11240	13458	//"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing!
	13459	+
	13460	+ // Compare fragment depth in light space with shadowmap.
11241	13461	"SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" +
11242	13462	"SGE temp.y, temp.x, zero.x;" +
11243		- "SUB " + shadow + ".y, one.x, temp.y;" +
	13463	+ "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded
	13464	+
	13465	+ // Reverse comparison
11244	13466	"SUB temp.x, one.x, temp.x;" +
11245	13467	"MUL " + shadow + ".x, temp.x, temp.y;" +
11246		- "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded
	13468	+ "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse
11247	13469	"POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth
11248	13470
11249	13471	"SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" +
..	..	@@ -11257,6 +13479,10 @@
11257	13479	// No shadow for backface
11258	13480	"DP3 temp.x, normal, lightd;" +
11259	13481	"SLT temp.x, temp.x, zero.x;" + // shadoweps
	13482	+ "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
	13483	+
	13484	+ // No shadow when out of frustum
	13485	+ "SGE temp.x, " + depth + ".z, one.z;" +
11260	13486	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
11261	13487	"";
11262	13488	}
..	..	@@ -11403,7 +13629,8 @@
11403	13629	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
11404	13630	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
11405	13631	/static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
11406		- Object3D.cVector2[] vector2buffer;
	13632	+
	13633	+ //Object3D.cVector2[] vector2buffer;
11407	13634
11408	13635	// IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
11409	13636	// OUT : diff, spec
..	..	@@ -11419,9 +13646,10 @@
11419	13646	"DP3 " + dest + ".z," + "normals," + "eye;" +
11420	13647	"MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
11421	13648	//"MOV " + dest + ".w," + "normal.z;" +
11422		- "MUL " + dest + ".z," + "params2.w," + dest + ".x;" +
11423		- "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
11424		- //"MOV " + dest + ".z," + "params2.w;" +
	13649	+// "MUL " + dest + ".z," + "params2.w," + dest + ".x;" + // PRETTY HEURISTIC FOR VELVET
	13650	+// "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
	13651	+
	13652	+ "MOV " + dest + ".z," + "params2.w;" + // EXACT
11425	13653	"POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
11426	13654	"RCP " + dest + ".w," + dest + ".w;" +
11427	13655	//"RSQ " + dest + ".w," + dest + ".w;" +
..	..	@@ -11815,7 +14043,7 @@
11815	14043	public void mousePressed(MouseEvent e)
11816	14044	{
11817	14045	//System.out.println("mousePressed: " + e);
11818		- clickStart(e.getX(), e.getY(), e.getModifiersEx());
	14046	+ clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
11819	14047	}
11820	14048
11821	14049	static long prevtime = 0;
..	..	@@ -11842,14 +14070,16 @@
11842	14070
11843	14071	//System.err.println("Dtime = " + Dtime + "; units = " + e.getUnitsToScroll() + "; ratio (units/ms) = " + ratio);
11844	14072
	14073	+ if (BUTTONLESSWHEEL)
11845	14074	if (Math.abs(ratio) < 0.1 \|\| Math.abs(Dtime) == 0) // < 30)
11846	14075	{
11847	14076	return;
11848	14077	}
11849	14078
	14079	+ boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
11850	14080
11851	14081	// TIMER
11852		- if (!wheeltimer.isRunning() && e.getModifiersEx() == 0) // VR
	14082	+ if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
11853	14083	{
11854	14084	keepboxmode = BOXMODE;
11855	14085	keepsupport = SUPPORT;
..	..	@@ -11889,8 +14119,8 @@
11889	14119	// mode \|= META;
11890	14120	//}
11891	14121
11892		- SetMouseMode(WHEEL \| e.getModifiersEx());
11893		- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0);
	14122	+ SetMouseMode(e.getModifiers(), WHEEL \| e.getModifiersEx());
	14123	+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
11894	14124	anchorX = ax;
11895	14125	anchorY = ay;
11896	14126	prevX = px;
..	..	@@ -11924,6 +14154,7 @@
11924	14154	else
11925	14155	if (evt.getSource() == AAtimer)
11926	14156	{
	14157	+ Globals.TIMERRUNNING = false;
11927	14158	if (mouseDown)
11928	14159	{
11929	14160	//new Exception().printStackTrace();
..	..	@@ -11949,6 +14180,10 @@
11949	14180	// LIVE = waslive;
11950	14181	// wasliveok = true;
11951	14182	// waslive = false;
	14183	+
	14184	+ // May 2019 Forget it:
	14185	+ if (true)
	14186	+ return;
11952	14187
11953	14188	// source == timer
11954	14189	if (mouseDown)
..	..	@@ -11978,8 +14213,8 @@
11978	14213	// ObjEditor.tweenManager.update(1f / 60f);
11979	14214
11980	14215	// fev 2014???
11981		- if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && drawMode == SHADOW) // && !lightMode)
11982		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	14216	+ if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
	14217	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11983	14218	pingthread.StepToTarget(true); // true);
11984	14219	}
11985	14220	// if (!LIVE)
..	..	@@ -11988,12 +14223,13 @@
11988	14223
11989	14224	javax.swing.Timer timer = new javax.swing.Timer(350, this);
11990	14225
11991		- void clickStart(int x, int y, int modifiers)
	14226	+ void clickStart(int x, int y, int modifiers, int modifiersex)
11992	14227	{
11993	14228	if (!wasliveok)
11994	14229	return;
11995	14230
11996	14231	AAtimer.restart(); //
	14232	+ Globals.TIMERRUNNING = true;
11997	14233
11998	14234	// waslive = LIVE;
11999	14235	// LIVE = false;
..	..	@@ -12005,7 +14241,7 @@
12005	14241	// touched = true; // main DL
12006	14242	if (isRenderer)
12007	14243	{
12008		- SetMouseMode(modifiers);
	14244	+ SetMouseMode(modifiers, modifiersex);
12009	14245	}
12010	14246
12011	14247	selectX = anchorX = x;
..	..	@@ -12018,7 +14254,7 @@
12018	14254	clicked = true;
12019	14255	hold = false;
12020	14256
12021		- if (((modifiers & ~1024) & ~0) == 0) // Single or multiple selection
	14257	+ if (((modifiersex & ~1024) & ~0) == 0) // Single or multiple selection
12022	14258	// june 2013 means CTRL_CLICK: if (((modifiers & ~1024) & ~128) == 0) // Single or multiple selection
12023	14259	{
12024	14260	// System.out.println("RESTART II " + modifiers);
..	..	@@ -12043,14 +14279,15 @@
12043	14279	drag = false;
12044	14280	//System.out.println("Mouse DOWN");
12045	14281	editObj = false;
12046		- ClickInfo info = new ClickInfo();
12047		- info.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
12048		- info.pane = this;
12049		- info.camera = renderCamera;
12050		- info.x = x;
12051		- info.y = y;
12052		- info.modifiers = modifiers;
12053		- editObj = object.doEditClick(info, 0);
	14282	+ //ClickInfo info = new ClickInfo();
	14283	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14284	+ object.clickInfo.pane = this;
	14285	+ object.clickInfo.camera = renderCamera;
	14286	+ object.clickInfo.x = x;
	14287	+ object.clickInfo.y = y;
	14288	+ object.clickInfo.modifiers = modifiersex;
	14289	+ editObj = object.doEditClick(//info,
	14290	+ 0);
12054	14291	if (!editObj)
12055	14292	{
12056	14293	hasMarquee = true;
..	..	@@ -12066,11 +14303,14 @@
12066	14303
12067	14304	public void mouseDragged(MouseEvent e)
12068	14305	{
	14306	+ Globals.MOUSEDRAGGED = true;
	14307	+
	14308	+ //System.out.println("mouseDragged: " + e);
12069	14309	if (isRenderer)
12070	14310	movingcamera = true;
	14311	+
12071	14312	//if (drawing)
12072	14313	//return;
12073		- //System.out.println("mouseDragged: " + e);
12074	14314	if ((e.getModifiersEx() & CTRL) != 0
12075	14315	\|\| (e.getModifiersEx() & COMMAND) != 0) // \|\| IsFrozen())
12076	14316	{
..	..	@@ -12078,7 +14318,7 @@
12078	14318	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
12079	14319	}
12080	14320	else
12081		- drag(e.getX(), e.getY(), e.getModifiersEx());
	14321	+ drag(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
12082	14322
12083	14323	//try { Thread.sleep(1); } catch (Exception ex) {}
12084	14324	}
..	..	@@ -12090,6 +14330,11 @@
12090	14330	cVector tmp = new cVector();
12091	14331	cVector tmp2 = new cVector();
12092	14332	boolean isMoving;
	14333	+
	14334	+ public cVector TargetLookAt()
	14335	+ {
	14336	+ return targetLookAt;
	14337	+ }
12093	14338
12094	14339	class PingThread extends Thread
12095	14340	{
..	..	@@ -12229,7 +14474,7 @@
12229	14474	//System.out.println("---------------- ---------- Paint " + tmp.length2());
12230	14475	if (lightMode)
12231	14476	{
12232		- lighttouched = true;
	14477	+ Globals.lighttouched = true;
12233	14478	}
12234	14479
12235	14480	if (OEILONCE && OEIL)
..	..	@@ -12246,6 +14491,7 @@
12246	14491
12247	14492	public void run()
12248	14493	{
	14494	+ new Exception().printStackTrace();
12249	14495	System.exit(0);
12250	14496	for (;;)
12251	14497	{
..	..	@@ -12287,7 +14533,7 @@
12287	14533	mouseDown = false;
12288	14534	if (lightMode)
12289	14535	{
12290		- lighttouched = true;
	14536	+ Globals.lighttouched = true;
12291	14537	}
12292	14538	repaint();
12293	14539	alreadypainted = true;
..	..	@@ -12295,7 +14541,7 @@
12295	14541	isMoving = false;
12296	14542	} //??
12297	14543
12298		- if (isLIVE() && !alreadypainted)
	14544	+ if (Globals.isLIVE() && !alreadypainted)
12299	14545	{
12300	14546	// FOR DEBUG BREAKPOINT USING PAUSE: while (true)
12301	14547	repaint();
..	..	@@ -12307,9 +14553,9 @@
12307	14553	{
12308	14554	if (lightMode)
12309	14555	{
12310		- lighttouched = true;
	14556	+ Globals.lighttouched = true;
12311	14557	}
12312		- drag(X, (mouseMode != 0) ? Y : anchorY, MODIFIERS);
	14558	+ drag(X, (mouseMode != 0) ? Y : anchorY, 0, MODIFIERS);
12313	14559	}
12314	14560	//else
12315	14561	}
..	..	@@ -12323,12 +14569,12 @@
12323	14569	void GoDown(int mod)
12324	14570	{
12325	14571	MODIFIERS \|= COMMAND;
12326		- /*
	14572	+ /**/
12327	14573	if((mod&SHIFT) == SHIFT)
12328	14574	manipCamera.RotatePosition(0, -speed);
12329	14575	else
12330		- manipCamera.BackForth(0, -speed*delta, getWidth());
12331		- */
	14576	+ manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
	14577	+ /**/
12332	14578	if ((mod & SHIFT) == SHIFT)
12333	14579	{
12334	14580	mouseMode = mouseMode; // VR??
..	..	@@ -12344,12 +14590,12 @@
12344	14590	void GoUp(int mod)
12345	14591	{
12346	14592	MODIFIERS \|= COMMAND;
12347		- /*
	14593	+ /**/
12348	14594	if((mod&SHIFT) == SHIFT)
12349	14595	manipCamera.RotatePosition(0, speed);
12350	14596	else
12351		- manipCamera.BackForth(0, speed*delta, getWidth());
12352		- */
	14597	+ manipCamera.BackForth(0, speed*delta, 0); // getWidth());
	14598	+ /**/
12353	14599	if ((mod & SHIFT) == SHIFT)
12354	14600	{
12355	14601	mouseMode = mouseMode;
..	..	@@ -12365,12 +14611,12 @@
12365	14611	void GoLeft(int mod)
12366	14612	{
12367	14613	MODIFIERS \|= COMMAND;
12368		- /*
	14614	+ /**/
12369	14615	if((mod&SHIFT) == SHIFT)
12370		- manipCamera.RotatePosition(speed, 0);
12371		- else
12372	14616	manipCamera.Translate(speed*delta, 0, getWidth());
12373		- */
	14617	+ else
	14618	+ manipCamera.RotatePosition(speed, 0);
	14619	+ /**/
12374	14620	if ((mod & SHIFT) == SHIFT)
12375	14621	{
12376	14622	mouseMode = mouseMode;
..	..	@@ -12386,12 +14632,12 @@
12386	14632	void GoRight(int mod)
12387	14633	{
12388	14634	MODIFIERS \|= COMMAND;
12389		- /*
	14635	+ /**/
12390	14636	if((mod&SHIFT) == SHIFT)
12391		- manipCamera.RotatePosition(-speed, 0);
12392		- else
12393	14637	manipCamera.Translate(-speed*delta, 0, getWidth());
12394		- */
	14638	+ else
	14639	+ manipCamera.RotatePosition(-speed, 0);
	14640	+ /**/
12395	14641	if ((mod & SHIFT) == SHIFT)
12396	14642	{
12397	14643	mouseMode = mouseMode;
..	..	@@ -12409,7 +14655,7 @@
12409	14655	int X, Y;
12410	14656	boolean SX, SY;
12411	14657
12412		- void drag(int x, int y, int modifiers)
	14658	+ void drag(int x, int y, int modifiers, int modifiersex)
12413	14659	{
12414	14660	if (IsFrozen())
12415	14661	{
..	..	@@ -12418,17 +14664,17 @@
12418	14664
12419	14665	drag = true; // NEW
12420	14666
12421		- boolean continuous = (modifiers & COMMAND) == COMMAND;
	14667	+ boolean continuous = (modifiersex & COMMAND) == COMMAND;
12422	14668
12423	14669	X = x;
12424	14670	Y = y;
12425	14671	// floating state for animation
12426		- MODIFIERS = modifiers;
12427		- modifiers &= ~1024;
	14672	+ MODIFIERS = modifiersex;
	14673	+ modifiersex &= ~1024;
12428	14674	if (false) // modifiers != 0)
12429	14675	{
12430	14676	//new Exception().printStackTrace();
12431		- System.out.println("mouseDragged: " + modifiers);
	14677	+ System.out.println("mouseDragged: " + modifiersex);
12432	14678	System.out.println("SHIFT = " + SHIFT);
12433	14679	System.out.println("CONTROL = " + COMMAND);
12434	14680	System.out.println("META = " + META);
..	..	@@ -12441,14 +14687,16 @@
12441	14687	if (editObj)
12442	14688	{
12443	14689	drag = true;
12444		- ClickInfo info = new ClickInfo();
12445		- info.bounds.setBounds(0, 0,
	14690	+ //ClickInfo info = new ClickInfo();
	14691	+ object.clickInfo.bounds.setBounds(0, 0,
12446	14692	(int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
12447		- info.pane = this;
12448		- info.camera = renderCamera;
12449		- info.x = x;
12450		- info.y = y;
12451		- object.editWindow.copy.doEditDrag(info);
	14693	+ object.clickInfo.pane = this;
	14694	+ object.clickInfo.camera = renderCamera;
	14695	+ object.clickInfo.x = x;
	14696	+ object.clickInfo.y = y;
	14697	+ object //.GetWindow().copy
	14698	+ .doEditDrag(//info,
	14699	+ (modifiers & MouseEvent.BUTTON3_MASK) != 0);
12452	14700	} else
12453	14701	{
12454	14702	if (x < startX)
..	..	@@ -12550,6 +14798,7 @@
12550	14798	{
12551	14799	manipCamera.Translate(dx, dy, getWidth());
12552	14800	}
	14801	+ else
12553	14802	if ((mouseMode & ZOOM) == 0 && (mouseMode & VR) != 0)
12554	14803	{
12555	14804	manipCamera.RotateInterest(dx, dy);
..	..	@@ -12560,7 +14809,7 @@
12560	14809
12561	14810	if (manipCamera == lightCamera)
12562	14811	{
12563		- lighttouched = true;
	14812	+ Globals.lighttouched = true;
12564	14813	}
12565	14814	/*
12566	14815	switch (mode)
..	..	@@ -12596,23 +14845,27 @@
12596	14845	}
12597	14846	}
12598	14847
	14848	+// ClickInfo clickInfo = new ClickInfo();
	14849	+
12599	14850	public void mouseMoved(MouseEvent e)
12600	14851	{
12601	14852	//System.out.println("mouseMoved: " + e);
12602		-
12603	14853	if (isRenderer)
12604	14854	return;
12605	14855
12606		- ClickInfo ci = new ClickInfo();
12607		- ci.x = e.getX();
12608		- ci.y = e.getY();
12609		- ci.modifiers = e.getModifiersEx();
12610		- ci.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
12611		- ci.pane = this;
12612		- ci.camera = renderCamera;
	14856	+ // Mouse cursor feedback
	14857	+ object.clickInfo.x = e.getX();
	14858	+ object.clickInfo.y = e.getY();
	14859	+ object.clickInfo.modifiers = e.getModifiersEx();
	14860	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14861	+ object.clickInfo.pane = this;
	14862	+ object.clickInfo.camera = renderCamera;
12613	14863	if (!isRenderer)
12614	14864	{
12615		- if (object.editWindow.copy.doEditClick(ci, 0))
	14865	+ //ObjEditor editWindow = object.editWindow;
	14866	+ //Object3D copy = editWindow.copy;
	14867	+ if (object.doEditClick(//clickInfo,
	14868	+ 0))
12616	14869	{
12617	14870	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
12618	14871	} else
..	..	@@ -12624,7 +14877,11 @@
12624	14877
12625	14878	public void mouseReleased(MouseEvent e)
12626	14879	{
	14880	+ Globals.MOUSEDRAGGED = false;
	14881	+
12627	14882	movingcamera = false;
	14883	+ X = 0; // getBounds().width/2;
	14884	+ Y = 0; // getBounds().height/2;
12628	14885	//System.out.println("mouseReleased: " + e);
12629	14886	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
12630	14887	}
..	..	@@ -12647,9 +14904,9 @@
12647	14904	boolean control = ((modifiers & CTRL) != 0); // june 2013: for point selection
12648	14905	boolean command = ((modifiers & COMMAND) != 0); // june 2013: for multiple selection
12649	14906
12650		- if (control \|\| command \|\| IsFrozen())
	14907	+// No delay if (control \|\| command \|\| IsFrozen())
12651	14908	timeout = true;
12652		- else
	14909	+// ?? May 2019 else
12653	14910	// timer.setDelay((modifiers & 128) != 0?0:350);
12654	14911	mouseDown = false;
12655	14912	if (!control && !command) // june 2013
..	..	@@ -12759,7 +15016,7 @@
12759	15016	System.out.println("keyReleased: " + e);
12760	15017	}
12761	15018
12762		- void SetMouseMode(int modifiers)
	15019	+ void SetMouseMode(int modifiers, int modifiersex)
12763	15020	{
12764	15021	//System.out.println("SetMouseMode = " + modifiers);
12765	15022	//modifiers &= ~1024;
..	..	@@ -12771,24 +15028,27 @@
12771	15028	//if (modifiers == 0) // \|\| (modifiers == (1024 \| CONTROL)))
12772	15029	// return;
12773	15030	//System.out.println("SetMode = " + modifiers);
12774		- if ((modifiers & WHEEL) == WHEEL)
	15031	+ if ((modifiersex & WHEEL) == WHEEL)
12775	15032	{
12776	15033	mouseMode \|= ZOOM;
12777	15034	}
12778		- if ((modifiers & META) == META)
	15035	+
	15036	+ boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
	15037	+ if (capsLocked) // \|\| (modifiers & META) == META)
12779	15038	{
12780	15039	mouseMode \|= VR; // BACKFORTH;
12781	15040	}
12782		- if ((modifiers & CTRLCLICK) == CTRLCLICK)
12783		- {
12784		- mouseMode \|= SELECT; // BACKFORTH;
12785		- }
12786		- if ((modifiers & COMMAND) == COMMAND)
	15041	+ if ((modifiersex & CTRLCLICK) == CTRLCLICK)
12787	15042	{
12788	15043	mouseMode \|= SELECT;
12789	15044	}
12790		- if ((modifiers & SHIFT) == SHIFT \|\| forcetranslate)
	15045	+ if ((modifiersex & COMMAND) == COMMAND)
12791	15046	{
	15047	+ mouseMode \|= SELECT;
	15048	+ }
	15049	+ if ((modifiersex & SHIFT) == SHIFT \|\| forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
	15050	+ {
	15051	+ mouseMode &= ~VR;
12792	15052	mouseMode \|= TRANSLATE;
12793	15053	}
12794	15054	// if ((modifiers & SHIFT_META) == SHIFT_META)
..	..	@@ -12815,10 +15075,10 @@
12815	15075
12816	15076	if (isRenderer) //
12817	15077	{
12818		- SetMouseMode(modifiers);
	15078	+ SetMouseMode(0, modifiers);
12819	15079	}
12820	15080
12821		- theRenderer.keyPressed(key);
	15081	+ Globals.theRenderer.keyPressed(key);
12822	15082	}
12823	15083
12824	15084	int kompactbit = 4; // power bit
..	..	@@ -12830,7 +15090,7 @@
12830	15090	float SATPOW = 1; // 2; // 0.5f;
12831	15091	float BRIPOW = 1; // 0.5f; // 0.5f;
12832	15092
12833		- void keyPressed(int key)
	15093	+ public void keyPressed(int key)
12834	15094	{
12835	15095	if (key >= '0' && key <= '5')
12836	15096	clampbit = (key-'0');
..	..	@@ -12877,7 +15137,8 @@
12877	15137	// break;
12878	15138	case 'T':
12879	15139	CACHETEXTURE ^= true;
12880		- textures.clear();
	15140	+ texturepigment.clear();
	15141	+ texturebump.clear();
12881	15142	// repaint();
12882	15143	break;
12883	15144	case 'Y':
..	..	@@ -12945,7 +15206,7 @@
12945	15206	case 'B':
12946	15207	BRISMOOTH ^= true;
12947	15208	SHADOWCULLFACE ^= true;
12948		- lighttouched = true;
	15209	+ Globals.lighttouched = true;
12949	15210	repaint();
12950	15211	break;
12951	15212	case 'b':
..	..	@@ -12962,7 +15223,9 @@
12962	15223	case 'E' : COMPACT ^= true;
12963	15224	repaint();
12964	15225	break;
12965		- case 'W' : DEBUGHSB ^= true;
	15226	+ case 'W' : // Wide Window (fullscreen)
	15227	+ //DEBUGHSB ^= true;
	15228	+ ObjEditor.theFrame.ToggleFullScreen();
12966	15229	repaint();
12967	15230	break;
12968	15231	case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
..	..	@@ -12987,8 +15250,8 @@
12987	15250	RevertCamera();
12988	15251	repaint();
12989	15252	break;
12990		- case 'L':
12991	15253	case 'l':
	15254	+ //case 'L':
12992	15255	if (lightMode)
12993	15256	{
12994	15257	lightMode = false;
..	..	@@ -13045,7 +15308,7 @@
13045	15308	repaint();
13046	15309	break;
13047	15310	case 'O':
13048		- drawMode = OCCLUSION;
	15311	+ Globals.drawMode = OCCLUSION; // WARNING
13049	15312	repaint();
13050	15313	break;
13051	15314	case 'o':
..	..	@@ -13131,12 +15394,12 @@
13131	15394	case '_':
13132	15395	kompactbit = 5;
13133	15396	break;
13134		- case '+':
13135		- kompactbit = 6;
13136		- break;
	15397	+// case '+':
	15398	+// kompactbit = 6;
	15399	+// break;
13137	15400	case ' ':
13138	15401	lightMode ^= true;
13139		- lighttouched = true;
	15402	+ Globals.lighttouched = true;
13140	15403	manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
13141	15404	targetLookAt.set(manipCamera.lookAt);
13142	15405	repaint();
..	..	@@ -13145,14 +15408,15 @@
13145	15408	case ESC:
13146	15409	RENDERPROGRAM += 1;
13147	15410	RENDERPROGRAM %= 3;
	15411	+
13148	15412	repaint();
13149	15413	break;
13150	15414	case 'Z':
13151		- RESIZETEXTURE ^= true;
13152		- break;
	15415	+ //RESIZETEXTURE ^= true;
	15416	+ //break;
13153	15417	case 'z':
13154		- RENDERSHADOW ^= true;
13155		- lighttouched = true;
	15418	+ Globals.RENDERSHADOW ^= true;
	15419	+ Globals.lighttouched = true;
13156	15420	repaint();
13157	15421	break;
13158	15422	//case UP:
..	..	@@ -13178,13 +15442,15 @@
13178	15442	FlipTransform();
13179	15443	break;
13180	15444	case ENTER:
13181		- object.editWindow.ScreenFit(); // Edit();
	15445	+ // object.editWindow.ScreenFit(); // Edit();
	15446	+ ToggleLive();
13182	15447	break;
13183	15448	case DELETE:
13184	15449	ClearSelection();
13185	15450	break;
13186		- /*
13187	15451	case '+':
	15452	+
	15453	+ /*
13188	15454	//fontsize += 1;
13189	15455	bbzoom *= 2;
13190	15456	repaint();
..	..	@@ -13201,17 +15467,17 @@
13201	15467	case '=':
13202	15468	IncDepth();
13203	15469	//fontsize += 1;
13204		- object.editWindow.refreshContents(true);
	15470	+ object.GetWindow().refreshContents(true);
13205	15471	maskbit = 6;
13206	15472	break;
13207	15473	case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
13208	15474	DecDepth();
13209	15475	maskbit = 5;
13210	15476	//if(fontsize > 1) fontsize -= 1;
13211		- if (object.editWindow == null)
13212		- new Exception().printStackTrace();
13213		- else
13214		- object.editWindow.refreshContents(true);
	15477	+// if (object.editWindow == null)
	15478	+// new Exception().printStackTrace();
	15479	+// else
	15480	+ object.GetWindow().refreshContents(true);
13215	15481	break;
13216	15482	case '{':
13217	15483	manipCamera.shaper_fovy /= 1.1;
..	..	@@ -13266,6 +15532,7 @@
13266	15532	}
13267	15533	//System.out.println("shaper_fovy = " + manipCamera.shaper_fovy);
13268	15534	}
	15535	+
13269	15536	static double OCCLUSIONBOOST = 1; // 0.5;
13270	15537
13271	15538	void keyReleased(int key, int modifiers)
..	..	@@ -13273,11 +15540,11 @@
13273	15540	//mode = ROTATE;
13274	15541	if ((MODIFIERS & COMMAND) == 0) // VR??
13275	15542	{
13276		- SetMouseMode(modifiers);
	15543	+ SetMouseMode(0, modifiers);
13277	15544	}
13278	15545	}
13279	15546
13280		- protected void processKeyEvent(KeyEvent e)
	15547	+ public void processKeyEvent(KeyEvent e)
13281	15548	{
13282	15549	switch (e.getID())
13283	15550	{
..	..	@@ -13407,8 +15674,9 @@
13407	15674
13408	15675	protected void processMouseMotionEvent(MouseEvent e)
13409	15676	{
13410		- //System.out.println("processMouseMotionEvent: " + mouseMode);
13411		- if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
	15677	+ //System.out.println("processMouseMotionEvent: " + mouseMode + " " + e.getModifiers() + " " + e.getModifiersEx() + " " + e.getButton());
	15678	+ //if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
	15679	+ if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (e.getModifiers() & MouseEvent.BUTTON3_MASK) == 0 && (mouseMode & SELECT) == 0)
13412	15680	{
13413	15681	mouseMoved(e);
13414	15682	} else
..	..	@@ -13433,11 +15701,12 @@
13433	15701	}
13434	15702	*/
13435	15703
13436		- object.editWindow.EditSelection();
	15704	+ object.GetWindow().EditSelection(false);
13437	15705	}
13438	15706
13439	15707	void SelectParent()
13440	15708	{
	15709	+ new Exception().printStackTrace();
13441	15710	System.exit(0);
13442	15711	Composite group = (Composite) object;
13443	15712	java.util.Vector selectees = new java.util.Vector(group.selection);
..	..	@@ -13449,10 +15718,10 @@
13449	15718	{
13450	15719	//selectees.remove(i);
13451	15720	System.out.println("select parent of " + elem);
13452		- group.editWindow.Select(elem.parent.GetTreePath(), first, true);
	15721	+ group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
13453	15722	} else
13454	15723	{
13455		- group.editWindow.Select(elem.GetTreePath(), first, true);
	15724	+ group.GetWindow().Select(elem.GetTreePath(), first, true);
13456	15725	}
13457	15726
13458	15727	first = false;
..	..	@@ -13461,6 +15730,7 @@
13461	15730
13462	15731	void SelectChildren()
13463	15732	{
	15733	+ new Exception().printStackTrace();
13464	15734	System.exit(0);
13465	15735	/*
13466	15736	Composite group = (Composite) object;
..	..	@@ -13493,12 +15763,12 @@
13493	15763	for (int j = 0; j < group.children.size(); j++)
13494	15764	{
13495	15765	elem = (Object3D) group.children.elementAt(j);
13496		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15766	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
13497	15767	first = false;
13498	15768	}
13499	15769	} else
13500	15770	{
13501		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15771	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
13502	15772	}
13503	15773
13504	15774	first = false;
..	..	@@ -13509,21 +15779,21 @@
13509	15779	{
13510	15780	//Composite group = (Composite) object;
13511	15781	Object3D group = object;
13512		- group.editWindow.loadClipboard(true); // ClearSelection(false);
	15782	+ group.GetWindow().loadClipboard(true); // ClearSelection(false);
13513	15783	}
13514	15784
13515	15785	void ResetTransform(int mask)
13516	15786	{
13517	15787	//Composite group = (Composite) object;
13518	15788	Object3D group = object;
13519		- group.editWindow.ResetTransform(mask);
	15789	+ group.GetWindow().ResetTransform(mask);
13520	15790	}
13521	15791
13522	15792	void FlipTransform()
13523	15793	{
13524	15794	//Composite group = (Composite) object;
13525	15795	Object3D group = object;
13526		- group.editWindow.FlipTransform();
	15796	+ group.GetWindow().FlipTransform();
13527	15797	// group.editWindow.ReduceMesh(true);
13528	15798	}
13529	15799
..	..	@@ -13531,7 +15801,7 @@
13531	15801	{
13532	15802	//Composite group = (Composite) object;
13533	15803	Object3D group = object;
13534		- group.editWindow.PrintMemory();
	15804	+ group.GetWindow().PrintMemory();
13535	15805	// group.editWindow.ReduceMesh(true);
13536	15806	}
13537	15807
..	..	@@ -13539,7 +15809,7 @@
13539	15809	{
13540	15810	//Composite group = (Composite) object;
13541	15811	Object3D group = object;
13542		- group.editWindow.ResetCentroid();
	15812	+ group.GetWindow().ResetCentroid();
13543	15813	}
13544	15814
13545	15815	void IncDepth()
..	..	@@ -13621,11 +15891,11 @@
13621	15891
13622	15892	int width = getBounds().width;
13623	15893	int height = getBounds().height;
13624		- ClickInfo info = new ClickInfo();
13625		- info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
13626	15894	//Image img = CreateImage(width, height);
13627	15895	//System.out.println("width = " + width + "; height = " + height + "\n");
	15896	+
13628	15897	Graphics gr = g; // img.getGraphics();
	15898	+
13629	15899	if (!hasMarquee)
13630	15900	{
13631	15901	if (Xmin < Xmax) // !locked)
..	..	@@ -13697,40 +15967,88 @@
13697	15967	}
13698	15968	if (object != null && !hasMarquee)
13699	15969	{
	15970	+ if (object.clickInfo == null)
	15971	+ object.clickInfo = new ClickInfo();
	15972	+ ClickInfo info = object.clickInfo;
	15973	+ //ClickInfo info = new ClickInfo();
	15974	+ info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
	15975	+
13700	15976	if (isRenderer)
13701	15977	{
13702		- info.flags++;
	15978	+ object.clickInfo.flags++;
13703	15979	double frameAspect = (double) width / (double) height;
13704	15980	if (frameAspect > renderCamera.aspect)
13705	15981	{
13706	15982	int desired = (int) ((double) height * renderCamera.aspect);
13707		- info.bounds.width -= width - desired;
13708		- info.bounds.x += (width - desired) / 2;
	15983	+ object.clickInfo.bounds.width -= width - desired;
	15984	+ object.clickInfo.bounds.x += (width - desired) / 2;
13709	15985	} else
13710	15986	{
13711	15987	int desired = (int) ((double) width / renderCamera.aspect);
13712		- info.bounds.height -= height - desired;
13713		- info.bounds.y += (height - desired) / 2;
	15988	+ object.clickInfo.bounds.height -= height - desired;
	15989	+ object.clickInfo.bounds.y += (height - desired) / 2;
13714	15990	}
13715	15991	}
13716		- info.g = gr;
13717		- info.camera = renderCamera;
	15992	+
	15993	+ object.clickInfo.g = gr;
	15994	+ object.clickInfo.camera = renderCamera;
13718	15995	/*
13719	15996	// Memory intensive (brep.verticescopy)
13720	15997	if (!(object instanceof Composite))
13721	15998	object.draw(info, 0, false); // SLOW :
13722	15999	*/
13723		- if (!isRenderer)
	16000	+ if (!isRenderer) // && drag)
13724	16001	{
13725		- object.drawEditHandles(info, 0);
	16002	+ Grafreed.Assert(object != null);
	16003	+ Grafreed.Assert(object.selection != null);
	16004	+ if (object.selection.Size() > 0)
	16005	+ {
	16006	+ int hitSomething = object.selection.get(0).hitSomething;
	16007	+
	16008	+ object.clickInfo.DX = 0;
	16009	+ object.clickInfo.DY = 0;
	16010	+ object.clickInfo.W = 1;
	16011	+ if (hitSomething == Object3D.hitCenter)
	16012	+ {
	16013	+ info.DX = X;
	16014	+ if (X != 0)
	16015	+ info.DX -= info.bounds.width/2;
	16016	+
	16017	+ info.DY = Y;
	16018	+ if (Y != 0)
	16019	+ info.DY -= info.bounds.height/2;
	16020	+ }
	16021	+
	16022	+ object.drawEditHandles(//info,
	16023	+ 0);
	16024	+
	16025	+ if (drag && (X != 0 \|\| Y != 0))
	16026	+ {
	16027	+ switch (hitSomething)
	16028	+ {
	16029	+ case Object3D.hitCenter: gr.setColor(Color.pink);
	16030	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16031	+ break;
	16032	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	16033	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16034	+ break;
	16035	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	16036	+ gr.drawLine(X, Y, 0, 0);
	16037	+ break;
	16038	+ }
	16039	+
	16040	+ }
	16041	+ }
13726	16042	}
13727	16043	}
	16044	+
13728	16045	if (isRenderer)
13729	16046	{
13730	16047	//gr.setColor(Color.black);
13731	16048	//gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
13732	16049	//gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
13733	16050	}
	16051	+
13734	16052	if (hasMarquee)
13735	16053	{
13736	16054	gr.setXORMode(Color.white);
..	..	@@ -13753,6 +16071,7 @@
13753	16071	//if (g != gr) g.drawImage(img, 0, 0, width, height, null);
13754	16072	}
13755	16073
	16074	+ // To avoid clear.
13756	16075	public void update(Graphics g)
13757	16076	{
13758	16077	paint(g);
..	..	@@ -13842,6 +16161,7 @@
13842	16161	public boolean mouseDown(Event evt, int x, int y)
13843	16162	{
13844	16163	System.out.println("mouseDown: " + evt);
	16164	+ System.exit(0);
13845	16165	/*
13846	16166	locked = true;
13847	16167	drag = false;
..	..	@@ -13885,7 +16205,7 @@
13885	16205	{
13886	16206	keyPressed(0, modifiers);
13887	16207	}
13888		- clickStart(x, y, modifiers);
	16208	+ // clickStart(x, y, modifiers);
13889	16209	return true;
13890	16210	}
13891	16211
..	..	@@ -14003,7 +16323,7 @@
14003	16323	{
14004	16324	keyReleased(0, 0);
14005	16325	}
14006		- drag(x, y, modifiers);
	16326	+ drag(x, y, 0, modifiers);
14007	16327	return true;
14008	16328	}
14009	16329
..	..	@@ -14135,7 +16455,7 @@
14135	16455	Object3D object;
14136	16456	static Object3D trackedobject;
14137	16457	Camera renderCamera; // Light or Eye (or Occlusion)
14138		- /static/ Camera manipCamera; // Light or Eye
	16458	+ /static/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
14139	16459	/static/ Camera eyeCamera;
14140	16460	/static/ Camera lightCamera;
14141	16461	int cameracount;
..	..	@@ -14355,7 +16675,7 @@
14355	16675	gl.glPushAttrib(GL.GL_ALL_ATTRIB_BITS);
14356	16676	gl.glPushMatrix();
14357	16677	gl.glLoadIdentity();
14358		- PushMatrix(checker.toParent);
	16678	+ //PushMatrix(checker.toParent);
14359	16679
14360	16680	gl.glMatrixMode(GL.GL_TEXTURE);
14361	16681	gl.glPushMatrix();
..	..	@@ -14378,8 +16698,8 @@
14378	16698
14379	16699	gl.glNormal3f(0.0f, 0.0f, 1.0f);
14380	16700
14381		- float step = 0.1666f; //0.25f;
14382		- float stepv = step * 1652 / 998;
	16701	+ float step = 2; // 0.1666f; //0.25f;
	16702	+ float stepv = 2; // step * 1652 / 998;
14383	16703
14384	16704	int i0 = 0;
14385	16705	/*
..	..	@@ -14415,20 +16735,21 @@
14415	16735	/**/
14416	16736	//checker.GetMaterial().opacity = 1.1f;
14417	16737	////checker.GetMaterial().ambient = 0.99f;
14418		- Object3D.materialstack[Object3D.materialdepth] = checker.material;
14419		- Object3D.selectedstack[Object3D.materialdepth] = false;
14420		- cStatic.objectstack[Object3D.materialdepth++] = checker;
	16738	+ materialstack[materialdepth] = checker.material;
	16739	+ selectedstack[materialdepth] = false;
	16740	+ cStatic.objectstack[materialdepth++] = checker;
14421	16741	//System.out.println("material " + material);
14422	16742	//Applet3D.tracein(this, selected);
14423		- vector2buffer = checker.projectedVertices;
	16743	+ //vector2buffer = checker.projectedVertices;
14424	16744
14425		- checker.GetMaterial().Draw(this, false); // true);
	16745	+ //checker.GetMaterial().Draw(this, false); // true);
	16746	+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
14426	16747
14427		- Object3D.materialdepth -= 1;
14428		- if (Object3D.materialdepth > 0)
	16748	+ materialdepth -= 1;
	16749	+ if (materialdepth > 0)
14429	16750	{
14430		- vector2buffer = cStatic.objectstack[Object3D.materialdepth - 1].projectedVertices;
14431		- Object3D.materialstack[Object3D.materialdepth - 1].Draw(this, Object3D.selectedstack[Object3D.materialdepth - 1]);
	16751	+ //vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	16752	+ DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
14432	16753	}
14433	16754	//checker.GetMaterial().opacity = 1f;
14434	16755	////checker.GetMaterial().ambient = 1f;
..	..	@@ -14449,15 +16770,27 @@
14449	16770
14450	16771	//float u = (i+1)/2;
14451	16772	//float v = (j+1)/2;
14452		- gl.glTexCoord2f((i + 1) / 2, (j + 1) / 2); // (1,0) // (i+1+step)/2,(j+1)/2);
	16773	+ if (checker.flipV)
	16774	+ gl.glTexCoord2f((i + 1) / 2, 1 - (j + 1) / 2);
	16775	+ else
	16776	+ gl.glTexCoord2f((i + 1) / 2, (j + 1) / 2); // (1,0) // (i+1+step)/2,(j+1)/2);
14453	16777	gl.glVertex3f(i, j, -0.5f);
14454	16778
	16779	+ if (checker.flipV)
	16780	+ gl.glTexCoord2f((i + 1 + step) / 2, 1 - (j + 1) / 2); // (1,1) // (i+1+step)/2,(j+1+step)/2);
	16781	+ else
14455	16782	gl.glTexCoord2f((i + 1 + step) / 2, (j + 1) / 2); // (1,1) // (i+1+step)/2,(j+1+step)/2);
14456	16783	gl.glVertex3f(i + step, j, -0.5f);
14457	16784
	16785	+ if (checker.flipV)
	16786	+ gl.glTexCoord2f((i + 1 + step) / 2, 1 - (j + 1 + stepv) / 2); // (0,1) //(i+1)/2,(j+1+step)/2);
	16787	+ else
14458	16788	gl.glTexCoord2f((i + 1 + step) / 2, (j + 1 + stepv) / 2); // (0,1) //(i+1)/2,(j+1+step)/2);
14459	16789	gl.glVertex3f(i + step, j + stepv, -0.5f);
14460	16790
	16791	+ if (checker.flipV)
	16792	+ gl.glTexCoord2f((i + 1) / 2, 1 - (j + 1 + stepv) / 2); // (0,0) //(i+1)/2,(j+1)/2);
	16793	+ else
14461	16794	gl.glTexCoord2f((i + 1) / 2, (j + 1 + stepv) / 2); // (0,0) //(i+1)/2,(j+1)/2);
14462	16795	gl.glVertex3f(i, j + stepv, -0.5f);
14463	16796	}
..	..	@@ -14469,7 +16802,7 @@
14469	16802	gl.glMatrixMode(GL.GL_PROJECTION);
14470	16803	gl.glPopMatrix();
14471	16804	gl.glMatrixMode(GL.GL_MODELVIEW);
14472		- PopMatrix(null); // checker.toParent); // null);
	16805	+ //PopMatrix(null); // checker.toParent); // null);
14473	16806	gl.glPopMatrix();
14474	16807	PopTextureMatrix(checker.toParent);
14475	16808	gl.glMatrixMode(GL.GL_TEXTURE);
..	..	@@ -14502,6 +16835,14 @@
14502	16835	}
14503	16836	}
14504	16837
	16838	+ private Object3D GetFolder()
	16839	+ {
	16840	+ Object3D folder = object.GetWindow().copy;
	16841	+ if (object.GetWindow().copy.selection.Size() > 0)
	16842	+ folder = object.GetWindow().copy.selection.elementAt(0);
	16843	+ return folder;
	16844	+ }
	16845	+
14505	16846	class SelectBuffer implements GLEventListener
14506	16847	{
14507	16848
..	..	@@ -14560,6 +16901,7 @@
14560	16901	{
14561	16902	if (!selection)
14562	16903	{
	16904	+ new Exception().printStackTrace();
14563	16905	System.exit(0);
14564	16906	return;
14565	16907	}
..	..	@@ -14580,17 +16922,39 @@
14580	16922
14581	16923	//gl.glDisable(GL.GL_POLYGON_OFFSET_FILL);
14582	16924
	16925	+ if (PAINTMODE)
	16926	+ {
	16927	+ if (object.GetWindow().copy.selection.Size() > 0)
	16928	+ {
	16929	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	16930	+
	16931	+ // Make what you paint not selectable.
	16932	+ paintobj.ResetSelectable();
	16933	+ }
	16934	+ }
	16935	+
14583	16936	//int tmp = selection_view;
14584	16937	//selection_view = -1;
14585		- int temp = drawMode;
14586		- drawMode = SELECTION;
	16938	+ int temp = DrawMode();
	16939	+ Globals.drawMode = SELECTION; // WARNING
14587	16940	indexcount = 0;
14588	16941	parent.display(drawable);
14589	16942	//selection_view = tmp;
14590	16943	//if (temp == SELECTION)
14591	16944	// temp = DEFAULT; // patch for selection debug
14592		- drawMode = temp;
	16945	+ Globals.drawMode = temp; // WARNING
14593	16946
	16947	+ if (PAINTMODE)
	16948	+ {
	16949	+ if (object.GetWindow().copy.selection.Size() > 0)
	16950	+ {
	16951	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	16952	+
	16953	+ // Revert.
	16954	+ paintobj.RestoreSelectable();
	16955	+ }
	16956	+ }
	16957	+
14594	16958	//gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
14595	16959
14596	16960	// trying different ways of getting the depth info over
..	..	@@ -14639,6 +17003,13 @@
14639	17003	// System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
14640	17004	// System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
14641	17005
	17006	+ CreateSelectedPoint();
	17007	+
	17008	+ // Will fit the mesh !!!
	17009	+ selectedpoint.toParent[0][0] = 0.0001;
	17010	+ selectedpoint.toParent[1][1] = 0.0001;
	17011	+ selectedpoint.toParent[2][2] = 0.0001;
	17012	+
14642	17013	glu.gluUnProject(x,y,depth,view,0,tempmat2,0,viewport,0,selectedpoint.toParent[3],0);
14643	17014
14644	17015	// if (object.selection != null && object.selection.Size() > 0)
..	..	@@ -14682,34 +17053,36 @@
14682	17053	System.out.println("; fromto " + sel + " " + Trunk(previousselectedpoint.toParent[3][0]) + " " + Trunk(previousselectedpoint.toParent[3][2]) + " " + Trunk(selectedpoint.toParent[3][0]) + " " + Trunk(selectedpoint.toParent[3][2]));
14683	17054	}
14684	17055
14685		- previousselectedpoint = (Sphere) GraphreeD.clone(selectedpoint);
	17056	+ previousselectedpoint = (Sphere) Grafreed.clone(selectedpoint);
14686	17057	}
14687	17058	}
14688	17059
14689	17060	if (!movingcamera && !PAINTMODE)
14690		- object.editWindow.ScreenFitPoint(); // fev 2014
	17061	+ object.GetWindow().ScreenFitPoint(); // fev 2014
14691	17062
14692		- if (PAINTMODE && GraphreeD.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	17063	+ if (PAINTMODE) // && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
14693	17064	{
14694		- Object3D paintobj = GraphreeD.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
	17065	+ //Object3D paintobj; // = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
14695	17066
14696		- Object3D group = new Object3D("inst" + paintcount++);
	17067	+ if (object.GetWindow().copy.selection.Size() > 0)
	17068	+ {
	17069	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
14697	17070
14698		- group.CreateMaterial(); // use a void leaf to select instances
14699		-
14700		- group.add(paintobj); // link
14701		-
14702		- object.editWindow.SnapObject(group);
14703		-
14704		- Object3D folder = object.editWindow.copy;
14705		-
14706		- if (object.editWindow.copy.selection.Size() > 0)
14707		- folder = object.editWindow.copy.selection.elementAt(0);
14708		-
14709		- folder.add(group);
14710		-
14711		- object.editWindow.ResetModel();
14712		- object.editWindow.refreshContents();
	17071	+ Object3D inst = new Object3D("inst" + paintcount++);
	17072	+
	17073	+ inst.CreateMaterial(); // use a void leaf to select instances
	17074	+
	17075	+ inst.add(paintobj); // link
	17076	+
	17077	+ object.GetWindow().SnapObject(inst);
	17078	+
	17079	+ Object3D folder = paintFolder; // GetFolder();
	17080	+
	17081	+ folder.add(inst);
	17082	+
	17083	+ object.GetWindow().ResetModel();
	17084	+ object.GetWindow().refreshContents();
	17085	+ }
14713	17086	}
14714	17087	else
14715	17088	paintcount = 0;
..	..	@@ -14748,6 +17121,11 @@
14748	17121	//System.out.println("objects[color] = " + objects[color]);
14749	17122	//objects[color].Select();
14750	17123	indexcount = 0;
	17124	+ ObjEditor window = object.GetWindow();
	17125	+ if (window != null && deselect)
	17126	+ {
	17127	+ window.Select(null, deselect, true);
	17128	+ }
14751	17129	object.Select(color, deselect);
14752	17130	}
14753	17131
..	..	@@ -14847,7 +17225,7 @@
14847	17225	gl.glDisable(gl.GL_CULL_FACE);
14848	17226	}
14849	17227
14850		- if (!RENDERSHADOW)
	17228	+ if (!Globals.RENDERSHADOW)
14851	17229	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
14852	17230
14853	17231	// SB gl.glPolygonOffset(2.5f, 10);
..	..	@@ -14857,14 +17235,14 @@
14857	17235	//gl.glColorMask(false, false, false, false);
14858	17236
14859	17237	//render_scene_from_light_view(gl, drawable, 0, 0);
14860		- if (RENDERSHADOW && lighttouched && !movingcamera) // && !parent.IsFreezed())
	17238	+ if (Globals.RENDERSHADOW && Globals.lighttouched && (!movingcamera \|\| !Globals.FREEZEONMOVE)) // && !parent.IsFreezed())
14861	17239	{
14862	17240	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
14863	17241
14864		- int temp = drawMode;
14865		- drawMode = SHADOW;
	17242	+ int temp = DrawMode();
	17243	+ Globals.drawMode = SHADOW; // WARNING
14866	17244	parent.display(drawable);
14867		- drawMode = temp;
	17245	+ Globals.drawMode = temp; // WARNING
14868	17246	}
14869	17247
14870	17248	gl.glCullFace(gl.GL_BACK);
..	..	@@ -14917,7 +17295,6 @@
14917	17295
14918	17296	class AntialiasBuffer implements GLEventListener
14919	17297	{
14920		-
14921	17298	CameraPane parent = null;
14922	17299
14923	17300	AntialiasBuffer(CameraPane p)
..	..	@@ -15027,13 +17404,19 @@
15027	17404	gl.glFlush();
15028	17405
15029	17406	/**/
15030		- gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_BGRA, GL.GL_UNSIGNED_INT_8_8_8_8_REV, occlusionsizebuffer);
	17407	+ gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusionsizebuffer);
15031	17408
15032		- int[] pixels = occlusionsizebuffer.array();
	17409	+ float[] pixels = occlusionsizebuffer.array();
15033	17410
15034	17411	double r = 0, g = 0, b = 0;
15035	17412
15036	17413	double count = 0;
	17414	+
	17415	+ gl.glGetDoublev(gl.GL_PROJECTION_MATRIX, tempmat2, 0);
	17416	+
	17417	+ float mindepth = 1;
	17418	+
	17419	+ double FACTOR = 1;
15037	17420
15038	17421	for (int i = 0; i < pixels.length; i++)
15039	17422	{
..	..	@@ -15118,7 +17501,7 @@
15118	17501
15119	17502	double scale = ray.z; // 1; // cos
15120	17503
15121		- int p = pixels[newindex];
	17504	+ float depth = pixels[newindex];
15122	17505
15123	17506	/*
15124	17507	int newindex2 = (x + 1) * OCCLUSION_SIZE + y;
..	..	@@ -15142,10 +17525,23 @@
15142	17525	scale = (1 - modu) * modv;
15143	17526	*/
15144	17527
15145		- r += ((p >> 16) & 0xFF) * scale / 255;
15146		- g += ((p >> 8) & 0xFF) * scale / 255;
15147		- b += (p & 0xFF) * scale / 255;
	17528	+ //r += ((p >> 16) & 0xFF) * scale / 255;
	17529	+ //g += ((p >> 8) & 0xFF) * scale / 255;
	17530	+ //b += (p & 0xFF) * scale / 255;
	17531	+
	17532	+ if (mindepth > depth)
	17533	+ {
	17534	+ mindepth = depth;
	17535	+ }
15148	17536
	17537	+ double z_eye = tempmat2[34 + 2] / (depth -2.0 + 1.0 - tempmat2[2*4 + 2]);
	17538	+
	17539	+ double factor = 1 - Math.exp(-z_eye * z_eye / FACTOR);
	17540	+
	17541	+ r += factor * scale;
	17542	+ g += factor * scale;
	17543	+ b += factor * scale;
	17544	+
15149	17545	count += scale;
15150	17546	}
15151	17547
..	..	@@ -15243,12 +17639,6 @@
15243	17639	GLUT glut = new GLUT();
15244	17640
15245	17641
15246		- static final public int DEFAULT = 0;
15247		- static final public int SELECTION = 1;
15248		- static final public int SHADOW = 2;
15249		- static final public int OCCLUSION = 3;
15250		- static
15251		- public int drawMode = DEFAULT;
15252	17642	public boolean spherical = false;
15253	17643	static boolean DEBUG_OCCLUSION = false;
15254	17644	static boolean DEBUG_SELECTION = false;
..	..	@@ -15261,21 +17651,15 @@
15261	17651	int AAbuffersize = 0;
15262	17652
15263	17653	//double[] selectedpoint = new double[3];
15264		- static Sphere selectedpoint = new Sphere();
	17654	+ static Superellipsoid selectedpoint;
15265	17655	static Sphere previousselectedpoint = null;
15266		- static Sphere debugpoint = new Sphere();
15267		- static Sphere debugpoint2 = new Sphere();
	17656	+ static Sphere debugpointG;
	17657	+ static Sphere debugpointP;
	17658	+ static Sphere debugpointC;
	17659	+ static Sphere debugpointR;
15268	17660
15269	17661	static Sphere debugpoints[] = new Sphere[8];
15270	17662
15271		- static
15272		- {
15273		- for (int i=0; i<8; i++)
15274		- {
15275		- debugpoints[i] = new Sphere();
15276		- }
15277		- }
15278		-
15279	17663	static void InitPoints(float radius)
15280	17664	{
15281	17665	for (int i=0; i<8; i++)
..	..	@@ -15295,7 +17679,7 @@
15295	17679	}
15296	17680	}
15297	17681
15298		- static void DrawPoints(CameraPane cpane)
	17682	+ static void DrawPoints(iCameraPane cpane)
15299	17683	{
15300	17684	for (int i=0; i<8; i++) // first and last are red
15301	17685	{
..	..	@@ -15317,7 +17701,8 @@
15317	17701	static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
15318	17702	static IntBuffer selectsizebuffer = IntBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
15319	17703	static java.nio.FloatBuffer pointselectsizebuffer = java.nio.FloatBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
15320		- static IntBuffer occlusionsizebuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17704	+ //static IntBuffer occlusionsizebuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17705	+ static java.nio.FloatBuffer occlusionsizebuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
15321	17706	static BufferedImage bufimage = new BufferedImage(TEX_SIZE, TEX_SIZE, BufferedImage.TYPE_INT_RGB);
15322	17707	static BufferedImage textest = new cBufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB);
15323	17708	static java.util.Vector<BufferedImage> billboards = new java.util.Vector<BufferedImage>();
..	..	@@ -15326,10 +17711,11 @@
15326	17711	static IntBuffer textbuffer = null; // IntBuffer.allocate(TEXT_WIDTH88 * TEXT_HEIGHT);
15327	17712	// Depth buffer format
15328	17713	//private int depth_format;
15329		- static public void NextIndex(Object3D o, GL gl)
	17714	+
	17715	+ public void NextIndex()
15330	17716	{
15331	17717	indexcount+=16;
15332		- gl.glColor3d(((indexcount >>> 16) & 255) / 255.0, ((indexcount >>> 8) & 255) / 255.0, ((indexcount) & 255) / 255.0);
	17718	+ GetGL().glColor3d(((indexcount >>> 16) & 255) / 255.0, ((indexcount >>> 8) & 255) / 255.0, ((indexcount) & 255) / 255.0);
15333	17719	//objects[indexcount] = o;
15334	17720	//System.out.println("indexcount = " + indexcount);
15335	17721	}