~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,54 @@
165	185	defaultcaps.setAccumBlueBits(16);
166	186	defaultcaps.setAccumAlphaBits(16);
167	187	}
168		- static CameraPane theRenderer;
	188	+
	189	+ private File defaultDirectory = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory();
169	190
	191	+ public void LoadSkybox(String name, String ext, boolean mipmap) throws GLException
	192	+ {
	193	+ try
	194	+ {
	195	+ cubemap = LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
	196	+ } catch (IOException e)
	197	+ {
	198	+ System.out.println("NAME = " + name);
	199	+ e.printStackTrace(); // throw new RuntimeException(e);
	200	+ }
	201	+ }
	202	+
170	203	void SetAsGLRenderer(boolean b)
171	204	{
172	205	isRenderer = b;
173		- theRenderer = this;
	206	+ Globals.theRenderer = this;
	207	+ }
	208	+
	209	+ CameraPane(Object3D o, Camera cam, boolean withcontext)
	210	+ {
	211	+ super(defaultcaps, null, withcontext?glcontext:null, null);
	212	+
	213	+ //System.out.println("AMERICA AREA = " + (9458886 + 9210755 + 8480395 + 2736391 + 1943018 + 1289475 + 1141569 + 1069350 + 911559 + 721229 + 395886 + 377972 + 246700 + 211156 + 173985 + 141133 + 118279 + 112079 + 108523));
	214	+ glcontext = getContext();
	215	+
	216	+ cameras = new Camera[2];
	217	+ targetLookAts = new cVector[2];
	218	+
	219	+ SetCamera(cam);
	220	+
	221	+ // Warning: not used.
	222	+ SetLight(new Camera(new cVector(15, 10, -20)));
	223	+
	224	+ object = o;
	225	+
	226	+ setBackground(Color.white);
	227	+
	228	+ addKeyListener(this);
	229	+ addMouseListener(this);
	230	+ addMouseMotionListener(this);
	231	+ addMouseWheelListener(this);
	232	+ //System.out.println("addGLEventListener: " + this);
	233	+ addGLEventListener(this);
	234	+
	235	+// pingthread.start(); // may 2013
174	236	}
175	237
176	238	static boolean AntialiasingEnabled()
..	..	@@ -178,12 +240,53 @@
178	240	return CURRENTANTIALIAS > 0;
179	241	}
180	242
181		- void ClearDepth()
	243	+ /// INTERFACE
	244	+
	245	+ public javax.media.opengl.GL GetGL0()
	246	+ {
	247	+ return null;
	248	+ }
	249	+
	250	+ public int GenList()
	251	+ {
	252	+ javax.media.opengl.GL gl = GetGL();
	253	+ return gl.glGenLists(1);
	254	+ }
	255	+
	256	+ public void NewList(int id)
	257	+ {
	258	+ javax.media.opengl.GL gl = GetGL();
	259	+ gl.glNewList(id, gl.GL_COMPILE); //_AND_EXECUTE);
	260	+ }
	261	+
	262	+ public void CallList(int id)
	263	+ {
	264	+ javax.media.opengl.GL gl = GetGL();
	265	+ gl.glCallList(id);
	266	+ }
	267	+
	268	+ public void EndList()
	269	+ {
	270	+ javax.media.opengl.GL gl = GetGL();
	271	+ gl.glEndList();
	272	+ }
	273	+
	274	+ public boolean IsBoxMode()
	275	+ {
	276	+ return BOXMODE;
	277	+ }
	278	+
	279	+ public boolean IsZoomBoxMode()
	280	+ {
	281	+ return ZOOMBOXMODE;
	282	+ }
	283	+
	284	+ public void ClearDepth()
182	285	{
183	286	GetGL().glClear(GetGL().GL_DEPTH_BUFFER_BIT);
184	287	}
185	288
186		- void DepthTest(boolean depthtest)
	289	+ public void DepthTest(boolean depthtest)
187	290	{
188	291	if (depthtest)
189	292	GetGL().glDepthFunc(GL.GL_LEQUAL);
..	..	@@ -191,7 +294,7 @@
191	294	GetGL().glDepthFunc(GL.GL_ALWAYS);
192	295	}
193	296
194		- void DepthWrite(boolean depthwrite)
	297	+ public void DepthWrite(boolean depthwrite)
195	298	{
196	299	if (depthwrite)
197	300	GetGL().glDepthMask(true);
..	..	@@ -199,12 +302,1616 @@
199	302	GetGL().glDepthMask(false);
200	303	}
201	304
202		- void BackFaceCull(boolean bfc)
	305	+ public void BackFaceCull(boolean bfc)
