~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	{
..	..	@@ -2000,10 +3732,12 @@
2000	3732	*/
2001	3733	TextureData ReduceTexture(TextureData texturedata, int resolution) // String name)
2002	3734	{
	3735	+ int pixelformat = texturedata.getPixelFormat();
	3736	+
2003	3737	int stride = 1;
2004		- if (texturedata.getPixelFormat() == GetGL().GL_RGB \|\| texturedata.getPixelFormat() == GetGL().GL_BGR) // \|\| texturedata.getPixelFormat() == GL.GL_LUMINANCE)
	3738	+ if (pixelformat == GetGL().GL_RGB \|\| pixelformat == GetGL().GL_BGR) // \|\| texturedata.getPixelFormat() == GL.GL_LUMINANCE)
2005	3739	stride = 3;
2006		- if (texturedata.getPixelFormat() == GetGL().GL_RGBA \|\| texturedata.getPixelFormat() == GetGL().GL_BGRA) // \|\| texturedata.getPixelFormat() == GL.GL_LUMINANCE_ALPHA)
	3740	+ if (pixelformat == GetGL().GL_RGBA \|\| pixelformat == GetGL().GL_BGRA) // \|\| texturedata.getPixelFormat() == GL.GL_LUMINANCE_ALPHA)
2007	3741	stride = 4;
2008	3742
2009	3743	int width = texturedata.getWidth();
..	..	@@ -2593,6 +4327,7 @@
2593	4327
2594	4328	com.sun.opengl.util.texture.Texture CompressTexture2(String name)
2595	4329	{
	4330	+ new Exception().printStackTrace();
2596	4331	System.exit(0);
2597	4332	com.sun.opengl.util.texture.Texture texture = null;
2598	4333
..	..	@@ -6269,7 +8004,7 @@
6269	8004	return null;
6270	8005	}
6271	8006
6272		- void ReleaseTextures(cTexture tex)
	8007	+ public void ReleaseTextures(cTexture tex) // INTERFACE
6273	8008	{
6274	8009	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
6275	8010	{
..	..	@@ -6286,7 +8021,7 @@
6286	8021	String pigment = Object3D.GetPigment(tex);
6287	8022	String bump = Object3D.GetBump(tex);
6288	8023
6289		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8024	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
6290	8025	{
6291	8026	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
6292	8027	// System.out.println("; bump = " + bump);
..	..	@@ -6301,13 +8036,71 @@
6301	8036	pigment = null;
6302	8037	}
6303	8038
6304		- ReleaseTexture(bump, true);
6305		- ReleaseTexture(pigment, false);
	8039	+ ReleaseTexture(tex, true);
	8040	+ ReleaseTexture(tex, false);
6306	8041	}
6307	8042
6308		- void ReleaseTexture(String tex, boolean bump)
	8043	+ public void ReleasePigmentTexture(cTexture tex) // INTERFACE
6309	8044	{
6310		- 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 \|\|/
6311	8104	ambientOcclusion ) // \|\| !textureon)
6312	8105	{
6313	8106	return;
..	..	@@ -6316,7 +8109,7 @@
6316	8109	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
6317	8110
6318	8111	if (tex != null)
6319		- texture = textures.get(tex);
	8112	+ texture = bump ? texturebump.get(tex) : texturepigment.get(tex);
6320	8113
6321	8114	// //assert( texture != null );
6322	8115	// if (texture == null)
..	..	@@ -6408,9 +8201,57 @@
6408	8201	}
6409	8202	}
6410	8203
6411		- /boolean/ void BindTextures(cTexture tex, int resolution)
	8204	+ /boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
6412	8205	{
6413		- 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 \|\|/
6414	8255	ambientOcclusion ) // \|\| !textureon)
6415	8256	{
6416	8257	return; // false;
..	..	@@ -6419,17 +8260,47 @@
6419	8260	if (tex == null)
6420	8261	{
6421	8262	BindTexture(null,false,resolution);
6422		- BindTexture(null,true,resolution);
6423	8263	return;
6424	8264	}
6425	8265
6426	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	+
6427	8299	String bump = Object3D.GetBump(tex);
6428	8300
6429		- usedtextures.put(pigment, pigment);
6430		- usedtextures.put(bump, bump);
	8301	+ usedtextures.add(tex);
6431	8302
6432		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8303	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
6433	8304	{
6434	8305	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
6435	8306	// System.out.println("; bump = " + bump);
..	..	@@ -6439,43 +8310,94 @@
6439	8310	{
6440	8311	bump = null;
6441	8312	}
6442		- if (pigment.equals(""))
6443		- {
6444		- pigment = null;
6445		- }
6446	8313
6447		- GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
6448		- BindTexture(pigment, false, resolution);
6449	8314	GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
6450		- BindTexture(bump, true, resolution);
	8315	+ BindTexture(tex, true, resolution);
6451	8316	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
6452		-
6453		- return; // true;
6454	8317	}
6455	8318
6456		- 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)
6457	8322	{
6458		- 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;
6459	8342
6460	8343	if (tex != null)
6461	8344	{
6462		- String texname = tex;
	8345	+ String texname = bump ? Object3D.GetBump(tex) : Object3D.GetPigment(tex);
	8346	+ byte[] texdata = bump ? tex.bumpdata : tex.pigmentdata;
6463	8347
6464		- String[] split = tex.split("Textures");
6465		- if (split.length > 1)
6466		- texname = "/Users/nbriere/Textures" + split[split.length-1];
6467		- else
6468		- if (!texname.startsWith("/"))
6469		- texname = "/Users/nbriere/Textures/" + texname;
	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	+ }
6470	8365
6471	8366	if (CACHETEXTURE)
6472		- texture = textures.get(texname); // TEXTURE CACHE
6473		-
6474		- TextureData texturedata = null;
6475		-
6476		- if (texture == null \|\| texture.resolution < resolution)
6477	8367	{
6478		- 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(""))
6479	8401	{
6480	8402	assert(!bump);
6481	8403	// if (bump)
..	..	@@ -6486,19 +8408,23 @@
6486	8408	// }
6487	8409	// else
6488	8410	// {
6489		- texture = textures.get(tex);
6490		- if (texture == null)
	8411	+ // texturecache = textures.get(texname); // suspicious
	8412	+ if (texturecache == null)
6491	8413	{
6492		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8414	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
6493	8415	}
	8416	+ else
	8417	+ new Exception().printStackTrace();
6494	8418	// }
6495	8419	} else
6496		- if (tex.equals("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
	8420	+ if (texname.endsWith("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
6497	8421	{
6498	8422	assert(bump);
6499		- texture = textures.get(tex);
6500		- if (texture == null)
6501		- 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();
6502	8428	} else
6503	8429	{
6504	8430	//if (tex.equals("IMMORTAL"))
..	..	@@ -6506,11 +8432,13 @@
6506	8432	// texture = GetResourceTexture("default.png");
6507	8433	//} else
6508	8434	//{
6509		- if (tex.equals("WHITE_NOISE"))
	8435	+ if (texname.endsWith("WHITE_NOISE"))
6510	8436	{
6511		- texture = textures.get(tex);
6512		- if (texture == null)
6513		- 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();
6514	8442	} else
6515	8443	{
6516	8444	if (textureon)
..	..	@@ -6535,7 +8463,7 @@
6535	8463	}
6536	8464
6537	8465	cachename = texname.substring(0, texname.length()-4)+ext+".jpg";
6538		- if (!new File(cachename).exists())
	8466	+ if (!FileExists(cachename))
6539	8467	cachename = texname;
6540	8468	else
6541	8469	processbump = false; // don't process bump map again
..	..	@@ -6557,7 +8485,7 @@
6557	8485	}
6558	8486
6559	8487	cachename = texname.substring(0, texname.length()-4)+ext+".png";
6560		- if (!new File(cachename).exists())
	8488	+ if (!FileExists(cachename))
6561	8489	cachename = texname;
6562	8490	else
6563	8491	processbump = false; // don't process bump map again
..	..	@@ -6566,20 +8494,22 @@
6566	8494	texturedata = GetFileTexture(cachename, processbump, resolution);
6567	8495
6568	8496
6569		- if (texturedata != null)
6570		- 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);
6571	8501	//texture = GetTexture(tex, bump);
6572	8502	}
6573	8503	}
6574	8504	//}
6575	8505	}
6576	8506
6577		- if (/CACHETEXTURE &&/ texture != null && textureon)
	8507	+ if (texdata == null && /CACHETEXTURE &&/ texturecache != null && textureon)
6578	8508	{
6579	8509	//return false;
6580	8510
6581	8511	// System.out.println("CACHE +++++++++++++++ TEXTURE : " + texname + " (" + texture.getEstimatedMemorySize() + ")");
6582		- if (texturedata != null && (texname.endsWith(".jpg") \|\| texname.endsWith(".JPG")))
	8512	+ if (texturedata != null && texname.toLowerCase().endsWith(".jpg"))
6583	8513	{
6584	8514	// String ext = "_highres";
6585	8515	// if (REDUCETEXTURE)
..	..	@@ -6596,52 +8526,17 @@
6596	8526	File cachefile = new File(texname.substring(0, texname.length()-4)+ext+".jpg");
6597	8527	if (!cachefile.exists())
6598	8528	{
6599		- // cache to disk
6600		- Buffer buffer = texturedata.getBuffer(); // getMipmapData();
6601		- //buffers[0].
6602		-
6603		- ByteBuffer bytebuf = (ByteBuffer)buffer; // ).asIntBuffer();
6604		- int[] pixels = new int[bytebuf.capacity()/3];
6605		-
6606		- // squared size heuristic...
6607		- if ((int)Math.sqrt(pixels.length) == Math.sqrt(pixels.length))
	8529	+ //if (texturedata.getWidth() == texturedata.getHeight())
6608	8530	{
6609		- for (int i=pixels.length; --i>=0;)
6610		- {
6611		- int i3 = i*3;
6612		- pixels[i] = 0xFF;
6613		- pixels[i] <<= 8;
6614		- pixels[i] \|= bytebuf.get(i3+2) & 0xFF;
6615		- pixels[i] <<= 8;
6616		- pixels[i] \|= bytebuf.get(i3+1) & 0xFF;
6617		- pixels[i] <<= 8;
6618		- pixels[i] \|= bytebuf.get(i3) & 0xFF;
6619		- }
6620		-
6621		- /*
6622		- int r=0,g=0,b=0,a=0;
6623		- for (int i=0; i<width; i++)
6624		- for (int j=0; j<height; j++)
6625		- {
6626		- int index = j*width+i;
6627		- int p = pixels[index];
6628		- a = ((p>>24) & 0xFF);
6629		- r = ((p>>16) & 0xFF);
6630		- g = ((p>>8) & 0xFF);
6631		- b = (p & 0xFF);
6632		- pixels[index] = (a<<24) \| (b<<16) \| (g<<8) \| r;
6633		- }
6634		- /**/
6635		- int width = (int)Math.sqrt(pixels.length); // squared
6636		- int height = width;
6637		- BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
6638		- rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
	8531	+ BufferedImage rendImage = CreateBim(texturedata);
	8532	+
6639	8533	ImageWriter writer = null;
6640	8534	Iterator iter = ImageIO.getImageWritersByFormatName("jpg");
6641	8535	if (iter.hasNext()) {
6642	8536	writer = (ImageWriter)iter.next();
6643	8537	}
6644		- float compressionQuality = 0.9f;
	8538	+
	8539	+ float compressionQuality = 0.85f;
6645	8540	try
6646	8541	{
6647	8542	ImageOutputStream ios = ImageIO.createImageOutputStream(cachefile);
..	..	@@ -6658,18 +8553,20 @@
6658	8553	}
6659	8554	}
6660	8555	}
6661		-
	8556	+
	8557	+ Hashtable<cTexture, CacheTexture> textures = bump ? texturebump : texturepigment;
	8558	+
6662	8559	//System.out.println("Texture = " + tex);
6663		- if (textures.containsKey(texname))
	8560	+ if (textures.containsKey(tex))
6664	8561	{
6665		- CacheTexture thetex = textures.get(texname);
	8562	+ CacheTexture thetex = textures.get(tex);
6666	8563	thetex.texture.disable();
6667	8564	thetex.texture.dispose();
6668		- textures.remove(texname);
	8565	+ textures.remove(tex);
6669	8566	}
6670	8567
6671		- texture.texturedata = texturedata;
6672		- textures.put(texname, texture);
	8568	+ //texture.texturedata = texturedata;
	8569	+ textures.put(tex, texturecache);
6673	8570
6674	8571	// newtex = true;
6675	8572	}
..	..	@@ -6685,10 +8582,44 @@
6685	8582	}
6686	8583	}
6687	8584
6688		- return texture;
	8585	+ return texturecache;
6689	8586	}
6690	8587
6691		- 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
6692	8623	{
6693	8624	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
6694	8625
..	..	@@ -6706,21 +8637,21 @@
6706	8637	return texture!=null?texture.texture:null;
6707	8638	}
6708	8639
6709		- 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
6710	8641	{
6711	8642	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
6712	8643
6713	8644	return texture!=null?texture.texturedata:null;
6714	8645	}
6715	8646
6716		- boolean BindTexture(String tex, boolean bump, int resolution)
	8647	+ boolean BindTexture(cTexture tex, boolean bump, int resolution) throws Exception
6717	8648	{
6718	8649	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
6719	8650	{
6720	8651	return false;
6721	8652	}
6722	8653
6723		- boolean newtex = false;
	8654	+ //boolean newtex = false;
6724	8655
6725	8656	com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
6726	8657
..	..	@@ -6752,9 +8683,75 @@
6752	8683	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_S, GetGL().GL_REPEAT);
6753	8684	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_T, GetGL().GL_REPEAT);
6754	8685
6755		- return newtex;
	8686	+ return true; // Warning: not used.
6756	8687	}
6757	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	+
6758	8755	ShadowBuffer shadowPBuf;
6759	8756	AntialiasBuffer antialiasPBuf;
6760	8757	int MAXSTACK;
..	..	@@ -6947,7 +8944,7 @@
6947	8944
6948	8945	if (cubemap == null)
6949	8946	{
6950		- LoadEnvy(5);
	8947	+ //LoadEnvy(1);
6951	8948	}
6952	8949
6953	8950	//cubemap.enable();
..	..	@@ -7234,37 +9231,58 @@
7234	9231	cubemap = null;
7235	9232	return;
7236	9233	case 1:
7237		- name = "cubemaps/box_";
7238		- ext = "png";
	9234	+ name = "cubemaps/rgb/";
	9235	+ ext = "jpg";
7239	9236	reverseUP = false;
7240	9237	break;
7241	9238	case 2:
7242		- name = "cubemaps/uffizi_";
7243		- ext = "png";
7244		- break; // reverseUP = true; break;
	9239	+ name = "cubemaps/uffizi/";
	9240	+ ext = "jpg";
	9241	+ reverseUP = false;
	9242	+ break;
7245	9243	case 3:
7246		- name = "cubemaps/CloudyHills_";
7247		- ext = "tga";
	9244	+ name = "cubemaps/CloudyHills/";
	9245	+ ext = "jpg";
7248	9246	reverseUP = false;
7249	9247	break;
7250	9248	case 4:
7251		- name = "cubemaps/cornell_";
	9249	+ name = "cubemaps/cornell/";
7252	9250	ext = "png";
7253	9251	reverseUP = false;
7254	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;
7255	9278	default:
7256		- name = "cubemaps/rgb_";
7257		- ext = "png"; /mipmap = true;/ reverseUP = false;
	9279	+ name = "cubemaps/box/";
	9280	+ ext = "png"; /mipmap = true;/
	9281	+ reverseUP = false;
7258	9282	break;
7259	9283	}
7260		-
7261		- try
7262		- {
7263		- cubemap = LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
7264		- } catch (IOException e)
7265		- {
7266		- throw new RuntimeException(e);
7267		- }
	9284	+
	9285	+ LoadSkybox(name, ext, mipmap);
7268	9286	}
7269	9287
7270	9288	public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height)
..	..	@@ -7296,8 +9314,12 @@
7296	9314	static double[] model = new double[16];
7297	9315	double[] camera2light = new double[16];
7298	9316	double[] light2camera = new double[16];
7299		- int newenvy = -1;
7300		- boolean envyoff = true; // false;
	9317	+
	9318	+ //int newenvy = -1;
	9319	+ //boolean envyoff = false;
	9320	+
	9321	+ String loadedskyboxname;
	9322	+
7301	9323	cVector light0 = new cVector(0, 0, 0); // 1,3,2);
7302	9324	//float[] light0 = { 0,0,0 };
7303	9325	cVector dirlight = new cVector(0, 0, 1); // 1,3,2);
..	..	@@ -7310,9 +9332,9 @@
7310	9332	static boolean occlusionInitialized = false;
7311	9333	boolean selection = false;
7312	9334	boolean pointselection = false;
7313		- /static/ boolean lighttouched = true;
	9335	+ ///static/ boolean lighttouched = true;
7314	9336	boolean deselect;
7315		- boolean ambientOcclusion = false;
	9337	+ private boolean ambientOcclusion = false;