203	306	{
204	307	if (bfc)
205	308	GetGL().glEnable(GetGL().GL_CULL_FACE);
206	309	else
207	310	GetGL().glDisable(GetGL().GL_CULL_FACE);
	311	+ }
	312	+
	313	+ public boolean BackFaceCullMode()
	314	+ {
	315	+ return this.CULLFACE;
	316	+ }
	317	+
	318	+ public boolean IsAmbientOcclusionOn()
	319	+ {
	320	+ return this.ambientOcclusion;
	321	+ }
	322	+
	323	+ public boolean IsDebugSelection()
	324	+ {
	325	+ return DEBUG_SELECTION;
	326	+ }
	327	+
	328	+ public boolean IsFrozen()
	329	+ {
	330	+ boolean selectmode = this.DrawMode() == SELECTION \|\| this.IsDebugSelection();
	331	+
	332	+ return !selectmode && cameracount == 0; // != 0;
	333	+ }
	334	+
	335	+ // Currently in Globals
	336	+ public int DrawMode()
	337	+ {
	338	+ return Globals.DrawMode();
	339	+ }
	340	+
	341	+ public Camera EyeCamera()
	342	+ {
	343	+ return eyeCamera;
	344	+ }
	345	+
	346	+ public Camera LightCamera()
	347	+ {
	348	+ return lightCamera;
	349	+ }
	350	+
	351	+ public Camera ManipCamera()
	352	+ {
	353	+ return manipCamera;
	354	+ }
	355	+
	356	+ public Camera RenderCamera()
	357	+ {
	358	+ return renderCamera;
	359	+ }
	360	+
	361	+ public Camera[] Cameras()
	362	+ {
	363	+ return cameras;
	364	+ }
	365	+
	366	+ public void PushMaterial(Object3D obj, boolean selected)
	367	+ {
	368	+ CameraPane display = this;
	369	+ javax.media.opengl.GL gl = display.GetGL();
	370	+ cMaterial material = obj.material;
	371	+
	372	+ if (material != null)
	373	+ {
	374	+ materialstack[materialdepth] = material;
	375	+ selectedstack[materialdepth] = selected;
	376	+ cStatic.objectstack[materialdepth++] = obj;
	377	+ //System.out.println("material " + material);
	378	+ //Applet3D.tracein(this, selected);
	379	+ //display.vector2buffer = obj.projectedVertices;
	380	+ if (obj instanceof Camera)
	381	+ {
	382	+ display.options1[0] = material.shift;
	383	+ //System.out.println("shift " + material.shift);
	384	+ display.options1[1] = material.lightarea;
	385	+ display.options1[2] = material.shadowbias;
	386	+ display.options1[3] = material.aniso;
	387	+ display.options1[4] = material.anisoV;
	388	+// System.out.println("display.options1[0] " + display.options1[0]);
	389	+// System.out.println("display.options1[1] " + display.options1[1]);
	390	+// System.out.println("display.options1[2] " + display.options1[2]);
	391	+// System.out.println("display.options1[3] " + display.options1[3]);
	392	+// System.out.println("display.options1[4] " + display.options1[4]);
	393	+ display.options2[0] = material.opacity;
	394	+ display.options2[1] = material.diffuse;
	395	+ display.options2[2] = material.factor;
	396	+// System.out.println("display.options2[0] " + display.options2[0]);
	397	+// System.out.println("display.options2[1] " + display.options2[1]);
	398	+// System.out.println("display.options2[2] " + display.options2[2]);
	399	+
	400	+ cColor.HSBtoRGB(material.color, material.modulation, 1, display.options3);
	401	+// System.out.println("display.options3[0] " + display.options3[0]);
	402	+// System.out.println("display.options3[1] " + display.options3[1]);
	403	+// System.out.println("display.options3[2] " + display.options3[2]);
	404	+ display.options4[0] = material.cameralight/0.2f;
	405	+ display.options4[1] = material.subsurface;
	406	+ display.options4[2] = material.sheen;
	407	+// System.out.println("display.options4[0] " + display.options4[0]);
	408	+// System.out.println("display.options4[1] " + display.options4[1]);
	409	+// System.out.println("display.options4[2] " + display.options4[2]);
	410	+
	411	+ // if (display.CURRENTANTIALIAS > 0)
	412	+ // display.options3[3] /= 4;
	413	+
	414	+ /*
	415	+ System.out.println("Focus = " + display.options1[0]);
	416	+ System.out.println("Aperture = " + display.options1[1]);
	417	+ System.out.println("ShadowBlur = " + display.options1[2]);
	418	+ System.out.println("Antialiasing = " + display.options1[3]);
	419	+ System.out.println("Fog = " + display.options2[0]);
	420	+ System.out.println("Intensity = " + display.options2[1]);
	421	+ System.out.println("Elevation = " + display.options2[2]);
	422	+ /**/
	423	+ } else
	424	+ {
	425	+ DrawMaterial(material, selected, obj.projectedVertices);
	426	+ }
	427	+ } else
	428	+ {
	429	+ if (selected && CameraPane.flash)
	430	+ {
	431	+ display.modelParams4[1] = 100;
	432	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 4, display.modelParams4, 0);
	433	+ }
	434	+ }
	435	+ }
	436	+
	437	+ public void PushMaterial2(Object3D obj, boolean selected)
	438	+ {
	439	+ CameraPane display = this;
	440	+ cMaterial material = obj.material;
	441	+
	442	+ if (material != null)
	443	+ {
	444	+ materialstack[materialdepth] = material;
	445	+ selectedstack[materialdepth] = selected;
	446	+ cStatic.objectstack[materialdepth++] = obj;
	447	+ //System.out.println("material " + material);
	448	+ //Applet3D.tracein("selected ", selected);
	449	+ //display.vector2buffer = obj.projectedVertices;
	450	+ display.DrawMaterial(material, selected, obj.projectedVertices);
	451	+ }
	452	+ }
	453	+
	454	+ public void PopMaterial(Object3D obj, boolean selected)
	455	+ {
	456	+ CameraPane display = this;
	457	+ javax.media.opengl.GL gl = display.GetGL();
	458	+ cMaterial material = obj.material;
	459	+
	460	+ //if (parent != null && parent.GetMaterial() != null)
	461	+ // parent.GetMaterial().Draw(display, parent.IsSelected(this));
	462	+ if (material != null)
	463	+ {
	464	+ materialdepth -= 1;
	465	+ if (materialdepth > 0)
	466	+ {
	467	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	468	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
	469	+ }
	470	+ //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
	471	+ } else if (selected && CameraPane.flash && obj.GetMaterial() != null)
	472	+ {
	473	+ display.modelParams4[1] = obj.GetMaterial().cameralight;
	474	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 4, display.modelParams4, 0);
	475	+ }
	476	+ }
	477	+
	478	+ public void PopMaterial2(Object3D obj)
	479	+ {
	480	+ CameraPane display = this;
	481	+ cMaterial material = obj.material;
	482	+
	483	+ if (material != null)
	484	+ {
	485	+ materialdepth -= 1;
	486	+ if (materialdepth > 0)
	487	+ {
	488	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	489	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
	490	+ }
	491	+ //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
	492	+ //else
	493	+ //material.Draw(display, false);
	494	+ }
	495	+ }
	496	+
	497	+ public void DrawFace(Object3D obj, Vertex pv, Vertex qv, Vertex rv, Face face)
	498	+ {
	499	+ CameraPane display = this;
	500	+
	501	+ if (pv.y == -10000 \|\|
	502	+ qv.y == -10000 \|\|
	503	+ rv.y == -10000)
	504	+ return;
	505	+
	506	+// float b = f.nbiterations & 1;
	507	+// float g = (f.nbiterations>>1) & 1;
	508	+// float r = (f.nbiterations>>2) & 1;
	509	+//
	510	+// //if (f.weight == 10000)
	511	+// //{
	512	+// // r = 1; g = b = 0;
	513	+// //}
	514	+// //else
	515	+// //{
	516	+// // assert(f.weight < 10000);
	517	+// r = g = b = (float)bRep.FaceWeight(f)*100;
	518	+// if (r<0)
	519	+// assert(r>=0);
	520	+// //}
	521	+
	522	+ javax.media.opengl.GL gl = display.GetGL();
	523	+
	524	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
	525	+
	526	+ //System.out.println("p = " + pv + "; q = " + qv + "; r = " + rv);
	527	+ if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
	528	+ {
	529	+ //gl.glBegin(gl.GL_TRIANGLES);
	530	+ boolean hasnorm = pv.norm != null && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0)
	531	+ // TEST LIVE NORMALS && !obj.dontselect
	532	+ ;
	533	+ if (!hasnorm)
	534	+ {
	535	+ // System.out.println("Mesh normal");
	536	+ LA.vecSub(pv/.pos/, qv/.pos/, obj.v0);
	537	+ LA.vecSub(pv/.pos/, rv/.pos/, obj.v1);
	538	+ LA.vecCross(obj.v0, obj.v1, obj.v2);
	539	+ LA.vecNormalize(obj.v2);
	540	+ gl.glNormal3f((float) obj.v2.x, (float) obj.v2.y, (float) obj.v2.z);
	541	+ }
	542	+
	543	+ // P
	544	+ float x = (float)pv.x;
	545	+ float y = (float)pv.y;
	546	+ float z = (float)pv.z;
	547	+
	548	+ if (hasnorm)
	549	+ {
	550	+// if (!pv.norm.normalized())
	551	+// assert(pv.norm.normalized());
	552	+
	553	+ //System.out.println("normalp = " + pv.norm.x + ", " + pv.norm.y + ", " + pv.norm.z);
	554	+ float nx = (float)pv.norm.x;
	555	+ float ny = (float)pv.norm.y;
	556	+ float nz = (float)pv.norm.z;
	557	+
	558	+ x += nx * obj.NORMALPUSH;
	559	+ y += ny * obj.NORMALPUSH;
	560	+ z += nz * obj.NORMALPUSH;
	561	+
	562	+ gl.glNormal3f(nx, ny, nz);
	563	+ }
	564	+ gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
	565	+ SetColor(obj, pv);
	566	+ //gl.glColor4f(r, g, b, 1);
	567	+ //gl.glColor4f(pv.boundary, pv.boundary, pv.boundary, 1);
	568	+ if (obj.flipV)
	569	+ gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
	570	+ else
	571	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	572	+ //System.out.println("vertexp = " + pv.x + ", " + pv.y + ", " + pv.z);
	573	+
	574	+ gl.glVertex3f(x, y, z);
	575	+
	576	+ // Q
	577	+ x = (float)qv.x;
	578	+ y = (float)qv.y;
	579	+ z = (float)qv.z;
	580	+
	581	+// Print(pv);
	582	+ if (hasnorm)
	583	+ {
	584	+// assert(qv.norm.normalized());
	585	+ //System.out.println("normalq = " + qv.norm.x + ", " + qv.norm.y + ", " + qv.norm.z);
	586	+ float nx = (float)qv.norm.x;
	587	+ float ny = (float)qv.norm.y;
	588	+ float nz = (float)qv.norm.z;
	589	+
	590	+ x += nx * obj.NORMALPUSH;
	591	+ y += ny * obj.NORMALPUSH;
	592	+ z += nz * obj.NORMALPUSH;
	593	+
	594	+ gl.glNormal3f(nx, ny, nz);
	595	+ }
	596	+ //System.out.println("vertexq = " + qv.s + ", " + qv.t);
	597	+ // boolean locked = false;
	598	+ // float eps = 0.1f;
	599	+ // boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
	600	+
	601	+ // int dot = 0; //*/ (int)f.dot;
	602	+
	603	+ // if ((dot&1) == 0)
	604	+ // dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
	605	+
	606	+ // if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
	607	+ if (obj.flipV)
	608	+ gl.glTexCoord2f((float) qv.s, 1-(float) qv.t);
	609	+ else
	610	+ gl.glTexCoord2f((float) qv.s, (float) qv.t);
	611	+ // else
	612	+ // {
	613	+ // locked = true;
	614	+ // gl.glTexCoord2f((float) pv.s, (float) pv.t);
	615	+ // }
	616	+ gl.glColor4f(qv.AO, qv.AO, qv.AO, 1);
	617	+ SetColor(obj, qv);
	618	+
	619	+ gl.glVertex3f(x, y, z);
	620	+ //gl.glColor4f(r, g, b, 1);
	621	+ //gl.glColor4f(qv.boundary, qv.boundary, qv.boundary, 1);
	622	+ //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
	623	+// Print(qv);
	624	+
	625	+ // R
	626	+ x = (float)rv.x;
	627	+ y = (float)rv.y;
	628	+ z = (float)rv.z;
	629	+
	630	+ if (hasnorm)
	631	+ {
	632	+// assert(rv.norm.normalized());
	633	+ //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
	634	+ float nx = (float)rv.norm.x;
	635	+ float ny = (float)rv.norm.y;
	636	+ float nz = (float)rv.norm.z;
	637	+
	638	+ x += nx * obj.NORMALPUSH;
	639	+ y += ny * obj.NORMALPUSH;
	640	+ z += nz * obj.NORMALPUSH;
	641	+
	642	+ gl.glNormal3f(nx, ny, nz);
	643	+ }
	644	+
	645	+ // if ((dot&4) == 0)
	646	+ // dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
	647	+
	648	+ // if (wrap \|\| !locked && (dot&8) != 0)
	649	+ if (obj.flipV)
	650	+ gl.glTexCoord2f((float) rv.s, 1-(float) rv.t);
	651	+ else
	652	+ gl.glTexCoord2f((float) rv.s, (float) rv.t);
	653	+ // else
	654	+ // gl.glTexCoord2f((float) pv.s, (float) pv.t);
	655	+
	656	+ // f.dot = dot;
	657	+
	658	+ gl.glColor4f(rv.AO, rv.AO, rv.AO, 1);
	659	+ SetColor(obj, rv);
	660	+ //gl.glColor4f(r, g, b, 1);
	661	+ //gl.glColor4f(rv.boundary, rv.boundary, rv.boundary, 1);
	662	+ //System.out.println("vertexr = " + rv.x + ", " + rv.y + ", " + rv.z);
	663	+ gl.glVertex3f(x, y, z);
	664	+// Print(rv);
	665	+ //gl.glEnd();
	666	+ }
	667	+ else
	668	+ {
	669	+ gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
	670	+ gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
	671	+ gl.glVertex3f((float) rv.x, (float) rv.y, (float) rv.z);
	672	+
	673	+ }
	674	+
	675	+ if (false) // (attributes & WIREFRAME) != 0)
	676	+ {
	677	+ gl.glDisable(gl.GL_LIGHTING);
	678	+
	679	+ gl.glBegin(gl.GL_LINE_LOOP);
	680	+ gl.glVertex3d(pv./pos./x, pv./pos./y, pv./pos./z);
	681	+ gl.glVertex3d(qv./pos./x, qv./pos./y, qv./pos./z);
	682	+ gl.glVertex3d(rv./pos./x, rv./pos./y, rv./pos./z);
	683	+ gl.glEnd();
	684	+
	685	+ gl.glEnable(gl.GL_LIGHTING);
	686	+ }
	687	+ }
	688	+
	689	+ /**
	690	+ * <code>draw</code> renders a <code>TriMesh</code> object including
	691	+ * it's normals, colors, textures and vertices.
	692	+ *
	693	+ * @see Renderer#draw(TriMesh)
	694	+ * @param tris
	695	+ * the mesh to render.
	696	+ */
	697	+ public void DrawParticles(TriMesh geo, Object3D shape, boolean selected, boolean rotate) // TriMesh tris)
	698	+ {
	699	+ CameraPane display = this;
	700	+
	701	+ float r = display.modelParams0[0];
	702	+ float g = display.modelParams0[1];
	703	+ float b = display.modelParams0[2];
	704	+ float opacity = display.modelParams5[1];
	705	+
	706	+ //final GL gl = GLU.getCurrentGL();
	707	+ GL gl = display.GetGL(); // getGL();
	708	+
	709	+ FloatBuffer vertBuf = geo.vertBuf;
	710	+
	711	+ int v = vertBuf.capacity();
	712	+
	713	+ int count = 0;
	714	+
	715	+ boolean cf = gl.glIsEnabled(gl.GL_CULL_FACE);
	716	+ gl.glEnable(gl.GL_CULL_FACE);
	717	+ // gl.glScalef(1.0f/1024,1.0f/1024,1.0f/1024);
	718	+ for (int i=0; i<v/3; i++)
	719	+ {
	720	+ int index3 = i*3;
	721	+
	722	+ if (geo.sizeBuf.get(index3+1) == 0)
	723	+ continue;
	724	+
	725	+ count++;
	726	+
	727	+ int index4 = i*4;
	728	+
	729	+ float tx = vertBuf.get(index3);
	730	+ float ty = vertBuf.get(index3+1);
	731	+ float tz = vertBuf.get(index3+2);
	732	+
	733	+ // if (tx == 0 && ty == 0 && tz == 0)
	734	+ // continue;
	735	+
	736	+ gl.glMatrixMode(gl.GL_TEXTURE);
	737	+ gl.glPushMatrix();
	738	+
	739	+ float[] texmat = geo.texmat;
	740	+ texmat[12] = texmat[13] = texmat[14] = i;
	741	+
	742	+ gl.glMultMatrixf(texmat, 0);
	743	+
	744	+ gl.glMatrixMode(gl.GL_MODELVIEW);
	745	+ gl.glPushMatrix();
	746	+
	747	+ gl.glTranslatef(tx,ty,tz);
	748	+
	749	+ if (rotate)
	750	+ gl.glRotatef(i, 0, 1, 0);
	751	+
	752	+ float size = geo.sizeBuf.get(index3) / 100;
	753	+ gl.glScalef(size,size,size);
	754	+
	755	+ float cr = geo.colorBuf.get(index4);
	756	+ float cg = geo.colorBuf.get(index4+1);
	757	+ float cb = geo.colorBuf.get(index4+2);
	758	+ float ca = geo.colorBuf.get(index4+3);
	759	+
	760	+ display.modelParams0[0] = r * cr;
	761	+ display.modelParams0[1] = g * cg;
	762	+ display.modelParams0[2] = b * cb;
	763	+
	764	+ display.modelParams5[1] = opacity * ca;
	765	+
	766	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 0, display.modelParams0, 0);
	767	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 5, display.modelParams5, 0);
	768	+
	769	+ RandomNode.globalseed = (int)geo.sizeBuf.get(index3+2); // i;
	770	+ RandomNode.globalseed2 = RandomNode.globalseed;
	771	+
	772	+// gl.glColor4f(cr,cg,cb,ca);
	773	+ // gl.glScalef(1024/16,1024/16,1024/16);
	774	+ shape.Draw/Node/(display,null,selected,false); // blocked
	775	+ // gl.glScalef(16.0f/1024,16.0f/1024,16.0f/1024);
	776	+ //gl.glTranslatef(-tx,-ty,-tz);
	777	+ gl.glPopMatrix();
	778	+
	779	+ gl.glMatrixMode(gl.GL_TEXTURE);
	780	+ gl.glPopMatrix();
	781	+ }
	782	+ // gl.glScalef(1024,1024,1024);
	783	+ if (!cf)
	784	+ gl.glDisable(gl.GL_CULL_FACE);
	785	+
	786	+ display.modelParams0[0] = r;
	787	+ display.modelParams0[1] = g;
	788	+ display.modelParams0[2] = b;
	789	+
	790	+ display.modelParams5[1] = opacity;
	791	+
	792	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 0, display.modelParams0, 0);
	793	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 5, display.modelParams5, 0);
	794	+
	795	+ gl.glMatrixMode(gl.GL_MODELVIEW);
	796	+
	797	+// System.err.println("total = " + v/3 + "; displayed = " + count);
	798	+ if (true)
	799	+ return;
	800	+
	801	+//// if (!tris.predraw(this))
	802	+//// {
	803	+//// return;
	804	+//// }
	805	+//// if (Debug.stats)
	806	+//// {
	807	+//// StatCollector.addStat(StatType.STAT_TRIANGLE_COUNT, tris.getTriangleCount());
	808	+//// StatCollector.addStat(StatType.STAT_VERTEX_COUNT, tris.getVertexCount());
	809	+//// StatCollector.addStat(StatType.STAT_GEOM_COUNT, 1);
	810	+//// }
	811	+////
	812	+//// if (tris.getDisplayListID() != -1)
	813	+//// {
	814	+//// renderDisplayList(tris);
	815	+//// return;
	816	+//// }
	817	+////
	818	+//// if (!generatingDisplayList)
	819	+//// {
	820	+//// applyStates(tris.states, tris);
	821	+//// }
	822	+//// if (Debug.stats)
	823	+//// {
	824	+//// StatCollector.startStat(StatType.STAT_RENDER_TIMER);
	825	+//// }
	826	+//// boolean transformed = doTransforms(tris);
	827	+//
	828	+// int glMode = GL.GL_TRIANGLES;
	829	+// switch (getMode())
	830	+// {
	831	+// case Triangles:
	832	+// glMode = GL.GL_TRIANGLES;
	833	+// break;
	834	+// case Strip:
	835	+// glMode = GL.GL_TRIANGLE_STRIP;
	836	+// break;
	837	+// case Fan:
	838	+// glMode = GL.GL_TRIANGLE_FAN;
	839	+// break;
	840	+// }
	841	+//
	842	+// if (!predrawGeometry(gl))
	843	+// {
	844	+// // make sure only the necessary indices are sent through on old
	845	+// // cards.
	846	+// IntBuffer indices = this.getIndexBuffer();
	847	+// if (indices == null)
	848	+// {
	849	+// logger.severe("missing indices on geometry object: " + this.toString());
	850	+// } else
	851	+// {
	852	+// indices.rewind();
	853	+// indices.limit(this.getMaxIndex());
	854	+//
	855	+// gl.glDrawElements(glMode, indices.limit(), GL.GL_UNSIGNED_INT, indices); // TODO Check <count> and assumed <type> of GL_UNSIGNED_INT
	856	+//
	857	+// indices.clear();
	858	+// }
	859	+// } else
	860	+// {
	861	+// gl.glDrawElements(glMode, this.getIndexBuffer().limit(),
	862	+// GL.GL_UNSIGNED_INT, 0);
	863	+// }
	864	+//
	865	+//// postdrawGeometry(tris);
	866	+//// if (transformed)
	867	+//// {
	868	+//// undoTransforms(tris);
	869	+//// }
	870	+////
	871	+//// if (Debug.stats)
	872	+//// {
	873	+//// StatCollector.endStat(StatType.STAT_RENDER_TIMER);
	874	+//// }
	875	+//// tris.postdraw(this);
	876	+ }
	877	+
	878	+ static Camera localcamera = new Camera();
	879	+ static cVector from = new cVector();
	880	+ static cVector to = new cVector();
	881	+
	882	+ public void PrepOcclusion(BoundaryRep br, double[][] transform)
	883	+ {
	884	+ CameraPane cp = this;
	885	+
	886	+ Camera keep = cp.RenderCamera();
	887	+ cp.renderCamera = localcamera;
	888	+
	889	+ if (br.trimmed)
	890	+ {
	891	+ float[] colors = new float[br.positions.length / 3];
	892	+
	893	+ int i3 = 0;
	894	+ for (int i = 0; i < br.positions.length / 3; i++, i3 += 3)
	895	+ {
	896	+ if (br.normals[i3] == 0 && br.normals[i3+1] == 0 && br.normals[i3+2] == 0)
	897	+ continue;
	898	+
	899	+ from.set(br.positions[i3], br.positions[i3 + 1], br.positions[i3 + 2]);
	900	+ to.set(br.positions[i3] + br.normals[i3],
	901	+ br.positions[i3 + 1] + br.normals[i3 + 1],
	902	+ br.positions[i3 + 2] + br.normals[i3 + 2]);
	903	+ LA.xformPos(from, transform, from);
	904	+ LA.xformPos(to, transform, to); // RIGID ONLY
	905	+ localcamera.setAim(from, to);
	906	+
	907	+ CameraPane.occlusionbuffer.display();
	908	+
	909	+ if (CameraPane.DEBUG_OCCLUSION)
	910	+ cp.display(); // debug
	911	+
	912	+ colors[i] = cp.vertexOcclusion.r;
	913	+ //colors[i3 + 1] = cp.vertexOcclusion.g;
	914	+ //colors[i3 + 2] = cp.vertexOcclusion.b;
	915	+
	916	+ if ((i % 100) == 0 && i != 0)
	917	+ {
	918	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	919	+ //System.out.println("Color = " + cp.vertexOcclusion.r + ", " + cp.vertexOcclusion.g + ", " + cp.vertexOcclusion.b + "; " + (int)(100.0*i/(positions.length/3)) + "% done");
	920	+ System.out.println((int) (100.0 * i / (br.positions.length / 3)) + "% (" + i + " of " + (br.positions.length / 3) + ")");
	921	+ }
	922	+ }
	923	+
	924	+ br.colors = colors;
	925	+ }
	926	+ else
	927	+ {
	928	+ for (int i = 0; i < br.VertexCount(); i++)
	929	+ {
	930	+ Vertex v = br.GetVertex(i);
	931	+
	932	+ if (v.norm == null \|\| v.norm.x == 0 && v.norm.y == 0 && v.norm.z == 0)
	933	+ continue;
	934	+
	935	+ from.set(v.x, v.y, v.z);
	936	+ to.set(v.x+v.norm.x, v.y+v.norm.y, v.z+v.norm.z);
	937	+ LA.xformPos(from, transform, from);
	938	+ LA.xformPos(to, transform, to); // RIGID ONLY
	939	+ localcamera.setAim(from, to);
	940	+
	941	+ CameraPane.occlusionbuffer.display();
	942	+
	943	+ if (CameraPane.DEBUG_OCCLUSION)
	944	+ cp.display(); // debug
	945	+
	946	+ v.AO = cp.vertexOcclusion.r;
	947	+
	948	+ if ((i % 100) == 0 && i != 0)
	949	+ {
	950	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	951	+ //System.out.println("Color = " + cp.vertexOcclusion.r + ", " + cp.vertexOcclusion.g + ", " + cp.vertexOcclusion.b + "; " + (int)(100.0*i/(positions.length/3)) + "% done");
	952	+ System.out.println((int) (100.0 * i / br.VertexCount()) + "% (" + i + " of " + br.VertexCount() + ")");
	953	+ }
	954	+ }
	955	+ }
	956	+
	957	+ //System.out.println("done.");
	958	+
	959	+ cp.renderCamera = keep;
	960	+ }
	961	+
	962	+ void DrawPointFLow(PointFlow pointFlow, Object3D /Composite/ root, boolean selected, boolean blocked)
	963	+ {
	964	+ CameraPane display = this;
	965	+ pointFlow.CreateHT();
	966	+
	967	+ float r = display.modelParams0[0];
	968	+ float g = display.modelParams0[1];
	969	+ float b = display.modelParams0[2];
	970	+ float opacity = display.modelParams5[1];
	971	+
	972	+ //final GL gl = GLU.getCurrentGL();
	973	+ GL gl = display.GetGL(); // getGL();
	974	+
	975	+ int s = pointFlow.points.size();
	976	+
	977	+ boolean cf = gl.glIsEnabled(gl.GL_CULL_FACE);
	978	+ gl.glEnable(gl.GL_CULL_FACE);
	979	+
	980	+ for (int i=s; --i>=0;)
	981	+ //for (int i=0; i<s; i++)
	982	+ {
	983	+ cVector v = pointFlow.points.get(i);
	984	+
	985	+ double mindist = Double.MAX_VALUE;
	986	+
	987	+ double size = pointFlow.minimumSize;
	988	+
	989	+ double distancenext = 0;
	990	+
	991	+ if (i > 0)
	992	+ {
	993	+ cVector w = pointFlow.points.get(i-1);
	994	+
	995	+ double dist = w.distance(v);
	996	+
	997	+ distancenext = dist;
	998	+
	999	+ if (mindist > dist)
	1000	+ {
	1001	+ mindist = dist;
	1002	+ size = mindist*pointFlow.resizefactor;
	1003	+ }
	1004	+ }
	1005	+
	1006	+ if (i < s-1)
	1007	+ {
	1008	+ cVector w = pointFlow.points.get(i+1);
	1009	+
	1010	+ double dist = w.distance(v);
	1011	+
	1012	+ if (mindist > dist)
	1013	+ {
	1014	+ mindist = dist;
	1015	+ size = mindist*pointFlow.resizefactor;
	1016	+ }
	1017	+ }
	1018	+
	1019	+ if (size < pointFlow.minimumSize)
	1020	+ size = pointFlow.minimumSize;
	1021	+ if (size > pointFlow.maximumSize)
	1022	+ size = pointFlow.maximumSize;
	1023	+
	1024	+ double tx = v.x;
	1025	+ double ty = v.y;
	1026	+ double tz = v.z;
	1027	+
	1028	+ // if (tx == 0 && ty == 0 && tz == 0)
	1029	+ // continue;
	1030	+
	1031	+ gl.glMatrixMode(gl.GL_TEXTURE);
	1032	+ gl.glPushMatrix();
	1033	+ pointFlow.texmat[12] = pointFlow.texmat[13] = pointFlow.texmat[14] = i;
	1034	+
	1035	+ gl.glMultMatrixf(pointFlow.texmat, 0);
	1036	+
	1037	+ gl.glMatrixMode(gl.GL_MODELVIEW);
	1038	+ gl.glPushMatrix();
	1039	+
	1040	+ gl.glTranslated(tx,ty,tz);
	1041	+
	1042	+ gl.glScaled(size,size,size);
	1043	+
	1044	+// float cr = colorBuf.get(index4);
	1045	+// float cg = colorBuf.get(index4+1);
	1046	+// float cb = colorBuf.get(index4+2);
	1047	+// float ca = colorBuf.get(index4+3);
	1048	+//
	1049	+// display.modelParams0[0] = r * cr;
	1050	+// display.modelParams0[1] = g * cg;
	1051	+// display.modelParams0[2] = b * cb;
	1052	+//
	1053	+// display.modelParams5[1] = opacity * ca;
	1054	+//
	1055	+// gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 0, display.modelParams0, 0);
	1056	+// gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 5, display.modelParams5, 0);
	1057	+//
	1058	+// RandomNode.globalseed = (int)sizeBuf.get(index3+2); // i;
	1059	+// RandomNode.globalseed2 = RandomNode.globalseed;
	1060	+//
	1061	+//// gl.glColor4f(cr,cg,cb,ca);
	1062	+// // gl.glScalef(1024/16,1024/16,1024/16);
	1063	+ pointFlow.geo.Draw/Node/(display,null,selected, blocked);
	1064	+
	1065	+ gl.glPopMatrix();
	1066	+
	1067	+ double step = size/4; //
	1068	+
	1069	+ if (i == 0 \|\| size == 0 \|\| distancenext > 8*size \|\| distancenext < step)
	1070	+ continue;
	1071	+
	1072	+ int nbsteps = (int)(distancenext/step);
	1073	+
	1074	+ step = distancenext/nbsteps;
	1075	+
	1076	+ cVector next = pointFlow.points.get(i-1);
	1077	+
	1078	+ tmp.set(next);
	1079	+ tmp.sub(v);
	1080	+ tmp.normalize();
	1081	+ tmp.mul(step);
	1082	+
	1083	+ // calculate next size
	1084	+ mindist = Double.MAX_VALUE;
	1085	+
	1086	+ double nextsize = pointFlow.minimumSize;
	1087	+
	1088	+ if (i > 1)
	1089	+ {
	1090	+ cVector w = pointFlow.points.get(i-2);
	1091	+
	1092	+ double dist = w.distance(next);
	1093	+
	1094	+ if (mindist > dist)
	1095	+ {
	1096	+ mindist = dist;
	1097	+ nextsize = mindist*pointFlow.resizefactor;
	1098	+ }
	1099	+ }
	1100	+
	1101	+ double dist = v.distance(next);
	1102	+
	1103	+ if (mindist > dist)
	1104	+ {
	1105	+ mindist = dist;
	1106	+ nextsize = mindist*pointFlow.resizefactor;
	1107	+ }
	1108	+
	1109	+ if (nextsize < pointFlow.minimumSize)
	1110	+ nextsize = pointFlow.minimumSize;
	1111	+ if (nextsize > pointFlow.maximumSize)
	1112	+ nextsize = pointFlow.maximumSize;
	1113	+ //
	1114	+
	1115	+ double count = 0;
	1116	+
	1117	+ while (distancenext > 0.000000001) // step
	1118	+ {
	1119	+ gl.glPushMatrix();
	1120	+
	1121	+ gl.glTranslated(tx + tmp.xcount, ty + tmp.ycount, tz + tmp.z*count);
	1122	+
	1123	+ double K = count/nbsteps;
	1124	+
	1125	+ double intersize = Knextsize + (1-K)size;
	1126	+
	1127	+ gl.glScaled(intersize,intersize,intersize);
	1128	+
	1129	+ pointFlow.geo.Draw/Node/(display,null,selected,blocked);
	1130	+
	1131	+ count++;
	1132	+
	1133	+ distancenext -= step;
	1134	+
	1135	+ gl.glPopMatrix();
	1136	+ }
	1137	+
	1138	+ if (count != nbsteps)
	1139	+ assert(count == nbsteps);
	1140	+
	1141	+ // gl.glScalef(16.0f/1024,16.0f/1024,16.0f/1024);
	1142	+ //gl.glTranslatef(-tx,-ty,-tz);
	1143	+
	1144	+ gl.glMatrixMode(gl.GL_TEXTURE);
	1145	+ gl.glPopMatrix();
	1146	+ }
	1147	+
	1148	+ if (!cf)
	1149	+ gl.glDisable(gl.GL_CULL_FACE);
	1150	+
	1151	+// display.modelParams0[0] = r;
	1152	+// display.modelParams0[1] = g;
	1153	+// display.modelParams0[2] = b;
	1154	+//
	1155	+// display.modelParams5[1] = opacity;
	1156	+//
	1157	+// gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 0, display.modelParams0, 0);
	1158	+// gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 5, display.modelParams5, 0);
	1159	+
	1160	+ gl.glMatrixMode(gl.GL_MODELVIEW);
	1161	+ }
	1162	+
	1163	+ public void DrawBox(cVector min, cVector max)
	1164	+ {
	1165	+ javax.media.opengl.GL gl = GetGL();
	1166	+ gl.glBegin(gl.GL_LINES);
	1167	+
	1168	+ gl.glVertex3d(min.x, min.y, min.z);
	1169	+ gl.glVertex3d(min.x, min.y, max.z);
	1170	+ gl.glVertex3d(min.x, min.y, min.z);
	1171	+ gl.glVertex3d(min.x, max.y, min.z);
	1172	+ gl.glVertex3d(min.x, min.y, min.z);
	1173	+ gl.glVertex3d(max.x, min.y, min.z);
	1174	+
	1175	+ gl.glVertex3d(max.x, max.y, max.z);
	1176	+ gl.glVertex3d(min.x, max.y, max.z);
	1177	+ gl.glVertex3d(max.x, max.y, max.z);
	1178	+ gl.glVertex3d(max.x, min.y, max.z);
	1179	+ gl.glVertex3d(max.x, max.y, max.z);
	1180	+ gl.glVertex3d(max.x, max.y, min.z);
	1181	+
	1182	+ gl.glEnd();
	1183	+ }
	1184	+
	1185	+ public void DrawGeometry(BoundaryRep bRep, boolean flipV, boolean selectmode)
	1186	+ {
	1187	+ int[] strips = bRep.getRawIndices();
	1188	+
	1189	+ javax.media.opengl.GL gl = GetGL();
	1190	+
	1191	+ // TRIANGLE STRIP ARRAY
	1192	+ if (bRep.trimmed)
	1193	+ {
	1194	+ float[] v = bRep.getRawVertices();
	1195	+ float[] n = bRep.getRawNormals();
	1196	+ float[] c = bRep.getRawColors();
	1197	+ float[] uv = bRep.getRawUVMap();
	1198	+
	1199	+ int count2 = 0;
	1200	+ int count3 = 0;
	1201	+
	1202	+ if (n.length > 0)
	1203	+ {
	1204	+ for (int i = 0; i < strips.length; i++)
	1205	+ {
	1206	+ gl.glBegin(gl.GL_TRIANGLE_STRIP);
	1207	+
	1208	+ /*
	1209	+ boolean locked = false;
	1210	+ float eps = 0.1f;
	1211	+ boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
	1212	+
	1213	+ int dot = 0;
	1214	+
	1215	+ if ((dot&1) == 0)
	1216	+ dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
	1217	+
	1218	+ if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
	1219	+ gl.glTexCoord2f((float) qv.s, (float) qv.t);
	1220	+ else
	1221	+ {
	1222	+ locked = true;
	1223	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	1224	+ }
	1225	+ //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
	1226	+ gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
	1227	+ if (hasnorm)
	1228	+ {
	1229	+ //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
	1230	+ gl.glNormal3f((float) rv.norm.x, (float) rv.norm.y, (float) rv.norm.z);
	1231	+ }
	1232	+
	1233	+ if ((dot&4) == 0)
	1234	+ dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
	1235	+
	1236	+ if (wrap \|\| !locked && (dot&8) != 0)
	1237	+ gl.glTexCoord2f((float) rv.s, (float) rv.t);
	1238	+ else
	1239	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	1240	+
	1241	+ f.dot = dot;
	1242	+ */
	1243	+
	1244	+ if (!selectmode)
	1245	+ {
	1246	+ if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
	1247	+ {
	1248	+ gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1249	+ } else
	1250	+ {
	1251	+ gl.glNormal3f(0, 0, 1);
	1252	+ }
	1253	+
	1254	+ if (c != null)
	1255	+ //System.out.println("glcolor = " + c[count3] + ", " + c[count3+1] + ", " + c[count3+2]);
	1256	+ {
	1257	+ gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
	1258	+ }
	1259	+ }
	1260	+
	1261	+ if (flipV)
	1262	+ gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
	1263	+ else
	1264	+ gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1265	+
	1266	+ //System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
	1267	+ gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1268	+
	1269	+ count2 += 2;
	1270	+ count3 += 3;
	1271	+ if (!selectmode)
	1272	+ {
	1273	+ if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
	1274	+ {
	1275	+ gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1276	+ } else
	1277	+ {
	1278	+ gl.glNormal3f(0, 0, 1);
	1279	+ }
	1280	+ if (c != null)
	1281	+ {
	1282	+ gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
	1283	+ }
	1284	+ }
	1285	+
	1286	+ if (flipV)
	1287	+ gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
	1288	+ else
	1289	+ gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1290	+
	1291	+ //System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
	1292	+ gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1293	+
	1294	+ count2 += 2;
	1295	+ count3 += 3;
	1296	+ for (int j = 0; j < strips[i] - 2; j++)
	1297	+ {
	1298	+ //gl.glTexCoord2d(...);
	1299	+ if (!selectmode)
	1300	+ {
	1301	+ if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
	1302	+ {
	1303	+ gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1304	+ } else
	1305	+ {
	1306	+ gl.glNormal3f(0, 0, 1);
	1307	+ }
	1308	+ if (c != null)
	1309	+ {
	1310	+ gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
	1311	+ }
	1312	+ }
	1313	+
	1314	+ if (flipV)
	1315	+ gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
	1316	+ else
	1317	+ gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1318	+
	1319	+ //System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
	1320	+ gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1321	+
	1322	+ count2 += 2;
	1323	+ count3 += 3;
	1324	+ }
	1325	+
	1326	+ gl.glEnd();
	1327	+ }
	1328	+ }
	1329	+
	1330	+ assert count3 == v.length;
	1331	+ }
	1332	+ else // !trimmed
	1333	+ {
	1334	+ int count = 0;
	1335	+ for (int i = 0; i < strips.length; i++)
	1336	+ {
	1337	+ gl.glBegin(gl.GL_TRIANGLE_STRIP);
	1338	+
	1339	+ Vertex p = bRep.GetVertex(bRep.indices[count++]);
	1340	+ Vertex q = bRep.GetVertex(bRep.indices[count++]);
	1341	+
	1342	+ drawVertex(gl, p, flipV, selectmode);
	1343	+ drawVertex(gl, q, flipV, selectmode);
	1344	+
	1345	+ for (int j = 0; j < strips[i] - 2; j++)
	1346	+ {
	1347	+ Vertex r = bRep.GetVertex(bRep.indices[count++]);
	1348	+
	1349	+ // if (j%2 == 0)
	1350	+ // drawFace(p, q, r, display, null);
	1351	+ // else
	1352	+ // drawFace(p, r, q, display, null);
	1353	+
	1354	+ // p = q;
	1355	+ // q = r;
	1356	+ drawVertex(gl, r, flipV, selectmode);
	1357	+ }
	1358	+
	1359	+ gl.glEnd();
	1360	+ }
	1361	+ }
	1362	+ }
	1363	+
	1364	+ static cSpring.Point3D temp = new cSpring.Point3D();
	1365	+ static cSpring.Point3D temp2 = new cSpring.Point3D();
	1366	+ static cSpring.Point3D temp3 = new cSpring.Point3D();
	1367	+
	1368	+ public void DrawDynamicMesh(cMesh mesh)
	1369	+ {
	1370	+ GL gl = GetGL(); // getGL();
	1371	+
	1372	+ cSpring.PhysicsController3D Phys = mesh.Phys;
	1373	+
	1374	+ gl.glDisable(gl.GL_LIGHTING);
	1375	+
	1376	+ gl.glLineWidth(1);
	1377	+ gl.glColor3f(1,1,1);
	1378	+ gl.glBegin(gl.GL_LINES);
	1379	+ double scale = 0;
	1380	+ int count = 0;
	1381	+ for (int s=0; s<Phys.allSprings.size(); s++)
	1382	+ {
	1383	+ cSpring.Spring spring = Phys.allSprings.get(s);
	1384	+ if(s == 0)
	1385	+ {
	1386	+ //System.out.println(" spring : " + spring.a.position + "; " + spring.b.position);
	1387	+ }
	1388	+ if (mesh.showsprings)
	1389	+ {
	1390	+ temp.set(spring.a.position);
	1391	+ temp.add(spring.b.position);
	1392	+ temp.mul(0.5);
	1393	+ temp2.set(spring.a.position);
	1394	+ temp2.sub(spring.b.position);
	1395	+ temp2.mul(spring.restLength/2);
	1396	+ temp.sub(temp2);
	1397	+ gl.glVertex3f((float)temp.x, (float)temp.y, (float)temp.z);
	1398	+ temp.add(temp2);
	1399	+ temp.add(temp2);
	1400	+ gl.glVertex3f((float)temp.x, (float)temp.y, (float)temp.z);
	1401	+ }
	1402	+
	1403	+ if (spring.isHandle)
	1404	+ continue;
	1405	+
	1406	+ //if (scale < spring.restLength)
	1407	+ scale += spring.restLength;
	1408	+ count++;
	1409	+ }
	1410	+ gl.glEnd();
	1411	+
	1412	+ if (count == 0)
	1413	+ scale = 0.01;
	1414	+ else
	1415	+ scale /= count * 3;
	1416	+
	1417	+ //scale = 0.25;
	1418	+
	1419	+ if (mesh.ShowInfo())
	1420	+ {
	1421	+ gl.glLineWidth(4);
	1422	+ for (int s=0; s<Phys.allNodes.size(); s++)
	1423	+ {
	1424	+ cSpring.DynamicNode node = Phys.allNodes.get(s);
	1425	+ if (node.mass == 0)
	1426	+ continue;
	1427	+
	1428	+ int i = node.springs==null?-1:node.springs.size();
	1429	+ gl.glColor3f((i>>2)&1,(i>>1)&1,i&1);
	1430	+ //temp.set(node.springForce.x, node.springForce.y, node.springForce.z);
	1431	+ //temp.normalize();
	1432	+ //gl.glColor3d((temp.x+1)/2, (temp.y+1)/2, (temp.z+1)/2);
	1433	+ gl.glBegin(gl.GL_LINES);
	1434	+ gl.glVertex3d(node.position.x, node.position.y, node.position.z);
	1435	+ //gl.glVertex3d(node.position.x + node.normal.xscale, node.position.y + node.normal.yscale, node.position.z + node.normal.z*scale);
	1436	+ gl.glVertex3d(node.position.x + mesh.bRep.GetVertex(s).norm.x*scale,
	1437	+ node.position.y + mesh.bRep.GetVertex(s).norm.y*scale,
	1438	+ node.position.z + mesh.bRep.GetVertex(s).norm.z*scale);
	1439	+ gl.glEnd();
	1440	+ }
	1441	+
	1442	+ gl.glLineWidth(8);
	1443	+ for (int s=0; s<Phys.allNodes.size(); s++)
	1444	+ {
	1445	+ cSpring.DynamicNode node = Phys.allNodes.get(s);
	1446	+
	1447	+ if (node.springs != null)
	1448	+ {
	1449	+ for (int i=0; i<node.springs.size(); i+=1)
	1450	+ {
	1451	+ cSpring.DynamicNode f = node.springs.get(i).GetOther(node);
	1452	+
	1453	+ int c = i+1;
	1454	+ // c = node.springs.get(i).nbcopies;
	1455	+
	1456	+ gl.glColor3f((c>>2)&1,(c>>1)&1,c&1);
	1457	+ gl.glBegin(gl.GL_LINES);
	1458	+ gl.glVertex3d(node.position.x, node.position.y, node.position.z);
	1459	+ 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);
	1460	+ gl.glEnd();
	1461	+ }
	1462	+ }
	1463	+ }
	1464	+
	1465	+ gl.glLineWidth(1);
	1466	+ }
	1467	+
	1468	+ gl.glEnable(gl.GL_LIGHTING);
	1469	+ }
	1470	+
	1471	+ /// INTERFACE
	1472	+
	1473	+ public void StartTriangles()
	1474	+ {
	1475	+ javax.media.opengl.GL gl = GetGL();
	1476	+ gl.glBegin(gl.GL_TRIANGLES);
	1477	+ }
	1478	+
	1479	+ public void EndTriangles()
	1480	+ {
	1481	+ GetGL().glEnd();
	1482	+ }
	1483	+
	1484	+ void drawVertex(javax.media.opengl.GL gl, Vertex pv, boolean flipV, boolean selectmode)
	1485	+ {
	1486	+ if (!selectmode)
	1487	+ {
	1488	+ gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
	1489	+ gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
	1490	+
	1491	+ if (flipV)
	1492	+ gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
	1493	+ else
	1494	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	1495	+ }
	1496	+
	1497	+ gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
	1498	+ }
	1499	+
	1500	+ float[] colorV = new float[4];
	1501	+
	1502	+ void SetColor(Object3D obj, Vertex p0)
	1503	+ {
	1504	+ CameraPane display = this;
	1505	+ BoundaryRep bRep = obj.bRep;
	1506	+
	1507	+ if (RENDERPROGRAM == 0)
	1508	+ {
	1509	+ float r = 0;
	1510	+ if (bRep != null)
	1511	+ {
	1512	+ if (bRep.stripified)
	1513	+ {
	1514	+ r = 1;
	1515	+ }
	1516	+ }
	1517	+ float g = 0;
	1518	+ if (bRep != null)
	1519	+ {
	1520	+ if (bRep.trimmed)
	1521	+ {
	1522	+ g = 1;
	1523	+ }
	1524	+ }
	1525	+ float b = 0;
	1526	+ if (obj.support != null && obj.link2master)
	1527	+ {
	1528	+ b = 1;
	1529	+ }
	1530	+ display.GetGL().glColor3f(rp0.AO, gp0.AO, b*p0.AO);
	1531	+ return;
	1532	+ }
	1533	+
	1534	+ if (display.DrawMode() != CameraPane.SHADOW)
	1535	+ return;
	1536	+
	1537	+ javax.media.opengl.GL gl = display.GetGL();
	1538	+// if (true) return;
	1539	+// float ao = p.AO;
	1540	+//
	1541	+// // if (ao == 0 && !bRep.AOdone) // transient problem!
	1542	+// // ao = 1;
	1543	+//
	1544	+// gl.glColor4f(ao, ao, ao, 1);
	1545	+
	1546	+// CameraPane.selectedpoint.
	1547	+// getAverage(cStatic.point1, true);
	1548	+ if (CameraPane.pointflow == null) // !random) // live)
	1549	+ {
	1550	+ return;
	1551	+ }
	1552	+
	1553	+ cStatic.point1.set(0,0,0);
	1554	+ LA.xformPos(cStatic.point1, CameraPane.selectedpoint.toParent, cStatic.point1);
	1555	+
	1556	+ cStatic.point1.sub(p0);
	1557	+
	1558	+
	1559	+// if (marked && (p0.vertexlinks == null \|\| support == null \|\| support.bRep == null)) // no position delta?
	1560	+// {
	1561	+// return;
	1562	+// }
	1563	+
	1564	+ //if (true)
	1565	+ if (cStatic.point1.dot(cStatic.point1) > 0.000001)
	1566	+ {
	1567	+ return;
	1568	+ }
	1569	+
	1570	+ if (false) // marked)
	1571	+ {
	1572	+ // debug rigging weights
	1573	+ for (int object = 0; object < p0.vertexlinks.length; object++)
	1574	+ {
	1575	+ float weight = p0.weights[object] / p0.totalweight;
	1576	+
	1577	+ // if (weight < 0.1)
	1578	+ // {
	1579	+ // assert(weight == 0);
	1580	+ // continue;
	1581	+ // }
	1582	+
	1583	+ if (p0.vertexlinks[object] == -1)
	1584	+ continue;
	1585	+
	1586	+ Vertex q = obj.support.bRep.GetVertex(p0.vertexlinks[object]);
	1587	+
	1588	+ int color = //1 << object; //
	1589	+ //p.vertexlinks.length;
	1590	+ obj.support.bRep.supports[p0.closestsupport].links[object];
	1591	+ colorV[2] += (color & 1) * weight;
	1592	+ colorV[1] += ((color & 2) >> 1) * weight;
	1593	+ colorV[0] += ((color & 4) >> 2) * weight;
	1594	+ }
	1595	+ }
	1596	+ else
	1597	+ {
	1598	+ if (obj.drawingstarted)
	1599	+ {
	1600	+ // find next point
	1601	+ if (bRep.GetVertex(0).faceindices == null)
	1602	+ {
	1603	+ bRep.InitFaceIndices();
	1604	+ }
	1605	+
	1606	+ double ymin = p0.y;
	1607	+
	1608	+ Vertex newp = p0;
	1609	+
	1610	+ for (int fii = 0; fii < p0.faceindices.length; fii++)
	1611	+ {
	1612	+ int fi = p0.faceindices[fii];
	1613	+
	1614	+ if (fi == -1)
	1615	+ break;
	1616	+
	1617	+ Face f = bRep.GetFace(fi);
	1618	+
	1619	+ Vertex p = bRep.GetVertex(f.p);
	1620	+ Vertex q = bRep.GetVertex(f.q);
	1621	+ Vertex r = bRep.GetVertex(f.r);
	1622	+
	1623	+ int swap = (int)(Math.random()*3);
	1624	+
	1625	+// for (int s=swap; --s>=0;)
	1626	+// {
	1627	+// Vertex t = p;
	1628	+// p = q;
	1629	+// q = r;
	1630	+// r = t;
	1631	+// }
	1632	+ if (ymin > p.y)
	1633	+ {
	1634	+ ymin = p.y;
	1635	+ newp = p;
	1636	+// break;
	1637	+ }
	1638	+ if (ymin > q.y)
	1639	+ {
	1640	+ ymin = q.y;
	1641	+ newp = q;
	1642	+// break;
	1643	+ }
	1644	+ if (ymin > r.y)
	1645	+ {
	1646	+ ymin = r.y;
	1647	+ newp = r;
	1648	+// break;
	1649	+ }
	1650	+ }
	1651	+
	1652	+ CameraPane.selectedpoint.toParent[3][0] = newp.x;
	1653	+ CameraPane.selectedpoint.toParent[3][1] = newp.y;
	1654	+ CameraPane.selectedpoint.toParent[3][2] = newp.z;
	1655	+
	1656	+ obj.drawingstarted = false;
	1657	+
	1658	+ // return;
	1659	+ }
	1660	+
	1661	+ if (false) // CameraPane.DRAW
	1662	+ {
	1663	+ p0.AO = colorV[0] = 2;
	1664	+ colorV[1] = 2;
	1665	+ colorV[2] = 2;
	1666	+ }
	1667	+
	1668	+ CameraPane.pointflow.add(p0);
	1669	+ CameraPane.pointflow.Touch();
	1670	+ }
	1671	+
	1672	+// gl.glColor3f(colorV[0], colorV[1], colorV[2]);
	1673	+// gl.glMaterialfv(gl.GL_FRONT, gl.GL_DIFFUSE, colorV, 0);
	1674	+// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
	1675	+ }
	1676	+
	1677	+ void DrawMaterial(cMaterial material, boolean selected, Object3D.cVector2[] others)
	1678	+ {
	1679	+ CameraPane display = this;
	1680	+ //new Exception().printStackTrace();
	1681	+
	1682	+ if (display.IsFrozen() && !selected \|\| display.IsAmbientOcclusionOn()) // \|\| display.drawMode == display.SHADOW)
	1683	+ {
	1684	+ return;
	1685	+ }
	1686	+
	1687	+ javax.media.opengl.GL gl = display.GetGL();
	1688	+
	1689	+ //Color col = Color.getHSBColor(color,modulation,1);
	1690	+ //col.getColorComponents(ColorSpace.getInstance(ColorSpace.CS_LINEAR_RGB), CameraPane.modelParams0);
	1691	+ if (!material.multiply)
	1692	+ {
	1693	+ display.color = material.color;
	1694	+ display.saturation = material.modulation;
	1695	+ }
	1696	+ else
	1697	+ {
	1698	+ display.color = material.color2;
	1699	+ display.saturation = material.modulation2;
	1700	+ }
	1701	+
	1702	+ cColor.HSBtoRGB(display.color, display.saturation, 1, display.modelParams0);
	1703	+
	1704	+ float[] colorV = Grafreed.colorV;
	1705	+
	1706	+ /**/
	1707	+ if (display.DrawMode() == display.DEFAULT) // && display.RENDERPROGRAM == 0)
	1708	+ {
	1709	+ colorV[0] = display.modelParams0[0] * material.diffuse;
	1710	+ colorV[1] = display.modelParams0[1] * material.diffuse;
	1711	+ colorV[2] = display.modelParams0[2] * material.diffuse;
	1712	+ colorV[3] = 1; // material.opacity;
	1713	+
	1714	+ gl.glColor4f(colorV[0], colorV[1], colorV[2], material.opacity);
	1715	+ //System.out.println("Opacity = " + opacity);
	1716	+
	1717	+ gl.glMaterialfv(gl.GL_FRONT, gl.GL_DIFFUSE, colorV, 0);
	1718	+ //color[0] /= 2; color[1] /= 2; color[2] /= 2;
	1719	+ gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
	1720	+
	1721	+ float amb = material.ambient;
	1722	+ if (amb < material.cameralight)
	1723	+ {
	1724	+ amb = material.cameralight;
	1725	+ }
	1726	+ colorV[0] = display.modelParams0[0] * material.diffuse * amb;
	1727	+ colorV[1] = display.modelParams0[1] * material.diffuse * amb;
	1728	+ colorV[2] = display.modelParams0[2] * material.diffuse * amb;
	1729	+ gl.glMaterialfv(gl.GL_FRONT, gl.GL_AMBIENT, colorV, 0);
	1730	+ //color[0] /= 2; color[1] /= 2; color[2] /= 2;
	1731	+ gl.glMaterialfv(gl.GL_BACK, gl.GL_AMBIENT, colorV, 0);
	1732	+
	1733	+ /**/
	1734	+ colorV[0] = ((1 - material.metalness) + display.modelParams0[0] * material.metalness) * material.specular;
	1735	+ colorV[1] = ((1 - material.metalness) + display.modelParams0[1] * material.metalness) * material.specular;
	1736	+ colorV[2] = ((1 - material.metalness) + display.modelParams0[2] * material.metalness) * material.specular;
	1737	+ gl.glMaterialfv(gl.GL_FRONT, gl.GL_SPECULAR, colorV, 0);
	1738	+ //color[0] /= 2; color[1] /= 2; color[2] /= 2;
	1739	+ gl.glMaterialfv(gl.GL_BACK, gl.GL_SPECULAR, colorV, 0);
	1740	+ colorV[0] = 10 / material.shininess; // 1/0.005f;
	1741	+ //System.out.println("shininess = " + colorV[0]);
	1742	+ if (colorV[0] > 128)
	1743	+ {
	1744	+ colorV[0] = 128;
	1745	+ }
	1746	+ gl.glMaterialfv(gl.GL_FRONT, gl.GL_SHININESS, colorV, 0);
	1747	+ gl.glMaterialfv(gl.GL_BACK, gl.GL_SHININESS, colorV, 0);
	1748	+ /**/
	1749	+ }
	1750	+ /**/
	1751	+
	1752	+ //selected = false;
	1753	+ selected = selected && display.flash;
	1754	+
	1755	+ //display.modelParams0[0] = 0; // pigment.r;
	1756	+ //display.modelParams0[1] = 0; // pigment.g;
	1757	+ //display.modelParams0[2] = 0; // pigment.b;
	1758	+ if (!material.multiply)
	1759	+ {
	1760	+ display.modelParams0[3] = material.metalness;
	1761	+ display.modelParams1[0] = material.diffuse;
	1762	+ display.modelParams1[1] = material.specular;
	1763	+ display.modelParams1[2] = 1 / material.shininess;
	1764	+ display.modelParams1[3] = material.shift;
	1765	+ display.modelParams2[0] = material.ambient;
	1766	+ display.modelParams2[1] = material.lightarea;
	1767	+ //System.out.println("light area = " + lightarea);
	1768	+ display.modelParams2[2] = 1 / material.factor; // diffuseness
	1769	+ display.modelParams2[3] = material.velvet;
	1770	+ display.modelParams3[0] = material.sheen;
	1771	+ display.modelParams3[1] = material.subsurface;
	1772	+ display.modelParams3[2] = material.bump; // backlit
	1773	+ display.modelParams3[3] = material.aniso;
	1774	+ display.modelParams4[0] = material.anisoV;
	1775	+ display.modelParams4[1] = selected ? 100 : material.cameralight;
	1776	+ //System.out.println("selected = " + selected);
	1777	+ display.modelParams4[2] = material.diffuseness;
	1778	+ display.modelParams4[3] = material.shadow;
	1779	+ display.modelParams5[0] = material.texture;
	1780	+ display.modelParams5[1] = material.opacity;
	1781	+ display.modelParams5[2] = material.fakedepth;
	1782	+ display.modelParams5[3] = CameraPane.SHADOWCULLFACE ? 0f : (material.shadowbias - 0.005f) / 10;
	1783	+ }
	1784	+ else
	1785	+ {
	1786	+ display.modelParams0[3] = material.metalness2;
	1787	+ display.modelParams1[0] = material.diffuse2;
	1788	+ display.modelParams1[1] = material.specular2;
	1789	+ display.modelParams1[2] = material.shininess2;
	1790	+ display.modelParams1[3] = material.shift2;
	1791	+ display.modelParams2[0] = material.ambient2;
	1792	+ display.modelParams2[1] = material.lightarea2;
	1793	+ display.modelParams2[2] = material.factor2;
	1794	+ display.modelParams2[3] = material.velvet2;
	1795	+ display.modelParams3[0] = material.sheen2;
	1796	+ display.modelParams3[1] = material.subsurface2;
	1797	+ display.modelParams3[2] = material.bump2;
	1798	+ display.modelParams3[3] = material.aniso2;
	1799	+ display.modelParams4[0] = material.anisoV2;
	1800	+ display.modelParams4[1] = material.cameralight2;
	1801	+ //System.out.println("selected = " + selected);
	1802	+ display.modelParams4[2] = material.diffuseness2;
	1803	+ display.modelParams4[3] = material.shadow2;
	1804	+ display.modelParams5[0] = material.texture2;
	1805	+ display.modelParams5[1] = material.opacity2;
	1806	+ display.modelParams5[2] = material.fakedepth2;
	1807	+ display.modelParams5[3] = material.shadowbias2;
	1808	+ }
	1809	+
	1810	+ display.modelParams6[0] = 0;
	1811	+ display.modelParams6[1] = 0;
	1812	+ display.modelParams6[2] = 0;
	1813	+ display.modelParams6[3] = 0;
	1814	+
	1815	+ display.modelParams7[0] = 0;
	1816	+ display.modelParams7[1] = 1000;
	1817	+ display.modelParams7[2] = 0;
	1818	+ display.modelParams7[3] = 0;
	1819	+
	1820	+ //display.modelParams6[0] = 100; // criss de bug de bump
	1821	+
	1822	+ Object3D.cVector2[] extparams = others; // display.vector2buffer;
	1823	+ if (extparams != null && extparams.length > 0 && extparams[0] != null)
	1824	+ {
	1825	+ display.modelParams6[0] = extparams[0].x / 1000.0f; // bump
	1826	+ display.modelParams6[1] = extparams[0].y / 1000.0f; // noise
	1827	+ if (extparams.length > 1)
	1828	+ {
	1829	+ display.modelParams6[2] = extparams[1].x / 1000.0f; // borderfade
	1830	+ display.modelParams6[3] = extparams[1].y / 1000.0f; // (float)Math.exp(-extparams[1].y / 1000.0f); // fog punchthrough
	1831	+ if (extparams.length > 2)
	1832	+ {
	1833	+ display.modelParams7[0] = extparams[2].x / 1000.0f; // noise power
	1834	+ float x = extparams[2].y / 1000.0f;
	1835	+ //if (x == 0)
	1836	+ // x = 1f;
	1837	+ 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
	1838	+ if (extparams[2].y > 0)
	1839	+ {
	1840	+ //System.out.println("extparams[1].y = " + extparams[1].y);
	1841	+ //System.out.println("extparams[2].y = " + extparams[2].y);
	1842	+ //System.out.println("opacity power = " + display.modelParams7[1]);
	1843	+ }
	1844	+ }
	1845	+ }
	1846	+ }
	1847	+
	1848	+ //if (display.modelParams6[2] != 0)
	1849	+ /*
	1850	+ System.out.println("modelParams0[0] = " + display.modelParams0[0]);
	1851	+ System.out.println("modelParams0[1] = " + display.modelParams0[1]);
	1852	+ System.out.println("modelParams0[2] = " + display.modelParams0[2]);
	1853	+ System.out.println("modelParams0[3] = " + display.modelParams0[3]);
	1854	+ System.out.println("modelParams1[0] = " + display.modelParams1[0]);
	1855	+ System.out.println("modelParams1[1] = " + display.modelParams1[1]);
	1856	+ System.out.println("modelParams1[2] = " + display.modelParams1[2]);
	1857	+ System.out.println("modelParams1[3] = " + display.modelParams1[3]);
	1858	+ System.out.println("modelParams2[0] = " + display.modelParams2[0]);
	1859	+ System.out.println("modelParams2[1] = " + display.modelParams2[1]);
	1860	+ System.out.println("modelParams2[2] = " + display.modelParams2[2]);
	1861	+ System.out.println("modelParams2[3] = " + display.modelParams2[3]);
	1862	+ System.out.println("modelParams3[0] = " + display.modelParams3[0]);
	1863	+ System.out.println("modelParams3[1] = " + display.modelParams3[1]);
	1864	+ System.out.println("modelParams3[2] = " + display.modelParams3[2]);
	1865	+ System.out.println("modelParams3[3] = " + display.modelParams3[3]);
	1866	+ System.out.println("modelParams4[0] = " + display.modelParams4[0]);
	1867	+ System.out.println("modelParams4[1] = " + display.modelParams4[1]);
	1868	+ System.out.println("modelParams4[2] = " + display.modelParams4[2]);
	1869	+ System.out.println("modelParams4[3] = " + display.modelParams4[3]);
	1870	+ System.out.println("modelParams5[0] = " + display.modelParams5[0]);
	1871	+ System.out.println("modelParams5[1] = " + display.modelParams5[1]);
	1872	+ System.out.println("modelParams5[2] = " + display.modelParams5[2]);
	1873	+ System.out.println("modelParams5[3] = " + display.modelParams5[3]);
	1874	+ System.out.println("modelParams6[0] = " + display.modelParams6[0]);
	1875	+ System.out.println("modelParams6[1] = " + display.modelParams6[1]);
	1876	+ System.out.println("modelParams6[2] = " + display.modelParams6[2]);
	1877	+ System.out.println("modelParams6[3] = " + display.modelParams6[3]);
	1878	+ System.out.println("modelParams7[0] = " + display.modelParams7[0]);
	1879	+ System.out.println("modelParams7[1] = " + display.modelParams7[1]);
	1880	+ System.out.println("modelParams7[2] = " + display.modelParams7[2]);
	1881	+ System.out.println("modelParams7[3] = " + display.modelParams7[3]);
	1882	+ /**/
	1883	+ //assert (display.modelParams6[2] == 0);
	1884	+
	1885	+ //System.out.println("noise power = " + display.modelParams7[0]);
	1886	+ //System.out.println("shadowbias = " + shadowbias);
	1887	+
	1888	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 0, display.modelParams0, 0);
	1889	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 1, display.modelParams1, 0);
	1890	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 2, display.modelParams2, 0);
	1891	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 3, display.modelParams3, 0);
	1892	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 4, display.modelParams4, 0);
	1893	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 5, display.modelParams5, 0);
	1894	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 6, display.modelParams6, 0);
	1895	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 7, display.modelParams7, 0);
	1896	+
	1897	+ int mode = display.FP_SHADER;
	1898	+
	1899	+ if (material.aniso != material.anisoV \|\| material.aniso > 0.002)
	1900	+ {
	1901	+ mode \|= display.FP_ANISO;
	1902	+ }
	1903	+
	1904	+ display.EnableProgram(mode);
	1905	+
	1906	+ //System.out.println("opacity power = " + display.modelParams7[1]);
	1907	+
	1908	+ if (!material.multiply)
	1909	+ {
	1910	+ if (Globals.drawMode == CameraPane.SHADOW)
	1911	+ gl.glDepthMask(material.opacity >= 0.9 && display.modelParams7[1] > 0.1);
	1912	+ else
	1913	+ gl.glDepthMask(material.opacity >= 0.99);
	1914	+ }
208	1915	}
209	1916
210	1917	int matrixdepth = 0; // 10000; // CONFLICT WITH cMESH... WARNING WARNING WARNING WARNING WARNING WARNING !!!!!!!!!!!! 0;
..	..	@@ -225,7 +1932,7 @@
225	1932	currentGL.glMultMatrixd(model, 0);
226	1933	}
227	1934
228		- void PushMatrix(double[][] matrix, int count)
	1935	+ public void PushMatrix(double[][] matrix, int count) // INTERFACE
229	1936	{
230	1937	matrixdepth++;
231	1938	// GrafreeD.tracein(matrix);
..	..	@@ -254,7 +1961,7 @@
254	1961	void PushMatrix(double[][] matrix)
255	1962	{
256	1963	// GrafreeD.tracein(matrix);
257		- PushMatrix(matrix,1);
	1964	+ PushMatrix(matrix, 1);
258	1965	}
259	1966
260	1967	void PushMatrix()
..	..	@@ -270,7 +1977,7 @@
270	1977
271	1978	double[][] tmpmat = new double[4][4];
272	1979
273		- void PopMatrix(double[][] inverse)
	1980	+ public void PopMatrix(double[][] inverse) // INTERFACE
274	1981	{
275	1982	--matrixdepth;
276	1983
..	..	@@ -310,7 +2017,7 @@
310	2017	PushTextureMatrix(matrix, 1);
311	2018	}
312	2019
313		- void PushTextureMatrix(double[][] matrix, int count)
	2020	+ public void PushTextureMatrix(double[][] matrix, int count) // INTERFACE
314	2021	{
315	2022	currentGL.glActiveTexture(GetGL().GL_TEXTURE0);
316	2023
..	..	@@ -324,7 +2031,7 @@
324	2031	currentGL.glMatrixMode(GetGL().GL_MODELVIEW);
325	2032	}
326	2033
327		- void PopTextureMatrix(double[][] inverse)
	2034	+ public void PopTextureMatrix(double[][] inverse) // INTERFACE
328	2035	{
329	2036	currentGL.glActiveTexture(GetGL().GL_TEXTURE0);
330	2037	currentGL.glMatrixMode(GetGL().GL_TEXTURE);
..	..	@@ -351,15 +2058,15 @@
351	2058
352	2059	static int camerachangeframe;
353	2060
354		- boolean SetCamera(Camera cam)
	2061	+ public boolean SetCamera(Camera cam)
355	2062	{
356	2063	// may 2014 if (cam == cameras[0] \|\| cam == cameras[1])
357	2064	// return false;
358	2065
359		- if (REFUSEMODE && isLIVE() && camerachangeframe != 0 && camerachangeframe != framecount)
	2066	+ if (REFUSEMODE && Globals.isLIVE() && camerachangeframe != 0 && camerachangeframe != Globals.framecount)
360	2067	{
361	2068	// check for last change
362		- if (framecount < camerachangeframe + 400) // 120 == 1 second
	2069	+ if (Globals.framecount < camerachangeframe + 400) // 120 == 1 second
363	2070	{
364	2071	// refuse the camera change
365	2072	System.err.println("Camera " + cam + " REFUSED");
..	..	@@ -367,7 +2074,7 @@
367	2074	}
368	2075	}
369	2076
370		- camerachangeframe = framecount;
	2077	+ camerachangeframe = Globals.framecount;
371	2078
372	2079	cam.hAspect = -1; // Read only
373	2080
..	..	@@ -398,7 +2105,7 @@
398	2105	{
399	2106	//System.err.println("Oeil on");
400	2107	TRACK = true;
401		-// JUNE 2014 if (TRACK && trackedobject != null && drawMode == SHADOW) // && !lightMode)
	2108	+// JUNE 2014 if (TRACK && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
402	2109	// object.editWindow.ScreenFit(trackedobject);
403	2110	//pingthread.StepToTarget(true);
404	2111	}
..	..	@@ -407,8 +2114,8 @@
407	2114	{
408	2115	//System.err.println("Oeil on");
409	2116	OEIL = true;
410		- if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && drawMode == SHADOW) // && !lightMode)
411		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	2117	+ if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
	2118	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
412	2119	//pingthread.StepToTarget(true);
413	2120	}
414	2121
..	..	@@ -471,39 +2178,12 @@
471	2178	{
472	2179	frozen ^= true;
473	2180	// Weird...
474		- lighttouched = true;
	2181	+ Globals.lighttouched = true;
475	2182	}
476	2183
477	2184	void ToggleDL()
478	2185	{
479	2186	mainDL ^= true;
480		- }
481		-
482		- void ToggleTexture()
483		- {
484		- textureon ^= true;
485		- }
486		-
487		- void ToggleLive()
488		- {
489		- setLIVE(isLIVE() ^ true);
490		-
491		- System.err.println("LIVE = " + isLIVE());
492		-
493		- if (!isLIVE()) // save sound
494		- GrafreeD.savesound = true; // wav.save();
495		- // else
496		- repaint(); // start loop // may 2013
497		- }
498		-
499		- void ToggleSupport()
500		- {
501		- SUPPORT ^= true;
502		- }
503		-
504		- void ToggleAbort()
505		- {
506		- ABORTMODE ^= true;
507	2187	}
508	2188
509	2189	void ToggleFullScreen()
..	..	@@ -513,12 +2193,7 @@
513	2193
514	2194	void ToggleCrowd()
515	2195	{
516		- CROWD ^= true;
517		- }
518		-
519		- void ToggleInertia()
520		- {
521		- INERTIA ^= true;
	2196	+ Globals.CROWD ^= true;
522	2197	}
523	2198
524	2199	void ToggleLocal()
..	..	@@ -526,62 +2201,89 @@
526	2201	LOCALTRANSFORM ^= true;
527	2202	}
528	2203
529		- void ToggleFast()
	2204	+ public void ToggleTexture()
	2205	+ {
	2206	+ textureon ^= true;
	2207	+ }
	2208	+
	2209	+ public void ToggleLive()
	2210	+ {
	2211	+ Globals.setLIVE(Globals.isLIVE() ^ true);
	2212	+
	2213	+ System.err.println("LIVE = " + Globals.isLIVE());
	2214	+
	2215	+ if (!Globals.isLIVE()) // save sound
	2216	+ Grafreed.savesound = true; // wav.save();
	2217	+ // else
	2218	+ repaint(); // start loop // may 2013
	2219	+ }
	2220	+
	2221	+ public void ToggleSupport()
	2222	+ {
	2223	+ SUPPORT ^= true;
	2224	+ }
	2225	+
	2226	+ public void ToggleAbort()
	2227	+ {
	2228	+ ABORTMODE ^= true;
	2229	+ }
	2230	+
	2231	+ public void ToggleInertia()
	2232	+ {
	2233	+ INERTIA ^= true;
	2234	+ }
	2235	+
	2236	+ public void ToggleFast()
530	2237	{
531	2238	FAST ^= true;
532	2239	}
533	2240
534		- void ToggleSlowPose()
	2241	+ public void ToggleSlowPose()
535	2242	{
536	2243	SLOWPOSE ^= true;
537	2244	}
538	2245
539		- void ToggleFootContact()
540		- {
541		- FOOTCONTACT ^= true;
542		- }
543		-
544		- void ToggleBoxMode()
	2246	+ public void ToggleBoxMode()
545	2247	{
546	2248	BOXMODE ^= true;
547	2249	}
548	2250
549		- void ToggleSmoothFocus()
	2251	+ public void ToggleZoomBoxMode()
	2252	+ {
	2253	+ ZOOMBOXMODE ^= true;
	2254	+ }
	2255	+
	2256	+ public void ToggleSmoothFocus()
550	2257	{
551	2258	SMOOTHFOCUS ^= true;
552	2259	}
553	2260
554		- void ToggleImageFlip()
	2261	+ public void ToggleImageFlip()
555	2262	{
556	2263	IMAGEFLIP ^= true;
557	2264	}
558	2265
559		- void ToggleSpeakerMocap()
	2266	+ public void ToggleSpeakerMocap()
560	2267	{
561	2268	SPEAKERMOCAP ^= true;
562	2269	}
563	2270
564		- void ToggleSpeakerCamera()
	2271	+ public void ToggleSpeakerCamera()
565	2272	{
566	2273	SPEAKERCAMERA ^= true;
567	2274	}
568	2275
569		- void ToggleSpeakerFocus()
	2276	+ public void ToggleSpeakerFocus()
570	2277	{
571	2278	SPEAKERFOCUS ^= true;
572	2279	}
573	2280
574		- void ToggleDebug()
575		- {
576		- DEBUG ^= true;
577		- }
578		-
579		- void ToggleFrustum()
	2281	+ public void ToggleFrustum()
580	2282	{
581	2283	FRUSTUM ^= true;
582	2284	}
583	2285
584		- void ToggleTrack()
	2286	+ public void ToggleTrack()
585	2287	{
586	2288	TRACK ^= true;
587	2289	if (TRACK)
..	..	@@ -600,25 +2302,35 @@
600	2302	repaint();
601	2303	}
602	2304
603		- void ToggleTrackOnce()
	2305	+ public void ToggleTrackOnce()
604	2306	{
605	2307	TRACKONCE ^= true;
606	2308	}
607	2309
608		- void ToggleShadowTrack()
	2310	+ public void ToggleShadowTrack()
609	2311	{
610	2312	SHADOWTRACK ^= true;
611	2313	repaint();
612	2314	}
613	2315
614		- void ToggleOeil()
	2316	+ public void ToggleOeil()
615	2317	{
616	2318	OEIL ^= true;
617	2319	}
618	2320
619		- void ToggleOeilOnce()
	2321	+ public void ToggleOeilOnce()
620	2322	{
621	2323	OEILONCE ^= true;
	2324	+ }
	2325	+
	2326	+ void ToggleFootContact()
	2327	+ {
	2328	+ FOOTCONTACT ^= true;
	2329	+ }
	2330	+
	2331	+ void ToggleDebug()
	2332	+ {
	2333	+ Globals.DEBUG ^= true;
622	2334	}
623	2335
624	2336	void ToggleLookAt()
..	..	@@ -626,9 +2338,9 @@
626	2338	LOOKAT ^= true;
627	2339	}
628	2340
629		- void ToggleRandom()
	2341	+ void ToggleSwitch()
630	2342	{
631		- RANDOM ^= true;
	2343	+ SWITCH ^= true;
632	2344	}
633	2345
634	2346	void ToggleHandles()
..	..	@@ -636,10 +2348,17 @@
636	2348	HANDLES ^= true;
637	2349	}
638	2350
	2351	+ Object3D paintFolder;
	2352	+
639	2353	void TogglePaint()
640	2354	{
641	2355	PAINTMODE ^= true;
642	2356	paintcount = 0;
	2357	+
	2358	+ if (PAINTMODE)
	2359	+ {
	2360	+ paintFolder = GetFolder();
	2361	+ }
643	2362	}
644	2363
645	2364	void SwapCamera(int a, int b)
..	..	@@ -672,34 +2391,6 @@
672	2391	//assert (cam.hAspect == 0);
673	2392	cam.hAspect = 0;
674	2393	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	2394	}
704	2395
705	2396	private static void ApplyTransform(GL gl, Mat4f xform)
..	..	@@ -759,11 +2450,26 @@
759	2450
760	2451	GL currentGL;
761	2452
762		- GL GetGL()
	2453	+ public GL GetGL() // INTERFACE
763	2454	{
764	2455	return currentGL;
765	2456	}
766		-
	2457	+
	2458	+ static private BufferedImage CreateBim(TextureData texturedata)
	2459	+ {
	2460	+ Grafreed.Assert(texturedata != null);
	2461	+
	2462	+ int width = texturedata.getWidth();
	2463	+ int height = texturedata.getHeight();
	2464	+
	2465	+ Buffer buffer = texturedata.getBuffer();
	2466	+ ByteBuffer bytebuf = (ByteBuffer)buffer;
	2467	+
	2468	+ byte[] bytes = bytebuf.array();
	2469	+
	2470	+ return CreateBim(bytes, width, height);
	2471	+ }
	2472	+
767	2473	/**/
768	2474	class CacheTexture
769	2475	{
..	..	@@ -772,28 +2478,31 @@
772	2478
773	2479	int resolution;
774	2480
775		- CacheTexture(com.sun.opengl.util.texture.Texture tex, int res)
	2481	+ CacheTexture(com.sun.opengl.util.texture.TextureData texdata, int res)
776	2482	{
777		- texture = tex;
	2483	+ texture = com.sun.opengl.util.texture.TextureIO.newTexture(texdata);
	2484	+ texturedata = texdata;
778	2485	resolution = res;
779	2486	}
780	2487	}
781	2488	/**/
782	2489
783	2490	// TEXTURE static Texture texture;
784		- static public java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/> textures
785		- = new java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/>();
786		- static public java.util.Hashtable<String, String> usedtextures = new java.util.Hashtable<String, String>();
	2491	+ static public Hashtable<cTexture, CacheTexture> texturepigment = new Hashtable<cTexture, CacheTexture>();
	2492	+ static public Hashtable<cTexture, CacheTexture> texturebump = new Hashtable<cTexture, CacheTexture>();
	2493	+ static public Hashtable<byte[], CacheTexture> bimtextures = new Hashtable<byte[], CacheTexture>();
	2494	+ static public java.util.HashSet<cTexture> usedtextures = new java.util.HashSet<cTexture>();
	2495	+
787	2496	int pigmentdepth = 0;
788	2497	public com.sun.opengl.util.texture.Texture[] pigmentstack = new com.sun.opengl.util.texture.Texture[65536];
789	2498	int bumpdepth = 0;
790	2499	public com.sun.opengl.util.texture.Texture[] bumpstack = new com.sun.opengl.util.texture.Texture[65536];
791	2500	//public static String DEFAULT_TEXTURE = "DEFAULT_TEXTURE";
792	2501	public static cTexture DEFAULT_TEXTURES = new cTexture("DEFAULT_TEXTURE" + ":" + "DEFAULT_TEXTURE_BUMP");
793		- public static String NOISE_TEXTURE = "WHITE_NOISE";
	2502	+ public static cTexture NOISE_TEXTURE = new cTexture("WHITE_NOISE:");
794	2503	// public static cTexture IMMORTAL_TEXTURE = new cTexture("IMMORTAL");
795	2504
796		- com.sun.opengl.util.texture.Texture GetResourceTexture(String name, boolean bump)
	2505	+ com.sun.opengl.util.texture.TextureData GetResourceTexture(String name, boolean bump)