7316	9338	static boolean flash = false;
7317	9339	/static/ boolean wait = false;
7318	9340	boolean displaydone = false; // after repaint() calls
..	..	@@ -7442,6 +9464,8 @@
7442	9464	//gl.glFrustum(-0.5scale, 0.5scale, -0.5scale, 0.5scale, 1, 100);
7443	9465	//glu.gluPerspective(lightshaper_fovy, 1, lightshaper_zNear, lightshaper_zFar);
7444	9466	double scale = lightCamera.SCALE / lightCamera.Distance();
	9467	+// PATCH FILLE AUX JEANS
	9468	+ //scale *= lightCamera.shaper_fovy / 25;
7445	9469	gl.glScaled(2 * scale, 2 * scale, -scale);
7446	9470	gl.glTranslated(0, 0, lightCamera.DECAL);
7447	9471
..	..	@@ -7588,17 +9612,40 @@
7588	9612	jy8[3] = 0.5f;
7589	9613	}
7590	9614
7591		- float[] options1 = new float[]{1000, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
	9615	+ float[] options1 = new float[]{100, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
7592	9616	float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
7593		- float[] options3 = new float[]{1, 1, 1, 1}; // fog color. image intensity
	9617	+ float[] options3 = new float[]{1, 1, 1, 0}; // fog color
	9618	+ float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
7594	9619
	9620	+ void ResetOptions()
	9621	+ {
	9622	+ options1[0] = 100;
	9623	+ options1[1] = 0.025f;
	9624	+ options1[2] = 0.01f;
	9625	+ options1[3] = 0;
	9626	+ options1[4] = 0;
	9627	+
	9628	+ options2[0] = 0;
	9629	+ options2[1] = 0.75f;
	9630	+ options2[2] = 0;
	9631	+ options2[3] = 0;
	9632	+
	9633	+ options3[0] = 1;
	9634	+ options3[1] = 1;
	9635	+ options3[2] = 1;
	9636	+ options3[3] = 0;
	9637	+
	9638	+ options4[0] = 1;
	9639	+ options4[1] = 0;
	9640	+ options4[2] = 1;
	9641	+ options4[3] = 0;
	9642	+ }
	9643	+
7595	9644	static int imagecount = 0; // movie generation
7596	9645
7597	9646	static int jitter = 0;
7598	9647
7599	9648	boolean restartframe = false;
7600		-
7601		- static int framecount = 0; // general-purpose global count
7602	9649
7603	9650	void displayAntiAliased(javax.media.opengl.GL gl)
7604	9651	{
..	..	@@ -7630,7 +9677,7 @@
7630	9677	gl.glClear(gl.GL_ACCUM_BUFFER_BIT);
7631	9678	for (jitter = 0; jitter < ACSIZE; jitter++) //, GrafreeD.wav.cursor += LIVE ? 735 : 0)
7632	9679	{
7633		- framecount++;
	9680	+ Globals.framecount++;
7634	9681
7635	9682	if (CameraPane.tickcount > 0)
7636	9683	CameraPane.tickcount--;
..	..	@@ -7668,7 +9715,7 @@
7668	9715
7669	9716	gl.glLightfv(gl.GL_LIGHT0, gl.GL_POSITION, pos, 0);
7670	9717	*/
7671		- lighttouched = true;
	9718	+ Globals.lighttouched = true;
7672	9719	//System.err.println(" shadowbuffer: " + jitter);
7673	9720	shadowbuffer.display();
7674	9721
..	..	@@ -7689,8 +9736,8 @@
7689	9736	assert (parentcam != renderCamera);
7690	9737
7691	9738	if (renderCamera != lightCamera)
7692		- for (int count = parentcam.GetTransformCount(); --count>=0;)
7693		- LA.matConcat(parentcam.toParent, matrix, matrix);
	9739	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9740	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
7694	9741
7695	9742	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
7696	9743
..	..	@@ -7705,8 +9752,8 @@
7705	9752	LA.matCopy(renderCamera.fromScreen, matrix);
7706	9753
7707	9754	if (renderCamera != lightCamera)
7708		- for (int count = parentcam.GetTransformCount(); --count>=0;)
7709		- LA.matConcat(matrix, parentcam.fromParent, matrix);
	9755	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9756	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
7710	9757
7711	9758	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
7712	9759
..	..	@@ -7752,10 +9799,12 @@
7752	9799	rati = 1 / rati;
7753	9800	gl.glOrtho(-skyscale / rati, skyscale / rati, -skyscale, skyscale, 0.001, 1000);
7754	9801	}
7755		- assert (newenvy == -1);
	9802	+
	9803	+ //assert (newenvy == -1);
	9804	+
7756	9805	gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
7757	9806	gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
7758		- DrawSkyBox(gl);
	9807	+ DrawSkyBox(gl, (float)rati);
7759	9808	gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
7760	9809	gl.glEnable(GL.GL_VERTEX_PROGRAM_ARB);
7761	9810	accPerspective(gl, renderCamera.shaper_fovy / ratio,
..	..	@@ -7778,7 +9827,7 @@
7778	9827	//gl.glFlush();
7779	9828	gl.glAccum(gl.GL_ACCUM, 1.0f / ACSIZE);
7780	9829
7781		- if (ANIMATION && ABORTED)
	9830	+ if (Globals.ANIMATION && ABORTED)
7782	9831	{
7783	9832	System.err.println(" ABORTED FRAME");
7784	9833	break;
..	..	@@ -7808,7 +9857,7 @@
7808	9857	setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
7809	9858
7810	9859	// save image
7811		- if (ANIMATION && !ABORTED)
	9860	+ if (Globals.ANIMATION && !ABORTED)
7812	9861	{
7813	9862	VPwidth = viewport[2];
7814	9863	VPheight = viewport[3];
..	..	@@ -7919,11 +9968,11 @@
7919	9968
7920	9969	// imagecount++;
7921	9970
7922		- String fullname = filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
	9971	+ String fullname = Globals.filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
7923	9972
7924	9973	if (!BOXMODE)
7925	9974	{
7926		- System.out.println("image: " + fullname + " (" + (GrafreeD.wav.cursor / 735 / 4) + ")");
	9975	+ System.out.println("image: " + fullname + " (wav cursor=" + (Grafreed.wav.cursor / 735 / 4) + ")");
7927	9976	}
7928	9977
7929	9978	if (!BOXMODE)
..	..	@@ -7961,7 +10010,7 @@
7961	10010	ABORTED = false;
7962	10011	}
7963	10012	else
7964		- GrafreeD.wav.cursor += 735 * ACSIZE;
	10013	+ Grafreed.wav.cursor += 735 * ACSIZE;
7965	10014
7966	10015	if (false)
7967	10016	{
..	..	@@ -8615,13 +10664,6 @@
8615	10664	}
8616	10665	}
8617	10666
8618		- boolean IsFrozen()
8619		- {
8620		- boolean selectmode = drawMode == SELECTION \|\| CameraPane.DEBUG_SELECTION;
8621		-
8622		- return !selectmode && cameracount == 0; // != 0;
8623		- }
8624		-
8625	10667	boolean niceon = false;
8626	10668	javax.swing.Timer AAtimer = new javax.swing.Timer(750, this);
8627	10669	boolean currentlydrawing = false;
..	..	@@ -8631,16 +10673,16 @@
8631	10673
8632	10674	public void display(GLAutoDrawable drawable)
8633	10675	{
8634		- if (GrafreeD.savesound && GrafreeD.hassound)
	10676	+ if (Grafreed.savesound && Grafreed.hassound)
8635	10677	{
8636		- GrafreeD.wav.save();
8637		- GrafreeD.savesound = false;
8638		- GrafreeD.hassound = false;
	10678	+ Grafreed.wav.save();
	10679	+ Grafreed.savesound = false;
	10680	+ Grafreed.hassound = false;
8639	10681	}
8640	10682	// if (DEBUG_SELECTION)
8641	10683	// {
8642		-// if (drawMode != SELECTION)
8643		-// drawMode = SELECTION;
	10684	+// if (DrawMode() != SELECTION)
	10685	+// DrawMode() = SELECTION;
8644	10686	// }
8645	10687
8646	10688	if (!isRenderer)
..	..	@@ -8696,9 +10738,9 @@
8696	10738
8697	10739	//ANTIALIAS = 0;
8698	10740
8699		- if (drawMode == DEFAULT) // && CURRENTANTIALIAS > 0)
	10741	+ if (DrawMode() == DEFAULT) // && CURRENTANTIALIAS > 0)
8700	10742	{
8701		- if (niceon \|\| isLIVE())
	10743	+ if (niceon \|\| Globals.isLIVE())
8702	10744	{
8703	10745	//if(active == 0)
8704	10746	// antialiaser = null;
..	..	@@ -8711,6 +10753,7 @@
8711	10753	ANTIALIAS = 0;
8712	10754	//System.out.println("RESTART");
8713	10755	AAtimer.restart();
	10756	+ Globals.TIMERRUNNING = true;
8714	10757	}
8715	10758	}
8716	10759	}
..	..	@@ -8723,7 +10766,7 @@
8723	10766	assert eyeCamera.shaper_zFar == 1E5f; // 500.0f;
8724	10767	*/
8725	10768
8726		- if (drawMode == DEFAULT)
	10769	+ if (DrawMode() == DEFAULT)
8727	10770	{
8728	10771	currentlydrawing = true;
8729	10772	}
..	..	@@ -8754,18 +10797,18 @@
8754	10797
8755	10798	// if(Applet3D.clipboard != null)
8756	10799	// System.out.println("Clipboard = " + Applet3D.clipboard); //.get(0).parent);
8757		-//drawMode = SELECTION;
	10800	+//DrawMode() = SELECTION;
8758	10801	indexcount = 0;
8759	10802
8760		- if (drawMode == OCCLUSION)
	10803	+ if (DrawMode() == OCCLUSION)
8761	10804	{
8762		- drawMode = DEFAULT;
	10805	+ Globals.drawMode = DEFAULT; // WARNING
8763	10806	ambientOcclusion = true;
8764	10807	setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
8765	10808	Object3D theobject = object;
8766	10809	Object3D theparent = object.parent;
8767	10810	object.parent = null;
8768		- object = (Object3D)GrafreeD.clone(object);
	10811	+ object = (Object3D)Grafreed.clone(object);
8769	10812	object.Stripify();
8770	10813	if (theobject.selection == null \|\| theobject.selection.Size() == 0)
8771	10814	theobject.PreprocessOcclusion(this);
..	..	@@ -8778,19 +10821,20 @@
8778	10821	ambientOcclusion = false;
8779	10822	}
8780	10823
8781		- if (lighttouched && drawMode == DEFAULT && !lightMode) // && !FROZEN)
	10824	+ if (//Globals.lighttouched &&
	10825	+ DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
8782	10826	{
8783	10827	//if (RENDERSHADOW) // ?
8784	10828	if (!IsFrozen())
8785	10829	{
8786	10830	// dec 2012
8787		- if (!(!flash && !lightMode && drawMode == DEFAULT && ANTIALIAS > 0))
	10831	+ if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
8788	10832	{
8789		- framecount++;
	10833	+ Globals.framecount++;
8790	10834	shadowbuffer.display();
8791	10835	}
8792	10836	}
8793		- lighttouched = false; // ??
	10837	+ Globals.lighttouched = false; // ??
8794	10838	//drawing = true;
8795	10839	//lighttouched = true;
8796	10840	}
..	..	@@ -8811,9 +10855,9 @@
8811	10855	//eyeCamera.shaper_fovy = 1;
8812	10856	}
8813	10857
8814		- if ((RENDERPROGRAM != 0 \|\| ambientOcclusion \|\| spherical) && drawMode == DEFAULT) // SELECTION)
	10858	+ if ((RENDERPROGRAM != 0 \|\| ambientOcclusion \|\| spherical) && DrawMode() == DEFAULT) // SELECTION)
8815	10859	{
8816		- //System.out.println("drawMode = " + drawMode);
	10860	+ //System.out.println("DrawMode() = " + DrawMode());
8817	10861	vertexMode \|= VP_PASS;
8818	10862	//vertexMode \|= VP_PROJECTION;
8819	10863	if (!ambientOcclusion)
..	..	@@ -8873,7 +10917,7 @@
8873	10917	Camera cam = renderCamera; // lightMode?lightCamera:eyeCamera;
8874	10918	//Camera lightcam = new Camera(light0);
8875	10919
8876		- if (drawMode == SHADOW)
	10920	+ if (DrawMode() == SHADOW)
8877	10921	{
8878	10922	/*
8879	10923	gl.glMatrixMode(GL.GL_MODELVIEW);
..	..	@@ -8911,8 +10955,8 @@
8911	10955
8912	10956	// if (parentcam != renderCamera) // not a light
8913	10957	if (cam != lightCamera)
8914		- for (int count = parentcam.GetTransformCount(); --count>=0;)
8915		- LA.matConcat(parentcam.toParent, matrix, matrix);
	10958	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10959	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
8916	10960
8917	10961	for (int j = 0; j < 4; j++)
8918	10962	{
..	..	@@ -8926,8 +10970,8 @@
8926	10970
8927	10971	// if (parentcam != renderCamera) // not a light
8928	10972	if (cam != lightCamera)
8929		- for (int count = parentcam.GetTransformCount(); --count>=0;)
8930		- LA.matConcat(matrix, parentcam.fromParent, matrix);
	10973	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10974	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
8931	10975
8932	10976	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
8933	10977
..	..	@@ -8963,7 +11007,7 @@
8963	11007	gl.glClear(gl.GL_DEPTH_BUFFER_BIT);
8964	11008	} else
8965	11009	{
8966		- if (drawMode != DEFAULT)
	11010	+ if (DrawMode() != DEFAULT)
8967	11011	{
8968	11012	gl.glClearColor(1, 1, 1, 0);
8969	11013	} // 1);
..	..	@@ -9013,13 +11057,27 @@
9013	11057	gl.glOrtho(-skyscale / ratio, skyscale / ratio, -skyscale, skyscale, 0.001, 1000);
9014	11058	}
9015	11059
9016		- if (newenvy > -1)
	11060	+// if (newenvy > -1)
	11061	+// {
	11062	+// LoadEnvy(newenvy);
	11063	+// }
	11064	+//
	11065	+// newenvy = -1;
	11066	+
	11067	+ if (object.skyboxname != null)
9017	11068	{
9018		- LoadEnvy(newenvy);
	11069	+ if (!object.skyboxname.equals(this.loadedskyboxname))
	11070	+ {
	11071	+ LoadSkybox(object.skyboxname + "/", object.skyboxext, false);
	11072	+ loadedskyboxname = object.skyboxname;
	11073	+ }
9019	11074	}
9020		-
9021		- newenvy = -1;
9022		-
	11075	+ else
	11076	+ {
	11077	+ cubemap = null;
	11078	+ loadedskyboxname = null;
	11079	+ }
	11080	+
9023	11081	ratio = ((double) getWidth()) / getHeight();
9024	11082	//System.out.println("ratio = " + ratio);
9025	11083
..	..	@@ -9028,14 +11086,14 @@
9028	11086
9029	11087	fast &= !ambientOcclusion;
9030	11088
9031		- if (drawMode == DEFAULT)
	11089	+ if (DrawMode() == DEFAULT)
9032	11090	{
9033	11091	//gl.glEnable(gl.GL_ALPHA_TEST);
9034	11092	//gl.glActiveTexture(GL.GL_TEXTURE0);
9035	11093
9036	11094	if (!IsFrozen() && !ambientOcclusion)
9037	11095	{
9038		- DrawSkyBox(gl);
	11096	+ DrawSkyBox(gl, (float)ratio);
9039	11097	}
9040	11098
9041	11099	//if (selection_view == -1)
..	..	@@ -9089,6 +11147,8 @@
9089	11147	//gl.glFrustum(-0.5scale, 0.5scale, -0.5scale, 0.5scale, 1, 100);
9090	11148	//glu.gluPerspective(lightshaper_fovy, 1, lightshaper_zNear, lightshaper_zFar);
9091	11149	double scale = lightCamera.SCALE / lightCamera.Distance();
	11150	+// PATCH FILLE AUX JEANS
	11151	+ //scale *= lightCamera.shaper_fovy / 25;
9092	11152	gl.glScaled(2 * scale, 2 * scale, -scale);
9093	11153	gl.glTranslated(0, 0, lightCamera.DECAL);
9094	11154
..	..	@@ -9184,7 +11244,16 @@
9184	11244	// Bump noise
9185	11245	gl.glActiveTexture(GL.GL_TEXTURE6);
9186	11246	//gl.glBindTexture(GL.GL_TEXTURE_2D, bump_noise);
9187		- BindTexture(NOISE_TEXTURE, false, 2);
	11247	+
	11248	+ try
	11249	+ {
	11250	+ BindTexture(NOISE_TEXTURE, false, 2);
	11251	+ }
	11252	+ catch (Exception e)
	11253	+ {
	11254	+ System.err.println("FAILED: " + NOISE_TEXTURE);
	11255	+ }
	11256	+
9188	11257
9189	11258	gl.glActiveTexture(GL.GL_TEXTURE0);
9190	11259	gl.glEnable(GL.GL_TEXTURE_2D);
..	..	@@ -9207,9 +11276,9 @@
9207	11276
9208	11277	gl.glMatrixMode(GL.GL_MODELVIEW);
9209	11278
9210		-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
9211		-//gl.glEnable(gl.GL_POLYGON_SMOOTH);
9212		-//gl.glEnable(gl.GL_MULTISAMPLE);
	11279	+gl.glEnable(gl.GL_POLYGON_SMOOTH);
	11280	+gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
	11281	+gl.glEnable(gl.GL_MULTISAMPLE);
9213	11282	} else
9214	11283	{
9215	11284	//gl.glDisable(GL.GL_TEXTURE_2D);
..	..	@@ -9220,14 +11289,16 @@
9220	11289	//System.out.println("BLENDING ON");
9221	11290	gl.glEnable(GL.GL_BLEND);
9222	11291	gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
9223		-
	11292	+// gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
9224	11293	gl.glMatrixMode(gl.GL_PROJECTION);
9225	11294	gl.glLoadIdentity();
9226	11295
9227		- if (drawMode == SHADOW \|\| cam == lightCamera) // \|\| (vertexMode&VP_PROJECTION) != 0)
	11296	+ if (DrawMode() == SHADOW \|\| cam == lightCamera) // \|\| (vertexMode&VP_PROJECTION) != 0)
9228	11297	{
9229	11298	//glu.gluPerspective(lightshaper_fovy, 1, lightshaper_zNear, lightshaper_zFar);
9230	11299	double scale = lightCamera.SCALE / lightCamera.Distance();
	11300	+// PATCH FILLE AUX JEANS
	11301	+ //scale *= lightCamera.shaper_fovy / 25;
9231	11302	gl.glScaled(2 * scale, 2 * scale, -scale);
9232	11303	gl.glTranslated(0, 0, lightCamera.DECAL);
9233	11304	//System.out.println("DECAL = " + LIGHTDECAL + "; SCALE = " + LIGHTSCALE);
..	..	@@ -9280,7 +11351,7 @@
9280	11351	//gl.glPushMatrix();
9281	11352	gl.glLoadIdentity();
9282	11353
9283		- if (!ambientOcclusion) // drawMode != OCCLUSION)
	11354	+ if (!ambientOcclusion) // DrawMode() != OCCLUSION)
9284	11355	{
9285	11356	//LA.xformPos(light0, lightCamera.fromScreen, light);
9286	11357	LA.xformDir(dirlight, lightCamera.fromScreen, lightposition);
..	..	@@ -9307,8 +11378,8 @@
9307	11378	System.err.println("parentcam != renderCamera");
9308	11379
9309	11380	// if (cam != lightCamera)
9310		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9311		- LA.xformDir(lightposition, parentcam.toParent, lightposition); // may 2013
	11381	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11382	+ LA.xformDir(lightposition, parentcam.GlobalTransformInv(), lightposition); // may 2013
9312	11383	}
9313	11384
9314	11385	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -9329,8 +11400,8 @@
9329	11400	if (true) // TODO
9330	11401	{
9331	11402	if (cam != lightCamera)
9332		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9333		- LA.xformDir(light0, parentcam.toParent, light0); // may 2013
	11403	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11404	+ LA.xformDir(light0, parentcam.GlobalTransform(), light0); // may 2013
9334	11405	}
9335	11406
9336	11407	LA.xformPos(light0, cam.toScreen, light0);
..	..	@@ -9367,7 +11438,7 @@
9367	11438	}
9368	11439
9369	11440	/**/
9370		- if (true) // drawMode == SELECTION) // != DEFAULT)
	11441	+ if (true) // DrawMode() == SELECTION) // != DEFAULT)
9371	11442	gl.glDisable(gl.GL_LIGHTING);
9372	11443	else
9373	11444	gl.glEnable(gl.GL_LIGHTING);
..	..	@@ -9379,12 +11450,13 @@
9379	11450
9380	11451	gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 63, options2, 0);
9381	11452	gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 62, options3, 0);
	11453	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 61, options4, 0);
9382	11454
9383	11455	options2[0] *= renderCamera.Distance();
9384	11456
9385	11457	lightslot = 64;
9386	11458
9387		- if (!frozen && !ambientOcclusion && isRenderer && drawMode == DEFAULT)
	11459	+ if (!frozen && !ambientOcclusion && isRenderer && DrawMode() == DEFAULT)
9388	11460	{
9389	11461	DrawLights(object);
9390	11462	}
..	..	@@ -9395,7 +11467,7 @@
9395	11467	fragmentMode \|= (lightslot - 64) << 2; // 1; // first bit is available for aniso
9396	11468	//System.out.println("fragmentMode = " + fragmentMode);
9397	11469
9398		- if (drawMode == DEFAULT \|\| drawMode == SELECTION \|\| DEBUG_SELECTION)
	11470	+ if (DrawMode() == DEFAULT \|\| DrawMode() == SELECTION \|\| IsDebugSelection())
9399	11471	{
9400	11472	/*
9401	11473	if (CULLFACE \|\| (ambientOcclusion && OCCLUSION_CULLING))
..	..	@@ -9428,7 +11500,7 @@
9428	11500	}
9429	11501	}
9430	11502
9431		- if (drawMode == DEFAULT)
	11503	+ if (DrawMode() == DEFAULT)
9432	11504	{
9433	11505	if (WIREFRAME && !ambientOcclusion)
9434	11506	{
..	..	@@ -9446,7 +11518,7 @@
9446	11518	gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9447	11519	gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9448	11520
9449		- if (!fast/RENDERPROGRAM != 0/ && (drawMode == DEFAULT \|\| drawMode == SHADOW)) // && !WIREFRAME) //
	11521	+ if (!fast/RENDERPROGRAM != 0/ && (DrawMode() == DEFAULT \|\| DrawMode() == SHADOW)) // && !WIREFRAME) //
9450	11522	{
9451	11523	if (vertexMode != 0) // && !fast)
9452	11524	{
..	..	@@ -9466,7 +11538,7 @@
9466	11538	}
9467	11539	}
9468	11540
9469		- if (false) // fast && !IsFreezed() && drawMode != SELECTION && !ambientOcclusion)
	11541	+ if (false) //RENDERPROGRAM > 0 && DrawMode() == DEFAULT) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
9470	11542	{
9471	11543	//gl.glDepthFunc(GL.GL_LEQUAL);
9472	11544	//gl.glClear(gl.GL_COLOR_BUFFER_BIT \| gl.GL_DEPTH_BUFFER_BIT);
..	..	@@ -9474,27 +11546,24 @@
9474	11546
9475	11547	boolean texon = textureon;
9476	11548
9477		- if (RENDERPROGRAM > 0)
9478		- {
9479		- gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9480		- textureon = false;
9481		- }
	11549	+ gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11550	+ textureon = false;
	11551	+
9482	11552	//gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9483	11553	//System.out.println("ALLO");
9484	11554	gl.glColorMask(false, false, false, false);
9485	11555	DrawObject(gl);
9486		- if (RENDERPROGRAM > 0)
9487		- {
9488		- gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
9489		- textureon = texon;
9490		- }
	11556	+
	11557	+ gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11558	+ textureon = texon;
	11559	+
9491	11560	gl.glColorMask(true, true, true, true);
9492	11561
9493	11562	gl.glDepthFunc(GL.GL_EQUAL);
9494		- //gl.glDepthMask(false);
	11563	+ gl.glDepthMask(false);
9495	11564	}
9496	11565
9497		- if (false) // drawMode == SHADOW)
	11566	+ if (false) // DrawMode() == SHADOW)
9498	11567	{
9499	11568	//SetColumnMajorData(cameraInverseTransform, view_1);
9500	11569	//System.out.println("light = " + cameraInverseTransform);
..	..	@@ -9508,16 +11577,16 @@
9508	11577	//System.out.println("object = " + object);
9509	11578	if (!frozen && !imageLocked)
9510	11579	{
9511		- if (!flash && !lightMode && drawMode == DEFAULT && ANTIALIAS > 0)
	11580	+ if (!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0)
9512	11581	{
9513	11582	displayAntiAliased(gl);
9514	11583	} else
9515	11584	{
9516	11585	programcount = 0;
9517		- int keepmode = drawMode;
	11586	+ int keepmode = DrawMode();
9518	11587	// if (DEBUG_SELECTION)
9519	11588	// {
9520		-// drawMode = SELECTION;
	11589	+// DrawMode() = SELECTION;
9521	11590	// }
9522	11591	// for point selection
9523	11592	// gl.glGetDoublev(gl.GL_MODELVIEW_MATRIX, tempmat, 0);
..	..	@@ -9527,10 +11596,10 @@
9527	11596	DrawObject(gl);
9528	11597
9529	11598	// jan 2013 System.err.println("RESET ABORT (display)");
9530		- // if (drawMode == DEFAULT)
	11599	+ // if (DrawMode() == DEFAULT)
9531	11600	// ABORTED = false;
9532	11601	fullreset = false;
9533		- drawMode = keepmode;
	11602	+ Globals.drawMode = keepmode; // WARNING
9534	11603	//System.out.println("PROGRAM SWITCH " + programcount);
9535	11604	}
9536	11605	}
..	..	@@ -9538,11 +11607,11 @@
9538	11607	gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9539	11608	gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9540	11609
9541		- if (drawMode == DEFAULT)
	11610	+ if (DrawMode() == DEFAULT)
9542	11611	{
9543	11612	ReleaseTexture(NOISE_TEXTURE, false);
9544	11613	}
9545		- //if (drawMode == DEFAULT)
	11614	+ //if (DrawMode() == DEFAULT)
9546	11615	{
9547	11616
9548	11617	gl.glActiveTexture(GL.GL_TEXTURE1);
..	..	@@ -9554,7 +11623,7 @@
9554	11623	//else
9555	11624	//gl.glDisable(gl.GL_TEXTURE_2D);
9556	11625	//gl.glPopMatrix();
9557		- if (imageCompleted && ANTIALIAS > 0 && drawMode == DEFAULT && cam != lightCamera && !ambientOcclusion)
	11626	+ if (imageCompleted && ANTIALIAS > 0 && DrawMode() == DEFAULT && cam != lightCamera && !ambientOcclusion)
9558	11627	{
9559	11628	//new Exception().printStackTrace();
9560	11629	//System.out.println("Draw image " + width + ", " + height);
..	..	@@ -9596,7 +11665,7 @@
9596	11665	//gl.glFlush();
9597	11666	}
9598	11667
9599		- if (flash && drawMode == DEFAULT)
	11668	+ if (flash && DrawMode() == DEFAULT)
9600	11669	{
9601	11670	flash = false;
9602	11671	wait = true;
..	..	@@ -9604,9 +11673,9 @@
9604	11673	}
9605	11674
9606	11675	//drawing = false;
9607		- //if(drawMode == DEFAULT)
	11676	+ //if(DrawMode() == DEFAULT)
9608	11677	// niceon = false;
9609		- if (drawMode == DEFAULT)
	11678	+ if (DrawMode() == DEFAULT)
9610	11679	{
9611	11680	currentlydrawing = false;
9612	11681	}
..	..	@@ -9626,7 +11695,7 @@
9626	11695	repaint();
9627	11696	}
9628	11697
9629		- if (isLIVE() && drawMode == DEFAULT) // may 2013
	11698	+ if (Globals.isLIVE() && DrawMode() == DEFAULT) // may 2013
9630	11699	repaint();
9631	11700
9632	11701	displaydone = true;
..	..	@@ -9645,8 +11714,14 @@
9645	11714	{
9646	11715	renderpass++;
9647	11716	// System.out.println("Draw object... ");
	11717	+ STEP = 1;
9648	11718	if (FAST) // in case there is no script
9649		- STEP = 16;
	11719	+ STEP = 8;
	11720	+
	11721	+ if (CURRENTANTIALIAS == 0 \|\| ACSIZE == 1)
	11722	+ {
	11723	+ STEP *= 4;
	11724	+ }
9650	11725
9651	11726	//object.FullInvariants();
9652	11727
..	..	@@ -9660,23 +11735,44 @@
9660	11735	e.printStackTrace();
9661	11736	}
9662	11737
9663		- if (GrafreeD.RENDERME > 0)
9664		- GrafreeD.RENDERME--; // mechante magouille
	11738	+ if (Grafreed.RENDERME > 0)
	11739	+ Grafreed.RENDERME--; // mechante magouille
9665	11740
9666		- ONESTEP = false;
	11741	+ Globals.ONESTEP = false;
9667	11742	}
9668	11743
9669	11744	static boolean zoomonce = false;
9670	11745
	11746	+ static void CreateSelectedPoint()
	11747	+ {
	11748	+ if (selectedpoint == null)
	11749	+ {
	11750	+ debugpointG = new Sphere();
	11751	+ debugpointP = new Sphere();
	11752	+ debugpointC = new Sphere();
	11753	+ debugpointR = new Sphere();
	11754	+
	11755	+ selectedpoint = new Superellipsoid();
	11756	+
	11757	+ for (int i=0; i<8; i++)
	11758	+ {
	11759	+ debugpoints[i] = new Sphere();
	11760	+ }
	11761	+ }
	11762	+ }
	11763	+
9671	11764	void DrawObject(GL gl, boolean draw)
9672	11765	{
	11766	+ // To clear camera values
	11767	+ ResetOptions();
	11768	+
9673	11769	//System.out.println("DRAW OBJECT " + mouseDown);
9674		-// drawMode = SELECTION;
	11770	+// DrawMode() = SELECTION;
9675	11771	//GL gl = getGL();
9676	11772	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
9677	11773	{
9678		- if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && drawMode == SHADOW) // && !lightMode)
9679		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	11774	+ if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
	11775	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
9680	11776	pingthread.StepToTarget(true); // true);
9681	11777	// zoomonce = false;
9682	11778	}
..	..	@@ -9696,9 +11792,9 @@
9696	11792	callist = gl.glGenLists(1);
9697	11793	}
9698	11794
9699		- boolean selectmode = drawMode == SELECTION \|\| CameraPane.DEBUG_SELECTION;
	11795	+ boolean selectmode = DrawMode() == SELECTION \|\| IsDebugSelection();
9700	11796
9701		- boolean active = !selectmode; // drawMode != SELECTION; // mouseDown;
	11797	+ boolean active = !selectmode; // DrawMode() != SELECTION; // mouseDown;
9702	11798
9703	11799	if (!mainDL \|\| !active \|\| touched)
9704	11800	{
..	..	@@ -9725,13 +11821,20 @@
9725	11821	PushMatrix(ClickInfo.matbuffer);
9726	11822	}
9727	11823
9728		- if (drawMode == 0)
	11824	+ if (DrawMode() == 0)
9729	11825	{
9730	11826	// System.out.println("CLEAR +++++++++++++++ +++++++++++++++ +++++++++++++++ +++++++++++++++");
9731	11827
9732	11828	usedtextures.clear();
9733	11829
9734		- BindTextures(DEFAULT_TEXTURES, 2);
	11830	+ try
	11831	+ {
	11832	+ BindTextures(DEFAULT_TEXTURES, 2);
	11833	+ }
	11834	+ catch (Exception e)
	11835	+ {
	11836	+ System.err.println("FAILED: " + DEFAULT_TEXTURES);
	11837	+ }
9735	11838	}
9736	11839	//System.out.println("--> " + stackdepth);
9737	11840	// GrafreeD.traceon();
..	..	@@ -9739,10 +11842,11 @@
9739	11842	// DRAW
9740	11843	object.draw(this, /(Composite)/ object, false, false);
9741	11844
9742		- if (drawMode == DEFAULT)
	11845	+ if (DrawMode() == DEFAULT)
9743	11846	{
9744		- if (DEBUG)
	11847	+ if (Globals.DEBUG)
9745	11848	{
	11849	+ CreateSelectedPoint();
9746	11850	float radius = 0.05f;
9747	11851	if (selectedpoint.radius != radius)
9748	11852	{
..	..	@@ -9750,40 +11854,40 @@
9750	11854	selectedpoint.radius = radius;
9751	11855	selectedpoint.recalculate();
9752	11856	selectedpoint.material = new cMaterial();
9753		- selectedpoint.material.color = 0.25f;
	11857	+ selectedpoint.material.color = 0.15f; // Yellow
9754	11858	selectedpoint.material.modulation = 0.75f;
9755	11859
9756		- debugpoint.radius = radius;
9757		- debugpoint.recalculate();
9758		- debugpoint.material = new cMaterial();
9759		- debugpoint.material.color = 0.25f;
9760		- debugpoint.material.modulation = 0.75f;
	11860	+ debugpointG.radius = radius;
	11861	+ debugpointG.recalculate();
	11862	+ debugpointG.material = new cMaterial();
	11863	+ debugpointG.material.color = 0.25f; // Green
	11864	+ debugpointG.material.modulation = 0.75f;
9761	11865
9762		- debugpoint2.radius = radius;
9763		- debugpoint2.recalculate();
9764		- debugpoint2.material = new cMaterial();
9765		- debugpoint2.material.color = 0.75f;
9766		- debugpoint2.material.modulation = 0.75f;
	11866	+ debugpointP.radius = radius;
	11867	+ debugpointP.recalculate();
	11868	+ debugpointP.material = new cMaterial();
	11869	+ debugpointP.material.color = 0.75f; // Purple
	11870	+ debugpointP.material.modulation = 0.75f;
9767	11871
9768		- debugpoint3.radius = radius;
9769		- debugpoint3.recalculate();
9770		- debugpoint3.material = new cMaterial();
9771		- debugpoint3.material.color = 0.5f;
9772		- debugpoint3.material.modulation = 0.75f;
	11872	+ debugpointC.radius = radius;
	11873	+ debugpointC.recalculate();
	11874	+ debugpointC.material = new cMaterial();
	11875	+ debugpointC.material.color = 0.5f; // Cyan
	11876	+ debugpointC.material.modulation = 0.75f;
9773	11877
9774		- debugpoint4.radius = radius;
9775		- debugpoint4.recalculate();
9776		- debugpoint4.material = new cMaterial();
9777		- debugpoint4.material.color = 0f;
9778		- debugpoint4.material.modulation = 0.75f;
	11878	+ debugpointR.radius = radius;
	11879	+ debugpointR.recalculate();
	11880	+ debugpointR.material = new cMaterial();
	11881	+ debugpointR.material.color = 0f; // Red
	11882	+ debugpointR.material.modulation = 0.75f;
9779	11883
9780	11884	InitPoints(radius);
9781	11885	}
9782	11886	selectedpoint.draw(this, /(Composite)/ null, false, false);
9783		- debugpoint.draw(this, /(Composite)/ null, false,false);
9784		- debugpoint2.draw(this, /(Composite)/ null, false,false);
9785		- debugpoint3.draw(this, /(Composite)/ null, false,false);
9786		- debugpoint4.draw(this, /(Composite)/ null, false,false);
	11887	+ debugpointG.draw(this, /(Composite)/ null, false,false);
	11888	+ debugpointP.draw(this, /(Composite)/ null, false,false);
	11889	+ debugpointC.draw(this, /(Composite)/ null, false,false);
	11890	+ debugpointR.draw(this, /(Composite)/ null, false,false);
9787	11891	// DrawPoints(this);
9788	11892	}
9789	11893
..	..	@@ -9791,42 +11895,63 @@
9791	11895	}
9792	11896	// GrafreeD.traceoff();
9793	11897	//System.out.println(stackdepth);
9794		- if (drawMode == 0)
	11898	+ if (DrawMode() == 0)
9795	11899	{
9796	11900	ReleaseTextures(DEFAULT_TEXTURES);
9797	11901
9798	11902	if (CLEANCACHE)
9799		- for (java.util.Enumeration<String> e = textures.keys() ; e.hasMoreElements();)
	11903	+ for (java.util.Enumeration<cTexture> e = texturepigment.keys() ; e.hasMoreElements();)
9800	11904	{
9801		- String tex = e.nextElement();
	11905	+ cTexture tex = e.nextElement();
9802	11906
9803	11907	// System.out.println("Texture --------- " + tex);
9804	11908
9805		- if (tex.equals("WHITE_NOISE"))
	11909	+ if (tex.equals("WHITE_NOISE:"))
9806	11910	continue;
9807	11911
9808		- if (!usedtextures.containsKey(tex))
	11912	+ if (!usedtextures.contains(tex))
9809	11913	{
	11914	+ CacheTexture gettex = texturepigment.get(tex);
9810	11915	// System.out.println("DISPOSE +++++++++++++++ " + tex);
9811		- textures.get(tex).texture.dispose();
9812		- textures.remove(tex);
	11916	+ if (gettex != null)
	11917	+ {
	11918	+ gettex.texture.dispose();
	11919	+ texturepigment.remove(tex);
	11920	+ }
	11921	+
	11922	+ gettex = texturebump.get(tex);
	11923	+ // System.out.println("DISPOSE +++++++++++++++ " + tex);
	11924	+ if (gettex != null)
	11925	+ {
	11926	+ gettex.texture.dispose();
	11927	+ texturebump.remove(tex);
	11928	+ }
9813	11929	}
9814	11930	}
9815	11931	}
9816	11932
9817	11933	checker = null;
9818	11934
9819		- if (!ambientOcclusion && !IsFrozen() && drawMode == DEFAULT)
	11935	+ if (!ambientOcclusion && !IsFrozen() && DrawMode() == DEFAULT)
9820	11936	FindChecker(object);
9821	11937
9822		- if (checker != null && drawMode == DEFAULT)
	11938	+ if (checker != null && DrawMode() == DEFAULT)
9823	11939	{
9824		- // BindTexture(IMMORTAL_TEXTURE);
	11940	+ //BindTexture(IMMORTAL_TEXTURE);
	11941	+ try
	11942	+ {
	11943	+ BindTextures(checker.GetTextures(), checker.texres);
	11944	+ }
	11945	+ catch (Exception e)
	11946	+ {
	11947	+ System.err.println("FAILED: " + checker.GetTextures());
	11948	+ }
9825	11949	// NEAREST
9826	11950	GetGL().glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST); // GL.GL_LINEAR);
9827	11951	DrawChecker(gl);
9828	11952	//checker.Draw(this, null, false);
9829	11953	// ReleaseTexture(IMMORTAL_TEXTURE);
	11954	+ ReleaseTextures(checker.GetTextures());
9830	11955	}
9831	11956
9832	11957	if (object.parent != null)
..	..	@@ -9839,7 +11964,7 @@
9839	11964	//gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9840	11965	//gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9841	11966
9842		- if (DISPLAYTEXT && drawMode == DEFAULT)
	11967	+ if (DISPLAYTEXT && DrawMode() == DEFAULT)
9843	11968	{
9844	11969	// Draw it once, then use the raster
9845	11970	Balloon(gl, balloon.createGraphics());
..	..	@@ -9895,14 +12020,14 @@
9895	12020	int[] xs = new int[3];
9896	12021	int[] ys = new int[3];
9897	12022
9898		- void DrawString(Object3D obj) // String string)
	12023	+ public void DrawString(Object3D obj) // String string) // INTERFACE
9899	12024	{
9900		- if (!DISPLAYTEXT \|\| drawMode != DEFAULT)
	12025	+ if (!DISPLAYTEXT \|\| DrawMode() != DEFAULT)
9901	12026	{
9902	12027	return;
9903	12028	}
9904	12029
9905		- String string = obj.GetToolTip();
	12030	+ String string = obj.toString(); //.GetToolTip();
9906	12031
9907	12032	GL gl = GetGL();
9908	12033
..	..	@@ -10219,8 +12344,8 @@
10219	12344	//obj.TransformToWorld(light, light);
10220	12345	for (int i = tp.size(); --i >= 0;)
10221	12346	{
10222		- for (int count = tp.get(i).GetTransformCount(); --count>=0;)
10223		- LA.xformPos(light, tp.get(i).toParent, light);
	12347	+ //for (int count = tp.get(i).GetTransformCount(); --count>=0;)
	12348	+ LA.xformPos(light, tp.get(i).GlobalTransformInv(), light);
10224	12349	}
10225	12350
10226	12351
..	..	@@ -10237,8 +12362,8 @@
10237	12362	parentcam = cameras[0];
10238	12363	}
10239	12364
10240		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10241		- LA.xformPos(light, parentcam.toParent, light); // may 2013
	12365	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	12366	+ LA.xformPos(light, parentcam.GlobalTransform(), light); // may 2013
10242	12367
10243	12368	LA.xformPos(light, renderCamera.toScreen, light);
10244	12369
..	..	@@ -10328,8 +12453,76 @@
10328	12453
10329	12454	//gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
10330	12455
10331		- String program =
	12456	+ String programmin =
	12457	+ // Min shader
10332	12458	"!!ARBfp1.0\n" +
	12459	+ "PARAM zero123 = { 0.0, 1.0, 2, 1.25 };" +
	12460	+ "PARAM pow2 = { 0.5, 0.25, 0.125, 0.0 };" +
	12461	+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
	12462	+ "PARAM eps = { 0.001, 0.001, 0.001, 1.0 };" +
	12463	+ "PARAM infinity = { 100000000, 100000000, 100000000, 1.0 };" +
	12464	+ "PARAM light2cam0 = program.env[10];" +
	12465	+ "PARAM light2cam1 = program.env[11];" +
	12466	+ "PARAM light2cam2 = program.env[12];" +
	12467	+ "TEMP temp;" +
	12468	+ "TEMP light;" +
	12469	+ "TEMP ndotl;" +
	12470	+ "TEMP normal;" +
	12471	+ "TEMP depth;" +
	12472	+ "TEMP eye;" +
	12473	+ "TEMP pos;" +
	12474	+
	12475	+ "MAD normal, fragment.color, zero123.z, -zero123.y;" +
	12476	+ Normalize("normal") +
	12477	+ "MOV light, state.light[0].position;" +
	12478	+ "DP3 ndotl.x, light, normal;" +
	12479	+
	12480	+ // shadow
	12481	+ "MOV pos, fragment.texcoord[1];" +
	12482	+ "MOV temp, pos;" +
	12483	+ ShadowTextureFetch("depth", "temp", "1") +
	12484	+ //"TEX depth, fragment.texcoord[1], texture[1], 2D;" +
	12485	+ "SLT ndotl.z, fragment.texcoord[1].z, depth.z;" +
	12486	+
	12487	+ // No shadow when out of frustum
	12488	+ //"SGE temp.y, depth.z, zero123.y;" +
	12489	+ //"LRP temp.x, temp.y, zero123.y, temp.x;" +
	12490	+
	12491	+ "MUL ndotl.x, ndotl.x, ndotl.z;" + // Shadow
	12492	+
	12493	+ // Backlit
	12494	+ "MOV pos.w, zero123.y;" +
	12495	+ "DP4 eye.x, pos, light2cam0;" +
	12496	+ "DP4 eye.y, pos, light2cam1;" +
	12497	+ "DP4 eye.z, pos, light2cam2;" +
	12498	+ Normalize("eye") +
	12499	+
	12500	+ "DP3 ndotl.y, -eye, normal;" +
	12501	+ //"MUL ndotl.y, ndotl.y, pow2.x;" +
	12502	+ "POW ndotl.y, ndotl.y, pow2.z;" + // backlit
	12503	+ "SUB ndotl.y, zero123.y, ndotl.y;" +
	12504	+ //"SUB ndotl.y, zero123.y, ndotl.y;" +
	12505	+ //"MUL ndotl.y, ndotl.y, pow2.z;" +
	12506	+
	12507	+ //"MAX ndotl.x, ndotl.x, ndotl.y;" + // Ambient
	12508	+ //"MAX ndotl.x, ndotl.x, pow2.y;" + // Ambient
	12509	+
	12510	+ // Pigment
	12511	+ "TEX temp, fragment.texcoord[0], texture[0], 2D;" +
	12512	+ "LRP temp, zero123.w, temp, one;" + // texture proportion
	12513	+ "MUL temp, temp, ndotl.x;" +
	12514	+
	12515	+ "MUL temp, temp, zero123.z;" +
	12516	+
	12517	+ //"MUL temp, temp, ndotl.y;" +
	12518	+
	12519	+ "MOV temp.w, zero123.y;" + // reset alpha
	12520	+ "MOV result.color, temp;" +
	12521	+ "END";
	12522	+
	12523	+ String programmax =
	12524	+ "!!ARBfp1.0\n" +
	12525	+
10333	12526	//"OPTION ARB_fragment_program_shadow;" +
10334	12527	"PARAM light2cam0 = program.env[10];" +
10335	12528	"PARAM light2cam1 = program.env[11];" +
..	..	@@ -10357,11 +12550,13 @@
10357	12550	"PARAM params6 = program.env[6];" + // bump, noise, borderfade, fog punchthrough
10358	12551	"PARAM params7 = program.env[7];" + // noise power, opacity power
10359	12552	"PARAM options0 = program.env[63];" + // fog density, intensity, elevation
10360		- "PARAM options1 = program.env[62];" + // fog rgb color, image intensity
	12553	+ "PARAM options1 = program.env[62];" + // fog rgb color
	12554	+ "PARAM options2 = program.env[61];" + // image intensity, subsurface, lightsheen
10361	12555	"PARAM pointlight = program.env[127];" + // ...
10362	12556	"PARAM zero = { 0.0, 0.0, 0.0, 0.0 };" +
10363	12557	"PARAM halfhalf = { 0.25, 0.25, 0.25, 1.0 };" +
10364	12558	"PARAM half = { 0.5, 0.5, 0.5, 1.0 };" +
	12559	+ "PARAM threequarter = { 0.75, 0.75, 0.75, 1.0 };" +
10365	12560	"PARAM two = { 2.0, 2.0, 2.0, 1.0 };" +
10366	12561	"PARAM ten = { 10, 10, 10, 1.0 };" +
10367	12562	"PARAM one3rd = { 0.5, 0.33333333333, 0.333333333, 1.0 };" +
..	..	@@ -10382,6 +12577,7 @@
10382	12577	"PARAM lodbias = { 10,10,10,10 };" + // 20, -2, -20, 1.0 };" +
10383	12578	"PARAM infinity = { 100000000, 100000000, 100000000, 1.0 };" +
10384	12579	"PARAM one2048th = { 0.00048828125, 0.00048828125, 0.00048828125, 1.0 };" +
	12580	+ "PARAM ninetenth = { 0.9, 0.9, 0.9, 1.0 };" +
10385	12581	"PARAM almostone = { 0.999, 0.999, 0.999, 1.0 };" +
10386	12582	"PARAM c256 = { 256, 256, 256, 1.0 };" +
10387	12583	"PARAM c256i = { 0.00390625, 0.00390625, 0.00390625, 1.0 };" +
..	..	@@ -10422,6 +12618,10 @@
10422	12618	"TEMP R1;" +
10423	12619	"TEMP R2;" +
10424	12620	"TEMP R3;" +
	12621	+ "TEMP min;" +
	12622	+ "TEMP max;" +
	12623	+ "TEMP average;" +
	12624	+ "TEMP saturation;" +
10425	12625	"TEMP keep1;" +
10426	12626	"TEMP keep2;" +
10427	12627	"TEMP keep3;" +
..	..	@@ -10437,8 +12637,7 @@
10437	12637	"TEMP shininess;" +
10438	12638	"\n" +
10439	12639	"MOV texSamp, one;" +
10440		- //"TEX texSamp, fragment.texcoord[0], texture[0], 2D;" +
10441		-
	12640	+
10442	12641	"MOV mapgrid.x, one2048th.x;" +
10443	12642	"MOV temp, fragment.texcoord[1];" +
10444	12643	/*
..	..	@@ -10459,20 +12658,20 @@
10459	12658	"MUL temp, floor, mapgrid.x;" +
10460	12659	//"TEX depth0, temp, texture[1], 2D;" +
10461	12660	(((mode & FP_SOFTSHADOW) == 0) ? "" :
10462		- TextureFetch("depth0", "temp", "1") +
	12661	+ ShadowTextureFetch("depth0", "temp", "1") +
10463	12662	"") +
10464	12663	"ADD temp.x, temp.x, mapgrid.x;" +
10465	12664	//"TEX depth1, temp, texture[1], 2D;" +
10466	12665	(((mode & FP_SOFTSHADOW) == 0) ? "" :
10467		- TextureFetch("depth1", "temp", "1") +
	12666	+ ShadowTextureFetch("depth1", "temp", "1") +
10468	12667	"") +
10469	12668	"ADD temp.y, temp.y, mapgrid.x;" +
10470	12669	//"TEX depth2, temp, texture[1], 2D;" +
10471		- TextureFetch("depth2", "temp", "1") +
	12670	+ ShadowTextureFetch("depth2", "temp", "1") +
10472	12671	"SUB temp.x, temp.x, mapgrid.x;" +
10473	12672	//"TEX depth3, temp, texture[1], 2D;" +
10474	12673	(((mode & FP_SOFTSHADOW) == 0) ? "" :
10475		- TextureFetch("depth3", "temp", "1") +
	12674	+ ShadowTextureFetch("depth3", "temp", "1") +
10476	12675	"") +
10477	12676	//"MUL texSamp0, texSamp0, state.material.front.diffuse;" +
10478	12677	//"MOV params, material;" +
..	..	@@ -10843,10 +13042,10 @@
10843	13042	"MAD shadow.x, buffer.x, frac.y, shadow.x;" +
10844	13043	"") +
10845	13044
10846		- // display shadow only (bump == 0)
	13045	+ // display shadow only (fakedepth == 0)
10847	13046	"SUB temp.x, half.x, shadow.x;" +
10848		- "MOV temp.y, -params6.x;" +
10849		- "SLT temp.z, temp.y, zero.x;" +
	13047	+ "MOV temp.y, -params5.z;" + // params6.x;" +
	13048	+ "SLT temp.z, temp.y, -c256i.x;" +
10850	13049	"SUB temp.y, one.x, temp.z;" +
10851	13050	"MUL temp.x, temp.x, temp.y;" +
10852	13051	"KIL temp.x;" +
..	..	@@ -10952,10 +13151,42 @@
10952	13151
10953	13152	// skin?
10954	13153	// Saturation for skin
10955		- /**/ // c'est ici
10956		- (Skinshader? "DP3 temp.x, final,one;" +
	13154	+ /**/
	13155	+ (Skinshader?
	13156	+ "DP3 average.x, final,one;" +
	13157	+ "MUL average, one3rd.xxxx,average.xxxx;" +
	13158	+
	13159	+ "MIN min.x, final.x,final.y;" +
	13160	+ "MIN min.x, min.x,final.z;" +
	13161	+
	13162	+ "MAX max.x, final.x,final.y;" +
	13163	+ "MAX max.x, max.x,final.z;" +
	13164	+ "MOV max, max.xxxx;" +
	13165	+
	13166	+ "SUB saturation, max, final;" +
	13167	+
	13168	+ "ADD temp.x, max.x, one10th.x;" +
	13169	+ "RCP temp.x, temp.x;" +
	13170	+ "MUL temp.x, temp.x, half.x;" +
	13171	+ "MUL saturation, saturation, temp.xxxx;" +
	13172	+
	13173	+ "DP3 ndotl.x, normald, light;" +
	13174	+ "MAX ndotl.x, ndotl.x, -ndotl.x;" +
	13175	+
	13176	+ "SUB temp.x, one.x, ndotl.x;" +
	13177	+ // Tuning for default skin
	13178	+ //"ADD temp.x, temp.x, options2.z;" + // lightsheen
	13179	+ "MAD temp.x, options2.z, half.y, temp.x;" + // lightsheen
	13180	+ "ADD temp.y, one.y, options2.y;" + // subsurface
	13181	+ "MUL temp.x, temp.x, temp.y;" +
	13182	+
	13183	+ "MUL saturation, saturation, temp.xxxx;" +
	13184	+ "SUB_SAT temp, max, saturation;" +
	13185	+/**
	13186	+ "DP3 temp.x, final,one;" +
10957	13187	"MUL R2, one3rd.xxxx,temp.xxxx;" +
10958		- "SUB temp, final,R2;" +
	13188	+ "SUB temp, final, R2;" +
	13189	+
10959	13190	// using light angle
10960	13191	"DP3 ndotl.x, normald,light;" +
10961	13192	//"SLT ndotl.y, ndotl.x, zero.x;" +
..	..	@@ -10968,7 +13199,6 @@
10968	13199	// using light intensity
10969	13200	"MOV ndotl.z, R2.x;" +
10970	13201	"MUL ndotl.z, ndotl.z, ndotl.z;" + // tuning...
10971		-
10972	13202	// june 2014
10973	13203	"MAD R1.x, ndotl.z,slope.y,one.x;" +
10974	13204	// "SUB ndotl.x, one.x, ndotl.x;" +
..	..	@@ -10980,6 +13210,7 @@
10980	13210	//"MUL R2.y, shadow.x,R2.y;" + // avril 2014
10981	13211
10982	13212	"MAD temp.x, R2.y, ndotl.y, temp.x;" + // red shift (skin)
	13213	+/**/
10983	13214
10984	13215	// "ADD final, R2,temp;" +
10985	13216	"MOV final, temp;"
..	..	@@ -11069,7 +13300,7 @@
11069	13300	/**/
11070	13301	// HDR
11071	13302	"MOV temp.z, final.a;" +
11072		- "MUL final, final,options1.w;" +
	13303	+ "MUL final, final,options2.x;" +
11073	13304	"MOV final.a, temp.z;" +
11074	13305	/**/
11075	13306
..	..	@@ -11145,7 +13376,14 @@
11145	13376	//once = true;
11146	13377	}
11147	13378
11148		- System.out.print("Program #" + mode + "; length = " + program.length());
	13379	+ String program = programmax;
	13380	+
	13381	+ if (Globals.MINSHADER)
	13382	+ {
	13383	+ program = programmin;
	13384	+ }
	13385	+
	13386	+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
11149	13387	System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
11150	13388	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
11151	13389
..	..	@@ -11238,30 +13476,32 @@
11238	13476	return out;
11239	13477	}
11240	13478
11241		- String TextureFetch(String dest, String src, String unit)
	13479	+ // Also does frustum culling
	13480	+ String ShadowTextureFetch(String dest, String src, String unit)
11242	13481	{
11243	13482	return "TEX " + dest + ", " + src + ", texture[" + unit + "], 2D;" +
11244	13483	"SGE " + src + ".w, " + src + ".x, eps.x;" +
11245	13484	"SGE " + src + ".z, " + src + ".y, eps.x;" +
	13485	+ "SLT " + dest + ".x, " + src + ".x, one.x;" +
	13486	+ "SLT " + dest + ".y, " + src + ".y, one.x;" +
11246	13487	"MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
11247		- "SLT " + src + ".z, " + src + ".x, one.x;" +
11248		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
11249		- "SLT " + src + ".z, " + src + ".y, one.x;" +
11250		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
	13488	+ "MUL " + src + ".w, " + dest + ".x, " + src + ".w;" +
	13489	+ "MUL " + src + ".w, " + dest + ".y, " + src + ".w;" +
11251	13490	//"SWZ buffer, temp, w,w,w,w;";
11252		- "MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
	13491	+ //"MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
11253	13492	"SUB " + src + ".z, " + "one.x, " + src + ".w;" +
11254	13493	//"MUL " + src + ".z, " + src + ".z, infinity.x;" +
11255	13494	//"ADD " + dest + ".z, " + dest + ".z, " + src + ".z;";
11256		- "MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
	13495	+ //"MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
11257	13496
11258		- //"LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
11259		- //"LRP " + dest + ".z" + ", " + src + ".w, infinity.x," + dest + ".z;";
	13497	+ //?? "LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
	13498	+ "LRP " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
11260	13499	}
11261	13500
11262	13501	String Shadow(String depth, String shadow)
11263	13502	{
11264	13503	return "MAX temp.x, ndotl.x, one64th.x;" +
	13504	+ "MIN temp.x, temp.x, ninetenth.x;" +
11265	13505	/**/
11266	13506	// Sine
11267	13507	"MUL temp.y, temp.x, temp.x;" +
..	..	@@ -11277,12 +13517,16 @@
11277	13517
11278	13518	"ADD " + depth + ".z, " + depth + ".z, temp.x;" +
11279	13519	//"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing!
	13520	+
	13521	+ // Compare fragment depth in light space with shadowmap.
11280	13522	"SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" +
11281	13523	"SGE temp.y, temp.x, zero.x;" +
11282		- "SUB " + shadow + ".y, one.x, temp.y;" +
	13524	+ "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded
	13525	+
	13526	+ // Reverse comparison
11283	13527	"SUB temp.x, one.x, temp.x;" +
11284	13528	"MUL " + shadow + ".x, temp.x, temp.y;" +
11285		- "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded
	13529	+ "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse
11286	13530	"POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth
11287	13531
11288	13532	"SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" +
..	..	@@ -11296,6 +13540,10 @@
11296	13540	// No shadow for backface
11297	13541	"DP3 temp.x, normal, lightd;" +
11298	13542	"SLT temp.x, temp.x, zero.x;" + // shadoweps
	13543	+ "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
	13544	+
	13545	+ // No shadow when out of frustum
	13546	+ "SGE temp.x, " + depth + ".z, one.z;" +
11299	13547	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
11300	13548	"";
11301	13549	}
..	..	@@ -11442,7 +13690,8 @@
11442	13690	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
11443	13691	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
11444	13692	/static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
11445		- Object3D.cVector2[] vector2buffer;
	13693	+
	13694	+ //Object3D.cVector2[] vector2buffer;
11446	13695
11447	13696	// IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
11448	13697	// OUT : diff, spec
..	..	@@ -11458,9 +13707,10 @@
11458	13707	"DP3 " + dest + ".z," + "normals," + "eye;" +
11459	13708	"MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
11460	13709	//"MOV " + dest + ".w," + "normal.z;" +
11461		- "MUL " + dest + ".z," + "params2.w," + dest + ".x;" +
11462		- "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
11463		- //"MOV " + dest + ".z," + "params2.w;" +
	13710	+// "MUL " + dest + ".z," + "params2.w," + dest + ".x;" + // PRETTY HEURISTIC FOR VELVET
	13711	+// "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
	13712	+
	13713	+ "MOV " + dest + ".z," + "params2.w;" + // EXACT
11464	13714	"POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
11465	13715	"RCP " + dest + ".w," + dest + ".w;" +
11466	13716	//"RSQ " + dest + ".w," + dest + ".w;" +
..	..	@@ -11854,7 +14104,7 @@
11854	14104	public void mousePressed(MouseEvent e)
11855	14105	{
11856	14106	//System.out.println("mousePressed: " + e);
11857		- clickStart(e.getX(), e.getY(), e.getModifiersEx());
	14107	+ clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
11858	14108	}
11859	14109
11860	14110	static long prevtime = 0;
..	..	@@ -11881,14 +14131,16 @@
11881	14131
11882	14132	//System.err.println("Dtime = " + Dtime + "; units = " + e.getUnitsToScroll() + "; ratio (units/ms) = " + ratio);
11883	14133
	14134	+ if (BUTTONLESSWHEEL)
11884	14135	if (Math.abs(ratio) < 0.1 \|\| Math.abs(Dtime) == 0) // < 30)
11885	14136	{
11886	14137	return;
11887	14138	}
11888	14139
	14140	+ boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
11889	14141
11890	14142	// TIMER
11891		- if (!wheeltimer.isRunning() && e.getModifiersEx() == 0) // VR
	14143	+ if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
11892	14144	{
11893	14145	keepboxmode = BOXMODE;
11894	14146	keepsupport = SUPPORT;
..	..	@@ -11928,8 +14180,8 @@
11928	14180	// mode \|= META;
11929	14181	//}
11930	14182
11931		- SetMouseMode(WHEEL \| e.getModifiersEx());
11932		- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0);
	14183	+ SetMouseMode(e.getModifiers(), WHEEL \| e.getModifiersEx());
	14184	+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
11933	14185	anchorX = ax;
11934	14186	anchorY = ay;
11935	14187	prevX = px;
..	..	@@ -11963,6 +14215,7 @@
11963	14215	else
11964	14216	if (evt.getSource() == AAtimer)
11965	14217	{
	14218	+ Globals.TIMERRUNNING = false;
11966	14219	if (mouseDown)
11967	14220	{
11968	14221	//new Exception().printStackTrace();
..	..	@@ -11988,6 +14241,10 @@
11988	14241	// LIVE = waslive;
11989	14242	// wasliveok = true;
11990	14243	// waslive = false;
	14244	+
	14245	+ // May 2019 Forget it:
	14246	+ if (true)
	14247	+ return;
11991	14248
11992	14249	// source == timer
11993	14250	if (mouseDown)
..	..	@@ -12017,8 +14274,8 @@
12017	14274	// ObjEditor.tweenManager.update(1f / 60f);
12018	14275
12019	14276	// fev 2014???
12020		- if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && drawMode == SHADOW) // && !lightMode)
12021		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	14277	+ if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
	14278	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
12022	14279	pingthread.StepToTarget(true); // true);
12023	14280	}
12024	14281	// if (!LIVE)
..	..	@@ -12027,12 +14284,13 @@
12027	14284
12028	14285	javax.swing.Timer timer = new javax.swing.Timer(350, this);
12029	14286
12030		- void clickStart(int x, int y, int modifiers)
	14287	+ void clickStart(int x, int y, int modifiers, int modifiersex)
12031	14288	{
12032	14289	if (!wasliveok)
12033	14290	return;
12034	14291
12035	14292	AAtimer.restart(); //
	14293	+ Globals.TIMERRUNNING = true;
12036	14294
12037	14295	// waslive = LIVE;
12038	14296	// LIVE = false;
..	..	@@ -12044,7 +14302,7 @@
12044	14302	// touched = true; // main DL
12045	14303	if (isRenderer)
12046	14304	{
12047		- SetMouseMode(modifiers);
	14305	+ SetMouseMode(modifiers, modifiersex);
12048	14306	}
12049	14307
12050	14308	selectX = anchorX = x;
..	..	@@ -12057,7 +14315,7 @@
12057	14315	clicked = true;
12058	14316	hold = false;
12059	14317
12060		- if (((modifiers & ~1024) & ~0) == 0) // Single or multiple selection
	14318	+ if (((modifiersex & ~1024) & ~0) == 0) // Single or multiple selection
12061	14319	// june 2013 means CTRL_CLICK: if (((modifiers & ~1024) & ~128) == 0) // Single or multiple selection
12062	14320	{
12063	14321	// System.out.println("RESTART II " + modifiers);
..	..	@@ -12082,14 +14340,15 @@
12082	14340	drag = false;
12083	14341	//System.out.println("Mouse DOWN");
12084	14342	editObj = false;
12085		- ClickInfo info = new ClickInfo();
12086		- info.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
12087		- info.pane = this;
12088		- info.camera = renderCamera;
12089		- info.x = x;
12090		- info.y = y;
12091		- info.modifiers = modifiers;
12092		- editObj = object.doEditClick(info, 0);
	14343	+ //ClickInfo info = new ClickInfo();
	14344	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14345	+ object.clickInfo.pane = this;
	14346	+ object.clickInfo.camera = renderCamera;
	14347	+ object.clickInfo.x = x;
	14348	+ object.clickInfo.y = y;
	14349	+ object.clickInfo.modifiers = modifiersex;
	14350	+ editObj = object.doEditClick(//info,
	14351	+ 0);
12093	14352	if (!editObj)
12094	14353	{
12095	14354	hasMarquee = true;
..	..	@@ -12105,11 +14364,14 @@
12105	14364
12106	14365	public void mouseDragged(MouseEvent e)
12107	14366	{
	14367	+ Globals.MOUSEDRAGGED = true;
	14368	+
	14369	+ //System.out.println("mouseDragged: " + e);
12108	14370	if (isRenderer)
12109	14371	movingcamera = true;
	14372	+
12110	14373	//if (drawing)
12111	14374	//return;
12112		- //System.out.println("mouseDragged: " + e);
12113	14375	if ((e.getModifiersEx() & CTRL) != 0
12114	14376	\|\| (e.getModifiersEx() & COMMAND) != 0) // \|\| IsFrozen())
12115	14377	{
..	..	@@ -12117,7 +14379,7 @@
12117	14379	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
12118	14380	}
12119	14381	else
12120		- drag(e.getX(), e.getY(), e.getModifiersEx());
	14382	+ drag(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
12121	14383
12122	14384	//try { Thread.sleep(1); } catch (Exception ex) {}
12123	14385	}
..	..	@@ -12129,6 +14391,11 @@
12129	14391	cVector tmp = new cVector();
12130	14392	cVector tmp2 = new cVector();
12131	14393	boolean isMoving;
	14394	+
	14395	+ public cVector TargetLookAt()
	14396	+ {
	14397	+ return targetLookAt;
	14398	+ }
12132	14399
12133	14400	class PingThread extends Thread
12134	14401	{
..	..	@@ -12268,7 +14535,7 @@
12268	14535	//System.out.println("---------------- ---------- Paint " + tmp.length2());
12269	14536	if (lightMode)
12270	14537	{
12271		- lighttouched = true;
	14538	+ Globals.lighttouched = true;
12272	14539	}
12273	14540
12274	14541	if (OEILONCE && OEIL)
..	..	@@ -12285,6 +14552,7 @@
12285	14552
12286	14553	public void run()
12287	14554	{
	14555	+ new Exception().printStackTrace();
12288	14556	System.exit(0);
12289	14557	for (;;)
12290	14558	{
..	..	@@ -12326,7 +14594,7 @@
12326	14594	mouseDown = false;
12327	14595	if (lightMode)
12328	14596	{
12329		- lighttouched = true;
	14597	+ Globals.lighttouched = true;
12330	14598	}
12331	14599	repaint();
12332	14600	alreadypainted = true;
..	..	@@ -12334,7 +14602,7 @@
12334	14602	isMoving = false;
12335	14603	} //??
12336	14604
12337		- if (isLIVE() && !alreadypainted)
	14605	+ if (Globals.isLIVE() && !alreadypainted)
12338	14606	{
12339	14607	// FOR DEBUG BREAKPOINT USING PAUSE: while (true)
12340	14608	repaint();
..	..	@@ -12346,9 +14614,9 @@
12346	14614	{
12347	14615	if (lightMode)
12348	14616	{
12349		- lighttouched = true;
	14617	+ Globals.lighttouched = true;
12350	14618	}
12351		- drag(X, (mouseMode != 0) ? Y : anchorY, MODIFIERS);
	14619	+ drag(X, (mouseMode != 0) ? Y : anchorY, 0, MODIFIERS);
12352	14620	}
12353	14621	//else
12354	14622	}
..	..	@@ -12362,12 +14630,12 @@
12362	14630	void GoDown(int mod)
12363	14631	{
12364	14632	MODIFIERS \|= COMMAND;
12365		- /*
	14633	+ /**/
12366	14634	if((mod&SHIFT) == SHIFT)
12367		- manipCamera.RotatePosition(0, -speed);
	14635	+ manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
12368	14636	else
12369		- manipCamera.BackForth(0, -speed*delta, getWidth());
12370		- */
	14637	+ manipCamera.RotatePosition(0, -speed);
	14638	+ /**/
12371	14639	if ((mod & SHIFT) == SHIFT)
12372	14640	{
12373	14641	mouseMode = mouseMode; // VR??
..	..	@@ -12383,12 +14651,12 @@
12383	14651	void GoUp(int mod)
12384	14652	{
12385	14653	MODIFIERS \|= COMMAND;
12386		- /*
	14654	+ /**/
12387	14655	if((mod&SHIFT) == SHIFT)
12388		- manipCamera.RotatePosition(0, speed);
	14656	+ manipCamera.BackForth(0, speed*delta, 0); // getWidth());
12389	14657	else
12390		- manipCamera.BackForth(0, speed*delta, getWidth());
12391		- */
	14658	+ manipCamera.RotatePosition(0, speed);
	14659	+ /**/
12392	14660	if ((mod & SHIFT) == SHIFT)
12393	14661	{
12394	14662	mouseMode = mouseMode;
..	..	@@ -12404,12 +14672,12 @@
12404	14672	void GoLeft(int mod)
12405	14673	{
12406	14674	MODIFIERS \|= COMMAND;
12407		- /*
	14675	+ /**/
12408	14676	if((mod&SHIFT) == SHIFT)
12409		- manipCamera.RotatePosition(speed, 0);
12410		- else
12411	14677	manipCamera.Translate(speed*delta, 0, getWidth());
12412		- */
	14678	+ else
	14679	+ manipCamera.RotatePosition(speed, 0);
	14680	+ /**/
12413	14681	if ((mod & SHIFT) == SHIFT)
12414	14682	{
12415	14683	mouseMode = mouseMode;
..	..	@@ -12425,12 +14693,12 @@
12425	14693	void GoRight(int mod)
12426	14694	{
12427	14695	MODIFIERS \|= COMMAND;
12428		- /*
	14696	+ /**/
12429	14697	if((mod&SHIFT) == SHIFT)
12430		- manipCamera.RotatePosition(-speed, 0);
12431		- else
12432	14698	manipCamera.Translate(-speed*delta, 0, getWidth());
12433		- */
	14699	+ else
	14700	+ manipCamera.RotatePosition(-speed, 0);
	14701	+ /**/
12434	14702	if ((mod & SHIFT) == SHIFT)
12435	14703	{
12436	14704	mouseMode = mouseMode;
..	..	@@ -12448,7 +14716,7 @@
12448	14716	int X, Y;
12449	14717	boolean SX, SY;
12450	14718
12451		- void drag(int x, int y, int modifiers)
	14719	+ void drag(int x, int y, int modifiers, int modifiersex)
12452	14720	{
12453	14721	if (IsFrozen())
12454	14722	{
..	..	@@ -12457,17 +14725,17 @@
12457	14725
12458	14726	drag = true; // NEW
12459	14727
12460		- boolean continuous = (modifiers & COMMAND) == COMMAND;
	14728	+ boolean continuous = (modifiersex & COMMAND) == COMMAND;
12461	14729
12462	14730	X = x;
12463	14731	Y = y;
12464	14732	// floating state for animation
12465		- MODIFIERS = modifiers;
12466		- modifiers &= ~1024;
	14733	+ MODIFIERS = modifiersex;
	14734	+ modifiersex &= ~1024;
12467	14735	if (false) // modifiers != 0)
12468	14736	{
12469	14737	//new Exception().printStackTrace();
12470		- System.out.println("mouseDragged: " + modifiers);
	14738	+ System.out.println("mouseDragged: " + modifiersex);
12471	14739	System.out.println("SHIFT = " + SHIFT);
12472	14740	System.out.println("CONTROL = " + COMMAND);
12473	14741	System.out.println("META = " + META);
..	..	@@ -12480,14 +14748,16 @@
12480	14748	if (editObj)
12481	14749	{
12482	14750	drag = true;
12483		- ClickInfo info = new ClickInfo();
12484		- info.bounds.setBounds(0, 0,
	14751	+ //ClickInfo info = new ClickInfo();
	14752	+ object.clickInfo.bounds.setBounds(0, 0,
12485	14753	(int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
12486		- info.pane = this;
12487		- info.camera = renderCamera;
12488		- info.x = x;
12489		- info.y = y;
12490		- object.editWindow.copy.doEditDrag(info);
	14754	+ object.clickInfo.pane = this;
	14755	+ object.clickInfo.camera = renderCamera;
	14756	+ object.clickInfo.x = x;
	14757	+ object.clickInfo.y = y;
	14758	+ object //.GetWindow().copy
	14759	+ .doEditDrag(//info,
	14760	+ (modifiers & MouseEvent.BUTTON3_MASK) != 0);
12491	14761	} else
12492	14762	{
12493	14763	if (x < startX)
..	..	@@ -12589,6 +14859,7 @@
12589	14859	{
12590	14860	manipCamera.Translate(dx, dy, getWidth());
12591	14861	}
	14862	+ else
12592	14863	if ((mouseMode & ZOOM) == 0 && (mouseMode & VR) != 0)
12593	14864	{
12594	14865	manipCamera.RotateInterest(dx, dy);
..	..	@@ -12599,7 +14870,7 @@
12599	14870
12600	14871	if (manipCamera == lightCamera)
12601	14872	{
12602		- lighttouched = true;
	14873	+ Globals.lighttouched = true;
12603	14874	}
12604	14875	/*
12605	14876	switch (mode)
..	..	@@ -12635,23 +14906,27 @@
12635	14906	}
12636	14907	}
12637	14908
	14909	+// ClickInfo clickInfo = new ClickInfo();
	14910	+
12638	14911	public void mouseMoved(MouseEvent e)
12639	14912	{
12640	14913	//System.out.println("mouseMoved: " + e);
12641		-
12642	14914	if (isRenderer)
12643	14915	return;
12644	14916
12645		- ClickInfo ci = new ClickInfo();
12646		- ci.x = e.getX();
12647		- ci.y = e.getY();
12648		- ci.modifiers = e.getModifiersEx();
12649		- ci.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
12650		- ci.pane = this;
12651		- ci.camera = renderCamera;
	14917	+ // Mouse cursor feedback
	14918	+ object.clickInfo.x = e.getX();
	14919	+ object.clickInfo.y = e.getY();
	14920	+ object.clickInfo.modifiers = e.getModifiersEx();
	14921	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14922	+ object.clickInfo.pane = this;
	14923	+ object.clickInfo.camera = renderCamera;
12652	14924	if (!isRenderer)
12653	14925	{
12654		- if (object.editWindow.copy.doEditClick(ci, 0))
	14926	+ //ObjEditor editWindow = object.editWindow;
	14927	+ //Object3D copy = editWindow.copy;
	14928	+ if (object.doEditClick(//clickInfo,
	14929	+ 0))
12655	14930	{
12656	14931	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
12657	14932	} else
..	..	@@ -12663,7 +14938,11 @@
12663	14938
12664	14939	public void mouseReleased(MouseEvent e)
12665	14940	{
	14941	+ Globals.MOUSEDRAGGED = false;
	14942	+
12666	14943	movingcamera = false;
	14944	+ X = 0; // getBounds().width/2;
	14945	+ Y = 0; // getBounds().height/2;
12667	14946	//System.out.println("mouseReleased: " + e);
12668	14947	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
12669	14948	}
..	..	@@ -12686,9 +14965,9 @@
12686	14965	boolean control = ((modifiers & CTRL) != 0); // june 2013: for point selection
12687	14966	boolean command = ((modifiers & COMMAND) != 0); // june 2013: for multiple selection
12688	14967
12689		- if (control \|\| command \|\| IsFrozen())
	14968	+// No delay if (control \|\| command \|\| IsFrozen())
12690	14969	timeout = true;
12691		- else
	14970	+// ?? May 2019 else
12692	14971	// timer.setDelay((modifiers & 128) != 0?0:350);
12693	14972	mouseDown = false;
12694	14973	if (!control && !command) // june 2013
..	..	@@ -12798,7 +15077,7 @@
12798	15077	System.out.println("keyReleased: " + e);
12799	15078	}
12800	15079
12801		- void SetMouseMode(int modifiers)
	15080	+ void SetMouseMode(int modifiers, int modifiersex)
12802	15081	{
12803	15082	//System.out.println("SetMouseMode = " + modifiers);
12804	15083	//modifiers &= ~1024;
..	..	@@ -12810,24 +15089,27 @@
12810	15089	//if (modifiers == 0) // \|\| (modifiers == (1024 \| CONTROL)))
12811	15090	// return;
12812	15091	//System.out.println("SetMode = " + modifiers);
12813		- if ((modifiers & WHEEL) == WHEEL)
	15092	+ if ((modifiersex & WHEEL) == WHEEL)
12814	15093	{
12815	15094	mouseMode \|= ZOOM;
12816	15095	}
12817		- if ((modifiers & META) == META)
	15096	+
	15097	+ boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
	15098	+ if (capsLocked) // \|\| (modifiers & META) == META)
12818	15099	{
12819	15100	mouseMode \|= VR; // BACKFORTH;
12820	15101	}
12821		- if ((modifiers & CTRLCLICK) == CTRLCLICK)
12822		- {
12823		- mouseMode \|= SELECT; // BACKFORTH;
12824		- }
12825		- if ((modifiers & COMMAND) == COMMAND)
	15102	+ if ((modifiersex & CTRLCLICK) == CTRLCLICK)
12826	15103	{
12827	15104	mouseMode \|= SELECT;
12828	15105	}
12829		- if ((modifiers & SHIFT) == SHIFT \|\| forcetranslate)
	15106	+ if ((modifiersex & COMMAND) == COMMAND)
12830	15107	{
	15108	+ mouseMode \|= SELECT;
	15109	+ }
	15110	+ if ((modifiersex & SHIFT) == SHIFT \|\| forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
	15111	+ {
	15112	+ mouseMode &= ~VR;
12831	15113	mouseMode \|= TRANSLATE;
12832	15114	}
12833	15115	// if ((modifiers & SHIFT_META) == SHIFT_META)
..	..	@@ -12854,10 +15136,10 @@
12854	15136
12855	15137	if (isRenderer) //
12856	15138	{
12857		- SetMouseMode(modifiers);
	15139	+ SetMouseMode(0, modifiers);
12858	15140	}
12859	15141
12860		- theRenderer.keyPressed(key);
	15142	+ Globals.theRenderer.keyPressed(key);
12861	15143	}
12862	15144
12863	15145	int kompactbit = 4; // power bit
..	..	@@ -12869,7 +15151,7 @@
12869	15151	float SATPOW = 1; // 2; // 0.5f;
12870	15152	float BRIPOW = 1; // 0.5f; // 0.5f;
12871	15153
12872		- void keyPressed(int key)
	15154	+ public void keyPressed(int key)
12873	15155	{
12874	15156	if (key >= '0' && key <= '5')
12875	15157	clampbit = (key-'0');
..	..	@@ -12916,7 +15198,8 @@
12916	15198	// break;
12917	15199	case 'T':
12918	15200	CACHETEXTURE ^= true;
12919		- textures.clear();
	15201	+ texturepigment.clear();
	15202	+ texturebump.clear();
12920	15203	// repaint();
12921	15204	break;
12922	15205	case 'Y':
..	..	@@ -12984,7 +15267,7 @@
12984	15267	case 'B':
12985	15268	BRISMOOTH ^= true;
12986	15269	SHADOWCULLFACE ^= true;
12987		- lighttouched = true;
	15270	+ Globals.lighttouched = true;
12988	15271	repaint();
12989	15272	break;
12990	15273	case 'b':
..	..	@@ -13001,7 +15284,9 @@
13001	15284	case 'E' : COMPACT ^= true;
13002	15285	repaint();
13003	15286	break;
13004		- case 'W' : DEBUGHSB ^= true;
	15287	+ case 'W' : // Wide Window (fullscreen)
	15288	+ //DEBUGHSB ^= true;
	15289	+ ObjEditor.theFrame.ToggleFullScreen();
13005	15290	repaint();
13006	15291	break;
13007	15292	case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
..	..	@@ -13026,8 +15311,8 @@
13026	15311	RevertCamera();
13027	15312	repaint();
13028	15313	break;
13029		- case 'L':
13030	15314	case 'l':
	15315	+ //case 'L':
13031	15316	if (lightMode)
13032	15317	{
13033	15318	lightMode = false;
..	..	@@ -13084,27 +15369,31 @@
13084	15369	repaint();
13085	15370	break;
13086	15371	case 'O':
13087		- drawMode = OCCLUSION;
	15372	+ Globals.drawMode = OCCLUSION; // WARNING
13088	15373	repaint();
13089	15374	break;
13090	15375	case 'o':
13091	15376	OCCLUSION_CULLING ^= true;
13092	15377	System.out.println("OCCLUSION CULLING = " + OCCLUSION_CULLING);
13093	15378	break;
13094		- case '0': envyoff ^= true; repaint(); break;
	15379	+ //case '0': envyoff ^= true; repaint(); break;
13095	15380	case '1':
13096	15381	case '2':
13097	15382	case '3':
13098	15383	case '4':
13099	15384	case '5':
13100		- newenvy = Character.getNumericValue(key);
13101		- repaint();
13102		- break;
13103	15385	case '6':
13104	15386	case '7':
13105	15387	case '8':
13106	15388	case '9':
13107		- BGcolor = (key - '6')/3.f;
	15389	+ if (true) // envyoff)
	15390	+ {
	15391	+ BGcolor = (key - '1')/8.f;
	15392	+ }
	15393	+ else
	15394	+ {
	15395	+ //newenvy = Character.getNumericValue(key);
	15396	+ }
13108	15397	repaint();
13109	15398	break;
13110	15399	case '!':
..	..	@@ -13170,12 +15459,12 @@
13170	15459	case '_':
13171	15460	kompactbit = 5;
13172	15461	break;
13173		- case '+':
13174		- kompactbit = 6;
13175		- break;
	15462	+// case '+':
	15463	+// kompactbit = 6;
	15464	+// break;
13176	15465	case ' ':
13177	15466	lightMode ^= true;
13178		- lighttouched = true;
	15467	+ Globals.lighttouched = true;
13179	15468	manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
13180	15469	targetLookAt.set(manipCamera.lookAt);
13181	15470	repaint();
..	..	@@ -13184,14 +15473,15 @@
13184	15473	case ESC:
13185	15474	RENDERPROGRAM += 1;
13186	15475	RENDERPROGRAM %= 3;
	15476	+
13187	15477	repaint();
13188	15478	break;
13189	15479	case 'Z':
13190		- RESIZETEXTURE ^= true;
13191		- break;
	15480	+ //RESIZETEXTURE ^= true;
	15481	+ //break;
13192	15482	case 'z':
13193		- RENDERSHADOW ^= true;
13194		- lighttouched = true;
	15483	+ Globals.RENDERSHADOW ^= true;
	15484	+ Globals.lighttouched = true;
13195	15485	repaint();
13196	15486	break;
13197	15487	//case UP:
..	..	@@ -13217,13 +15507,15 @@
13217	15507	FlipTransform();
13218	15508	break;
13219	15509	case ENTER:
13220		- object.editWindow.ScreenFit(); // Edit();
	15510	+ // object.editWindow.ScreenFit(); // Edit();
	15511	+ ToggleLive();
13221	15512	break;
13222	15513	case DELETE:
13223	15514	ClearSelection();
13224	15515	break;
13225		- /*
13226	15516	case '+':
	15517	+
	15518	+ /*
13227	15519	//fontsize += 1;
13228	15520	bbzoom *= 2;
13229	15521	repaint();
..	..	@@ -13240,17 +15532,17 @@
13240	15532	case '=':
13241	15533	IncDepth();
13242	15534	//fontsize += 1;
13243		- object.editWindow.refreshContents(true);
	15535	+ object.GetWindow().refreshContents(true);
13244	15536	maskbit = 6;
13245	15537	break;
13246	15538	case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
13247	15539	DecDepth();
13248	15540	maskbit = 5;
13249	15541	//if(fontsize > 1) fontsize -= 1;
13250		- if (object.editWindow == null)
13251		- new Exception().printStackTrace();
13252		- else
13253		- object.editWindow.refreshContents(true);
	15542	+// if (object.editWindow == null)
	15543	+// new Exception().printStackTrace();
	15544	+// else
	15545	+ object.GetWindow().refreshContents(true);
13254	15546	break;
13255	15547	case '{':
13256	15548	manipCamera.shaper_fovy /= 1.1;
..	..	@@ -13305,6 +15597,7 @@
13305	15597	}
13306	15598	//System.out.println("shaper_fovy = " + manipCamera.shaper_fovy);
13307	15599	}
	15600	+
13308	15601	static double OCCLUSIONBOOST = 1; // 0.5;
13309	15602
13310	15603	void keyReleased(int key, int modifiers)
..	..	@@ -13312,11 +15605,11 @@
13312	15605	//mode = ROTATE;
13313	15606	if ((MODIFIERS & COMMAND) == 0) // VR??
13314	15607	{
13315		- SetMouseMode(modifiers);
	15608	+ SetMouseMode(0, modifiers);
13316	15609	}
13317	15610	}
13318	15611
13319		- protected void processKeyEvent(KeyEvent e)
	15612	+ public void processKeyEvent(KeyEvent e)
13320	15613	{
13321	15614	switch (e.getID())
13322	15615	{
..	..	@@ -13446,8 +15739,9 @@
13446	15739
13447	15740	protected void processMouseMotionEvent(MouseEvent e)
13448	15741	{
13449		- //System.out.println("processMouseMotionEvent: " + mouseMode);
13450		- if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
	15742	+ //System.out.println("processMouseMotionEvent: " + mouseMode + " " + e.getModifiers() + " " + e.getModifiersEx() + " " + e.getButton());
	15743	+ //if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
	15744	+ if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (e.getModifiers() & MouseEvent.BUTTON3_MASK) == 0 && (mouseMode & SELECT) == 0)
13451	15745	{
13452	15746	mouseMoved(e);
13453	15747	} else
..	..	@@ -13472,11 +15766,12 @@
13472	15766	}
13473	15767	*/
13474	15768
13475		- object.editWindow.EditSelection();
	15769	+ object.GetWindow().EditSelection(false);
13476	15770	}
13477	15771
13478	15772	void SelectParent()
13479	15773	{
	15774	+ new Exception().printStackTrace();
13480	15775	System.exit(0);
13481	15776	Composite group = (Composite) object;
13482	15777	java.util.Vector selectees = new java.util.Vector(group.selection);
..	..	@@ -13488,10 +15783,10 @@
13488	15783	{
13489	15784	//selectees.remove(i);
13490	15785	System.out.println("select parent of " + elem);
13491		- group.editWindow.Select(elem.parent.GetTreePath(), first, true);
	15786	+ group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
13492	15787	} else
13493	15788	{
13494		- group.editWindow.Select(elem.GetTreePath(), first, true);
	15789	+ group.GetWindow().Select(elem.GetTreePath(), first, true);
13495	15790	}
13496	15791
13497	15792	first = false;
..	..	@@ -13500,6 +15795,7 @@
13500	15795
13501	15796	void SelectChildren()
13502	15797	{
	15798	+ new Exception().printStackTrace();
13503	15799	System.exit(0);
13504	15800	/*
13505	15801	Composite group = (Composite) object;
..	..	@@ -13532,12 +15828,12 @@
13532	15828	for (int j = 0; j < group.children.size(); j++)
13533	15829	{
13534	15830	elem = (Object3D) group.children.elementAt(j);
13535		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15831	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
13536	15832	first = false;
13537	15833	}
13538	15834	} else
13539	15835	{
13540		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15836	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
13541	15837	}
13542	15838
13543	15839	first = false;
..	..	@@ -13548,21 +15844,21 @@
13548	15844	{
13549	15845	//Composite group = (Composite) object;
13550	15846	Object3D group = object;
13551		- group.editWindow.loadClipboard(true); // ClearSelection(false);
	15847	+ group.GetWindow().loadClipboard(true); // ClearSelection(false);
13552	15848	}
13553	15849
13554	15850	void ResetTransform(int mask)
13555	15851	{
13556	15852	//Composite group = (Composite) object;
13557	15853	Object3D group = object;
13558		- group.editWindow.ResetTransform(mask);
	15854	+ group.GetWindow().ResetTransform(mask);
13559	15855	}
13560	15856
13561	15857	void FlipTransform()
13562	15858	{
13563	15859	//Composite group = (Composite) object;
13564	15860	Object3D group = object;
13565		- group.editWindow.FlipTransform();
	15861	+ group.GetWindow().FlipTransform();
13566	15862	// group.editWindow.ReduceMesh(true);
13567	15863	}
13568	15864
..	..	@@ -13570,7 +15866,7 @@
13570	15866	{
13571	15867	//Composite group = (Composite) object;
13572	15868	Object3D group = object;
13573		- group.editWindow.PrintMemory();
	15869	+ group.GetWindow().PrintMemory();
13574	15870	// group.editWindow.ReduceMesh(true);
13575	15871	}
13576	15872
..	..	@@ -13578,7 +15874,7 @@
13578	15874	{
13579	15875	//Composite group = (Composite) object;
13580	15876	Object3D group = object;
13581		- group.editWindow.ResetCentroid();
	15877	+ group.GetWindow().ResetCentroid();
13582	15878	}
13583	15879
13584	15880	void IncDepth()
..	..	@@ -13660,11 +15956,11 @@
13660	15956
13661	15957	int width = getBounds().width;
13662	15958	int height = getBounds().height;
13663		- ClickInfo info = new ClickInfo();
13664		- info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
13665	15959	//Image img = CreateImage(width, height);
13666	15960	//System.out.println("width = " + width + "; height = " + height + "\n");
	15961	+
13667	15962	Graphics gr = g; // img.getGraphics();
	15963	+
13668	15964	if (!hasMarquee)
13669	15965	{
13670	15966	if (Xmin < Xmax) // !locked)
..	..	@@ -13736,40 +16032,88 @@
13736	16032	}
13737	16033	if (object != null && !hasMarquee)
13738	16034	{
	16035	+ if (object.clickInfo == null)
	16036	+ object.clickInfo = new ClickInfo();
	16037	+ ClickInfo info = object.clickInfo;
	16038	+ //ClickInfo info = new ClickInfo();
	16039	+ info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
	16040	+
13739	16041	if (isRenderer)
13740	16042	{
13741		- info.flags++;
	16043	+ object.clickInfo.flags++;
13742	16044	double frameAspect = (double) width / (double) height;
13743	16045	if (frameAspect > renderCamera.aspect)
13744	16046	{
13745	16047	int desired = (int) ((double) height * renderCamera.aspect);
13746		- info.bounds.width -= width - desired;
13747		- info.bounds.x += (width - desired) / 2;
	16048	+ object.clickInfo.bounds.width -= width - desired;
	16049	+ object.clickInfo.bounds.x += (width - desired) / 2;
13748	16050	} else
13749	16051	{
13750	16052	int desired = (int) ((double) width / renderCamera.aspect);
13751		- info.bounds.height -= height - desired;
13752		- info.bounds.y += (height - desired) / 2;
	16053	+ object.clickInfo.bounds.height -= height - desired;
	16054	+ object.clickInfo.bounds.y += (height - desired) / 2;
13753	16055	}
13754	16056	}
13755		- info.g = gr;
13756		- info.camera = renderCamera;
	16057	+
	16058	+ object.clickInfo.g = gr;
	16059	+ object.clickInfo.camera = renderCamera;
13757	16060	/*
13758	16061	// Memory intensive (brep.verticescopy)
13759	16062	if (!(object instanceof Composite))
13760	16063	object.draw(info, 0, false); // SLOW :
13761	16064	*/
13762		- if (!isRenderer)
	16065	+ if (!isRenderer) // && drag)
13763	16066	{
13764		- object.drawEditHandles(info, 0);
	16067	+ Grafreed.Assert(object != null);
	16068	+ Grafreed.Assert(object.selection != null);
	16069	+ if (object.selection.Size() > 0)
	16070	+ {
	16071	+ int hitSomething = object.selection.get(0).hitSomething;
	16072	+
	16073	+ object.clickInfo.DX = 0;
	16074	+ object.clickInfo.DY = 0;
	16075	+ object.clickInfo.W = 1;
	16076	+ if (hitSomething == Object3D.hitCenter)
	16077	+ {
	16078	+ info.DX = X;
	16079	+ if (X != 0)
	16080	+ info.DX -= info.bounds.width/2;
	16081	+
	16082	+ info.DY = Y;
	16083	+ if (Y != 0)
	16084	+ info.DY -= info.bounds.height/2;
	16085	+ }
	16086	+
	16087	+ object.drawEditHandles(//info,
	16088	+ 0);
	16089	+
	16090	+ if (drag && (X != 0 \|\| Y != 0))
	16091	+ {
	16092	+ switch (hitSomething)
	16093	+ {
	16094	+ case Object3D.hitCenter: gr.setColor(Color.pink);
	16095	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16096	+ break;
	16097	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	16098	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16099	+ break;
	16100	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	16101	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16102	+ break;
	16103	+ }
	16104	+
	16105	+ }
	16106	+ }
13765	16107	}
13766	16108	}
	16109	+
13767	16110	if (isRenderer)
13768	16111	{
13769	16112	//gr.setColor(Color.black);
13770	16113	//gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
13771	16114	//gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
13772	16115	}
	16116	+
13773	16117	if (hasMarquee)
13774	16118	{
13775	16119	gr.setXORMode(Color.white);
..	..	@@ -13792,6 +16136,7 @@
13792	16136	//if (g != gr) g.drawImage(img, 0, 0, width, height, null);
13793	16137	}
13794	16138
	16139	+ // To avoid clear.
13795	16140	public void update(Graphics g)
13796	16141	{
13797	16142	paint(g);
..	..	@@ -13881,6 +16226,7 @@
13881	16226	public boolean mouseDown(Event evt, int x, int y)
13882	16227	{
13883	16228	System.out.println("mouseDown: " + evt);
	16229	+ System.exit(0);
13884	16230	/*
13885	16231	locked = true;
13886	16232	drag = false;
..	..	@@ -13924,7 +16270,7 @@
13924	16270	{
13925	16271	keyPressed(0, modifiers);
13926	16272	}
13927		- clickStart(x, y, modifiers);
	16273	+ // clickStart(x, y, modifiers);
13928	16274	return true;
13929	16275	}
13930	16276
..	..	@@ -14042,7 +16388,7 @@
14042	16388	{
14043	16389	keyReleased(0, 0);
14044	16390	}
14045		- drag(x, y, modifiers);
	16391	+ drag(x, y, 0, modifiers);
14046	16392	return true;
14047	16393	}
14048	16394
..	..	@@ -14174,7 +16520,7 @@
14174	16520	Object3D object;
14175	16521	static Object3D trackedobject;
14176	16522	Camera renderCamera; // Light or Eye (or Occlusion)
14177		- /static/ Camera manipCamera; // Light or Eye
	16523	+ /static/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
14178	16524	/static/ Camera eyeCamera;
14179	16525	/static/ Camera lightCamera;
14180	16526	int cameracount;
..	..	@@ -14238,6 +16584,8 @@
14238	16584	private /static/ boolean firstime;
14239	16585	private /static/ cVector newView = new cVector();
14240	16586	private static final String[] suffixes = {"posx", "negx", "posy", "negy", "posz", "negz"};
	16587	+ private static final String[] suffixes2 = {"east", "west", "top", "bottom", "north", "south"};
	16588	+ private static final String[] suffixes3 = {"ft", "bk", "up", "dn", "rt", "lf"};
14241	16589	private static final int[] targets = {GL.GL_TEXTURE_CUBE_MAP_POSITIVE_X,
14242	16590	GL.GL_TEXTURE_CUBE_MAP_NEGATIVE_X,
14243	16591	GL.GL_TEXTURE_CUBE_MAP_POSITIVE_Y,
..	..	@@ -14250,29 +16598,66 @@
14250	16598	{
14251	16599	com.sun.opengl.util.texture.Texture cubemap = TextureIO.newTexture(GL.GL_TEXTURE_CUBE_MAP);
14252	16600
	16601	+ int usedsuf = 0;
	16602	+
14253	16603	for (int i = 0; i < suffixes.length; i++)
14254	16604	{
14255		- String resourceName = basename + suffixes[i] + "." + suffix;
14256		- TextureData data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
14257		- mipmapped,
14258		- FileUtil.getFileSuffix(resourceName));
14259		- if (data == null)
	16605	+ String[] suffixe = suffixes;
	16606	+ String[] fallback = suffixes2;
	16607	+ String[] fallfallback = suffixes3;
	16608	+
	16609	+ for (int c=usedsuf; --c>=0;)
14260	16610	{
14261		- throw new IOException("Unable to load texture " + resourceName);
	16611	+// String[] temp = suffixe;
	16612	+// suffixe = fallback;
	16613	+// fallback = fallfallback;
	16614	+// fallfallback = temp;
14262	16615	}
	16616	+
	16617	+ String resourceName = basename + suffixe[i] + "." + suffix;
	16618	+ TextureData data;
	16619	+
	16620	+ try
	16621	+ {
	16622	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16623	+ mipmapped,
	16624	+ FileUtil.getFileSuffix(resourceName));
	16625	+ }
	16626	+ catch (Exception e)
	16627	+ {
	16628	+ try
	16629	+ {
	16630	+ resourceName = basename + fallback[i] + "." + suffix;
	16631	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16632	+ mipmapped,
	16633	+ FileUtil.getFileSuffix(resourceName));
	16634	+ }
	16635	+ catch (Exception e2)
	16636	+ {
	16637	+ resourceName = basename + fallfallback[i] + "." + suffix;
	16638	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16639	+ mipmapped,
	16640	+ FileUtil.getFileSuffix(resourceName));
	16641	+ }
	16642	+ }
	16643	+
14263	16644	//System.out.println("Target = " + targets[i]);
14264	16645	cubemap.updateImage(data, targets[i]);
14265	16646	}
14266	16647
14267	16648	return cubemap;
14268	16649	}
	16650	+
14269	16651	int bigsphere = -1;
14270	16652
14271	16653	float BGcolor = 0.5f;
14272	16654
14273		- private void DrawSkyBox(GL gl)
	16655	+ float ambientLight[] = {1f, 1f, 1f, 1.0f};
	16656	+
	16657	+ private void DrawSkyBox(GL gl, float ratio)
14274	16658	{
14275		- if (envyoff \|\| cubemap == null)
	16659	+ if (//envyoff \|\|
	16660	+ cubemap == null)
14276	16661	{
14277	16662	gl.glClearColor(BGcolor, BGcolor, BGcolor, 1);
14278	16663	gl.glClear(gl.GL_COLOR_BUFFER_BIT);
..	..	@@ -14287,7 +16672,17 @@
14287	16672	// Compensates for ExaminerViewer's modification of modelview matrix
14288	16673	gl.glMatrixMode(GL.GL_MODELVIEW);
14289	16674	gl.glLoadIdentity();
	16675	+ gl.glScalef(1,ratio,1);
14290	16676
	16677	+// colorV[0] = 2;
	16678	+// colorV[1] = 2;
	16679	+// colorV[2] = 2;
	16680	+// colorV[3] = 1;
	16681	+// gl.glDisable(gl.GL_COLOR_MATERIAL);
	16682	+// gl.glMaterialfv(gl.GL_FRONT_AND_BACK, gl.GL_AMBIENT, colorV, 0);
	16683	+//
	16684	+// gl.glLightModelfv(gl.GL_LIGHT_MODEL_AMBIENT, ambientLight, 0);
	16685	+
14291	16686	//gl.glActiveTexture(GL.GL_TEXTURE1);
14292	16687	//gl.glDisable(GL.GL_TEXTURE_CUBE_MAP);
14293	16688
..	..	@@ -14319,6 +16714,7 @@
14319	16714	{
14320	16715	gl.glScalef(1.0f, -1.0f, 1.0f);
14321	16716	}
	16717	+ gl.glScalef(-1.0f, 1.0f, 1.0f);
14322	16718	gl.glMultMatrixd(viewrot_1, 0);
14323	16719	gl.glTranslatef(0, 0, 0.5f); // (float)lightCamera.Distance()); // 0.5f);
14324	16720	//viewer.updateInverseRotation(gl);
..	..	@@ -14394,7 +16790,7 @@
14394	16790	gl.glPushAttrib(GL.GL_ALL_ATTRIB_BITS);
14395	16791	gl.glPushMatrix();
14396	16792	gl.glLoadIdentity();
14397		- PushMatrix(checker.toParent);
	16793	+ //PushMatrix(checker.toParent);
14398	16794
14399	16795	gl.glMatrixMode(GL.GL_TEXTURE);
14400	16796	gl.glPushMatrix();
..	..	@@ -14417,8 +16813,8 @@
14417	16813
14418	16814	gl.glNormal3f(0.0f, 0.0f, 1.0f);
14419	16815
14420		- float step = 0.1666f; //0.25f;
14421		- float stepv = step * 1652 / 998;
	16816	+ float step = 2; // 0.1666f; //0.25f;
	16817	+ float stepv = 2; // step * 1652 / 998;
14422	16818
14423	16819	int i0 = 0;
14424	16820	/*
..	..	@@ -14454,20 +16850,21 @@
14454	16850	/**/
14455	16851	//checker.GetMaterial().opacity = 1.1f;
14456	16852	////checker.GetMaterial().ambient = 0.99f;
14457		- Object3D.materialstack[Object3D.materialdepth] = checker.material;
14458		- Object3D.selectedstack[Object3D.materialdepth] = false;
14459		- cStatic.objectstack[Object3D.materialdepth++] = checker;
	16853	+ materialstack[materialdepth] = checker.material;
	16854	+ selectedstack[materialdepth] = false;
	16855	+ cStatic.objectstack[materialdepth++] = checker;
14460	16856	//System.out.println("material " + material);
14461	16857	//Applet3D.tracein(this, selected);
14462		- vector2buffer = checker.projectedVertices;
	16858	+ //vector2buffer = checker.projectedVertices;
14463	16859
14464		- checker.GetMaterial().Draw(this, false); // true);
	16860	+ //checker.GetMaterial().Draw(this, false); // true);
	16861	+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
14465	16862
14466		- Object3D.materialdepth -= 1;
14467		- if (Object3D.materialdepth > 0)
	16863	+ materialdepth -= 1;
	16864	+ if (materialdepth > 0)
14468	16865	{
14469		- vector2buffer = cStatic.objectstack[Object3D.materialdepth - 1].projectedVertices;
14470		- Object3D.materialstack[Object3D.materialdepth - 1].Draw(this, Object3D.selectedstack[Object3D.materialdepth - 1]);
	16866	+ //vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	16867	+ DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
14471	16868	}
14472	16869	//checker.GetMaterial().opacity = 1f;
14473	16870	////checker.GetMaterial().ambient = 1f;
..	..	@@ -14488,15 +16885,27 @@
14488	16885
14489	16886	//float u = (i+1)/2;
14490	16887	//float v = (j+1)/2;
14491		- gl.glTexCoord2f((i + 1) / 2, (j + 1) / 2); // (1,0) // (i+1+step)/2,(j+1)/2);
	16888	+ if (checker.flipV)
	16889	+ gl.glTexCoord2f((i + 1) / 2, 1 - (j + 1) / 2);
	16890	+ else
	16891	+ gl.glTexCoord2f((i + 1) / 2, (j + 1) / 2); // (1,0) // (i+1+step)/2,(j+1)/2);
14492	16892	gl.glVertex3f(i, j, -0.5f);
14493	16893
	16894	+ if (checker.flipV)
	16895	+ gl.glTexCoord2f((i + 1 + step) / 2, 1 - (j + 1) / 2); // (1,1) // (i+1+step)/2,(j+1+step)/2);
	16896	+ else
14494	16897	gl.glTexCoord2f((i + 1 + step) / 2, (j + 1) / 2); // (1,1) // (i+1+step)/2,(j+1+step)/2);
14495	16898	gl.glVertex3f(i + step, j, -0.5f);
14496	16899
	16900	+ if (checker.flipV)
	16901	+ gl.glTexCoord2f((i + 1 + step) / 2, 1 - (j + 1 + stepv) / 2); // (0,1) //(i+1)/2,(j+1+step)/2);
	16902	+ else
14497	16903	gl.glTexCoord2f((i + 1 + step) / 2, (j + 1 + stepv) / 2); // (0,1) //(i+1)/2,(j+1+step)/2);
14498	16904	gl.glVertex3f(i + step, j + stepv, -0.5f);
14499	16905
	16906	+ if (checker.flipV)
	16907	+ gl.glTexCoord2f((i + 1) / 2, 1 - (j + 1 + stepv) / 2); // (0,0) //(i+1)/2,(j+1)/2);
	16908	+ else
14500	16909	gl.glTexCoord2f((i + 1) / 2, (j + 1 + stepv) / 2); // (0,0) //(i+1)/2,(j+1)/2);
14501	16910	gl.glVertex3f(i, j + stepv, -0.5f);
14502	16911	}
..	..	@@ -14508,7 +16917,7 @@
14508	16917	gl.glMatrixMode(GL.GL_PROJECTION);
14509	16918	gl.glPopMatrix();
14510	16919	gl.glMatrixMode(GL.GL_MODELVIEW);
14511		- PopMatrix(null); // checker.toParent); // null);
	16920	+ //PopMatrix(null); // checker.toParent); // null);
14512	16921	gl.glPopMatrix();
14513	16922	PopTextureMatrix(checker.toParent);
14514	16923	gl.glMatrixMode(GL.GL_TEXTURE);
..	..	@@ -14541,6 +16950,14 @@
14541	16950	}
14542	16951	}
14543	16952
	16953	+ private Object3D GetFolder()
	16954	+ {
	16955	+ Object3D folder = object.GetWindow().copy;
	16956	+ if (object.GetWindow().copy.selection.Size() > 0)
	16957	+ folder = object.GetWindow().copy.selection.elementAt(0);
	16958	+ return folder;
	16959	+ }
	16960	+
14544	16961	class SelectBuffer implements GLEventListener
14545	16962	{
14546	16963
..	..	@@ -14556,7 +16973,7 @@
14556	16973	//new Exception().printStackTrace();
14557	16974	System.out.println("select buffer init");
14558	16975	// Use debug pipeline
14559		- drawable.setGL(new DebugGL(drawable.getGL()));
	16976	+ //drawable.setGL(new DebugGL(drawable.getGL()));
14560	16977
14561	16978	GL gl = drawable.getGL();
14562	16979
..	..	@@ -14599,6 +17016,7 @@
14599	17016	{
14600	17017	if (!selection)
14601	17018	{
	17019	+ new Exception().printStackTrace();
14602	17020	System.exit(0);
14603	17021	return;
14604	17022	}
..	..	@@ -14619,17 +17037,39 @@
14619	17037
14620	17038	//gl.glDisable(GL.GL_POLYGON_OFFSET_FILL);
14621	17039
	17040	+ if (PAINTMODE)
	17041	+ {
	17042	+ if (object.GetWindow().copy.selection.Size() > 0)
	17043	+ {
	17044	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	17045	+
	17046	+ // Make what you paint not selectable.
	17047	+ paintobj.ResetSelectable();
	17048	+ }
	17049	+ }
	17050	+
14622	17051	//int tmp = selection_view;
14623	17052	//selection_view = -1;
14624		- int temp = drawMode;
14625		- drawMode = SELECTION;
	17053	+ int temp = DrawMode();
	17054	+ Globals.drawMode = SELECTION; // WARNING
14626	17055	indexcount = 0;
14627	17056	parent.display(drawable);
14628	17057	//selection_view = tmp;
14629	17058	//if (temp == SELECTION)
14630	17059	// temp = DEFAULT; // patch for selection debug
14631		- drawMode = temp;
	17060	+ Globals.drawMode = temp; // WARNING
14632	17061
	17062	+ if (PAINTMODE)
	17063	+ {
	17064	+ if (object.GetWindow().copy.selection.Size() > 0)
	17065	+ {
	17066	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	17067	+
	17068	+ // Revert.
	17069	+ paintobj.RestoreSelectable();
	17070	+ }
	17071	+ }
	17072	+
14633	17073	//gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
14634	17074
14635	17075	// trying different ways of getting the depth info over
..	..	@@ -14678,6 +17118,13 @@
14678	17118	// System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
14679	17119	// System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
14680	17120
	17121	+ CreateSelectedPoint();
	17122	+
	17123	+ // Will fit the mesh !!!
	17124	+ selectedpoint.toParent[0][0] = 0.0001;
	17125	+ selectedpoint.toParent[1][1] = 0.0001;
	17126	+ selectedpoint.toParent[2][2] = 0.0001;
	17127	+
14681	17128	glu.gluUnProject(x,y,depth,view,0,tempmat2,0,viewport,0,selectedpoint.toParent[3],0);
14682	17129
14683	17130	// if (object.selection != null && object.selection.Size() > 0)
..	..	@@ -14721,34 +17168,36 @@
14721	17168	System.out.println("; fromto " + sel + " " + Trunk(previousselectedpoint.toParent[3][0]) + " " + Trunk(previousselectedpoint.toParent[3][2]) + " " + Trunk(selectedpoint.toParent[3][0]) + " " + Trunk(selectedpoint.toParent[3][2]));
14722	17169	}
14723	17170
14724		- previousselectedpoint = (Sphere) GrafreeD.clone(selectedpoint);
	17171	+ previousselectedpoint = (Sphere) Grafreed.clone(selectedpoint);
14725	17172	}
14726	17173	}
14727	17174
14728	17175	if (!movingcamera && !PAINTMODE)
14729		- object.editWindow.ScreenFitPoint(); // fev 2014
	17176	+ object.GetWindow().ScreenFitPoint(); // fev 2014
14730	17177
14731		- if (PAINTMODE && GrafreeD.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	17178	+ if (PAINTMODE) // && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
14732	17179	{
14733		- Object3D paintobj = GrafreeD.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
	17180	+ //Object3D paintobj; // = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
14734	17181
14735		- Object3D group = new Object3D("inst" + paintcount++);
	17182	+ if (object.GetWindow().copy.selection.Size() > 0)
	17183	+ {
	17184	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
14736	17185
14737		- group.CreateMaterial(); // use a void leaf to select instances
14738		-
14739		- group.add(paintobj); // link
14740		-
14741		- object.editWindow.SnapObject(group);
14742		-
14743		- Object3D folder = object.editWindow.copy;
14744		-
14745		- if (object.editWindow.copy.selection.Size() > 0)
14746		- folder = object.editWindow.copy.selection.elementAt(0);
14747		-
14748		- folder.add(group);
14749		-
14750		- object.editWindow.ResetModel();
14751		- object.editWindow.refreshContents();
	17186	+ Object3D inst = new Object3D("inst" + paintcount++);
	17187	+
	17188	+ inst.CreateMaterial(); // use a void leaf to select instances
	17189	+
	17190	+ inst.add(paintobj); // link
	17191	+
	17192	+ object.GetWindow().SnapObject(inst);
	17193	+
	17194	+ Object3D folder = paintFolder; // GetFolder();
	17195	+
	17196	+ folder.add(inst);
	17197	+
	17198	+ object.GetWindow().ResetModel();
	17199	+ object.GetWindow().refreshContents();
	17200	+ }
14752	17201	}
14753	17202	else
14754	17203	paintcount = 0;
..	..	@@ -14787,6 +17236,11 @@
14787	17236	//System.out.println("objects[color] = " + objects[color]);
14788	17237	//objects[color].Select();
14789	17238	indexcount = 0;
	17239	+ ObjEditor window = object.GetWindow();
	17240	+ if (window != null && deselect)
	17241	+ {
	17242	+ window.Select(null, deselect, true);
	17243	+ }
14790	17244	object.Select(color, deselect);
14791	17245	}
14792	17246
..	..	@@ -14886,7 +17340,7 @@
14886	17340	gl.glDisable(gl.GL_CULL_FACE);
14887	17341	}
14888	17342
14889		- if (!RENDERSHADOW)
	17343	+ if (!Globals.RENDERSHADOW)
14890	17344	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
14891	17345
14892	17346	// SB gl.glPolygonOffset(2.5f, 10);
..	..	@@ -14896,14 +17350,14 @@
14896	17350	//gl.glColorMask(false, false, false, false);
14897	17351
14898	17352	//render_scene_from_light_view(gl, drawable, 0, 0);
14899		- if (RENDERSHADOW && lighttouched && !movingcamera) // && !parent.IsFreezed())
	17353	+ if (Globals.RENDERSHADOW && Globals.lighttouched && (!movingcamera \|\| !Globals.FREEZEONMOVE)) // && !parent.IsFreezed())
14900	17354	{
14901	17355	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
14902	17356
14903		- int temp = drawMode;
14904		- drawMode = SHADOW;
	17357	+ int temp = DrawMode();
	17358	+ Globals.drawMode = SHADOW; // WARNING
14905	17359	parent.display(drawable);
14906		- drawMode = temp;
	17360	+ Globals.drawMode = temp; // WARNING
14907	17361	}
14908	17362
14909	17363	gl.glCullFace(gl.GL_BACK);
..	..	@@ -14956,7 +17410,6 @@
14956	17410
14957	17411	class AntialiasBuffer implements GLEventListener
14958	17412	{
14959		-
14960	17413	CameraPane parent = null;
14961	17414
14962	17415	AntialiasBuffer(CameraPane p)
..	..	@@ -15066,13 +17519,19 @@
15066	17519	gl.glFlush();
15067	17520
15068	17521	/**/
15069		- gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_BGRA, GL.GL_UNSIGNED_INT_8_8_8_8_REV, occlusionsizebuffer);
	17522	+ gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusionsizebuffer);
15070	17523
15071		- int[] pixels = occlusionsizebuffer.array();
	17524	+ float[] pixels = occlusionsizebuffer.array();
15072	17525
15073	17526	double r = 0, g = 0, b = 0;
15074	17527
15075	17528	double count = 0;
	17529	+
	17530	+ gl.glGetDoublev(gl.GL_PROJECTION_MATRIX, tempmat2, 0);
	17531	+
	17532	+ float mindepth = 1;
	17533	+
	17534	+ double FACTOR = 1;
15076	17535
15077	17536	for (int i = 0; i < pixels.length; i++)
15078	17537	{
..	..	@@ -15157,7 +17616,7 @@
15157	17616
15158	17617	double scale = ray.z; // 1; // cos
15159	17618
15160		- int p = pixels[newindex];
	17619	+ float depth = pixels[newindex];
15161	17620
15162	17621	/*
15163	17622	int newindex2 = (x + 1) * OCCLUSION_SIZE + y;
..	..	@@ -15181,10 +17640,23 @@
15181	17640	scale = (1 - modu) * modv;
15182	17641	*/
15183	17642
15184		- r += ((p >> 16) & 0xFF) * scale / 255;
15185		- g += ((p >> 8) & 0xFF) * scale / 255;
15186		- b += (p & 0xFF) * scale / 255;
	17643	+ //r += ((p >> 16) & 0xFF) * scale / 255;
	17644	+ //g += ((p >> 8) & 0xFF) * scale / 255;
	17645	+ //b += (p & 0xFF) * scale / 255;
	17646	+
	17647	+ if (mindepth > depth)
	17648	+ {
	17649	+ mindepth = depth;
	17650	+ }
15187	17651
	17652	+ double z_eye = tempmat2[34 + 2] / (depth -2.0 + 1.0 - tempmat2[2*4 + 2]);
	17653	+
	17654	+ double factor = 1 - Math.exp(-z_eye * z_eye / FACTOR);
	17655	+
	17656	+ r += factor * scale;
	17657	+ g += factor * scale;
	17658	+ b += factor * scale;
	17659	+
15188	17660	count += scale;
15189	17661	}
15190	17662
..	..	@@ -15282,12 +17754,6 @@
15282	17754	GLUT glut = new GLUT();
15283	17755
15284	17756
15285		- static final public int DEFAULT = 0;
15286		- static final public int SELECTION = 1;
15287		- static final public int SHADOW = 2;
15288		- static final public int OCCLUSION = 3;
15289		- static
15290		- public int drawMode = DEFAULT;
15291	17757	public boolean spherical = false;
15292	17758	static boolean DEBUG_OCCLUSION = false;
15293	17759	static boolean DEBUG_SELECTION = false;
..	..	@@ -15300,23 +17766,15 @@
15300	17766	int AAbuffersize = 0;
15301	17767
15302	17768	//double[] selectedpoint = new double[3];
15303		- static Sphere selectedpoint = new Sphere();
	17769	+ static Superellipsoid selectedpoint;
15304	17770	static Sphere previousselectedpoint = null;
15305		- static Sphere debugpoint = new Sphere();
15306		- static Sphere debugpoint2 = new Sphere();
15307		- static Sphere debugpoint3 = new Sphere();
15308		- static Sphere debugpoint4 = new Sphere();
	17771	+ static Sphere debugpointG;
	17772	+ static Sphere debugpointP;
	17773	+ static Sphere debugpointC;
	17774	+ static Sphere debugpointR;
15309	17775
15310	17776	static Sphere debugpoints[] = new Sphere[8];
15311	17777
15312		- static
15313		- {
15314		- for (int i=0; i<8; i++)
15315		- {
15316		- debugpoints[i] = new Sphere();
15317		- }
15318		- }
15319		-
15320	17778	static void InitPoints(float radius)
15321	17779	{
15322	17780	for (int i=0; i<8; i++)
..	..	@@ -15336,7 +17794,7 @@
15336	17794	}
15337	17795	}
15338	17796
15339		- static void DrawPoints(CameraPane cpane)
	17797	+ static void DrawPoints(iCameraPane cpane)
15340	17798	{
15341	17799	for (int i=0; i<8; i++) // first and last are red
15342	17800	{
..	..	@@ -15358,7 +17816,8 @@
15358	17816	static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
15359	17817	static IntBuffer selectsizebuffer = IntBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
15360	17818	static java.nio.FloatBuffer pointselectsizebuffer = java.nio.FloatBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
15361		- static IntBuffer occlusionsizebuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17819	+ //static IntBuffer occlusionsizebuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17820	+ static java.nio.FloatBuffer occlusionsizebuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
15362	17821	static BufferedImage bufimage = new BufferedImage(TEX_SIZE, TEX_SIZE, BufferedImage.TYPE_INT_RGB);
15363	17822	static BufferedImage textest = new cBufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB);
15364	17823	static java.util.Vector<BufferedImage> billboards = new java.util.Vector<BufferedImage>();
..	..	@@ -15367,10 +17826,11 @@
15367	17826	static IntBuffer textbuffer = null; // IntBuffer.allocate(TEXT_WIDTH88 * TEXT_HEIGHT);
15368	17827	// Depth buffer format
15369	17828	//private int depth_format;
15370		- static public void NextIndex(Object3D o, GL gl)
	17829	+
	17830	+ public void NextIndex()
15371	17831	{
15372	17832	indexcount+=16;
15373		- gl.glColor3d(((indexcount >>> 16) & 255) / 255.0, ((indexcount >>> 8) & 255) / 255.0, ((indexcount) & 255) / 255.0);
	17833	+ GetGL().glColor3d(((indexcount >>> 16) & 255) / 255.0, ((indexcount >>> 8) & 255) / 255.0, ((indexcount) & 255) / 255.0);
15374	17834	//objects[indexcount] = o;
15375	17835	//System.out.println("indexcount = " + indexcount);
15376	17836	}