797	2506	{
798	2507	TextureData texturedata = null;
799	2508
..	..	@@ -812,13 +2521,34 @@
812	2521	if (bump)
813	2522	texturedata = ConvertBump(texturedata, false);
814	2523
815		- com.sun.opengl.util.texture.Texture texture =
816		- com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
	2524	+// com.sun.opengl.util.texture.Texture texture =
	2525	+// com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
817	2526
818		- texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
819		- texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
	2527	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
	2528	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
820	2529
821		- return texture;
	2530	+ return texturedata;
	2531	+ }
	2532	+
	2533	+ com.sun.opengl.util.texture.TextureData GetBimTexture(BufferedImage bim, boolean bump)
	2534	+ {
	2535	+ TextureData texturedata = null;
	2536	+
	2537	+ try
	2538	+ {
	2539	+ texturedata =
	2540	+ com.sun.opengl.util.texture.TextureIO.newTextureData(
	2541	+ bim,
	2542	+ true);
	2543	+ } catch (Exception e)
	2544	+ {
	2545	+ throw new javax.media.opengl.GLException(e);
	2546	+ }
	2547	+
	2548	+ if (bump)
	2549	+ texturedata = ConvertBump(texturedata, false);
	2550	+
	2551	+ return texturedata;
822	2552	}
823	2553
824	2554	boolean HUESMOOTH = true; // wrap around bug... true;
..	..	@@ -1891,6 +3621,8 @@
1891	3621
1892	3622	System.out.println("LOADING TEXTURE : " + name);
1893	3623
	3624	+ Object x = texturedata.getMipmapData(); // .getBuffer();
	3625	+
1894	3626	//
1895	3627	if (false) // compressbit > 0)
1896	3628	{
..	..	@@ -2595,6 +4327,7 @@
2595	4327
2596	4328	com.sun.opengl.util.texture.Texture CompressTexture2(String name)
2597	4329	{
	4330	+ new Exception().printStackTrace();
2598	4331	System.exit(0);
2599	4332	com.sun.opengl.util.texture.Texture texture = null;
2600	4333
..	..	@@ -6271,7 +8004,7 @@
6271	8004	return null;
6272	8005	}
6273	8006
6274		- void ReleaseTextures(cTexture tex)
	8007	+ public void ReleaseTextures(cTexture tex) // INTERFACE
6275	8008	{
6276	8009	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
6277	8010	{
..	..	@@ -6288,7 +8021,7 @@
6288	8021	String pigment = Object3D.GetPigment(tex);
6289	8022	String bump = Object3D.GetBump(tex);
6290	8023
6291		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8024	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
6292	8025	{
6293	8026	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
6294	8027	// System.out.println("; bump = " + bump);
..	..	@@ -6303,13 +8036,71 @@
6303	8036	pigment = null;
6304	8037	}
6305	8038
6306		- ReleaseTexture(bump, true);
6307		- ReleaseTexture(pigment, false);
	8039	+ ReleaseTexture(tex, true);
	8040	+ ReleaseTexture(tex, false);
6308	8041	}
6309	8042
6310		- void ReleaseTexture(String tex, boolean bump)
	8043	+ public void ReleasePigmentTexture(cTexture tex) // INTERFACE
6311	8044	{
6312		- if (// drawMode != 0 \|\| /tex == null \|\|/
	8045	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	8046	+ {
	8047	+ return;
	8048	+ }
	8049	+
	8050	+ if (tex == null)
	8051	+ {
	8052	+ ReleaseTexture(null, false);
	8053	+ return;
	8054	+ }
	8055	+
	8056	+ String pigment = Object3D.GetPigment(tex);
	8057	+
	8058	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8059	+ {
	8060	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	8061	+ // System.out.println("; bump = " + bump);
	8062	+ }
	8063	+
	8064	+ if (pigment.equals(""))
	8065	+ {
	8066	+ pigment = null;
	8067	+ }
	8068	+
	8069	+ ReleaseTexture(tex, false);
	8070	+ }
	8071	+
	8072	+ public void ReleaseBumpTexture(cTexture tex) // INTERFACE
	8073	+ {
	8074	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	8075	+ {
	8076	+ return;
	8077	+ }
	8078	+
	8079	+ if (tex == null)
	8080	+ {
	8081	+ ReleaseTexture(null, true);
	8082	+ return;
	8083	+ }
	8084	+
	8085	+ String bump = Object3D.GetBump(tex);
	8086	+
	8087	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8088	+ {
	8089	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	8090	+ // System.out.println("; bump = " + bump);
	8091	+ }
	8092	+
	8093	+ if (bump.equals(""))
	8094	+ {
	8095	+ bump = null;
	8096	+ }
	8097	+
	8098	+ ReleaseTexture(tex, true);
	8099	+ }
	8100	+
	8101	+ void ReleaseTexture(cTexture tex, boolean bump)
	8102	+ {
	8103	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
6313	8104	ambientOcclusion ) // \|\| !textureon)
6314	8105	{
6315	8106	return;
..	..	@@ -6318,7 +8109,7 @@
6318	8109	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
6319	8110
6320	8111	if (tex != null)
6321		- texture = textures.get(tex);
	8112	+ texture = bump ? texturebump.get(tex) : texturepigment.get(tex);
6322	8113
6323	8114	// //assert( texture != null );
6324	8115	// if (texture == null)
..	..	@@ -6410,9 +8201,57 @@
6410	8201	}
6411	8202	}
6412	8203
6413		- /boolean/ void BindTextures(cTexture tex, int resolution)
	8204	+ /boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
6414	8205	{
6415		- if (// drawMode != 0 \|\| /tex == null \|\|/
	8206	+// if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8207	+// ambientOcclusion ) // \|\| !textureon)
	8208	+// {
	8209	+// return; // false;
	8210	+// }
	8211	+//
	8212	+// if (tex == null)
	8213	+// {
	8214	+// BindTexture(null,false,resolution);
	8215	+// BindTexture(null,true,resolution);
	8216	+// return;
	8217	+// }
	8218	+//
	8219	+// String pigment = Object3D.GetPigment(tex);
	8220	+// String bump = Object3D.GetBump(tex);
	8221	+//
	8222	+// usedtextures.add(pigment);
	8223	+// usedtextures.add(bump);
	8224	+//
	8225	+// //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8226	+// {
	8227	+// // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8228	+// // System.out.println("; bump = " + bump);
	8229	+// }
	8230	+//
	8231	+// if (bump.equals(""))
	8232	+// {
	8233	+// bump = null;
	8234	+// }
	8235	+// if (pigment.equals(""))
	8236	+// {
	8237	+// pigment = null;
	8238	+// }
	8239	+//
	8240	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8241	+// BindTexture(pigment, false, resolution);
	8242	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
	8243	+// BindTexture(bump, true, resolution);
	8244	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8245	+//
	8246	+// return; // true;
	8247	+
	8248	+ BindPigmentTexture(tex, resolution);
	8249	+ BindBumpTexture(tex, resolution);
	8250	+ }
	8251	+
	8252	+ /boolean/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8253	+ {
	8254	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
6416	8255	ambientOcclusion ) // \|\| !textureon)
6417	8256	{
6418	8257	return; // false;
..	..	@@ -6421,17 +8260,47 @@
6421	8260	if (tex == null)
6422	8261	{
6423	8262	BindTexture(null,false,resolution);
6424		- BindTexture(null,true,resolution);
6425	8263	return;
6426	8264	}
6427	8265
6428	8266	String pigment = Object3D.GetPigment(tex);
	8267	+
	8268	+ usedtextures.add(tex);
	8269	+
	8270	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8271	+ {
	8272	+ // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8273	+ // System.out.println("; bump = " + bump);
	8274	+ }
	8275	+
	8276	+ if (pigment.equals(""))
	8277	+ {
	8278	+ pigment = null;
	8279	+ }
	8280	+
	8281	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8282	+ BindTexture(tex, false, resolution);
	8283	+ }
	8284	+
	8285	+ /boolean/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8286	+ {
	8287	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8288	+ ambientOcclusion ) // \|\| !textureon)
	8289	+ {
	8290	+ return; // false;
	8291	+ }
	8292	+
	8293	+ if (tex == null)
	8294	+ {
	8295	+ BindTexture(null,true,resolution);
	8296	+ return;
	8297	+ }
	8298	+
6429	8299	String bump = Object3D.GetBump(tex);
6430	8300
6431		- usedtextures.put(pigment, pigment);
6432		- usedtextures.put(bump, bump);
	8301	+ usedtextures.add(tex);
6433	8302
6434		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8303	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
6435	8304	{
6436	8305	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
6437	8306	// System.out.println("; bump = " + bump);
..	..	@@ -6441,43 +8310,94 @@
6441	8310	{
6442	8311	bump = null;
6443	8312	}
6444		- if (pigment.equals(""))
6445		- {
6446		- pigment = null;
6447		- }
6448	8313
6449		- GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
6450		- BindTexture(pigment, false, resolution);
6451	8314	GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
6452		- BindTexture(bump, true, resolution);
	8315	+ BindTexture(tex, true, resolution);
6453	8316	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
6454		-
6455		- return; // true;
6456	8317	}
6457	8318
6458		- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution)
	8319	+ java.util.HashSet<String> missingTextures = new java.util.HashSet<String>();
	8320	+
	8321	+ private boolean FileExists(String tex)
6459	8322	{
6460		- CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
	8323	+ if (missingTextures.contains(tex))
	8324	+ {
	8325	+ return false;
	8326	+ }
	8327	+
	8328	+ boolean fileExists = new File(tex).exists();
	8329	+
	8330	+ if (!fileExists)
	8331	+ {
	8332	+ // If file exists, the "new File()" is not executed sgain
	8333	+ missingTextures.add(tex);
	8334	+ }
	8335	+
	8336	+ return fileExists;
	8337	+ }
	8338	+
	8339	+ CacheTexture GetCacheTexture(cTexture tex, boolean bump, int resolution) throws Exception
	8340	+ {
	8341	+ CacheTexture texturecache = null;
6461	8342
6462	8343	if (tex != null)
6463	8344	{
6464		- String texname = tex;
	8345	+ String texname = bump ? Object3D.GetBump(tex) : Object3D.GetPigment(tex);
	8346	+ byte[] texdata = bump ? tex.bumpdata : tex.pigmentdata;
6465	8347
6466		- String[] split = tex.split("Textures");
6467		- if (split.length > 1)
6468		- texname = "/Users/nbriere/Textures" + split[split.length-1];
6469		- else
6470		- if (!texname.startsWith("/"))
6471		- texname = "/Users/nbriere/Textures/" + texname;
	8348	+ if (texname.equals("") && texdata == null)
	8349	+ {
	8350	+ return null;
	8351	+ }
	8352	+
	8353	+ String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
	8354	+
	8355	+// String[] split = tex.split("Textures");
	8356	+// if (split.length > 1)
	8357	+// texname = "/Users/nbriere/Textures" + split[split.length-1];
	8358	+// else
	8359	+// if (!texname.startsWith("/"))
	8360	+// texname = "/Users/nbriere/Textures/" + texname;
	8361	+ if (!FileExists(texname))
	8362	+ {
	8363	+ texname = fallbackTextureName;
	8364	+ }
6472	8365
6473	8366	if (CACHETEXTURE)
6474		- texture = textures.get(texname); // TEXTURE CACHE
6475		-
6476		- TextureData texturedata = null;
6477		-
6478		- if (texture == null \|\| texture.resolution < resolution)
6479	8367	{
6480		- if (tex.equals("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
	8368	+ if (texdata == null)
	8369	+ texturecache = bump ? texturebump.get(tex) : texturepigment.get(tex);
	8370	+ else
	8371	+ texturecache = bimtextures.get(texdata);
	8372	+ }
	8373	+
	8374	+ if (texturecache == null \|\| texturecache.resolution != -1 && texturecache.resolution < resolution)
	8375	+ {
	8376	+ TextureData texturedata = null;
	8377	+
	8378	+ if (texdata != null && textureon)
	8379	+ {
	8380	+ BufferedImage bim; // = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
	8381	+
	8382	+ try
	8383	+ {
	8384	+ bim = DecompressJPEG(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8385	+ }
	8386	+ catch (Exception e)
	8387	+ {
	8388	+ bim = CreateBim(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8389	+ }
	8390	+
	8391	+ texturecache = new CacheTexture(GetBimTexture(bim, bump), -1);
	8392	+ bimtextures.put(texdata, texturecache);
	8393	+
	8394	+ //BufferedImage bim3 = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
	8395	+
	8396	+ //Object bim2 = CreateBim(texturecache.texturedata);
	8397	+ //bim2 = bim;
	8398	+ }
	8399	+ else
	8400	+ if (texname.endsWith("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
6481	8401	{
6482	8402	assert(!bump);
6483	8403	// if (bump)
..	..	@@ -6488,19 +8408,23 @@
6488	8408	// }
6489	8409	// else
6490	8410	// {
6491		- texture = textures.get(tex);
6492		- if (texture == null)
	8411	+ // texturecache = textures.get(texname); // suspicious
	8412	+ if (texturecache == null)
6493	8413	{
6494		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8414	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
6495	8415	}
	8416	+ else
	8417	+ new Exception().printStackTrace();
6496	8418	// }
6497	8419	} else
6498		- if (tex.equals("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
	8420	+ if (texname.endsWith("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
6499	8421	{
6500	8422	assert(bump);
6501		- texture = textures.get(tex);
6502		- if (texture == null)
6503		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8423	+ // texturecache = textures.get(texname); // suspicious
	8424	+ if (texturecache == null)
	8425	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8426	+ else
	8427	+ new Exception().printStackTrace();
6504	8428	} else
6505	8429	{
6506	8430	//if (tex.equals("IMMORTAL"))
..	..	@@ -6508,11 +8432,13 @@
6508	8432	// texture = GetResourceTexture("default.png");
6509	8433	//} else
6510	8434	//{
6511		- if (tex.equals("WHITE_NOISE"))
	8435	+ if (texname.endsWith("WHITE_NOISE"))
6512	8436	{
6513		- texture = textures.get(tex);
6514		- if (texture == null)
6515		- texture = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8437	+ // texturecache = textures.get(texname); // suspicious
	8438	+ if (texturecache == null)
	8439	+ texturecache = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8440	+ else
	8441	+ new Exception().printStackTrace();
6516	8442	} else
6517	8443	{
6518	8444	if (textureon)
..	..	@@ -6537,7 +8463,7 @@
6537	8463	}
6538	8464
6539	8465	cachename = texname.substring(0, texname.length()-4)+ext+".jpg";
6540		- if (!new File(cachename).exists())
	8466	+ if (!FileExists(cachename))
6541	8467	cachename = texname;
6542	8468	else
6543	8469	processbump = false; // don't process bump map again
..	..	@@ -6559,7 +8485,7 @@
6559	8485	}
6560	8486
6561	8487	cachename = texname.substring(0, texname.length()-4)+ext+".png";
6562		- if (!new File(cachename).exists())
	8488	+ if (!FileExists(cachename))
6563	8489	cachename = texname;
6564	8490	else
6565	8491	processbump = false; // don't process bump map again
..	..	@@ -6568,20 +8494,22 @@
6568	8494	texturedata = GetFileTexture(cachename, processbump, resolution);
6569	8495
6570	8496
6571		- if (texturedata != null)
6572		- texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
	8497	+ if (texturedata == null)
	8498	+ throw new Exception();
	8499	+
	8500	+ texturecache = new CacheTexture(texturedata,resolution);
6573	8501	//texture = GetTexture(tex, bump);
6574	8502	}
6575	8503	}
6576	8504	//}
6577	8505	}
6578	8506
6579		- if (/CACHETEXTURE &&/ texture != null && textureon)
	8507	+ if (texdata == null && /CACHETEXTURE &&/ texturecache != null && textureon)
6580	8508	{
6581	8509	//return false;
6582	8510
6583	8511	// System.out.println("CACHE +++++++++++++++ TEXTURE : " + texname + " (" + texture.getEstimatedMemorySize() + ")");
6584		- if (texturedata != null && (texname.endsWith(".jpg") \|\| texname.endsWith(".JPG")))
	8512	+ if (texturedata != null && texname.toLowerCase().endsWith(".jpg"))
6585	8513	{
6586	8514	// String ext = "_highres";
6587	8515	// if (REDUCETEXTURE)
..	..	@@ -6598,52 +8526,17 @@
6598	8526	File cachefile = new File(texname.substring(0, texname.length()-4)+ext+".jpg");
6599	8527	if (!cachefile.exists())
6600	8528	{
6601		- // cache to disk
6602		- Buffer buffer = texturedata.getBuffer(); // getMipmapData();
6603		- //buffers[0].
6604		-
6605		- ByteBuffer bytebuf = (ByteBuffer)buffer; // ).asIntBuffer();
6606		- int[] pixels = new int[bytebuf.capacity()/3];
6607		-
6608		- // squared size heuristic...
6609		- if ((int)Math.sqrt(pixels.length) == Math.sqrt(pixels.length))
	8529	+ //if (texturedata.getWidth() == texturedata.getHeight())
6610	8530	{
6611		- for (int i=pixels.length; --i>=0;)
6612		- {
6613		- int i3 = i*3;
6614		- pixels[i] = 0xFF;
6615		- pixels[i] <<= 8;
6616		- pixels[i] \|= bytebuf.get(i3+2) & 0xFF;
6617		- pixels[i] <<= 8;
6618		- pixels[i] \|= bytebuf.get(i3+1) & 0xFF;
6619		- pixels[i] <<= 8;
6620		- pixels[i] \|= bytebuf.get(i3) & 0xFF;
6621		- }
6622		-
6623		- /*
6624		- int r=0,g=0,b=0,a=0;
6625		- for (int i=0; i<width; i++)
6626		- for (int j=0; j<height; j++)
6627		- {
6628		- int index = j*width+i;
6629		- int p = pixels[index];
6630		- a = ((p>>24) & 0xFF);
6631		- r = ((p>>16) & 0xFF);
6632		- g = ((p>>8) & 0xFF);
6633		- b = (p & 0xFF);
6634		- pixels[index] = (a<<24) \| (b<<16) \| (g<<8) \| r;
6635		- }
6636		- /**/
6637		- int width = (int)Math.sqrt(pixels.length); // squared
6638		- int height = width;
6639		- BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
6640		- rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
	8531	+ BufferedImage rendImage = CreateBim(texturedata);
	8532	+
6641	8533	ImageWriter writer = null;
6642	8534	Iterator iter = ImageIO.getImageWritersByFormatName("jpg");
6643	8535	if (iter.hasNext()) {
6644	8536	writer = (ImageWriter)iter.next();
6645	8537	}
6646		- float compressionQuality = 0.9f;
	8538	+
	8539	+ float compressionQuality = 0.85f;
6647	8540	try
6648	8541	{
6649	8542	ImageOutputStream ios = ImageIO.createImageOutputStream(cachefile);
..	..	@@ -6660,18 +8553,20 @@
6660	8553	}
6661	8554	}
6662	8555	}
6663		-
	8556	+
	8557	+ Hashtable<cTexture, CacheTexture> textures = bump ? texturebump : texturepigment;
	8558	+
6664	8559	//System.out.println("Texture = " + tex);
6665		- if (textures.containsKey(texname))
	8560	+ if (textures.containsKey(tex))
6666	8561	{
6667		- CacheTexture thetex = textures.get(texname);
	8562	+ CacheTexture thetex = textures.get(tex);
6668	8563	thetex.texture.disable();
6669	8564	thetex.texture.dispose();
6670		- textures.remove(texname);
	8565	+ textures.remove(tex);
6671	8566	}
6672	8567
6673		- texture.texturedata = texturedata;
6674		- textures.put(texname, texture);
	8568	+ //texture.texturedata = texturedata;
	8569	+ textures.put(tex, texturecache);
6675	8570
6676	8571	// newtex = true;
6677	8572	}
..	..	@@ -6687,10 +8582,44 @@
6687	8582	}
6688	8583	}
6689	8584
6690		- return texture;
	8585	+ return texturecache;
6691	8586	}
6692	8587
6693		- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution)
	8588	+ static void EmbedTextures(cTexture tex)
	8589	+ {
	8590	+ if (tex.pigmentdata == null)
	8591	+ {
	8592	+ //String texname = Object3D.GetPigment(tex);
	8593	+
	8594	+ CacheTexture texturecache = texturepigment.get(tex);
	8595	+
	8596	+ if (texturecache != null)
	8597	+ {
	8598	+ tex.pw = texturecache.texturedata.getWidth();
	8599	+ tex.ph = texturecache.texturedata.getHeight();
	8600	+ tex.pigmentdata = //CompressJPEG(CreateBim
	8601	+ ((ByteBuffer)texturecache.texturedata.getBuffer()).array()
	8602	+ ;
	8603	+ //, tex.pw, tex.ph), 0.5f);
	8604	+ }
	8605	+ }
	8606	+
	8607	+ if (tex.bumpdata == null)
	8608	+ {
	8609	+ //String texname = Object3D.GetBump(tex);
	8610	+
	8611	+ CacheTexture texturecache = texturebump.get(tex);
	8612	+
	8613	+ if (texturecache != null)
	8614	+ {
	8615	+ tex.bw = texturecache.texturedata.getWidth();
	8616	+ tex.bh = texturecache.texturedata.getHeight();
	8617	+ tex.bumpdata = CompressJPEG(CreateBim(((ByteBuffer)texturecache.texturedata.getBuffer()).array(), tex.bw, tex.bh), 0.5f);
	8618	+ }
	8619	+ }
	8620	+ }
	8621	+
	8622	+ com.sun.opengl.util.texture.Texture GetTexture(cTexture tex, boolean bump, int resolution) throws Exception
6694	8623	{
6695	8624	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
6696	8625
..	..	@@ -6708,21 +8637,21 @@
6708	8637	return texture!=null?texture.texture:null;
6709	8638	}
6710	8639
6711		- com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution)
	8640	+ public com.sun.opengl.util.texture.TextureData GetTextureData(cTexture tex, boolean bump, int resolution) throws Exception
6712	8641	{
6713	8642	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
6714	8643
6715	8644	return texture!=null?texture.texturedata:null;
6716	8645	}
6717	8646
6718		- boolean BindTexture(String tex, boolean bump, int resolution)
	8647	+ boolean BindTexture(cTexture tex, boolean bump, int resolution) throws Exception
6719	8648	{
6720	8649	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
6721	8650	{
6722	8651	return false;
6723	8652	}
6724	8653
6725		- boolean newtex = false;
	8654	+ //boolean newtex = false;
6726	8655
6727	8656	com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
6728	8657
..	..	@@ -6754,9 +8683,75 @@
6754	8683	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_S, GetGL().GL_REPEAT);
6755	8684	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_T, GetGL().GL_REPEAT);
6756	8685
6757		- return newtex;
	8686	+ return true; // Warning: not used.
6758	8687	}
6759	8688
	8689	+ public static byte[] CompressJPEG(BufferedImage image, float quality)
	8690	+ {
	8691	+ try
	8692	+ {
	8693	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	8694	+ Iterator<ImageWriter> writers = ImageIO.getImageWritersByFormatName("jpg");
	8695	+ ImageWriter writer = writers.next();
	8696	+
	8697	+ ImageWriteParam param = writer.getDefaultWriteParam();
	8698	+ param.setCompressionMode(ImageWriteParam.MODE_EXPLICIT);
	8699	+ param.setCompressionQuality(quality);
	8700	+
	8701	+ ImageOutputStream ios = ImageIO.createImageOutputStream(baos);
	8702	+ writer.setOutput(ios);
	8703	+ writer.write(null, new IIOImage(image, null, null), param);
	8704	+
	8705	+ byte[] data = baos.toByteArray();
	8706	+ writer.dispose();
	8707	+ return data;
	8708	+ }
	8709	+ catch (Exception e)
	8710	+ {
	8711	+ e.printStackTrace();
	8712	+ return null;
	8713	+ }
	8714	+ }
	8715	+
	8716	+ public static BufferedImage DecompressJPEG(byte[] image, int w, int h) throws IOException
	8717	+ {
	8718	+ ByteArrayInputStream baos = new ByteArrayInputStream(image);
	8719	+ Iterator<ImageReader> writers = ImageIO.getImageReadersByFormatName("jpg");
	8720	+ ImageReader reader = writers.next();
	8721	+
	8722	+ BufferedImage bim = new BufferedImage(w, h, BufferedImage.TYPE_INT_RGB);
	8723	+
	8724	+ ImageReadParam param = reader.getDefaultReadParam();
	8725	+ param.setDestination(bim);
	8726	+ //param.setDestinationType(ImageTypeSpecifier.createFromBufferedImageType(BufferedImage.TYPE_INT_RGB));
	8727	+
	8728	+ ImageInputStream ios = ImageIO.createImageInputStream(baos);
	8729	+ reader.setInput(ios);
	8730	+ BufferedImage bim2 = reader.read(0, param);
	8731	+ reader.dispose();
	8732	+
	8733	+// WritableRaster raster = bim2.getRaster();
	8734	+// DataBufferByte data = (DataBufferByte) raster.getDataBuffer();
	8735	+// byte[] bytes = data.getData();
	8736	+//
	8737	+// int[] pixels = new int[bytes.length/3];
	8738	+// for (int i=pixels.length; --i>=0;)
	8739	+// {
	8740	+// int i3 = i*3;
	8741	+// pixels[i] = 0xFF;
	8742	+// pixels[i] <<= 8;
	8743	+// pixels[i] \|= bytes[i3+2] & 0xFF;
	8744	+// pixels[i] <<= 8;
	8745	+// pixels[i] \|= bytes[i3+1] & 0xFF;
	8746	+// pixels[i] <<= 8;
	8747	+// pixels[i] \|= bytes[i3] & 0xFF;
	8748	+// }
	8749	+//
	8750	+// bim.setRGB(0,0,w,h, pixels, w*(h-1),-w);
	8751	+
	8752	+ return bim;
	8753	+ }
	8754	+
6760	8755	ShadowBuffer shadowPBuf;
6761	8756	AntialiasBuffer antialiasPBuf;
6762	8757	int MAXSTACK;
..	..	@@ -6949,7 +8944,7 @@
6949	8944
6950	8945	if (cubemap == null)
6951	8946	{
6952		- LoadEnvy(5);
	8947	+ //LoadEnvy(1);
6953	8948	}
6954	8949
6955	8950	//cubemap.enable();
..	..	@@ -7236,37 +9231,58 @@
7236	9231	cubemap = null;
7237	9232	return;
7238	9233	case 1:
7239		- name = "cubemaps/box_";
7240		- ext = "png";
	9234	+ name = "cubemaps/rgb/";
	9235	+ ext = "jpg";
7241	9236	reverseUP = false;
7242	9237	break;
7243	9238	case 2:
7244		- name = "cubemaps/uffizi_";
7245		- ext = "png";
7246		- break; // reverseUP = true; break;
	9239	+ name = "cubemaps/uffizi/";
	9240	+ ext = "jpg";
	9241	+ reverseUP = false;
	9242	+ break;
7247	9243	case 3:
7248		- name = "cubemaps/CloudyHills_";
7249		- ext = "tga";
	9244	+ name = "cubemaps/CloudyHills/";
	9245	+ ext = "jpg";
7250	9246	reverseUP = false;
7251	9247	break;
7252	9248	case 4:
7253		- name = "cubemaps/cornell_";
	9249	+ name = "cubemaps/cornell/";
7254	9250	ext = "png";
7255	9251	reverseUP = false;
7256	9252	break;
	9253	+ case 5:
	9254	+ name = "cubemaps/skycube/";
	9255	+ ext = "jpg";
	9256	+ reverseUP = false;
	9257	+ break;
	9258	+ case 6:
	9259	+ name = "cubemaps/SaintLazarusChurch3/";
	9260	+ ext = "jpg";
	9261	+ reverseUP = false;
	9262	+ break;
	9263	+ case 7:
	9264	+ name = "cubemaps/Sodermalmsallen/";
	9265	+ ext = "jpg";
	9266	+ reverseUP = false;
	9267	+ break;
	9268	+ case 8:
	9269	+ name = "cubemaps/Sodermalmsallen2/";
	9270	+ ext = "jpg";
	9271	+ reverseUP = false;
	9272	+ break;
	9273	+ case 9:
	9274	+ name = "cubemaps/UnionSquare/";
	9275	+ ext = "jpg";
	9276	+ reverseUP = false;
	9277	+ break;
7257	9278	default:
7258		- name = "cubemaps/rgb_";
7259		- ext = "png"; /mipmap = true;/ reverseUP = false;
	9279	+ name = "cubemaps/box/";
	9280	+ ext = "png"; /mipmap = true;/
	9281	+ reverseUP = false;
7260	9282	break;
7261	9283	}
7262		-
7263		- try
7264		- {
7265		- cubemap = LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
7266		- } catch (IOException e)
7267		- {
7268		- throw new RuntimeException(e);
7269		- }
	9284	+
	9285	+ LoadSkybox(name, ext, mipmap);
7270	9286	}
7271	9287
7272	9288	public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height)
..	..	@@ -7298,8 +9314,13 @@
7298	9314	static double[] model = new double[16];
7299	9315	double[] camera2light = new double[16];
7300	9316	double[] light2camera = new double[16];
7301		- int newenvy = -1;
	9317	+
	9318	+ //int newenvy = -1;
7302	9319	boolean envyoff = true; // false;
	9320	+ String skyboxname = "";
	9321	+ String skyboxext;
	9322	+ String loadedskyboxname = "";
	9323	+
7303	9324	cVector light0 = new cVector(0, 0, 0); // 1,3,2);
7304	9325	//float[] light0 = { 0,0,0 };
7305	9326	cVector dirlight = new cVector(0, 0, 1); // 1,3,2);
..	..	@@ -7312,9 +9333,9 @@
7312	9333	static boolean occlusionInitialized = false;
7313	9334	boolean selection = false;
7314	9335	boolean pointselection = false;
7315		- /static/ boolean lighttouched = true;
	9336	+ ///static/ boolean lighttouched = true;
7316	9337	boolean deselect;
7317		- boolean ambientOcclusion = false;
	9338	+ private boolean ambientOcclusion = false;
7318	9339	static boolean flash = false;
7319	9340	/static/ boolean wait = false;
7320	9341	boolean displaydone = false; // after repaint() calls
..	..	@@ -7444,6 +9465,8 @@
7444	9465	//gl.glFrustum(-0.5scale, 0.5scale, -0.5scale, 0.5scale, 1, 100);
7445	9466	//glu.gluPerspective(lightshaper_fovy, 1, lightshaper_zNear, lightshaper_zFar);
7446	9467	double scale = lightCamera.SCALE / lightCamera.Distance();
	9468	+// PATCH FILLE AUX JEANS
	9469	+ //scale *= lightCamera.shaper_fovy / 25;
7447	9470	gl.glScaled(2 * scale, 2 * scale, -scale);
7448	9471	gl.glTranslated(0, 0, lightCamera.DECAL);
7449	9472
..	..	@@ -7590,18 +9613,40 @@
7590	9613	jy8[3] = 0.5f;
7591	9614	}
7592	9615
7593		- float[] options1 = new float[]{1000, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
	9616	+ float[] options1 = new float[]{100, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
7594	9617	float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
7595	9618	float[] options3 = new float[]{1, 1, 1, 0}; // fog color
7596	9619	float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
7597	9620
	9621	+ void ResetOptions()
	9622	+ {
	9623	+ options1[0] = 100;
	9624	+ options1[1] = 0.025f;
	9625	+ options1[2] = 0.01f;
	9626	+ options1[3] = 0;
	9627	+ options1[4] = 0;
	9628	+
	9629	+ options2[0] = 0;
	9630	+ options2[1] = 0.75f;
	9631	+ options2[2] = 0;
	9632	+ options2[3] = 0;
	9633	+
	9634	+ options3[0] = 1;
	9635	+ options3[1] = 1;
	9636	+ options3[2] = 1;
	9637	+ options3[3] = 0;
	9638	+
	9639	+ options4[0] = 1;
	9640	+ options4[1] = 0;
	9641	+ options4[2] = 1;
	9642	+ options4[3] = 0;
	9643	+ }
	9644	+
7598	9645	static int imagecount = 0; // movie generation
7599	9646
7600	9647	static int jitter = 0;
7601	9648
7602	9649	boolean restartframe = false;
7603		-
7604		- static int framecount = 0; // general-purpose global count
7605	9650
7606	9651	void displayAntiAliased(javax.media.opengl.GL gl)
7607	9652	{
..	..	@@ -7633,7 +9678,7 @@
7633	9678	gl.glClear(gl.GL_ACCUM_BUFFER_BIT);
7634	9679	for (jitter = 0; jitter < ACSIZE; jitter++) //, GrafreeD.wav.cursor += LIVE ? 735 : 0)
7635	9680	{
7636		- framecount++;
	9681	+ Globals.framecount++;
7637	9682
7638	9683	if (CameraPane.tickcount > 0)
7639	9684	CameraPane.tickcount--;
..	..	@@ -7671,7 +9716,7 @@
7671	9716
7672	9717	gl.glLightfv(gl.GL_LIGHT0, gl.GL_POSITION, pos, 0);
7673	9718	*/
7674		- lighttouched = true;
	9719	+ Globals.lighttouched = true;
7675	9720	//System.err.println(" shadowbuffer: " + jitter);
7676	9721	shadowbuffer.display();
7677	9722
..	..	@@ -7692,8 +9737,8 @@
7692	9737	assert (parentcam != renderCamera);
7693	9738
7694	9739	if (renderCamera != lightCamera)
7695		- for (int count = parentcam.GetTransformCount(); --count>=0;)
7696		- LA.matConcat(parentcam.toParent, matrix, matrix);
	9740	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9741	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
7697	9742
7698	9743	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
7699	9744
..	..	@@ -7708,8 +9753,8 @@
7708	9753	LA.matCopy(renderCamera.fromScreen, matrix);
7709	9754
7710	9755	if (renderCamera != lightCamera)
7711		- for (int count = parentcam.GetTransformCount(); --count>=0;)
7712		- LA.matConcat(matrix, parentcam.fromParent, matrix);
	9756	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9757	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
7713	9758
7714	9759	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
7715	9760
..	..	@@ -7755,10 +9800,12 @@
7755	9800	rati = 1 / rati;
7756	9801	gl.glOrtho(-skyscale / rati, skyscale / rati, -skyscale, skyscale, 0.001, 1000);
7757	9802	}
7758		- assert (newenvy == -1);
	9803	+
	9804	+ //assert (newenvy == -1);
	9805	+
7759	9806	gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
7760	9807	gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
7761		- DrawSkyBox(gl);
	9808	+ DrawSkyBox(gl, (float)rati);
7762	9809	gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
7763	9810	gl.glEnable(GL.GL_VERTEX_PROGRAM_ARB);
7764	9811	accPerspective(gl, renderCamera.shaper_fovy / ratio,
..	..	@@ -7781,7 +9828,7 @@
7781	9828	//gl.glFlush();
7782	9829	gl.glAccum(gl.GL_ACCUM, 1.0f / ACSIZE);
7783	9830
7784		- if (ANIMATION && ABORTED)
	9831	+ if (Globals.ANIMATION && ABORTED)
7785	9832	{
7786	9833	System.err.println(" ABORTED FRAME");
7787	9834	break;
..	..	@@ -7811,7 +9858,7 @@
7811	9858	setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
7812	9859
7813	9860	// save image
7814		- if (ANIMATION && !ABORTED)
	9861	+ if (Globals.ANIMATION && !ABORTED)
7815	9862	{
7816	9863	VPwidth = viewport[2];
7817	9864	VPheight = viewport[3];
..	..	@@ -7922,11 +9969,11 @@
7922	9969
7923	9970	// imagecount++;
7924	9971
7925		- String fullname = filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
	9972	+ String fullname = Globals.filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
7926	9973
7927	9974	if (!BOXMODE)
7928	9975	{
7929		- System.out.println("image: " + fullname + " (wav cursor=" + (GrafreeD.wav.cursor / 735 / 4) + ")");
	9976	+ System.out.println("image: " + fullname + " (wav cursor=" + (Grafreed.wav.cursor / 735 / 4) + ")");
7930	9977	}
7931	9978
7932	9979	if (!BOXMODE)
..	..	@@ -7964,7 +10011,7 @@
7964	10011	ABORTED = false;
7965	10012	}
7966	10013	else
7967		- GrafreeD.wav.cursor += 735 * ACSIZE;
	10014	+ Grafreed.wav.cursor += 735 * ACSIZE;
7968	10015
7969	10016	if (false)
7970	10017	{
..	..	@@ -8618,13 +10665,6 @@
8618	10665	}
8619	10666	}
8620	10667
8621		- boolean IsFrozen()
8622		- {
8623		- boolean selectmode = drawMode == SELECTION \|\| CameraPane.DEBUG_SELECTION;
8624		-
8625		- return !selectmode && cameracount == 0; // != 0;
8626		- }
8627		-
8628	10668	boolean niceon = false;
8629	10669	javax.swing.Timer AAtimer = new javax.swing.Timer(750, this);
8630	10670	boolean currentlydrawing = false;
..	..	@@ -8634,16 +10674,16 @@
8634	10674
8635	10675	public void display(GLAutoDrawable drawable)
8636	10676	{
8637		- if (GrafreeD.savesound && GrafreeD.hassound)
	10677	+ if (Grafreed.savesound && Grafreed.hassound)
8638	10678	{
8639		- GrafreeD.wav.save();
8640		- GrafreeD.savesound = false;
8641		- GrafreeD.hassound = false;
	10679	+ Grafreed.wav.save();
	10680	+ Grafreed.savesound = false;
	10681	+ Grafreed.hassound = false;
8642	10682	}
8643	10683	// if (DEBUG_SELECTION)
8644	10684	// {
8645		-// if (drawMode != SELECTION)
8646		-// drawMode = SELECTION;
	10685	+// if (DrawMode() != SELECTION)
	10686	+// DrawMode() = SELECTION;
8647	10687	// }
8648	10688
8649	10689	if (!isRenderer)
..	..	@@ -8699,9 +10739,9 @@
8699	10739
8700	10740	//ANTIALIAS = 0;
8701	10741
8702		- if (drawMode == DEFAULT) // && CURRENTANTIALIAS > 0)
	10742	+ if (DrawMode() == DEFAULT) // && CURRENTANTIALIAS > 0)
8703	10743	{
8704		- if (niceon \|\| isLIVE())
	10744	+ if (niceon \|\| Globals.isLIVE())
8705	10745	{
8706	10746	//if(active == 0)
8707	10747	// antialiaser = null;
..	..	@@ -8714,6 +10754,7 @@
8714	10754	ANTIALIAS = 0;
8715	10755	//System.out.println("RESTART");
8716	10756	AAtimer.restart();
	10757	+ Globals.TIMERRUNNING = true;
8717	10758	}
8718	10759	}
8719	10760	}
..	..	@@ -8726,7 +10767,7 @@
8726	10767	assert eyeCamera.shaper_zFar == 1E5f; // 500.0f;
8727	10768	*/
8728	10769
8729		- if (drawMode == DEFAULT)
	10770	+ if (DrawMode() == DEFAULT)
8730	10771	{
8731	10772	currentlydrawing = true;
8732	10773	}
..	..	@@ -8757,18 +10798,18 @@
8757	10798
8758	10799	// if(Applet3D.clipboard != null)
8759	10800	// System.out.println("Clipboard = " + Applet3D.clipboard); //.get(0).parent);
8760		-//drawMode = SELECTION;
	10801	+//DrawMode() = SELECTION;
8761	10802	indexcount = 0;
8762	10803
8763		- if (drawMode == OCCLUSION)
	10804	+ if (DrawMode() == OCCLUSION)
8764	10805	{
8765		- drawMode = DEFAULT;
	10806	+ Globals.drawMode = DEFAULT; // WARNING
8766	10807	ambientOcclusion = true;
8767	10808	setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
8768	10809	Object3D theobject = object;
8769	10810	Object3D theparent = object.parent;
8770	10811	object.parent = null;
8771		- object = (Object3D)GrafreeD.clone(object);
	10812	+ object = (Object3D)Grafreed.clone(object);
8772	10813	object.Stripify();
8773	10814	if (theobject.selection == null \|\| theobject.selection.Size() == 0)
8774	10815	theobject.PreprocessOcclusion(this);
..	..	@@ -8781,19 +10822,20 @@
8781	10822	ambientOcclusion = false;
8782	10823	}
8783	10824
8784		- if (lighttouched && drawMode == DEFAULT && !lightMode) // && !FROZEN)
	10825	+ if (//Globals.lighttouched &&
	10826	+ DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
8785	10827	{
8786	10828	//if (RENDERSHADOW) // ?
8787	10829	if (!IsFrozen())
8788	10830	{
8789	10831	// dec 2012
8790		- if (!ambientOcclusion && !(!flash && !lightMode && drawMode == DEFAULT && ANTIALIAS > 0))
	10832	+ if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
8791	10833	{
8792		- framecount++;
	10834	+ Globals.framecount++;
8793	10835	shadowbuffer.display();
8794	10836	}
8795	10837	}
8796		- lighttouched = false; // ??
	10838	+ Globals.lighttouched = false; // ??
8797	10839	//drawing = true;
8798	10840	//lighttouched = true;
8799	10841	}
..	..	@@ -8814,9 +10856,9 @@
8814	10856	//eyeCamera.shaper_fovy = 1;
8815	10857	}
8816	10858
8817		- if ((RENDERPROGRAM != 0 \|\| ambientOcclusion \|\| spherical) && drawMode == DEFAULT) // SELECTION)
	10859	+ if ((RENDERPROGRAM != 0 \|\| ambientOcclusion \|\| spherical) && DrawMode() == DEFAULT) // SELECTION)
8818	10860	{
8819		- //System.out.println("drawMode = " + drawMode);
	10861	+ //System.out.println("DrawMode() = " + DrawMode());
8820	10862	vertexMode \|= VP_PASS;
8821	10863	//vertexMode \|= VP_PROJECTION;
8822	10864	if (!ambientOcclusion)
..	..	@@ -8876,7 +10918,7 @@
8876	10918	Camera cam = renderCamera; // lightMode?lightCamera:eyeCamera;
8877	10919	//Camera lightcam = new Camera(light0);
8878	10920
8879		- if (drawMode == SHADOW)
	10921	+ if (DrawMode() == SHADOW)
8880	10922	{
8881	10923	/*
8882	10924	gl.glMatrixMode(GL.GL_MODELVIEW);
..	..	@@ -8914,8 +10956,8 @@
8914	10956
8915	10957	// if (parentcam != renderCamera) // not a light
8916	10958	if (cam != lightCamera)
8917		- for (int count = parentcam.GetTransformCount(); --count>=0;)
8918		- LA.matConcat(parentcam.toParent, matrix, matrix);
	10959	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10960	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
8919	10961
8920	10962	for (int j = 0; j < 4; j++)
8921	10963	{
..	..	@@ -8929,8 +10971,8 @@
8929	10971
8930	10972	// if (parentcam != renderCamera) // not a light
8931	10973	if (cam != lightCamera)
8932		- for (int count = parentcam.GetTransformCount(); --count>=0;)
8933		- LA.matConcat(matrix, parentcam.fromParent, matrix);
	10974	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10975	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
8934	10976
8935	10977	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
8936	10978
..	..	@@ -8966,7 +11008,7 @@
8966	11008	gl.glClear(gl.GL_DEPTH_BUFFER_BIT);
8967	11009	} else
8968	11010	{
8969		- if (drawMode != DEFAULT)
	11011	+ if (DrawMode() != DEFAULT)
8970	11012	{
8971	11013	gl.glClearColor(1, 1, 1, 0);
8972	11014	} // 1);
..	..	@@ -9016,13 +11058,19 @@
9016	11058	gl.glOrtho(-skyscale / ratio, skyscale / ratio, -skyscale, skyscale, 0.001, 1000);
9017	11059	}
9018	11060
9019		- if (newenvy > -1)
	11061	+// if (newenvy > -1)
	11062	+// {
	11063	+// LoadEnvy(newenvy);
	11064	+// }
	11065	+//
	11066	+// newenvy = -1;
	11067	+
	11068	+ if (!skyboxname.equals(this.loadedskyboxname))
9020	11069	{
9021		- LoadEnvy(newenvy);
	11070	+ LoadSkybox(skyboxname + "/", skyboxext, false);
	11071	+ loadedskyboxname = skyboxname;
9022	11072	}
9023		-
9024		- newenvy = -1;
9025		-
	11073	+
9026	11074	ratio = ((double) getWidth()) / getHeight();
9027	11075	//System.out.println("ratio = " + ratio);
9028	11076
..	..	@@ -9031,14 +11079,14 @@
9031	11079
9032	11080	fast &= !ambientOcclusion;
9033	11081
9034		- if (drawMode == DEFAULT)
	11082	+ if (DrawMode() == DEFAULT)
9035	11083	{
9036	11084	//gl.glEnable(gl.GL_ALPHA_TEST);
9037	11085	//gl.glActiveTexture(GL.GL_TEXTURE0);
9038	11086
9039	11087	if (!IsFrozen() && !ambientOcclusion)
9040	11088	{
9041		- DrawSkyBox(gl);
	11089	+ DrawSkyBox(gl, (float)ratio);
9042	11090	}
9043	11091
9044	11092	//if (selection_view == -1)
..	..	@@ -9092,6 +11140,8 @@
9092	11140	//gl.glFrustum(-0.5scale, 0.5scale, -0.5scale, 0.5scale, 1, 100);
9093	11141	//glu.gluPerspective(lightshaper_fovy, 1, lightshaper_zNear, lightshaper_zFar);
9094	11142	double scale = lightCamera.SCALE / lightCamera.Distance();
	11143	+// PATCH FILLE AUX JEANS
	11144	+ //scale *= lightCamera.shaper_fovy / 25;
9095	11145	gl.glScaled(2 * scale, 2 * scale, -scale);
9096	11146	gl.glTranslated(0, 0, lightCamera.DECAL);
9097	11147
..	..	@@ -9187,7 +11237,16 @@
9187	11237	// Bump noise
9188	11238	gl.glActiveTexture(GL.GL_TEXTURE6);
9189	11239	//gl.glBindTexture(GL.GL_TEXTURE_2D, bump_noise);
9190		- BindTexture(NOISE_TEXTURE, false, 2);
	11240	+
	11241	+ try
	11242	+ {
	11243	+ BindTexture(NOISE_TEXTURE, false, 2);
	11244	+ }
	11245	+ catch (Exception e)
	11246	+ {
	11247	+ System.err.println("FAILED: " + NOISE_TEXTURE);
	11248	+ }
	11249	+
9191	11250
9192	11251	gl.glActiveTexture(GL.GL_TEXTURE0);
9193	11252	gl.glEnable(GL.GL_TEXTURE_2D);
..	..	@@ -9210,9 +11269,9 @@
9210	11269
9211	11270	gl.glMatrixMode(GL.GL_MODELVIEW);
9212	11271
9213		-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
9214		-//gl.glEnable(gl.GL_POLYGON_SMOOTH);
9215		-//gl.glEnable(gl.GL_MULTISAMPLE);
	11272	+gl.glEnable(gl.GL_POLYGON_SMOOTH);
	11273	+gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
	11274	+gl.glEnable(gl.GL_MULTISAMPLE);
9216	11275	} else
9217	11276	{
9218	11277	//gl.glDisable(GL.GL_TEXTURE_2D);
..	..	@@ -9223,14 +11282,16 @@
9223	11282	//System.out.println("BLENDING ON");
9224	11283	gl.glEnable(GL.GL_BLEND);
9225	11284	gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
9226		-
	11285	+// gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
9227	11286	gl.glMatrixMode(gl.GL_PROJECTION);
9228	11287	gl.glLoadIdentity();
9229	11288
9230		- if (drawMode == SHADOW \|\| cam == lightCamera) // \|\| (vertexMode&VP_PROJECTION) != 0)
	11289	+ if (DrawMode() == SHADOW \|\| cam == lightCamera) // \|\| (vertexMode&VP_PROJECTION) != 0)
9231	11290	{
9232	11291	//glu.gluPerspective(lightshaper_fovy, 1, lightshaper_zNear, lightshaper_zFar);
9233	11292	double scale = lightCamera.SCALE / lightCamera.Distance();
	11293	+// PATCH FILLE AUX JEANS
	11294	+ //scale *= lightCamera.shaper_fovy / 25;
9234	11295	gl.glScaled(2 * scale, 2 * scale, -scale);
9235	11296	gl.glTranslated(0, 0, lightCamera.DECAL);
9236	11297	//System.out.println("DECAL = " + LIGHTDECAL + "; SCALE = " + LIGHTSCALE);
..	..	@@ -9283,7 +11344,7 @@
9283	11344	//gl.glPushMatrix();
9284	11345	gl.glLoadIdentity();
9285	11346
9286		- if (!ambientOcclusion) // drawMode != OCCLUSION)
	11347	+ if (!ambientOcclusion) // DrawMode() != OCCLUSION)
9287	11348	{
9288	11349	//LA.xformPos(light0, lightCamera.fromScreen, light);
9289	11350	LA.xformDir(dirlight, lightCamera.fromScreen, lightposition);
..	..	@@ -9310,8 +11371,8 @@
9310	11371	System.err.println("parentcam != renderCamera");
9311	11372
9312	11373	// if (cam != lightCamera)
9313		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9314		- LA.xformDir(lightposition, parentcam.toParent, lightposition); // may 2013
	11374	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11375	+ LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
9315	11376	}
9316	11377
9317	11378	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -9332,8 +11393,8 @@
9332	11393	if (true) // TODO
9333	11394	{
9334	11395	if (cam != lightCamera)
9335		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9336		- LA.xformDir(light0, parentcam.toParent, light0); // may 2013
	11396	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11397	+ LA.xformDir(light0, parentcam.GlobalTransform(), light0); // may 2013
9337	11398	}
9338	11399
9339	11400	LA.xformPos(light0, cam.toScreen, light0);
..	..	@@ -9370,7 +11431,7 @@
9370	11431	}
9371	11432
9372	11433	/**/
9373		- if (true) // drawMode == SELECTION) // != DEFAULT)
	11434	+ if (true) // DrawMode() == SELECTION) // != DEFAULT)
9374	11435	gl.glDisable(gl.GL_LIGHTING);
9375	11436	else
9376	11437	gl.glEnable(gl.GL_LIGHTING);
..	..	@@ -9388,7 +11449,7 @@
9388	11449
9389	11450	lightslot = 64;
9390	11451
9391		- if (!frozen && !ambientOcclusion && isRenderer && drawMode == DEFAULT)
	11452	+ if (!frozen && !ambientOcclusion && isRenderer && DrawMode() == DEFAULT)
9392	11453	{
9393	11454	DrawLights(object);
9394	11455	}
..	..	@@ -9399,7 +11460,7 @@
9399	11460	fragmentMode \|= (lightslot - 64) << 2; // 1; // first bit is available for aniso
9400	11461	//System.out.println("fragmentMode = " + fragmentMode);
9401	11462
9402		- if (drawMode == DEFAULT \|\| drawMode == SELECTION \|\| DEBUG_SELECTION)
	11463	+ if (DrawMode() == DEFAULT \|\| DrawMode() == SELECTION \|\| IsDebugSelection())
9403	11464	{
9404	11465	/*
9405	11466	if (CULLFACE \|\| (ambientOcclusion && OCCLUSION_CULLING))
..	..	@@ -9432,7 +11493,7 @@
9432	11493	}
9433	11494	}
9434	11495
9435		- if (drawMode == DEFAULT)
	11496	+ if (DrawMode() == DEFAULT)
9436	11497	{
9437	11498	if (WIREFRAME && !ambientOcclusion)
9438	11499	{
..	..	@@ -9450,7 +11511,7 @@
9450	11511	gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9451	11512	gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9452	11513
9453		- if (!fast/RENDERPROGRAM != 0/ && (drawMode == DEFAULT \|\| drawMode == SHADOW)) // && !WIREFRAME) //
	11514	+ if (!fast/RENDERPROGRAM != 0/ && (DrawMode() == DEFAULT \|\| DrawMode() == SHADOW)) // && !WIREFRAME) //
9454	11515	{
9455	11516	if (vertexMode != 0) // && !fast)
9456	11517	{
..	..	@@ -9470,7 +11531,7 @@
9470	11531	}
9471	11532	}
9472	11533
9473		- if (false) // fast && !IsFreezed() && drawMode != SELECTION && !ambientOcclusion)
	11534	+ if (false) //RENDERPROGRAM > 0 && DrawMode() == DEFAULT) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
9474	11535	{
9475	11536	//gl.glDepthFunc(GL.GL_LEQUAL);
9476	11537	//gl.glClear(gl.GL_COLOR_BUFFER_BIT \| gl.GL_DEPTH_BUFFER_BIT);
..	..	@@ -9478,27 +11539,24 @@
9478	11539
9479	11540	boolean texon = textureon;
9480	11541
9481		- if (RENDERPROGRAM > 0)
9482		- {
9483		- gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9484		- textureon = false;
9485		- }
	11542	+ gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11543	+ textureon = false;
	11544	+
9486	11545	//gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9487	11546	//System.out.println("ALLO");
9488	11547	gl.glColorMask(false, false, false, false);
9489	11548	DrawObject(gl);
9490		- if (RENDERPROGRAM > 0)
9491		- {
9492		- gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
9493		- textureon = texon;
9494		- }
	11549	+
	11550	+ gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11551	+ textureon = texon;
	11552	+
9495	11553	gl.glColorMask(true, true, true, true);
9496	11554
9497	11555	gl.glDepthFunc(GL.GL_EQUAL);
9498		- //gl.glDepthMask(false);
	11556	+ gl.glDepthMask(false);
9499	11557	}
9500	11558
9501		- if (false) // drawMode == SHADOW)
	11559	+ if (false) // DrawMode() == SHADOW)
9502	11560	{
9503	11561	//SetColumnMajorData(cameraInverseTransform, view_1);
9504	11562	//System.out.println("light = " + cameraInverseTransform);
..	..	@@ -9512,16 +11570,16 @@
9512	11570	//System.out.println("object = " + object);
9513	11571	if (!frozen && !imageLocked)
9514	11572	{
9515		- if (!flash && !lightMode && drawMode == DEFAULT && ANTIALIAS > 0)
	11573	+ if (!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0)
9516	11574	{
9517	11575	displayAntiAliased(gl);
9518	11576	} else
9519	11577	{
9520	11578	programcount = 0;
9521		- int keepmode = drawMode;
	11579	+ int keepmode = DrawMode();
9522	11580	// if (DEBUG_SELECTION)
9523	11581	// {
9524		-// drawMode = SELECTION;
	11582	+// DrawMode() = SELECTION;
9525	11583	// }
9526	11584	// for point selection
9527	11585	// gl.glGetDoublev(gl.GL_MODELVIEW_MATRIX, tempmat, 0);
..	..	@@ -9531,10 +11589,10 @@
9531	11589	DrawObject(gl);
9532	11590
9533	11591	// jan 2013 System.err.println("RESET ABORT (display)");
9534		- // if (drawMode == DEFAULT)
	11592	+ // if (DrawMode() == DEFAULT)
9535	11593	// ABORTED = false;
9536	11594	fullreset = false;
9537		- drawMode = keepmode;
	11595	+ Globals.drawMode = keepmode; // WARNING
9538	11596	//System.out.println("PROGRAM SWITCH " + programcount);
9539	11597	}
9540	11598	}
..	..	@@ -9542,11 +11600,11 @@
9542	11600	gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9543	11601	gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9544	11602
9545		- if (drawMode == DEFAULT)
	11603	+ if (DrawMode() == DEFAULT)
9546	11604	{
9547	11605	ReleaseTexture(NOISE_TEXTURE, false);
9548	11606	}
9549		- //if (drawMode == DEFAULT)
	11607	+ //if (DrawMode() == DEFAULT)
9550	11608	{
9551	11609
9552	11610	gl.glActiveTexture(GL.GL_TEXTURE1);
..	..	@@ -9558,7 +11616,7 @@
9558	11616	//else
9559	11617	//gl.glDisable(gl.GL_TEXTURE_2D);
9560	11618	//gl.glPopMatrix();
9561		- if (imageCompleted && ANTIALIAS > 0 && drawMode == DEFAULT && cam != lightCamera && !ambientOcclusion)
	11619	+ if (imageCompleted && ANTIALIAS > 0 && DrawMode() == DEFAULT && cam != lightCamera && !ambientOcclusion)
9562	11620	{
9563	11621	//new Exception().printStackTrace();
9564	11622	//System.out.println("Draw image " + width + ", " + height);
..	..	@@ -9600,7 +11658,7 @@
9600	11658	//gl.glFlush();
9601	11659	}
9602	11660
9603		- if (flash && drawMode == DEFAULT)
	11661	+ if (flash && DrawMode() == DEFAULT)
9604	11662	{
9605	11663	flash = false;
9606	11664	wait = true;
..	..	@@ -9608,9 +11666,9 @@
9608	11666	}
9609	11667
9610	11668	//drawing = false;
9611		- //if(drawMode == DEFAULT)
	11669	+ //if(DrawMode() == DEFAULT)
9612	11670	// niceon = false;
9613		- if (drawMode == DEFAULT)
	11671	+ if (DrawMode() == DEFAULT)
9614	11672	{
9615	11673	currentlydrawing = false;
9616	11674	}
..	..	@@ -9630,7 +11688,7 @@
9630	11688	repaint();
9631	11689	}
9632	11690
9633		- if (isLIVE() && drawMode == DEFAULT) // may 2013
	11691	+ if (Globals.isLIVE() && DrawMode() == DEFAULT) // may 2013
9634	11692	repaint();
9635	11693
9636	11694	displaydone = true;
..	..	@@ -9649,8 +11707,14 @@
9649	11707	{
9650	11708	renderpass++;
9651	11709	// System.out.println("Draw object... ");
	11710	+ STEP = 1;
9652	11711	if (FAST) // in case there is no script
9653		- STEP = 16;
	11712	+ STEP = 8;
	11713	+
	11714	+ if (CURRENTANTIALIAS == 0 \|\| ACSIZE == 1)
	11715	+ {
	11716	+ STEP *= 4;
	11717	+ }
9654	11718
9655	11719	//object.FullInvariants();
9656	11720
..	..	@@ -9664,23 +11728,44 @@
9664	11728	e.printStackTrace();
9665	11729	}
9666	11730
9667		- if (GrafreeD.RENDERME > 0)
9668		- GrafreeD.RENDERME--; // mechante magouille
	11731	+ if (Grafreed.RENDERME > 0)
	11732	+ Grafreed.RENDERME--; // mechante magouille
9669	11733
9670		- ONESTEP = false;
	11734	+ Globals.ONESTEP = false;
9671	11735	}
9672	11736
9673	11737	static boolean zoomonce = false;
9674	11738
	11739	+ static void CreateSelectedPoint()
	11740	+ {
	11741	+ if (selectedpoint == null)
	11742	+ {
	11743	+ debugpointG = new Sphere();
	11744	+ debugpointP = new Sphere();
	11745	+ debugpointC = new Sphere();
	11746	+ debugpointR = new Sphere();
	11747	+
	11748	+ selectedpoint = new Superellipsoid();
	11749	+
	11750	+ for (int i=0; i<8; i++)
	11751	+ {
	11752	+ debugpoints[i] = new Sphere();
	11753	+ }
	11754	+ }
	11755	+ }
	11756	+
9675	11757	void DrawObject(GL gl, boolean draw)
9676	11758	{
	11759	+ // To clear camera values
	11760	+ ResetOptions();
	11761	+
9677	11762	//System.out.println("DRAW OBJECT " + mouseDown);
9678		-// drawMode = SELECTION;
	11763	+// DrawMode() = SELECTION;
9679	11764	//GL gl = getGL();
9680	11765	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
9681	11766	{
9682		- if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && drawMode == SHADOW) // && !lightMode)
9683		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	11767	+ if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
	11768	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
9684	11769	pingthread.StepToTarget(true); // true);
9685	11770	// zoomonce = false;
9686	11771	}
..	..	@@ -9700,9 +11785,9 @@
9700	11785	callist = gl.glGenLists(1);
9701	11786	}
9702	11787
9703		- boolean selectmode = drawMode == SELECTION \|\| CameraPane.DEBUG_SELECTION;
	11788	+ boolean selectmode = DrawMode() == SELECTION \|\| IsDebugSelection();
9704	11789
9705		- boolean active = !selectmode; // drawMode != SELECTION; // mouseDown;
	11790	+ boolean active = !selectmode; // DrawMode() != SELECTION; // mouseDown;
9706	11791
9707	11792	if (!mainDL \|\| !active \|\| touched)
9708	11793	{
..	..	@@ -9729,13 +11814,20 @@
9729	11814	PushMatrix(ClickInfo.matbuffer);
9730	11815	}
9731	11816
9732		- if (drawMode == 0)
	11817	+ if (DrawMode() == 0)
9733	11818	{
9734	11819	// System.out.println("CLEAR +++++++++++++++ +++++++++++++++ +++++++++++++++ +++++++++++++++");
9735	11820
9736	11821	usedtextures.clear();
9737	11822
9738		- BindTextures(DEFAULT_TEXTURES, 2);
	11823	+ try
	11824	+ {
	11825	+ BindTextures(DEFAULT_TEXTURES, 2);
	11826	+ }
	11827	+ catch (Exception e)
	11828	+ {
	11829	+ System.err.println("FAILED: " + DEFAULT_TEXTURES);
	11830	+ }
9739	11831	}
9740	11832	//System.out.println("--> " + stackdepth);
9741	11833	// GrafreeD.traceon();
..	..	@@ -9743,10 +11835,11 @@
9743	11835	// DRAW
9744	11836	object.draw(this, /(Composite)/ object, false, false);
9745	11837
9746		- if (drawMode == DEFAULT)
	11838	+ if (DrawMode() == DEFAULT)
9747	11839	{
9748		- if (DEBUG)
	11840	+ if (Globals.DEBUG)
9749	11841	{
	11842	+ CreateSelectedPoint();
9750	11843	float radius = 0.05f;
9751	11844	if (selectedpoint.radius != radius)
9752	11845	{
..	..	@@ -9754,40 +11847,40 @@
9754	11847	selectedpoint.radius = radius;
9755	11848	selectedpoint.recalculate();
9756	11849	selectedpoint.material = new cMaterial();
9757		- selectedpoint.material.color = 0.25f;
	11850	+ selectedpoint.material.color = 0.15f; // Yellow
9758	11851	selectedpoint.material.modulation = 0.75f;
9759	11852
9760		- debugpoint.radius = radius;
9761		- debugpoint.recalculate();
9762		- debugpoint.material = new cMaterial();
9763		- debugpoint.material.color = 0.25f;
9764		- debugpoint.material.modulation = 0.75f;
	11853	+ debugpointG.radius = radius;
	11854	+ debugpointG.recalculate();
	11855	+ debugpointG.material = new cMaterial();
	11856	+ debugpointG.material.color = 0.25f; // Green
	11857	+ debugpointG.material.modulation = 0.75f;
9765	11858
9766		- debugpoint2.radius = radius;
9767		- debugpoint2.recalculate();
9768		- debugpoint2.material = new cMaterial();
9769		- debugpoint2.material.color = 0.75f;
9770		- debugpoint2.material.modulation = 0.75f;
	11859	+ debugpointP.radius = radius;
	11860	+ debugpointP.recalculate();
	11861	+ debugpointP.material = new cMaterial();
	11862	+ debugpointP.material.color = 0.75f; // Purple
	11863	+ debugpointP.material.modulation = 0.75f;
9771	11864
9772		- debugpoint3.radius = radius;
9773		- debugpoint3.recalculate();
9774		- debugpoint3.material = new cMaterial();
9775		- debugpoint3.material.color = 0.5f;
9776		- debugpoint3.material.modulation = 0.75f;
	11865	+ debugpointC.radius = radius;
	11866	+ debugpointC.recalculate();
	11867	+ debugpointC.material = new cMaterial();
	11868	+ debugpointC.material.color = 0.5f; // Cyan
	11869	+ debugpointC.material.modulation = 0.75f;
9777	11870
9778		- debugpoint4.radius = radius;
9779		- debugpoint4.recalculate();
9780		- debugpoint4.material = new cMaterial();
9781		- debugpoint4.material.color = 0f;
9782		- debugpoint4.material.modulation = 0.75f;
	11871	+ debugpointR.radius = radius;
	11872	+ debugpointR.recalculate();
	11873	+ debugpointR.material = new cMaterial();
	11874	+ debugpointR.material.color = 0f; // Red
	11875	+ debugpointR.material.modulation = 0.75f;
9783	11876
9784	11877	InitPoints(radius);
9785	11878	}
9786	11879	selectedpoint.draw(this, /(Composite)/ null, false, false);
9787		- debugpoint.draw(this, /(Composite)/ null, false,false);
9788		- debugpoint2.draw(this, /(Composite)/ null, false,false);
9789		- debugpoint3.draw(this, /(Composite)/ null, false,false);
9790		- debugpoint4.draw(this, /(Composite)/ null, false,false);
	11880	+ debugpointG.draw(this, /(Composite)/ null, false,false);
	11881	+ debugpointP.draw(this, /(Composite)/ null, false,false);
	11882	+ debugpointC.draw(this, /(Composite)/ null, false,false);
	11883	+ debugpointR.draw(this, /(Composite)/ null, false,false);
9791	11884	// DrawPoints(this);
9792	11885	}
9793	11886
..	..	@@ -9795,42 +11888,63 @@
9795	11888	}
9796	11889	// GrafreeD.traceoff();
9797	11890	//System.out.println(stackdepth);
9798		- if (drawMode == 0)
	11891	+ if (DrawMode() == 0)
9799	11892	{
9800	11893	ReleaseTextures(DEFAULT_TEXTURES);
9801	11894
9802	11895	if (CLEANCACHE)
9803		- for (java.util.Enumeration<String> e = textures.keys() ; e.hasMoreElements();)
	11896	+ for (java.util.Enumeration<cTexture> e = texturepigment.keys() ; e.hasMoreElements();)
9804	11897	{
9805		- String tex = e.nextElement();
	11898	+ cTexture tex = e.nextElement();
9806	11899
9807	11900	// System.out.println("Texture --------- " + tex);
9808	11901
9809		- if (tex.equals("WHITE_NOISE"))
	11902	+ if (tex.equals("WHITE_NOISE:"))
9810	11903	continue;
9811	11904
9812		- if (!usedtextures.containsKey(tex))
	11905	+ if (!usedtextures.contains(tex))
9813	11906	{
	11907	+ CacheTexture gettex = texturepigment.get(tex);
9814	11908	// System.out.println("DISPOSE +++++++++++++++ " + tex);
9815		- textures.get(tex).texture.dispose();
9816		- textures.remove(tex);
	11909	+ if (gettex != null)
	11910	+ {
	11911	+ gettex.texture.dispose();
	11912	+ texturepigment.remove(tex);
	11913	+ }
	11914	+
	11915	+ gettex = texturebump.get(tex);
	11916	+ // System.out.println("DISPOSE +++++++++++++++ " + tex);
	11917	+ if (gettex != null)
	11918	+ {
	11919	+ gettex.texture.dispose();
	11920	+ texturebump.remove(tex);
	11921	+ }
9817	11922	}
9818	11923	}
9819	11924	}
9820	11925
9821	11926	checker = null;
9822	11927
9823		- if (!ambientOcclusion && !IsFrozen() && drawMode == DEFAULT)
	11928	+ if (!ambientOcclusion && !IsFrozen() && DrawMode() == DEFAULT)
9824	11929	FindChecker(object);
9825	11930
9826		- if (checker != null && drawMode == DEFAULT)
	11931	+ if (checker != null && DrawMode() == DEFAULT)
9827	11932	{
9828		- // BindTexture(IMMORTAL_TEXTURE);
	11933	+ //BindTexture(IMMORTAL_TEXTURE);
	11934	+ try
	11935	+ {
	11936	+ BindTextures(checker.GetTextures(), checker.texres);
	11937	+ }
	11938	+ catch (Exception e)
	11939	+ {
	11940	+ System.err.println("FAILED: " + checker.GetTextures());
	11941	+ }
9829	11942	// NEAREST
9830	11943	GetGL().glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST); // GL.GL_LINEAR);
9831	11944	DrawChecker(gl);
9832	11945	//checker.Draw(this, null, false);
9833	11946	// ReleaseTexture(IMMORTAL_TEXTURE);
	11947	+ ReleaseTextures(checker.GetTextures());
9834	11948	}
9835	11949
9836	11950	if (object.parent != null)
..	..	@@ -9843,7 +11957,7 @@
9843	11957	//gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9844	11958	//gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9845	11959
9846		- if (DISPLAYTEXT && drawMode == DEFAULT)
	11960	+ if (DISPLAYTEXT && DrawMode() == DEFAULT)
9847	11961	{
9848	11962	// Draw it once, then use the raster
9849	11963	Balloon(gl, balloon.createGraphics());
..	..	@@ -9899,14 +12013,14 @@
9899	12013	int[] xs = new int[3];
9900	12014	int[] ys = new int[3];
9901	12015
9902		- void DrawString(Object3D obj) // String string)
	12016	+ public void DrawString(Object3D obj) // String string) // INTERFACE
9903	12017	{
9904		- if (!DISPLAYTEXT \|\| drawMode != DEFAULT)
	12018	+ if (!DISPLAYTEXT \|\| DrawMode() != DEFAULT)
9905	12019	{
9906	12020	return;
9907	12021	}
9908	12022
9909		- String string = obj.GetToolTip();
	12023	+ String string = obj.toString(); //.GetToolTip();
9910	12024
9911	12025	GL gl = GetGL();
9912	12026
..	..	@@ -10223,8 +12337,8 @@
10223	12337	//obj.TransformToWorld(light, light);
10224	12338	for (int i = tp.size(); --i >= 0;)
10225	12339	{
10226		- for (int count = tp.get(i).GetTransformCount(); --count>=0;)
10227		- LA.xformPos(light, tp.get(i).toParent, light);
	12340	+ //for (int count = tp.get(i).GetTransformCount(); --count>=0;)
	12341	+ LA.xformPos(light, tp.get(i).GlobalTransformInv(), light);
10228	12342	}
10229	12343
10230	12344
..	..	@@ -10241,8 +12355,8 @@
10241	12355	parentcam = cameras[0];
10242	12356	}
10243	12357
10244		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10245		- LA.xformPos(light, parentcam.toParent, light); // may 2013
	12358	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	12359	+ LA.xformPos(light, parentcam.GlobalTransform(), light); // may 2013
10246	12360
10247	12361	LA.xformPos(light, renderCamera.toScreen, light);
10248	12362
..	..	@@ -10332,8 +12446,76 @@
10332	12446
10333	12447	//gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
10334	12448
	12449	+ String program0 =
	12450	+ // Min shader
	12451	+ "!!ARBfp1.0\n" +
	12452	+ "PARAM zero123 = { 0.0, 1.0, 2, 1.25 };" +
	12453	+ "PARAM pow2 = { 0.5, 0.25, 0.125, 0.0 };" +
	12454	+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
	12455	+ "PARAM eps = { 0.001, 0.001, 0.001, 1.0 };" +
	12456	+ "PARAM infinity = { 100000000, 100000000, 100000000, 1.0 };" +
	12457	+ "PARAM light2cam0 = program.env[10];" +
	12458	+ "PARAM light2cam1 = program.env[11];" +
	12459	+ "PARAM light2cam2 = program.env[12];" +
	12460	+ "TEMP temp;" +
	12461	+ "TEMP light;" +
	12462	+ "TEMP ndotl;" +
	12463	+ "TEMP normal;" +
	12464	+ "TEMP depth;" +
	12465	+ "TEMP eye;" +
	12466	+ "TEMP pos;" +
	12467	+
	12468	+ "MAD normal, fragment.color, zero123.z, -zero123.y;" +
	12469	+ Normalize("normal") +
	12470	+ "MOV light, state.light[0].position;" +
	12471	+ "DP3 ndotl.x, light, normal;" +
	12472	+
	12473	+ // shadow
	12474	+ "MOV pos, fragment.texcoord[1];" +
	12475	+ "MOV temp, pos;" +
	12476	+ ShadowTextureFetch("depth", "temp", "1") +
	12477	+ //"TEX depth, fragment.texcoord[1], texture[1], 2D;" +
	12478	+ "SLT ndotl.z, fragment.texcoord[1].z, depth.z;" +
	12479	+
	12480	+ // No shadow when out of frustum
	12481	+ //"SGE temp.y, depth.z, zero123.y;" +
	12482	+ //"LRP temp.x, temp.y, zero123.y, temp.x;" +
	12483	+
	12484	+ "MUL ndotl.x, ndotl.x, ndotl.z;" + // Shadow
	12485	+
	12486	+ // Backlit
	12487	+ "MOV pos.w, zero123.y;" +
	12488	+ "DP4 eye.x, pos, light2cam0;" +
	12489	+ "DP4 eye.y, pos, light2cam1;" +
	12490	+ "DP4 eye.z, pos, light2cam2;" +
	12491	+ Normalize("eye") +
	12492	+
	12493	+ "DP3 ndotl.y, -eye, normal;" +
	12494	+ //"MUL ndotl.y, ndotl.y, pow2.x;" +
	12495	+ "POW ndotl.y, ndotl.y, pow2.z;" + // backlit
	12496	+ "SUB ndotl.y, zero123.y, ndotl.y;" +
	12497	+ //"SUB ndotl.y, zero123.y, ndotl.y;" +
	12498	+ //"MUL ndotl.y, ndotl.y, pow2.z;" +
	12499	+
	12500	+ //"MAX ndotl.x, ndotl.x, ndotl.y;" + // Ambient
	12501	+ //"MAX ndotl.x, ndotl.x, pow2.y;" + // Ambient
	12502	+
	12503	+ // Pigment
	12504	+ "TEX temp, fragment.texcoord[0], texture[0], 2D;" +
	12505	+ "LRP temp, zero123.w, temp, one;" + // texture proportion
	12506	+ "MUL temp, temp, ndotl.x;" +
	12507	+
	12508	+ "MUL temp, temp, zero123.z;" +
	12509	+
	12510	+ //"MUL temp, temp, ndotl.y;" +
	12511	+
	12512	+ "MOV temp.w, zero123.y;" + // reset alpha
	12513	+ "MOV result.color, temp;" +
	12514	+ "END";
	12515	+
10335	12516	String program =
10336	12517	"!!ARBfp1.0\n" +
	12518	+
10337	12519	//"OPTION ARB_fragment_program_shadow;" +
10338	12520	"PARAM light2cam0 = program.env[10];" +
10339	12521	"PARAM light2cam1 = program.env[11];" +
..	..	@@ -10388,6 +12570,7 @@
10388	12570	"PARAM lodbias = { 10,10,10,10 };" + // 20, -2, -20, 1.0 };" +
10389	12571	"PARAM infinity = { 100000000, 100000000, 100000000, 1.0 };" +
10390	12572	"PARAM one2048th = { 0.00048828125, 0.00048828125, 0.00048828125, 1.0 };" +
	12573	+ "PARAM ninetenth = { 0.9, 0.9, 0.9, 1.0 };" +
10391	12574	"PARAM almostone = { 0.999, 0.999, 0.999, 1.0 };" +
10392	12575	"PARAM c256 = { 256, 256, 256, 1.0 };" +
10393	12576	"PARAM c256i = { 0.00390625, 0.00390625, 0.00390625, 1.0 };" +
..	..	@@ -10447,8 +12630,7 @@
10447	12630	"TEMP shininess;" +
10448	12631	"\n" +
10449	12632	"MOV texSamp, one;" +
10450		- //"TEX texSamp, fragment.texcoord[0], texture[0], 2D;" +
10451		-
	12633	+
10452	12634	"MOV mapgrid.x, one2048th.x;" +
10453	12635	"MOV temp, fragment.texcoord[1];" +
10454	12636	/*
..	..	@@ -10469,20 +12651,20 @@
10469	12651	"MUL temp, floor, mapgrid.x;" +
10470	12652	//"TEX depth0, temp, texture[1], 2D;" +
10471	12653	(((mode & FP_SOFTSHADOW) == 0) ? "" :
10472		- TextureFetch("depth0", "temp", "1") +
	12654	+ ShadowTextureFetch("depth0", "temp", "1") +
10473	12655	"") +
10474	12656	"ADD temp.x, temp.x, mapgrid.x;" +
10475	12657	//"TEX depth1, temp, texture[1], 2D;" +
10476	12658	(((mode & FP_SOFTSHADOW) == 0) ? "" :
10477		- TextureFetch("depth1", "temp", "1") +
	12659	+ ShadowTextureFetch("depth1", "temp", "1") +
10478	12660	"") +
10479	12661	"ADD temp.y, temp.y, mapgrid.x;" +
10480	12662	//"TEX depth2, temp, texture[1], 2D;" +
10481		- TextureFetch("depth2", "temp", "1") +
	12663	+ ShadowTextureFetch("depth2", "temp", "1") +
10482	12664	"SUB temp.x, temp.x, mapgrid.x;" +
10483	12665	//"TEX depth3, temp, texture[1], 2D;" +
10484	12666	(((mode & FP_SOFTSHADOW) == 0) ? "" :
10485		- TextureFetch("depth3", "temp", "1") +
	12667	+ ShadowTextureFetch("depth3", "temp", "1") +
10486	12668	"") +
10487	12669	//"MUL texSamp0, texSamp0, state.material.front.diffuse;" +
10488	12670	//"MOV params, material;" +
..	..	@@ -10853,10 +13035,10 @@
10853	13035	"MAD shadow.x, buffer.x, frac.y, shadow.x;" +
10854	13036	"") +
10855	13037
10856		- // display shadow only (bump == 0)
	13038	+ // display shadow only (fakedepth == 0)
10857	13039	"SUB temp.x, half.x, shadow.x;" +
10858		- "MOV temp.y, -params6.x;" +
10859		- "SLT temp.z, temp.y, zero.x;" +
	13040	+ "MOV temp.y, -params5.z;" + // params6.x;" +
	13041	+ "SLT temp.z, temp.y, -c256i.x;" +
10860	13042	"SUB temp.y, one.x, temp.z;" +
10861	13043	"MUL temp.x, temp.x, temp.y;" +
10862	13044	"KIL temp.x;" +
..	..	@@ -10985,8 +13167,10 @@
10985	13167	"MAX ndotl.x, ndotl.x, -ndotl.x;" +
10986	13168
10987	13169	"SUB temp.x, one.x, ndotl.x;" +
10988		- "ADD temp.x, temp.x, options2.z;" + // lightsheen
10989		- "ADD temp.y, one.y, options2.y;" + // sursurface
	13170	+ // Tuning for default skin
	13171	+ //"ADD temp.x, temp.x, options2.z;" + // lightsheen
	13172	+ "MAD temp.x, options2.z, half.y, temp.x;" + // lightsheen
	13173	+ "ADD temp.y, one.y, options2.y;" + // subsurface
10990	13174	"MUL temp.x, temp.x, temp.y;" +
10991	13175
10992	13176	"MUL saturation, saturation, temp.xxxx;" +
..	..	@@ -11185,7 +13369,7 @@
11185	13369	//once = true;
11186	13370	}
11187	13371
11188		- System.out.print("Program #" + mode + "; length = " + program.length());
	13372	+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
11189	13373	System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
11190	13374	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
11191	13375
..	..	@@ -11278,30 +13462,32 @@
11278	13462	return out;
11279	13463	}
11280	13464
11281		- String TextureFetch(String dest, String src, String unit)
	13465	+ // Also does frustum culling
	13466	+ String ShadowTextureFetch(String dest, String src, String unit)
11282	13467	{
11283	13468	return "TEX " + dest + ", " + src + ", texture[" + unit + "], 2D;" +
11284	13469	"SGE " + src + ".w, " + src + ".x, eps.x;" +
11285	13470	"SGE " + src + ".z, " + src + ".y, eps.x;" +
	13471	+ "SLT " + dest + ".x, " + src + ".x, one.x;" +
	13472	+ "SLT " + dest + ".y, " + src + ".y, one.x;" +
11286	13473	"MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
11287		- "SLT " + src + ".z, " + src + ".x, one.x;" +
11288		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
11289		- "SLT " + src + ".z, " + src + ".y, one.x;" +
11290		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
	13474	+ "MUL " + src + ".w, " + dest + ".x, " + src + ".w;" +
	13475	+ "MUL " + src + ".w, " + dest + ".y, " + src + ".w;" +
11291	13476	//"SWZ buffer, temp, w,w,w,w;";
11292		- "MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
	13477	+ //"MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
11293	13478	"SUB " + src + ".z, " + "one.x, " + src + ".w;" +
11294	13479	//"MUL " + src + ".z, " + src + ".z, infinity.x;" +
11295	13480	//"ADD " + dest + ".z, " + dest + ".z, " + src + ".z;";
11296		- "MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
	13481	+ //"MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
11297	13482
11298		- //"LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
11299		- //"LRP " + dest + ".z" + ", " + src + ".w, infinity.x," + dest + ".z;";
	13483	+ //?? "LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
	13484	+ "LRP " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
11300	13485	}
11301	13486
11302	13487	String Shadow(String depth, String shadow)
11303	13488	{
11304	13489	return "MAX temp.x, ndotl.x, one64th.x;" +
	13490	+ "MIN temp.x, temp.x, ninetenth.x;" +
11305	13491	/**/
11306	13492	// Sine
11307	13493	"MUL temp.y, temp.x, temp.x;" +
..	..	@@ -11317,12 +13503,16 @@
11317	13503
11318	13504	"ADD " + depth + ".z, " + depth + ".z, temp.x;" +
11319	13505	//"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing!
	13506	+
	13507	+ // Compare fragment depth in light space with shadowmap.
11320	13508	"SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" +
11321	13509	"SGE temp.y, temp.x, zero.x;" +
11322		- "SUB " + shadow + ".y, one.x, temp.y;" +
	13510	+ "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded
	13511	+
	13512	+ // Reverse comparison
11323	13513	"SUB temp.x, one.x, temp.x;" +
11324	13514	"MUL " + shadow + ".x, temp.x, temp.y;" +
11325		- "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded
	13515	+ "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse
11326	13516	"POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth
11327	13517
11328	13518	"SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" +
..	..	@@ -11336,6 +13526,10 @@
11336	13526	// No shadow for backface
11337	13527	"DP3 temp.x, normal, lightd;" +
11338	13528	"SLT temp.x, temp.x, zero.x;" + // shadoweps
	13529	+ "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
	13530	+
	13531	+ // No shadow when out of frustum
	13532	+ "SGE temp.x, " + depth + ".z, one.z;" +
11339	13533	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
11340	13534	"";
11341	13535	}
..	..	@@ -11482,7 +13676,8 @@
11482	13676	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
11483	13677	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
11484	13678	/static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
11485		- Object3D.cVector2[] vector2buffer;
	13679	+
	13680	+ //Object3D.cVector2[] vector2buffer;
11486	13681
11487	13682	// IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
11488	13683	// OUT : diff, spec
..	..	@@ -11498,9 +13693,10 @@
11498	13693	"DP3 " + dest + ".z," + "normals," + "eye;" +
11499	13694	"MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
11500	13695	//"MOV " + dest + ".w," + "normal.z;" +
11501		- "MUL " + dest + ".z," + "params2.w," + dest + ".x;" +
11502		- "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
11503		- //"MOV " + dest + ".z," + "params2.w;" +
	13696	+// "MUL " + dest + ".z," + "params2.w," + dest + ".x;" + // PRETTY HEURISTIC FOR VELVET
	13697	+// "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
	13698	+
	13699	+ "MOV " + dest + ".z," + "params2.w;" + // EXACT
11504	13700	"POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
11505	13701	"RCP " + dest + ".w," + dest + ".w;" +
11506	13702	//"RSQ " + dest + ".w," + dest + ".w;" +
..	..	@@ -11894,7 +14090,7 @@
11894	14090	public void mousePressed(MouseEvent e)
11895	14091	{
11896	14092	//System.out.println("mousePressed: " + e);
11897		- clickStart(e.getX(), e.getY(), e.getModifiersEx());
	14093	+ clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
11898	14094	}
11899	14095
11900	14096	static long prevtime = 0;
..	..	@@ -11921,14 +14117,16 @@
11921	14117
11922	14118	//System.err.println("Dtime = " + Dtime + "; units = " + e.getUnitsToScroll() + "; ratio (units/ms) = " + ratio);
11923	14119
	14120	+ if (BUTTONLESSWHEEL)
11924	14121	if (Math.abs(ratio) < 0.1 \|\| Math.abs(Dtime) == 0) // < 30)
11925	14122	{
11926	14123	return;
11927	14124	}
11928	14125
	14126	+ boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
11929	14127
11930	14128	// TIMER
11931		- if (!wheeltimer.isRunning() && e.getModifiersEx() == 0) // VR
	14129	+ if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
11932	14130	{
11933	14131	keepboxmode = BOXMODE;
11934	14132	keepsupport = SUPPORT;
..	..	@@ -11968,8 +14166,8 @@
11968	14166	// mode \|= META;
11969	14167	//}
11970	14168
11971		- SetMouseMode(WHEEL \| e.getModifiersEx());
11972		- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0);
	14169	+ SetMouseMode(e.getModifiers(), WHEEL \| e.getModifiersEx());
	14170	+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
11973	14171	anchorX = ax;
11974	14172	anchorY = ay;
11975	14173	prevX = px;
..	..	@@ -12003,6 +14201,7 @@
12003	14201	else
12004	14202	if (evt.getSource() == AAtimer)
12005	14203	{
	14204	+ Globals.TIMERRUNNING = false;
12006	14205	if (mouseDown)
12007	14206	{
12008	14207	//new Exception().printStackTrace();
..	..	@@ -12028,6 +14227,10 @@
12028	14227	// LIVE = waslive;
12029	14228	// wasliveok = true;
12030	14229	// waslive = false;
	14230	+
	14231	+ // May 2019 Forget it:
	14232	+ if (true)
	14233	+ return;
12031	14234
12032	14235	// source == timer
12033	14236	if (mouseDown)
..	..	@@ -12057,8 +14260,8 @@
12057	14260	// ObjEditor.tweenManager.update(1f / 60f);
12058	14261
12059	14262	// fev 2014???
12060		- if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && drawMode == SHADOW) // && !lightMode)
12061		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	14263	+ if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
	14264	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
12062	14265	pingthread.StepToTarget(true); // true);
12063	14266	}
12064	14267	// if (!LIVE)
..	..	@@ -12067,12 +14270,13 @@
12067	14270
12068	14271	javax.swing.Timer timer = new javax.swing.Timer(350, this);
12069	14272
12070		- void clickStart(int x, int y, int modifiers)
	14273	+ void clickStart(int x, int y, int modifiers, int modifiersex)
12071	14274	{
12072	14275	if (!wasliveok)
12073	14276	return;
12074	14277
12075	14278	AAtimer.restart(); //
	14279	+ Globals.TIMERRUNNING = true;
12076	14280
12077	14281	// waslive = LIVE;
12078	14282	// LIVE = false;
..	..	@@ -12084,7 +14288,7 @@
12084	14288	// touched = true; // main DL
12085	14289	if (isRenderer)
12086	14290	{
12087		- SetMouseMode(modifiers);
	14291	+ SetMouseMode(modifiers, modifiersex);
12088	14292	}
12089	14293
12090	14294	selectX = anchorX = x;
..	..	@@ -12097,7 +14301,7 @@
12097	14301	clicked = true;
12098	14302	hold = false;
12099	14303
12100		- if (((modifiers & ~1024) & ~0) == 0) // Single or multiple selection
	14304	+ if (((modifiersex & ~1024) & ~0) == 0) // Single or multiple selection
12101	14305	// june 2013 means CTRL_CLICK: if (((modifiers & ~1024) & ~128) == 0) // Single or multiple selection
12102	14306	{
12103	14307	// System.out.println("RESTART II " + modifiers);
..	..	@@ -12122,14 +14326,15 @@
12122	14326	drag = false;
12123	14327	//System.out.println("Mouse DOWN");
12124	14328	editObj = false;
12125		- ClickInfo info = new ClickInfo();
12126		- info.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
12127		- info.pane = this;
12128		- info.camera = renderCamera;
12129		- info.x = x;
12130		- info.y = y;
12131		- info.modifiers = modifiers;
12132		- editObj = object.doEditClick(info, 0);
	14329	+ //ClickInfo info = new ClickInfo();
	14330	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14331	+ object.clickInfo.pane = this;
	14332	+ object.clickInfo.camera = renderCamera;
	14333	+ object.clickInfo.x = x;
	14334	+ object.clickInfo.y = y;
	14335	+ object.clickInfo.modifiers = modifiersex;
	14336	+ editObj = object.doEditClick(//info,
	14337	+ 0);
12133	14338	if (!editObj)
12134	14339	{
12135	14340	hasMarquee = true;
..	..	@@ -12145,11 +14350,14 @@
12145	14350
12146	14351	public void mouseDragged(MouseEvent e)
12147	14352	{
	14353	+ Globals.MOUSEDRAGGED = true;
	14354	+
	14355	+ //System.out.println("mouseDragged: " + e);
12148	14356	if (isRenderer)
12149	14357	movingcamera = true;
	14358	+
12150	14359	//if (drawing)
12151	14360	//return;
12152		- //System.out.println("mouseDragged: " + e);
12153	14361	if ((e.getModifiersEx() & CTRL) != 0
12154	14362	\|\| (e.getModifiersEx() & COMMAND) != 0) // \|\| IsFrozen())
12155	14363	{
..	..	@@ -12157,7 +14365,7 @@
12157	14365	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
12158	14366	}
12159	14367	else
12160		- drag(e.getX(), e.getY(), e.getModifiersEx());
	14368	+ drag(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
12161	14369
12162	14370	//try { Thread.sleep(1); } catch (Exception ex) {}
12163	14371	}
..	..	@@ -12169,6 +14377,11 @@
12169	14377	cVector tmp = new cVector();
12170	14378	cVector tmp2 = new cVector();
12171	14379	boolean isMoving;
	14380	+
	14381	+ public cVector TargetLookAt()
	14382	+ {
	14383	+ return targetLookAt;
	14384	+ }
12172	14385
12173	14386	class PingThread extends Thread
12174	14387	{
..	..	@@ -12308,7 +14521,7 @@
12308	14521	//System.out.println("---------------- ---------- Paint " + tmp.length2());
12309	14522	if (lightMode)
12310	14523	{
12311		- lighttouched = true;
	14524	+ Globals.lighttouched = true;
12312	14525	}
12313	14526
12314	14527	if (OEILONCE && OEIL)
..	..	@@ -12325,6 +14538,7 @@
12325	14538
12326	14539	public void run()
12327	14540	{
	14541	+ new Exception().printStackTrace();
12328	14542	System.exit(0);
12329	14543	for (;;)
12330	14544	{
..	..	@@ -12366,7 +14580,7 @@
12366	14580	mouseDown = false;
12367	14581	if (lightMode)
12368	14582	{
12369		- lighttouched = true;
	14583	+ Globals.lighttouched = true;
12370	14584	}
12371	14585	repaint();
12372	14586	alreadypainted = true;
..	..	@@ -12374,7 +14588,7 @@
12374	14588	isMoving = false;
12375	14589	} //??
12376	14590
12377		- if (isLIVE() && !alreadypainted)
	14591	+ if (Globals.isLIVE() && !alreadypainted)
12378	14592	{
12379	14593	// FOR DEBUG BREAKPOINT USING PAUSE: while (true)
12380	14594	repaint();
..	..	@@ -12386,9 +14600,9 @@
12386	14600	{
12387	14601	if (lightMode)
12388	14602	{
12389		- lighttouched = true;
	14603	+ Globals.lighttouched = true;
12390	14604	}
12391		- drag(X, (mouseMode != 0) ? Y : anchorY, MODIFIERS);
	14605	+ drag(X, (mouseMode != 0) ? Y : anchorY, 0, MODIFIERS);
12392	14606	}
12393	14607	//else
12394	14608	}
..	..	@@ -12402,12 +14616,12 @@
12402	14616	void GoDown(int mod)
12403	14617	{
12404	14618	MODIFIERS \|= COMMAND;
12405		- /*
	14619	+ /**/
12406	14620	if((mod&SHIFT) == SHIFT)
12407	14621	manipCamera.RotatePosition(0, -speed);
12408	14622	else
12409		- manipCamera.BackForth(0, -speed*delta, getWidth());
12410		- */
	14623	+ manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
	14624	+ /**/
12411	14625	if ((mod & SHIFT) == SHIFT)
12412	14626	{
12413	14627	mouseMode = mouseMode; // VR??
..	..	@@ -12423,12 +14637,12 @@
12423	14637	void GoUp(int mod)
12424	14638	{
12425	14639	MODIFIERS \|= COMMAND;
12426		- /*
	14640	+ /**/
12427	14641	if((mod&SHIFT) == SHIFT)
12428	14642	manipCamera.RotatePosition(0, speed);
12429	14643	else
12430		- manipCamera.BackForth(0, speed*delta, getWidth());
12431		- */
	14644	+ manipCamera.BackForth(0, speed*delta, 0); // getWidth());
	14645	+ /**/
12432	14646	if ((mod & SHIFT) == SHIFT)
12433	14647	{
12434	14648	mouseMode = mouseMode;
..	..	@@ -12444,12 +14658,12 @@
12444	14658	void GoLeft(int mod)
12445	14659	{
12446	14660	MODIFIERS \|= COMMAND;
12447		- /*
	14661	+ /**/
12448	14662	if((mod&SHIFT) == SHIFT)
12449		- manipCamera.RotatePosition(speed, 0);
12450		- else
12451	14663	manipCamera.Translate(speed*delta, 0, getWidth());
12452		- */
	14664	+ else
	14665	+ manipCamera.RotatePosition(speed, 0);
	14666	+ /**/
12453	14667	if ((mod & SHIFT) == SHIFT)
12454	14668	{
12455	14669	mouseMode = mouseMode;
..	..	@@ -12465,12 +14679,12 @@
12465	14679	void GoRight(int mod)
12466	14680	{
12467	14681	MODIFIERS \|= COMMAND;
12468		- /*
	14682	+ /**/
12469	14683	if((mod&SHIFT) == SHIFT)
12470		- manipCamera.RotatePosition(-speed, 0);
12471		- else
12472	14684	manipCamera.Translate(-speed*delta, 0, getWidth());
12473		- */
	14685	+ else
	14686	+ manipCamera.RotatePosition(-speed, 0);
	14687	+ /**/
12474	14688	if ((mod & SHIFT) == SHIFT)
12475	14689	{
12476	14690	mouseMode = mouseMode;
..	..	@@ -12488,7 +14702,7 @@
12488	14702	int X, Y;
12489	14703	boolean SX, SY;
12490	14704
12491		- void drag(int x, int y, int modifiers)
	14705	+ void drag(int x, int y, int modifiers, int modifiersex)
12492	14706	{
12493	14707	if (IsFrozen())
12494	14708	{
..	..	@@ -12497,17 +14711,17 @@
12497	14711
12498	14712	drag = true; // NEW
12499	14713
12500		- boolean continuous = (modifiers & COMMAND) == COMMAND;
	14714	+ boolean continuous = (modifiersex & COMMAND) == COMMAND;
12501	14715
12502	14716	X = x;
12503	14717	Y = y;
12504	14718	// floating state for animation
12505		- MODIFIERS = modifiers;
12506		- modifiers &= ~1024;
	14719	+ MODIFIERS = modifiersex;
	14720	+ modifiersex &= ~1024;
12507	14721	if (false) // modifiers != 0)
12508	14722	{
12509	14723	//new Exception().printStackTrace();
12510		- System.out.println("mouseDragged: " + modifiers);
	14724	+ System.out.println("mouseDragged: " + modifiersex);
12511	14725	System.out.println("SHIFT = " + SHIFT);
12512	14726	System.out.println("CONTROL = " + COMMAND);
12513	14727	System.out.println("META = " + META);
..	..	@@ -12520,14 +14734,16 @@
12520	14734	if (editObj)
12521	14735	{
12522	14736	drag = true;
12523		- ClickInfo info = new ClickInfo();
12524		- info.bounds.setBounds(0, 0,
	14737	+ //ClickInfo info = new ClickInfo();
	14738	+ object.clickInfo.bounds.setBounds(0, 0,
12525	14739	(int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
12526		- info.pane = this;
12527		- info.camera = renderCamera;
12528		- info.x = x;
12529		- info.y = y;
12530		- object.editWindow.copy.doEditDrag(info);
	14740	+ object.clickInfo.pane = this;
	14741	+ object.clickInfo.camera = renderCamera;
	14742	+ object.clickInfo.x = x;
	14743	+ object.clickInfo.y = y;
	14744	+ object //.GetWindow().copy
	14745	+ .doEditDrag(//info,
	14746	+ (modifiers & MouseEvent.BUTTON3_MASK) != 0);
12531	14747	} else
12532	14748	{
12533	14749	if (x < startX)
..	..	@@ -12629,6 +14845,7 @@
12629	14845	{
12630	14846	manipCamera.Translate(dx, dy, getWidth());
12631	14847	}
	14848	+ else
12632	14849	if ((mouseMode & ZOOM) == 0 && (mouseMode & VR) != 0)
12633	14850	{
12634	14851	manipCamera.RotateInterest(dx, dy);
..	..	@@ -12639,7 +14856,7 @@
12639	14856
12640	14857	if (manipCamera == lightCamera)
12641	14858	{
12642		- lighttouched = true;
	14859	+ Globals.lighttouched = true;
12643	14860	}
12644	14861	/*
12645	14862	switch (mode)
..	..	@@ -12675,23 +14892,27 @@
12675	14892	}
12676	14893	}
12677	14894
	14895	+// ClickInfo clickInfo = new ClickInfo();
	14896	+
12678	14897	public void mouseMoved(MouseEvent e)
12679	14898	{
12680	14899	//System.out.println("mouseMoved: " + e);
12681		-
12682	14900	if (isRenderer)
12683	14901	return;
12684	14902
12685		- ClickInfo ci = new ClickInfo();
12686		- ci.x = e.getX();
12687		- ci.y = e.getY();
12688		- ci.modifiers = e.getModifiersEx();
12689		- ci.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
12690		- ci.pane = this;
12691		- ci.camera = renderCamera;
	14903	+ // Mouse cursor feedback
	14904	+ object.clickInfo.x = e.getX();
	14905	+ object.clickInfo.y = e.getY();
	14906	+ object.clickInfo.modifiers = e.getModifiersEx();
	14907	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14908	+ object.clickInfo.pane = this;
	14909	+ object.clickInfo.camera = renderCamera;
12692	14910	if (!isRenderer)
12693	14911	{
12694		- if (object.editWindow.copy.doEditClick(ci, 0))
	14912	+ //ObjEditor editWindow = object.editWindow;
	14913	+ //Object3D copy = editWindow.copy;
	14914	+ if (object.doEditClick(//clickInfo,
	14915	+ 0))
12695	14916	{
12696	14917	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
12697	14918	} else
..	..	@@ -12703,7 +14924,11 @@
12703	14924
12704	14925	public void mouseReleased(MouseEvent e)
12705	14926	{
	14927	+ Globals.MOUSEDRAGGED = false;
	14928	+
12706	14929	movingcamera = false;
	14930	+ X = 0; // getBounds().width/2;
	14931	+ Y = 0; // getBounds().height/2;
12707	14932	//System.out.println("mouseReleased: " + e);
12708	14933	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
12709	14934	}
..	..	@@ -12726,9 +14951,9 @@
12726	14951	boolean control = ((modifiers & CTRL) != 0); // june 2013: for point selection
12727	14952	boolean command = ((modifiers & COMMAND) != 0); // june 2013: for multiple selection
12728	14953
12729		- if (control \|\| command \|\| IsFrozen())
	14954	+// No delay if (control \|\| command \|\| IsFrozen())
12730	14955	timeout = true;
12731		- else
	14956	+// ?? May 2019 else
12732	14957	// timer.setDelay((modifiers & 128) != 0?0:350);
12733	14958	mouseDown = false;
12734	14959	if (!control && !command) // june 2013
..	..	@@ -12838,7 +15063,7 @@
12838	15063	System.out.println("keyReleased: " + e);
12839	15064	}
12840	15065
12841		- void SetMouseMode(int modifiers)
	15066	+ void SetMouseMode(int modifiers, int modifiersex)
12842	15067	{
12843	15068	//System.out.println("SetMouseMode = " + modifiers);
12844	15069	//modifiers &= ~1024;
..	..	@@ -12850,24 +15075,27 @@
12850	15075	//if (modifiers == 0) // \|\| (modifiers == (1024 \| CONTROL)))
12851	15076	// return;
12852	15077	//System.out.println("SetMode = " + modifiers);
12853		- if ((modifiers & WHEEL) == WHEEL)
	15078	+ if ((modifiersex & WHEEL) == WHEEL)
12854	15079	{
12855	15080	mouseMode \|= ZOOM;
12856	15081	}
12857		- if ((modifiers & META) == META)
	15082	+
	15083	+ boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
	15084	+ if (capsLocked) // \|\| (modifiers & META) == META)
12858	15085	{
12859	15086	mouseMode \|= VR; // BACKFORTH;
12860	15087	}
12861		- if ((modifiers & CTRLCLICK) == CTRLCLICK)
12862		- {
12863		- mouseMode \|= SELECT; // BACKFORTH;
12864		- }
12865		- if ((modifiers & COMMAND) == COMMAND)
	15088	+ if ((modifiersex & CTRLCLICK) == CTRLCLICK)
12866	15089	{
12867	15090	mouseMode \|= SELECT;
12868	15091	}
12869		- if ((modifiers & SHIFT) == SHIFT \|\| forcetranslate)
	15092	+ if ((modifiersex & COMMAND) == COMMAND)
12870	15093	{
	15094	+ mouseMode \|= SELECT;
	15095	+ }
	15096	+ if ((modifiersex & SHIFT) == SHIFT \|\| forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
	15097	+ {
	15098	+ mouseMode &= ~VR;
12871	15099	mouseMode \|= TRANSLATE;
12872	15100	}
12873	15101	// if ((modifiers & SHIFT_META) == SHIFT_META)
..	..	@@ -12894,10 +15122,10 @@
12894	15122
12895	15123	if (isRenderer) //
12896	15124	{
12897		- SetMouseMode(modifiers);
	15125	+ SetMouseMode(0, modifiers);
12898	15126	}
12899	15127
12900		- theRenderer.keyPressed(key);
	15128	+ Globals.theRenderer.keyPressed(key);
12901	15129	}
12902	15130
12903	15131	int kompactbit = 4; // power bit
..	..	@@ -12909,7 +15137,7 @@
12909	15137	float SATPOW = 1; // 2; // 0.5f;
12910	15138	float BRIPOW = 1; // 0.5f; // 0.5f;
12911	15139
12912		- void keyPressed(int key)
	15140	+ public void keyPressed(int key)
12913	15141	{
12914	15142	if (key >= '0' && key <= '5')
12915	15143	clampbit = (key-'0');
..	..	@@ -12956,7 +15184,8 @@
12956	15184	// break;
12957	15185	case 'T':
12958	15186	CACHETEXTURE ^= true;
12959		- textures.clear();
	15187	+ texturepigment.clear();
	15188	+ texturebump.clear();
12960	15189	// repaint();
12961	15190	break;
12962	15191	case 'Y':
..	..	@@ -13024,7 +15253,7 @@
13024	15253	case 'B':
13025	15254	BRISMOOTH ^= true;
13026	15255	SHADOWCULLFACE ^= true;
13027		- lighttouched = true;
	15256	+ Globals.lighttouched = true;
13028	15257	repaint();
13029	15258	break;
13030	15259	case 'b':
..	..	@@ -13041,7 +15270,9 @@
13041	15270	case 'E' : COMPACT ^= true;
13042	15271	repaint();
13043	15272	break;
13044		- case 'W' : DEBUGHSB ^= true;
	15273	+ case 'W' : // Wide Window (fullscreen)
	15274	+ //DEBUGHSB ^= true;
	15275	+ ObjEditor.theFrame.ToggleFullScreen();
13045	15276	repaint();
13046	15277	break;
13047	15278	case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
..	..	@@ -13066,8 +15297,8 @@
13066	15297	RevertCamera();
13067	15298	repaint();
13068	15299	break;
13069		- case 'L':
13070	15300	case 'l':
	15301	+ //case 'L':
13071	15302	if (lightMode)
13072	15303	{
13073	15304	lightMode = false;
..	..	@@ -13124,7 +15355,7 @@
13124	15355	repaint();
13125	15356	break;
13126	15357	case 'O':
13127		- drawMode = OCCLUSION;
	15358	+ Globals.drawMode = OCCLUSION; // WARNING
13128	15359	repaint();
13129	15360	break;
13130	15361	case 'o':
..	..	@@ -13137,14 +15368,18 @@
13137	15368	case '3':
13138	15369	case '4':
13139	15370	case '5':
13140		- newenvy = Character.getNumericValue(key);
13141		- repaint();
13142		- break;
13143	15371	case '6':
13144	15372	case '7':
13145	15373	case '8':
13146	15374	case '9':
13147		- BGcolor = (key - '6')/3.f;
	15375	+ if (envyoff)
	15376	+ {
	15377	+ BGcolor = (key - '1')/8.f;
	15378	+ }
	15379	+ else
	15380	+ {
	15381	+ //newenvy = Character.getNumericValue(key);
	15382	+ }
13148	15383	repaint();
13149	15384	break;
13150	15385	case '!':
..	..	@@ -13210,12 +15445,12 @@
13210	15445	case '_':
13211	15446	kompactbit = 5;
13212	15447	break;
13213		- case '+':
13214		- kompactbit = 6;
13215		- break;
	15448	+// case '+':
	15449	+// kompactbit = 6;
	15450	+// break;
13216	15451	case ' ':
13217	15452	lightMode ^= true;
13218		- lighttouched = true;
	15453	+ Globals.lighttouched = true;
13219	15454	manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
13220	15455	targetLookAt.set(manipCamera.lookAt);
13221	15456	repaint();
..	..	@@ -13224,14 +15459,15 @@
13224	15459	case ESC:
13225	15460	RENDERPROGRAM += 1;
13226	15461	RENDERPROGRAM %= 3;
	15462	+
13227	15463	repaint();
13228	15464	break;
13229	15465	case 'Z':
13230		- RESIZETEXTURE ^= true;
13231		- break;
	15466	+ //RESIZETEXTURE ^= true;
	15467	+ //break;
13232	15468	case 'z':
13233		- RENDERSHADOW ^= true;
13234		- lighttouched = true;
	15469	+ Globals.RENDERSHADOW ^= true;
	15470	+ Globals.lighttouched = true;
13235	15471	repaint();
13236	15472	break;
13237	15473	//case UP:
..	..	@@ -13257,13 +15493,15 @@
13257	15493	FlipTransform();
13258	15494	break;
13259	15495	case ENTER:
13260		- object.editWindow.ScreenFit(); // Edit();
	15496	+ // object.editWindow.ScreenFit(); // Edit();
	15497	+ ToggleLive();
13261	15498	break;
13262	15499	case DELETE:
13263	15500	ClearSelection();
13264	15501	break;
13265		- /*
13266	15502	case '+':
	15503	+
	15504	+ /*
13267	15505	//fontsize += 1;
13268	15506	bbzoom *= 2;
13269	15507	repaint();
..	..	@@ -13280,17 +15518,17 @@
13280	15518	case '=':
13281	15519	IncDepth();
13282	15520	//fontsize += 1;
13283		- object.editWindow.refreshContents(true);
	15521	+ object.GetWindow().refreshContents(true);
13284	15522	maskbit = 6;
13285	15523	break;
13286	15524	case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
13287	15525	DecDepth();
13288	15526	maskbit = 5;
13289	15527	//if(fontsize > 1) fontsize -= 1;
13290		- if (object.editWindow == null)
13291		- new Exception().printStackTrace();
13292		- else
13293		- object.editWindow.refreshContents(true);
	15528	+// if (object.editWindow == null)
	15529	+// new Exception().printStackTrace();
	15530	+// else
	15531	+ object.GetWindow().refreshContents(true);
13294	15532	break;
13295	15533	case '{':
13296	15534	manipCamera.shaper_fovy /= 1.1;
..	..	@@ -13345,6 +15583,7 @@
13345	15583	}
13346	15584	//System.out.println("shaper_fovy = " + manipCamera.shaper_fovy);
13347	15585	}
	15586	+
13348	15587	static double OCCLUSIONBOOST = 1; // 0.5;
13349	15588
13350	15589	void keyReleased(int key, int modifiers)
..	..	@@ -13352,11 +15591,11 @@
13352	15591	//mode = ROTATE;
13353	15592	if ((MODIFIERS & COMMAND) == 0) // VR??
13354	15593	{
13355		- SetMouseMode(modifiers);
	15594	+ SetMouseMode(0, modifiers);
13356	15595	}
13357	15596	}
13358	15597
13359		- protected void processKeyEvent(KeyEvent e)
	15598	+ public void processKeyEvent(KeyEvent e)
13360	15599	{
13361	15600	switch (e.getID())
13362	15601	{
..	..	@@ -13486,8 +15725,9 @@
13486	15725
13487	15726	protected void processMouseMotionEvent(MouseEvent e)
13488	15727	{
13489		- //System.out.println("processMouseMotionEvent: " + mouseMode);
13490		- if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
	15728	+ //System.out.println("processMouseMotionEvent: " + mouseMode + " " + e.getModifiers() + " " + e.getModifiersEx() + " " + e.getButton());
	15729	+ //if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
	15730	+ if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (e.getModifiers() & MouseEvent.BUTTON3_MASK) == 0 && (mouseMode & SELECT) == 0)
13491	15731	{
13492	15732	mouseMoved(e);
13493	15733	} else
..	..	@@ -13512,11 +15752,12 @@
13512	15752	}
13513	15753	*/
13514	15754
13515		- object.editWindow.EditSelection();
	15755	+ object.GetWindow().EditSelection(false);
13516	15756	}
13517	15757
13518	15758	void SelectParent()
13519	15759	{
	15760	+ new Exception().printStackTrace();
13520	15761	System.exit(0);
13521	15762	Composite group = (Composite) object;
13522	15763	java.util.Vector selectees = new java.util.Vector(group.selection);
..	..	@@ -13528,10 +15769,10 @@
13528	15769	{
13529	15770	//selectees.remove(i);
13530	15771	System.out.println("select parent of " + elem);
13531		- group.editWindow.Select(elem.parent.GetTreePath(), first, true);
	15772	+ group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
13532	15773	} else
13533	15774	{
13534		- group.editWindow.Select(elem.GetTreePath(), first, true);
	15775	+ group.GetWindow().Select(elem.GetTreePath(), first, true);
13535	15776	}
13536	15777
13537	15778	first = false;
..	..	@@ -13540,6 +15781,7 @@
13540	15781
13541	15782	void SelectChildren()
13542	15783	{
	15784	+ new Exception().printStackTrace();
13543	15785	System.exit(0);
13544	15786	/*
13545	15787	Composite group = (Composite) object;
..	..	@@ -13572,12 +15814,12 @@
13572	15814	for (int j = 0; j < group.children.size(); j++)
13573	15815	{
13574	15816	elem = (Object3D) group.children.elementAt(j);
13575		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15817	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
13576	15818	first = false;
13577	15819	}
13578	15820	} else
13579	15821	{
13580		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15822	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
13581	15823	}
13582	15824
13583	15825	first = false;
..	..	@@ -13588,21 +15830,21 @@
13588	15830	{
13589	15831	//Composite group = (Composite) object;
13590	15832	Object3D group = object;
13591		- group.editWindow.loadClipboard(true); // ClearSelection(false);
	15833	+ group.GetWindow().loadClipboard(true); // ClearSelection(false);
13592	15834	}
13593	15835
13594	15836	void ResetTransform(int mask)
13595	15837	{
13596	15838	//Composite group = (Composite) object;
13597	15839	Object3D group = object;
13598		- group.editWindow.ResetTransform(mask);
	15840	+ group.GetWindow().ResetTransform(mask);
13599	15841	}
13600	15842
13601	15843	void FlipTransform()
13602	15844	{
13603	15845	//Composite group = (Composite) object;
13604	15846	Object3D group = object;
13605		- group.editWindow.FlipTransform();
	15847	+ group.GetWindow().FlipTransform();
13606	15848	// group.editWindow.ReduceMesh(true);
13607	15849	}
13608	15850
..	..	@@ -13610,7 +15852,7 @@
13610	15852	{
13611	15853	//Composite group = (Composite) object;
13612	15854	Object3D group = object;
13613		- group.editWindow.PrintMemory();
	15855	+ group.GetWindow().PrintMemory();
13614	15856	// group.editWindow.ReduceMesh(true);
13615	15857	}
13616	15858
..	..	@@ -13618,7 +15860,7 @@
13618	15860	{
13619	15861	//Composite group = (Composite) object;
13620	15862	Object3D group = object;
13621		- group.editWindow.ResetCentroid();
	15863	+ group.GetWindow().ResetCentroid();
13622	15864	}
13623	15865
13624	15866	void IncDepth()
..	..	@@ -13700,11 +15942,11 @@
13700	15942
13701	15943	int width = getBounds().width;
13702	15944	int height = getBounds().height;
13703		- ClickInfo info = new ClickInfo();
13704		- info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
13705	15945	//Image img = CreateImage(width, height);
13706	15946	//System.out.println("width = " + width + "; height = " + height + "\n");
	15947	+
13707	15948	Graphics gr = g; // img.getGraphics();
	15949	+
13708	15950	if (!hasMarquee)
13709	15951	{
13710	15952	if (Xmin < Xmax) // !locked)
..	..	@@ -13776,40 +16018,88 @@
13776	16018	}
13777	16019	if (object != null && !hasMarquee)
13778	16020	{
	16021	+ if (object.clickInfo == null)
	16022	+ object.clickInfo = new ClickInfo();
	16023	+ ClickInfo info = object.clickInfo;
	16024	+ //ClickInfo info = new ClickInfo();
	16025	+ info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
	16026	+
13779	16027	if (isRenderer)
13780	16028	{
13781		- info.flags++;
	16029	+ object.clickInfo.flags++;
13782	16030	double frameAspect = (double) width / (double) height;
13783	16031	if (frameAspect > renderCamera.aspect)
13784	16032	{
13785	16033	int desired = (int) ((double) height * renderCamera.aspect);
13786		- info.bounds.width -= width - desired;
13787		- info.bounds.x += (width - desired) / 2;
	16034	+ object.clickInfo.bounds.width -= width - desired;
	16035	+ object.clickInfo.bounds.x += (width - desired) / 2;
13788	16036	} else
13789	16037	{
13790	16038	int desired = (int) ((double) width / renderCamera.aspect);
13791		- info.bounds.height -= height - desired;
13792		- info.bounds.y += (height - desired) / 2;
	16039	+ object.clickInfo.bounds.height -= height - desired;
	16040	+ object.clickInfo.bounds.y += (height - desired) / 2;
13793	16041	}
13794	16042	}
13795		- info.g = gr;
13796		- info.camera = renderCamera;
	16043	+
	16044	+ object.clickInfo.g = gr;
	16045	+ object.clickInfo.camera = renderCamera;
13797	16046	/*
13798	16047	// Memory intensive (brep.verticescopy)
13799	16048	if (!(object instanceof Composite))
13800	16049	object.draw(info, 0, false); // SLOW :
13801	16050	*/
13802		- if (!isRenderer)
	16051	+ if (!isRenderer) // && drag)
13803	16052	{
13804		- object.drawEditHandles(info, 0);
	16053	+ Grafreed.Assert(object != null);
	16054	+ Grafreed.Assert(object.selection != null);
	16055	+ if (object.selection.Size() > 0)
	16056	+ {
	16057	+ int hitSomething = object.selection.get(0).hitSomething;
	16058	+
	16059	+ object.clickInfo.DX = 0;
	16060	+ object.clickInfo.DY = 0;
	16061	+ object.clickInfo.W = 1;
	16062	+ if (hitSomething == Object3D.hitCenter)
	16063	+ {
	16064	+ info.DX = X;
	16065	+ if (X != 0)
	16066	+ info.DX -= info.bounds.width/2;
	16067	+
	16068	+ info.DY = Y;
	16069	+ if (Y != 0)
	16070	+ info.DY -= info.bounds.height/2;
	16071	+ }
	16072	+
	16073	+ object.drawEditHandles(//info,
	16074	+ 0);
	16075	+
	16076	+ if (drag && (X != 0 \|\| Y != 0))
	16077	+ {
	16078	+ switch (hitSomething)
	16079	+ {
	16080	+ case Object3D.hitCenter: gr.setColor(Color.pink);
	16081	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16082	+ break;
	16083	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	16084	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16085	+ break;
	16086	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	16087	+ gr.drawLine(X, Y, 0, 0);
	16088	+ break;
	16089	+ }
	16090	+
	16091	+ }
	16092	+ }
13805	16093	}
13806	16094	}
	16095	+
13807	16096	if (isRenderer)
13808	16097	{
13809	16098	//gr.setColor(Color.black);
13810	16099	//gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
13811	16100	//gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
13812	16101	}
	16102	+
13813	16103	if (hasMarquee)
13814	16104	{
13815	16105	gr.setXORMode(Color.white);
..	..	@@ -13832,6 +16122,7 @@
13832	16122	//if (g != gr) g.drawImage(img, 0, 0, width, height, null);
13833	16123	}
13834	16124
	16125	+ // To avoid clear.
13835	16126	public void update(Graphics g)
13836	16127	{
13837	16128	paint(g);
..	..	@@ -13921,6 +16212,7 @@
13921	16212	public boolean mouseDown(Event evt, int x, int y)
13922	16213	{
13923	16214	System.out.println("mouseDown: " + evt);
	16215	+ System.exit(0);
13924	16216	/*
13925	16217	locked = true;
13926	16218	drag = false;
..	..	@@ -13964,7 +16256,7 @@
13964	16256	{
13965	16257	keyPressed(0, modifiers);
13966	16258	}
13967		- clickStart(x, y, modifiers);
	16259	+ // clickStart(x, y, modifiers);
13968	16260	return true;
13969	16261	}
13970	16262
..	..	@@ -14082,7 +16374,7 @@
14082	16374	{
14083	16375	keyReleased(0, 0);
14084	16376	}
14085		- drag(x, y, modifiers);
	16377	+ drag(x, y, 0, modifiers);
14086	16378	return true;
14087	16379	}
14088	16380
..	..	@@ -14214,7 +16506,7 @@
14214	16506	Object3D object;
14215	16507	static Object3D trackedobject;
14216	16508	Camera renderCamera; // Light or Eye (or Occlusion)
14217		- /static/ Camera manipCamera; // Light or Eye
	16509	+ /static/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
14218	16510	/static/ Camera eyeCamera;
14219	16511	/static/ Camera lightCamera;
14220	16512	int cameracount;
..	..	@@ -14278,6 +16570,8 @@
14278	16570	private /static/ boolean firstime;
14279	16571	private /static/ cVector newView = new cVector();
14280	16572	private static final String[] suffixes = {"posx", "negx", "posy", "negy", "posz", "negz"};
	16573	+ private static final String[] suffixes2 = {"east", "west", "top", "bottom", "north", "south"};
	16574	+ private static final String[] suffixes3 = {"ft", "bk", "up", "dn", "rt", "lf"};
14281	16575	private static final int[] targets = {GL.GL_TEXTURE_CUBE_MAP_POSITIVE_X,
14282	16576	GL.GL_TEXTURE_CUBE_MAP_NEGATIVE_X,
14283	16577	GL.GL_TEXTURE_CUBE_MAP_POSITIVE_Y,
..	..	@@ -14290,16 +16584,49 @@
14290	16584	{
14291	16585	com.sun.opengl.util.texture.Texture cubemap = TextureIO.newTexture(GL.GL_TEXTURE_CUBE_MAP);
14292	16586
	16587	+ int usedsuf = 0;
	16588	+
14293	16589	for (int i = 0; i < suffixes.length; i++)
14294	16590	{
14295		- String resourceName = basename + suffixes[i] + "." + suffix;
14296		- TextureData data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
14297		- mipmapped,
14298		- FileUtil.getFileSuffix(resourceName));
14299		- if (data == null)
	16591	+ String[] suffixe = suffixes;
	16592	+ String[] fallback = suffixes2;
	16593	+ String[] fallfallback = suffixes3;
	16594	+
	16595	+ for (int c=usedsuf; --c>=0;)
14300	16596	{
14301		- throw new IOException("Unable to load texture " + resourceName);
	16597	+// String[] temp = suffixe;
	16598	+// suffixe = fallback;
	16599	+// fallback = fallfallback;
	16600	+// fallfallback = temp;
14302	16601	}
	16602	+
	16603	+ String resourceName = basename + suffixe[i] + "." + suffix;
	16604	+ TextureData data;
	16605	+
	16606	+ try
	16607	+ {
	16608	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16609	+ mipmapped,
	16610	+ FileUtil.getFileSuffix(resourceName));
	16611	+ }
	16612	+ catch (Exception e)
	16613	+ {
	16614	+ try
	16615	+ {
	16616	+ resourceName = basename + fallback[i] + "." + suffix;
	16617	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16618	+ mipmapped,
	16619	+ FileUtil.getFileSuffix(resourceName));
	16620	+ }
	16621	+ catch (Exception e2)
	16622	+ {
	16623	+ resourceName = basename + fallfallback[i] + "." + suffix;
	16624	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16625	+ mipmapped,
	16626	+ FileUtil.getFileSuffix(resourceName));
	16627	+ }
	16628	+ }
	16629	+
14303	16630	//System.out.println("Target = " + targets[i]);
14304	16631	cubemap.updateImage(data, targets[i]);
14305	16632	}
..	..	@@ -14310,7 +16637,9 @@
14310	16637
14311	16638	float BGcolor = 0.5f;
14312	16639
14313		- private void DrawSkyBox(GL gl)
	16640	+ float ambientLight[] = {1f, 1f, 1f, 1.0f};
	16641	+
	16642	+ private void DrawSkyBox(GL gl, float ratio)
14314	16643	{
14315	16644	if (envyoff \|\| cubemap == null)
14316	16645	{
..	..	@@ -14327,7 +16656,17 @@
14327	16656	// Compensates for ExaminerViewer's modification of modelview matrix
14328	16657	gl.glMatrixMode(GL.GL_MODELVIEW);
14329	16658	gl.glLoadIdentity();
	16659	+ gl.glScalef(1,ratio,1);
14330	16660
	16661	+ colorV[0] = 2;
	16662	+ colorV[1] = 2;
	16663	+ colorV[2] = 2;
	16664	+ colorV[3] = 1;
	16665	+ gl.glDisable(gl.GL_COLOR_MATERIAL);
	16666	+ gl.glMaterialfv(gl.GL_FRONT_AND_BACK, gl.GL_AMBIENT, colorV, 0);
	16667	+
	16668	+ gl.glLightModelfv(gl.GL_LIGHT_MODEL_AMBIENT, ambientLight, 0);
	16669	+
14331	16670	//gl.glActiveTexture(GL.GL_TEXTURE1);
14332	16671	//gl.glDisable(GL.GL_TEXTURE_CUBE_MAP);
14333	16672
..	..	@@ -14340,7 +16679,7 @@
14340	16679	// GL_NORMAL_MAP texgen mode. Temporarily enabling lighting
14341	16680	// causes the normals to be sent down. Thanks to Ken Dyke.
14342	16681	//gl.glEnable(GL.GL_LIGHTING);
14343		- gl.glDisable(GL.GL_LIGHTING);
	16682	+ gl.glEnable(GL.GL_LIGHTING);
14344	16683
14345	16684	gl.glTexGeni(GL.GL_S, GL.GL_TEXTURE_GEN_MODE, GL.GL_NORMAL_MAP);
14346	16685	gl.glTexGeni(GL.GL_T, GL.GL_TEXTURE_GEN_MODE, GL.GL_NORMAL_MAP);
..	..	@@ -14359,6 +16698,7 @@
14359	16698	{
14360	16699	gl.glScalef(1.0f, -1.0f, 1.0f);
14361	16700	}
	16701	+ gl.glScalef(-1.0f, 1.0f, 1.0f);
14362	16702	gl.glMultMatrixd(viewrot_1, 0);
14363	16703	gl.glTranslatef(0, 0, 0.5f); // (float)lightCamera.Distance()); // 0.5f);
14364	16704	//viewer.updateInverseRotation(gl);
..	..	@@ -14434,7 +16774,7 @@
14434	16774	gl.glPushAttrib(GL.GL_ALL_ATTRIB_BITS);
14435	16775	gl.glPushMatrix();
14436	16776	gl.glLoadIdentity();
14437		- PushMatrix(checker.toParent);
	16777	+ //PushMatrix(checker.toParent);
14438	16778
14439	16779	gl.glMatrixMode(GL.GL_TEXTURE);
14440	16780	gl.glPushMatrix();
..	..	@@ -14457,8 +16797,8 @@
14457	16797
14458	16798	gl.glNormal3f(0.0f, 0.0f, 1.0f);
14459	16799
14460		- float step = 0.1666f; //0.25f;
14461		- float stepv = step * 1652 / 998;
	16800	+ float step = 2; // 0.1666f; //0.25f;
	16801	+ float stepv = 2; // step * 1652 / 998;
14462	16802
14463	16803	int i0 = 0;
14464	16804	/*
..	..	@@ -14494,20 +16834,21 @@
14494	16834	/**/
14495	16835	//checker.GetMaterial().opacity = 1.1f;
14496	16836	////checker.GetMaterial().ambient = 0.99f;
14497		- Object3D.materialstack[Object3D.materialdepth] = checker.material;
14498		- Object3D.selectedstack[Object3D.materialdepth] = false;
14499		- cStatic.objectstack[Object3D.materialdepth++] = checker;
	16837	+ materialstack[materialdepth] = checker.material;
	16838	+ selectedstack[materialdepth] = false;
	16839	+ cStatic.objectstack[materialdepth++] = checker;
14500	16840	//System.out.println("material " + material);
14501	16841	//Applet3D.tracein(this, selected);
14502		- vector2buffer = checker.projectedVertices;
	16842	+ //vector2buffer = checker.projectedVertices;
14503	16843
14504		- checker.GetMaterial().Draw(this, false); // true);
	16844	+ //checker.GetMaterial().Draw(this, false); // true);
	16845	+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
14505	16846
14506		- Object3D.materialdepth -= 1;
14507		- if (Object3D.materialdepth > 0)
	16847	+ materialdepth -= 1;
	16848	+ if (materialdepth > 0)
14508	16849	{
14509		- vector2buffer = cStatic.objectstack[Object3D.materialdepth - 1].projectedVertices;
14510		- Object3D.materialstack[Object3D.materialdepth - 1].Draw(this, Object3D.selectedstack[Object3D.materialdepth - 1]);
	16850	+ //vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	16851	+ DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
14511	16852	}
14512	16853	//checker.GetMaterial().opacity = 1f;
14513	16854	////checker.GetMaterial().ambient = 1f;
..	..	@@ -14528,15 +16869,27 @@
14528	16869
14529	16870	//float u = (i+1)/2;
14530	16871	//float v = (j+1)/2;
14531		- gl.glTexCoord2f((i + 1) / 2, (j + 1) / 2); // (1,0) // (i+1+step)/2,(j+1)/2);
	16872	+ if (checker.flipV)
	16873	+ gl.glTexCoord2f((i + 1) / 2, 1 - (j + 1) / 2);
	16874	+ else
	16875	+ gl.glTexCoord2f((i + 1) / 2, (j + 1) / 2); // (1,0) // (i+1+step)/2,(j+1)/2);
14532	16876	gl.glVertex3f(i, j, -0.5f);
14533	16877
	16878	+ if (checker.flipV)
	16879	+ gl.glTexCoord2f((i + 1 + step) / 2, 1 - (j + 1) / 2); // (1,1) // (i+1+step)/2,(j+1+step)/2);
	16880	+ else
14534	16881	gl.glTexCoord2f((i + 1 + step) / 2, (j + 1) / 2); // (1,1) // (i+1+step)/2,(j+1+step)/2);
14535	16882	gl.glVertex3f(i + step, j, -0.5f);
14536	16883
	16884	+ if (checker.flipV)
	16885	+ gl.glTexCoord2f((i + 1 + step) / 2, 1 - (j + 1 + stepv) / 2); // (0,1) //(i+1)/2,(j+1+step)/2);
	16886	+ else
14537	16887	gl.glTexCoord2f((i + 1 + step) / 2, (j + 1 + stepv) / 2); // (0,1) //(i+1)/2,(j+1+step)/2);
14538	16888	gl.glVertex3f(i + step, j + stepv, -0.5f);
14539	16889
	16890	+ if (checker.flipV)
	16891	+ gl.glTexCoord2f((i + 1) / 2, 1 - (j + 1 + stepv) / 2); // (0,0) //(i+1)/2,(j+1)/2);
	16892	+ else
14540	16893	gl.glTexCoord2f((i + 1) / 2, (j + 1 + stepv) / 2); // (0,0) //(i+1)/2,(j+1)/2);
14541	16894	gl.glVertex3f(i, j + stepv, -0.5f);
14542	16895	}
..	..	@@ -14548,7 +16901,7 @@
14548	16901	gl.glMatrixMode(GL.GL_PROJECTION);
14549	16902	gl.glPopMatrix();
14550	16903	gl.glMatrixMode(GL.GL_MODELVIEW);
14551		- PopMatrix(null); // checker.toParent); // null);
	16904	+ //PopMatrix(null); // checker.toParent); // null);
14552	16905	gl.glPopMatrix();
14553	16906	PopTextureMatrix(checker.toParent);
14554	16907	gl.glMatrixMode(GL.GL_TEXTURE);
..	..	@@ -14581,6 +16934,14 @@
14581	16934	}
14582	16935	}
14583	16936
	16937	+ private Object3D GetFolder()
	16938	+ {
	16939	+ Object3D folder = object.GetWindow().copy;
	16940	+ if (object.GetWindow().copy.selection.Size() > 0)
	16941	+ folder = object.GetWindow().copy.selection.elementAt(0);
	16942	+ return folder;
	16943	+ }
	16944	+
14584	16945	class SelectBuffer implements GLEventListener
14585	16946	{
14586	16947
..	..	@@ -14596,7 +16957,7 @@
14596	16957	//new Exception().printStackTrace();
14597	16958	System.out.println("select buffer init");
14598	16959	// Use debug pipeline
14599		- drawable.setGL(new DebugGL(drawable.getGL()));
	16960	+ //drawable.setGL(new DebugGL(drawable.getGL()));
14600	16961
14601	16962	GL gl = drawable.getGL();
14602	16963
..	..	@@ -14639,6 +17000,7 @@
14639	17000	{
14640	17001	if (!selection)
14641	17002	{
	17003	+ new Exception().printStackTrace();
14642	17004	System.exit(0);
14643	17005	return;
14644	17006	}
..	..	@@ -14659,17 +17021,39 @@
14659	17021
14660	17022	//gl.glDisable(GL.GL_POLYGON_OFFSET_FILL);
14661	17023
	17024	+ if (PAINTMODE)
	17025	+ {
	17026	+ if (object.GetWindow().copy.selection.Size() > 0)
	17027	+ {
	17028	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	17029	+
	17030	+ // Make what you paint not selectable.
	17031	+ paintobj.ResetSelectable();
	17032	+ }
	17033	+ }
	17034	+
14662	17035	//int tmp = selection_view;
14663	17036	//selection_view = -1;
14664		- int temp = drawMode;
14665		- drawMode = SELECTION;
	17037	+ int temp = DrawMode();
	17038	+ Globals.drawMode = SELECTION; // WARNING
14666	17039	indexcount = 0;
14667	17040	parent.display(drawable);
14668	17041	//selection_view = tmp;
14669	17042	//if (temp == SELECTION)
14670	17043	// temp = DEFAULT; // patch for selection debug
14671		- drawMode = temp;
	17044	+ Globals.drawMode = temp; // WARNING
14672	17045
	17046	+ if (PAINTMODE)
	17047	+ {
	17048	+ if (object.GetWindow().copy.selection.Size() > 0)
	17049	+ {
	17050	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	17051	+
	17052	+ // Revert.
	17053	+ paintobj.RestoreSelectable();
	17054	+ }
	17055	+ }
	17056	+
14673	17057	//gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
14674	17058
14675	17059	// trying different ways of getting the depth info over
..	..	@@ -14718,6 +17102,13 @@
14718	17102	// System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
14719	17103	// System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
14720	17104
	17105	+ CreateSelectedPoint();
	17106	+
	17107	+ // Will fit the mesh !!!
	17108	+ selectedpoint.toParent[0][0] = 0.0001;
	17109	+ selectedpoint.toParent[1][1] = 0.0001;
	17110	+ selectedpoint.toParent[2][2] = 0.0001;
	17111	+
14721	17112	glu.gluUnProject(x,y,depth,view,0,tempmat2,0,viewport,0,selectedpoint.toParent[3],0);
14722	17113
14723	17114	// if (object.selection != null && object.selection.Size() > 0)
..	..	@@ -14761,34 +17152,36 @@
14761	17152	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]));
14762	17153	}
14763	17154
14764		- previousselectedpoint = (Sphere) GrafreeD.clone(selectedpoint);
	17155	+ previousselectedpoint = (Sphere) Grafreed.clone(selectedpoint);
14765	17156	}
14766	17157	}
14767	17158
14768	17159	if (!movingcamera && !PAINTMODE)
14769		- object.editWindow.ScreenFitPoint(); // fev 2014
	17160	+ object.GetWindow().ScreenFitPoint(); // fev 2014
14770	17161
14771		- if (PAINTMODE && GrafreeD.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	17162	+ if (PAINTMODE) // && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
14772	17163	{
14773		- Object3D paintobj = GrafreeD.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
	17164	+ //Object3D paintobj; // = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
14774	17165
14775		- Object3D group = new Object3D("inst" + paintcount++);
	17166	+ if (object.GetWindow().copy.selection.Size() > 0)
	17167	+ {
	17168	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
14776	17169
14777		- group.CreateMaterial(); // use a void leaf to select instances
14778		-
14779		- group.add(paintobj); // link
14780		-
14781		- object.editWindow.SnapObject(group);
14782		-
14783		- Object3D folder = object.editWindow.copy;
14784		-
14785		- if (object.editWindow.copy.selection.Size() > 0)
14786		- folder = object.editWindow.copy.selection.elementAt(0);
14787		-
14788		- folder.add(group);
14789		-
14790		- object.editWindow.ResetModel();
14791		- object.editWindow.refreshContents();
	17170	+ Object3D inst = new Object3D("inst" + paintcount++);
	17171	+
	17172	+ inst.CreateMaterial(); // use a void leaf to select instances
	17173	+
	17174	+ inst.add(paintobj); // link
	17175	+
	17176	+ object.GetWindow().SnapObject(inst);
	17177	+
	17178	+ Object3D folder = paintFolder; // GetFolder();
	17179	+
	17180	+ folder.add(inst);
	17181	+
	17182	+ object.GetWindow().ResetModel();
	17183	+ object.GetWindow().refreshContents();
	17184	+ }
14792	17185	}
14793	17186	else
14794	17187	paintcount = 0;
..	..	@@ -14827,6 +17220,11 @@
14827	17220	//System.out.println("objects[color] = " + objects[color]);
14828	17221	//objects[color].Select();
14829	17222	indexcount = 0;
	17223	+ ObjEditor window = object.GetWindow();
	17224	+ if (window != null && deselect)
	17225	+ {
	17226	+ window.Select(null, deselect, true);
	17227	+ }
14830	17228	object.Select(color, deselect);
14831	17229	}
14832	17230
..	..	@@ -14926,7 +17324,7 @@
14926	17324	gl.glDisable(gl.GL_CULL_FACE);
14927	17325	}
14928	17326
14929		- if (!RENDERSHADOW)
	17327	+ if (!Globals.RENDERSHADOW)
14930	17328	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
14931	17329
14932	17330	// SB gl.glPolygonOffset(2.5f, 10);
..	..	@@ -14936,14 +17334,14 @@
14936	17334	//gl.glColorMask(false, false, false, false);
14937	17335
14938	17336	//render_scene_from_light_view(gl, drawable, 0, 0);
14939		- if (RENDERSHADOW && lighttouched && !movingcamera) // && !parent.IsFreezed())
	17337	+ if (Globals.RENDERSHADOW && Globals.lighttouched && (!movingcamera \|\| !Globals.FREEZEONMOVE)) // && !parent.IsFreezed())
14940	17338	{
14941	17339	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
14942	17340
14943		- int temp = drawMode;
14944		- drawMode = SHADOW;
	17341	+ int temp = DrawMode();
	17342	+ Globals.drawMode = SHADOW; // WARNING
14945	17343	parent.display(drawable);
14946		- drawMode = temp;
	17344	+ Globals.drawMode = temp; // WARNING
14947	17345	}
14948	17346
14949	17347	gl.glCullFace(gl.GL_BACK);
..	..	@@ -14996,7 +17394,6 @@
14996	17394
14997	17395	class AntialiasBuffer implements GLEventListener
14998	17396	{
14999		-
15000	17397	CameraPane parent = null;
15001	17398
15002	17399	AntialiasBuffer(CameraPane p)
..	..	@@ -15106,13 +17503,19 @@
15106	17503	gl.glFlush();
15107	17504
15108	17505	/**/
15109		- gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_BGRA, GL.GL_UNSIGNED_INT_8_8_8_8_REV, occlusionsizebuffer);
	17506	+ gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusionsizebuffer);
15110	17507
15111		- int[] pixels = occlusionsizebuffer.array();
	17508	+ float[] pixels = occlusionsizebuffer.array();
15112	17509
15113	17510	double r = 0, g = 0, b = 0;
15114	17511
15115	17512	double count = 0;
	17513	+
	17514	+ gl.glGetDoublev(gl.GL_PROJECTION_MATRIX, tempmat2, 0);
	17515	+
	17516	+ float mindepth = 1;
	17517	+
	17518	+ double FACTOR = 1;
15116	17519
15117	17520	for (int i = 0; i < pixels.length; i++)
15118	17521	{
..	..	@@ -15197,7 +17600,7 @@
15197	17600
15198	17601	double scale = ray.z; // 1; // cos
15199	17602
15200		- int p = pixels[newindex];
	17603	+ float depth = pixels[newindex];
15201	17604
15202	17605	/*
15203	17606	int newindex2 = (x + 1) * OCCLUSION_SIZE + y;
..	..	@@ -15221,10 +17624,23 @@
15221	17624	scale = (1 - modu) * modv;
15222	17625	*/
15223	17626
15224		- r += ((p >> 16) & 0xFF) * scale / 255;
15225		- g += ((p >> 8) & 0xFF) * scale / 255;
15226		- b += (p & 0xFF) * scale / 255;
	17627	+ //r += ((p >> 16) & 0xFF) * scale / 255;
	17628	+ //g += ((p >> 8) & 0xFF) * scale / 255;
	17629	+ //b += (p & 0xFF) * scale / 255;
	17630	+
	17631	+ if (mindepth > depth)
	17632	+ {
	17633	+ mindepth = depth;
	17634	+ }
15227	17635
	17636	+ double z_eye = tempmat2[34 + 2] / (depth -2.0 + 1.0 - tempmat2[2*4 + 2]);
	17637	+
	17638	+ double factor = 1 - Math.exp(-z_eye * z_eye / FACTOR);
	17639	+
	17640	+ r += factor * scale;
	17641	+ g += factor * scale;
	17642	+ b += factor * scale;
	17643	+
15228	17644	count += scale;
15229	17645	}
15230	17646
..	..	@@ -15322,12 +17738,6 @@
15322	17738	GLUT glut = new GLUT();
15323	17739
15324	17740
15325		- static final public int DEFAULT = 0;
15326		- static final public int SELECTION = 1;
15327		- static final public int SHADOW = 2;
15328		- static final public int OCCLUSION = 3;
15329		- static
15330		- public int drawMode = DEFAULT;
15331	17741	public boolean spherical = false;
15332	17742	static boolean DEBUG_OCCLUSION = false;
15333	17743	static boolean DEBUG_SELECTION = false;
..	..	@@ -15340,23 +17750,15 @@
15340	17750	int AAbuffersize = 0;
15341	17751
15342	17752	//double[] selectedpoint = new double[3];
15343		- static Sphere selectedpoint = new Sphere();
	17753	+ static Superellipsoid selectedpoint;
15344	17754	static Sphere previousselectedpoint = null;
15345		- static Sphere debugpoint = new Sphere();
15346		- static Sphere debugpoint2 = new Sphere();
15347		- static Sphere debugpoint3 = new Sphere();
15348		- static Sphere debugpoint4 = new Sphere();
	17755	+ static Sphere debugpointG;
	17756	+ static Sphere debugpointP;
	17757	+ static Sphere debugpointC;
	17758	+ static Sphere debugpointR;
15349	17759
15350	17760	static Sphere debugpoints[] = new Sphere[8];
15351	17761
15352		- static
15353		- {
15354		- for (int i=0; i<8; i++)
15355		- {
15356		- debugpoints[i] = new Sphere();
15357		- }
15358		- }
15359		-
15360	17762	static void InitPoints(float radius)
15361	17763	{
15362	17764	for (int i=0; i<8; i++)
..	..	@@ -15376,7 +17778,7 @@
15376	17778	}
15377	17779	}
15378	17780
15379		- static void DrawPoints(CameraPane cpane)
	17781	+ static void DrawPoints(iCameraPane cpane)
15380	17782	{
15381	17783	for (int i=0; i<8; i++) // first and last are red
15382	17784	{
..	..	@@ -15398,7 +17800,8 @@
15398	17800	static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
15399	17801	static IntBuffer selectsizebuffer = IntBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
15400	17802	static java.nio.FloatBuffer pointselectsizebuffer = java.nio.FloatBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
15401		- static IntBuffer occlusionsizebuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17803	+ //static IntBuffer occlusionsizebuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17804	+ static java.nio.FloatBuffer occlusionsizebuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
15402	17805	static BufferedImage bufimage = new BufferedImage(TEX_SIZE, TEX_SIZE, BufferedImage.TYPE_INT_RGB);
15403	17806	static BufferedImage textest = new cBufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB);
15404	17807	static java.util.Vector<BufferedImage> billboards = new java.util.Vector<BufferedImage>();
..	..	@@ -15407,10 +17810,11 @@
15407	17810	static IntBuffer textbuffer = null; // IntBuffer.allocate(TEXT_WIDTH88 * TEXT_HEIGHT);
15408	17811	// Depth buffer format
15409	17812	//private int depth_format;
15410		- static public void NextIndex(Object3D o, GL gl)
	17813	+
	17814	+ public void NextIndex()
15411	17815	{
15412	17816	indexcount+=16;
15413		- gl.glColor3d(((indexcount >>> 16) & 255) / 255.0, ((indexcount >>> 8) & 255) / 255.0, ((indexcount) & 255) / 255.0);
	17817	+ GetGL().glColor3d(((indexcount >>> 16) & 255) / 255.0, ((indexcount >>> 8) & 255) / 255.0, ((indexcount) & 255) / 255.0);
15414	17818	//objects[indexcount] = o;
15415	17819	//System.out.println("indexcount = " + indexcount);
15416	17820	}