~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,10 +1932,10 @@
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		- // GraphreeD.tracein(matrix);
	1938	+ // GrafreeD.tracein(matrix);
232	1939	if (matrix == null)
233	1940	return; // Identity
234	1941
..	..	@@ -253,13 +1960,13 @@
253	1960
254	1961	void PushMatrix(double[][] matrix)
255	1962	{
256		- // GraphreeD.tracein(matrix);
257		- PushMatrix(matrix,1);
	1963	+ // GrafreeD.tracein(matrix);
	1964	+ PushMatrix(matrix, 1);
258	1965	}
259	1966
260	1967	void PushMatrix()
261	1968	{
262		- // GraphreeD.tracein(null);
	1969	+ // GrafreeD.tracein(null);
263	1970	if (matrixdepth++ < MAXSTACK - 1)
264	1971	{
265	1972	currentGL.glPushMatrix();
..	..	@@ -270,11 +1977,11 @@
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
277		- // GraphreeD.traceout(inverse);
	1984	+ // GrafreeD.traceout(inverse);
278	1985	if (inverse == null)
279	1986	return; // Identity
280	1987
..	..	@@ -292,7 +1999,7 @@
292	1999
293	2000	void PopMatrix()
294	2001	{
295		- // GraphreeD.traceout(null);
	2002	+ // GrafreeD.traceout(null);
296	2003	// inverse == null??
297	2004	if (--matrixdepth < MAXSTACK - 1)
298	2005	{
..	..	@@ -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		- GraphreeD.savesound = true; // wav.save();
495		- // else
496		- repaint(); // start loop // may 2013
497		- }
498		-
499		- void ToggleSupport()
500		- {
501		- SUPPORT ^= true;
502		- }
503		-
504		- void ToggleAbort()
505		- {
506		- ABORTMODE ^= true;
507	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)
..	..	@@ -6333,7 +8126,7 @@
6333	8126	{
6334	8127	bumpdepth--;
6335	8128
6336		- // GraphreeD.trace("POP " + tex + "(" + pigmentdepth + ")" + " : " + pigmentstack[pigmentdepth] + " vs " + texture);
	8129	+ // GrafreeD.trace("POP " + tex + "(" + pigmentdepth + ")" + " : " + pigmentstack[pigmentdepth] + " vs " + texture);
6337	8130	if (bumpstack[bumpdepth] != (texture!=null?texture.texture:null))
6338	8131	{
6339	8132	// assert (bumpstack[bumpdepth] == texture);
..	..	@@ -6363,7 +8156,7 @@
6363	8156	{
6364	8157	pigmentdepth--;
6365	8158
6366		- // GraphreeD.trace("POP " + tex + "(" + pigmentdepth + ")" + " : " + pigmentstack[pigmentdepth] + " vs " + texture);
	8159	+ // GrafreeD.trace("POP " + tex + "(" + pigmentdepth + ")" + " : " + pigmentstack[pigmentdepth] + " vs " + texture);
6367	8160	if (pigmentstack[pigmentdepth] != (texture!=null?texture.texture:null))
6368	8161	{
6369	8162	// assert (pigmentstack[pigmentdepth] == texture);
..	..	@@ -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) && !texname.startsWith("@"))
	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,22 @@
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();
	8442	+ } else
	8443	+ {
	8444	+ if (texname.startsWith("@"))
	8445	+ {
	8446	+ // texturecache = textures.get(texname); // suspicious
	8447	+ if (texturecache == null)
	8448	+ texturecache = new CacheTexture(GetResourceTexture(texname.substring(1), bump),resolution);
	8449	+ else
	8450	+ new Exception().printStackTrace();
6514	8451	} else
6515	8452	{
6516	8453	if (textureon)
..	..	@@ -6535,7 +8472,7 @@
6535	8472	}
6536	8473
6537	8474	cachename = texname.substring(0, texname.length()-4)+ext+".jpg";
6538		- if (!new File(cachename).exists())
	8475	+ if (!FileExists(cachename))
6539	8476	cachename = texname;
6540	8477	else
6541	8478	processbump = false; // don't process bump map again
..	..	@@ -6557,7 +8494,7 @@
6557	8494	}
6558	8495
6559	8496	cachename = texname.substring(0, texname.length()-4)+ext+".png";
6560		- if (!new File(cachename).exists())
	8497	+ if (!FileExists(cachename))
6561	8498	cachename = texname;
6562	8499	else
6563	8500	processbump = false; // don't process bump map again
..	..	@@ -6566,20 +8503,23 @@
6566	8503	texturedata = GetFileTexture(cachename, processbump, resolution);
6567	8504
6568	8505
6569		- if (texturedata != null)
6570		- texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
	8506	+ if (texturedata == null)
	8507	+ throw new Exception();
	8508	+
	8509	+ texturecache = new CacheTexture(texturedata,resolution);
6571	8510	//texture = GetTexture(tex, bump);
6572	8511	}
	8512	+ }
6573	8513	}
6574	8514	//}
6575	8515	}
6576	8516
6577		- if (/CACHETEXTURE &&/ texture != null && textureon)
	8517	+ if (texdata == null && /CACHETEXTURE &&/ texturecache != null && textureon)
6578	8518	{
6579	8519	//return false;
6580	8520
6581	8521	// System.out.println("CACHE +++++++++++++++ TEXTURE : " + texname + " (" + texture.getEstimatedMemorySize() + ")");
6582		- if (texturedata != null && (texname.endsWith(".jpg") \|\| texname.endsWith(".JPG")))
	8522	+ if (texturedata != null && texname.toLowerCase().endsWith(".jpg"))
6583	8523	{
6584	8524	// String ext = "_highres";
6585	8525	// if (REDUCETEXTURE)
..	..	@@ -6596,52 +8536,17 @@
6596	8536	File cachefile = new File(texname.substring(0, texname.length()-4)+ext+".jpg");
6597	8537	if (!cachefile.exists())
6598	8538	{
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))
	8539	+ //if (texturedata.getWidth() == texturedata.getHeight())
6608	8540	{
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);
	8541	+ BufferedImage rendImage = CreateBim(texturedata);
	8542	+
6639	8543	ImageWriter writer = null;
6640	8544	Iterator iter = ImageIO.getImageWritersByFormatName("jpg");
6641	8545	if (iter.hasNext()) {
6642	8546	writer = (ImageWriter)iter.next();
6643	8547	}
6644		- float compressionQuality = 0.9f;
	8548	+
	8549	+ float compressionQuality = 0.85f;
6645	8550	try
6646	8551	{
6647	8552	ImageOutputStream ios = ImageIO.createImageOutputStream(cachefile);
..	..	@@ -6658,18 +8563,20 @@
6658	8563	}
6659	8564	}
6660	8565	}
6661		-
	8566	+
	8567	+ Hashtable<cTexture, CacheTexture> textures = bump ? texturebump : texturepigment;
	8568	+
6662	8569	//System.out.println("Texture = " + tex);
6663		- if (textures.containsKey(texname))
	8570	+ if (textures.containsKey(tex))
6664	8571	{
6665		- CacheTexture thetex = textures.get(texname);
	8572	+ CacheTexture thetex = textures.get(tex);
6666	8573	thetex.texture.disable();
6667	8574	thetex.texture.dispose();
6668		- textures.remove(texname);
	8575	+ textures.remove(tex);
6669	8576	}
6670	8577
6671		- texture.texturedata = texturedata;
6672		- textures.put(texname, texture);
	8578	+ //texture.texturedata = texturedata;
	8579	+ textures.put(tex, texturecache);
6673	8580
6674	8581	// newtex = true;
6675	8582	}
..	..	@@ -6685,42 +8592,76 @@
6685	8592	}
6686	8593	}
6687	8594
6688		- return texture;
	8595	+ return texturecache;
6689	8596	}
6690	8597
6691		- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution)
	8598	+ static void EmbedTextures(cTexture tex)
	8599	+ {
	8600	+ if (tex.pigmentdata == null)
	8601	+ {
	8602	+ //String texname = Object3D.GetPigment(tex);
	8603	+
	8604	+ CacheTexture texturecache = texturepigment.get(tex);
	8605	+
	8606	+ if (texturecache != null)
	8607	+ {
	8608	+ tex.pw = texturecache.texturedata.getWidth();
	8609	+ tex.ph = texturecache.texturedata.getHeight();
	8610	+ tex.pigmentdata = //CompressJPEG(CreateBim
	8611	+ ((ByteBuffer)texturecache.texturedata.getBuffer()).array()
	8612	+ ;
	8613	+ //, tex.pw, tex.ph), 0.5f);
	8614	+ }
	8615	+ }
	8616	+
	8617	+ if (tex.bumpdata == null)
	8618	+ {
	8619	+ //String texname = Object3D.GetBump(tex);
	8620	+
	8621	+ CacheTexture texturecache = texturebump.get(tex);
	8622	+
	8623	+ if (texturecache != null)
	8624	+ {
	8625	+ tex.bw = texturecache.texturedata.getWidth();
	8626	+ tex.bh = texturecache.texturedata.getHeight();
	8627	+ tex.bumpdata = CompressJPEG(CreateBim(((ByteBuffer)texturecache.texturedata.getBuffer()).array(), tex.bw, tex.bh), 0.5f);
	8628	+ }
	8629	+ }
	8630	+ }
	8631	+
	8632	+ com.sun.opengl.util.texture.Texture GetTexture(cTexture tex, boolean bump, int resolution) throws Exception
6692	8633	{
6693	8634	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
6694	8635
6695	8636	if (bump)
6696	8637	{
6697		- // GraphreeD.trace("PUSH BUMP " + tex + "(" + bumpdepth + ")" + " : " + texture);
	8638	+ // GrafreeD.trace("PUSH BUMP " + tex + "(" + bumpdepth + ")" + " : " + texture);
6698	8639	bumpstack[bumpdepth++] = texture!=null?texture.texture:null;
6699	8640	}
6700	8641	else
6701	8642	{
6702		- // GraphreeD.trace("PUSH PIGMENT " + tex + "(" + pigmentdepth + ")" + " : " + texture);
	8643	+ // GrafreeD.trace("PUSH PIGMENT " + tex + "(" + pigmentdepth + ")" + " : " + texture);
6703	8644	pigmentstack[pigmentdepth++] = texture!=null?texture.texture:null;
6704	8645	}
6705	8646
6706	8647	return texture!=null?texture.texture:null;
6707	8648	}
6708	8649
6709		- com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution)
	8650	+ public com.sun.opengl.util.texture.TextureData GetTextureData(cTexture tex, boolean bump, int resolution) throws Exception
6710	8651	{
6711	8652	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
6712	8653
6713	8654	return texture!=null?texture.texturedata:null;
6714	8655	}
6715	8656
6716		- boolean BindTexture(String tex, boolean bump, int resolution)
	8657	+ boolean BindTexture(cTexture tex, boolean bump, int resolution) throws Exception
6717	8658	{
6718	8659	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
6719	8660	{
6720	8661	return false;
6721	8662	}
6722	8663
6723		- boolean newtex = false;
	8664	+ //boolean newtex = false;
6724	8665
6725	8666	com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
6726	8667
..	..	@@ -6752,9 +8693,75 @@
6752	8693	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_S, GetGL().GL_REPEAT);
6753	8694	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_T, GetGL().GL_REPEAT);
6754	8695
6755		- return newtex;
	8696	+ return true; // Warning: not used.
6756	8697	}
6757	8698
	8699	+ public static byte[] CompressJPEG(BufferedImage image, float quality)
	8700	+ {
	8701	+ try
	8702	+ {
	8703	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	8704	+ Iterator<ImageWriter> writers = ImageIO.getImageWritersByFormatName("jpg");
	8705	+ ImageWriter writer = writers.next();
	8706	+
	8707	+ ImageWriteParam param = writer.getDefaultWriteParam();
	8708	+ param.setCompressionMode(ImageWriteParam.MODE_EXPLICIT);
	8709	+ param.setCompressionQuality(quality);
	8710	+
	8711	+ ImageOutputStream ios = ImageIO.createImageOutputStream(baos);
	8712	+ writer.setOutput(ios);
	8713	+ writer.write(null, new IIOImage(image, null, null), param);
	8714	+
	8715	+ byte[] data = baos.toByteArray();
	8716	+ writer.dispose();
	8717	+ return data;
	8718	+ }
	8719	+ catch (Exception e)
	8720	+ {
	8721	+ e.printStackTrace();
	8722	+ return null;
	8723	+ }
	8724	+ }
	8725	+
	8726	+ public static BufferedImage DecompressJPEG(byte[] image, int w, int h) throws IOException
	8727	+ {
	8728	+ ByteArrayInputStream baos = new ByteArrayInputStream(image);
	8729	+ Iterator<ImageReader> writers = ImageIO.getImageReadersByFormatName("jpg");
	8730	+ ImageReader reader = writers.next();
	8731	+
	8732	+ BufferedImage bim = new BufferedImage(w, h, BufferedImage.TYPE_INT_RGB);
	8733	+
	8734	+ ImageReadParam param = reader.getDefaultReadParam();
	8735	+ param.setDestination(bim);
	8736	+ //param.setDestinationType(ImageTypeSpecifier.createFromBufferedImageType(BufferedImage.TYPE_INT_RGB));
	8737	+
	8738	+ ImageInputStream ios = ImageIO.createImageInputStream(baos);
	8739	+ reader.setInput(ios);
	8740	+ BufferedImage bim2 = reader.read(0, param);
	8741	+ reader.dispose();
	8742	+
	8743	+// WritableRaster raster = bim2.getRaster();
	8744	+// DataBufferByte data = (DataBufferByte) raster.getDataBuffer();
	8745	+// byte[] bytes = data.getData();
	8746	+//
	8747	+// int[] pixels = new int[bytes.length/3];
	8748	+// for (int i=pixels.length; --i>=0;)
	8749	+// {
	8750	+// int i3 = i*3;
	8751	+// pixels[i] = 0xFF;
	8752	+// pixels[i] <<= 8;
	8753	+// pixels[i] \|= bytes[i3+2] & 0xFF;
	8754	+// pixels[i] <<= 8;
	8755	+// pixels[i] \|= bytes[i3+1] & 0xFF;
	8756	+// pixels[i] <<= 8;
	8757	+// pixels[i] \|= bytes[i3] & 0xFF;
	8758	+// }
	8759	+//
	8760	+// bim.setRGB(0,0,w,h, pixels, w*(h-1),-w);
	8761	+
	8762	+ return bim;
	8763	+ }
	8764	+
6758	8765	ShadowBuffer shadowPBuf;
6759	8766	AntialiasBuffer antialiasPBuf;
6760	8767	int MAXSTACK;
..	..	@@ -6947,7 +8954,7 @@
6947	8954
6948	8955	if (cubemap == null)
6949	8956	{
6950		- LoadEnvy(5);
	8957	+ //LoadEnvy(1);
6951	8958	}
6952	8959
6953	8960	//cubemap.enable();
..	..	@@ -7234,37 +9241,58 @@
7234	9241	cubemap = null;
7235	9242	return;
7236	9243	case 1:
7237		- name = "cubemaps/box_";
7238		- ext = "png";
	9244	+ name = "cubemaps/rgb/";
	9245	+ ext = "jpg";
7239	9246	reverseUP = false;
7240	9247	break;
7241	9248	case 2:
7242		- name = "cubemaps/uffizi_";
7243		- ext = "png";
7244		- break; // reverseUP = true; break;
	9249	+ name = "cubemaps/uffizi/";
	9250	+ ext = "jpg";
	9251	+ reverseUP = false;
	9252	+ break;
7245	9253	case 3:
7246		- name = "cubemaps/CloudyHills_";
7247		- ext = "tga";
	9254	+ name = "cubemaps/CloudyHills/";
	9255	+ ext = "jpg";
7248	9256	reverseUP = false;
7249	9257	break;
7250	9258	case 4:
7251		- name = "cubemaps/cornell_";
	9259	+ name = "cubemaps/cornell/";
7252	9260	ext = "png";
7253	9261	reverseUP = false;
7254	9262	break;
	9263	+ case 5:
	9264	+ name = "cubemaps/skycube/";
	9265	+ ext = "jpg";
	9266	+ reverseUP = false;
	9267	+ break;
	9268	+ case 6:
	9269	+ name = "cubemaps/SaintLazarusChurch3/";
	9270	+ ext = "jpg";
	9271	+ reverseUP = false;
	9272	+ break;
	9273	+ case 7:
	9274	+ name = "cubemaps/Sodermalmsallen/";
	9275	+ ext = "jpg";
	9276	+ reverseUP = false;
	9277	+ break;
	9278	+ case 8:
	9279	+ name = "cubemaps/Sodermalmsallen2/";
	9280	+ ext = "jpg";
	9281	+ reverseUP = false;
	9282	+ break;
	9283	+ case 9:
	9284	+ name = "cubemaps/UnionSquare/";
	9285	+ ext = "jpg";
	9286	+ reverseUP = false;
	9287	+ break;
7255	9288	default:
7256		- name = "cubemaps/rgb_";
7257		- ext = "png"; /mipmap = true;/ reverseUP = false;
	9289	+ name = "cubemaps/box/";
	9290	+ ext = "png"; /mipmap = true;/
	9291	+ reverseUP = false;
7258	9292	break;
7259	9293	}
7260		-
7261		- try
7262		- {
7263		- cubemap = LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
7264		- } catch (IOException e)
7265		- {
7266		- throw new RuntimeException(e);
7267		- }
	9294	+
	9295	+ LoadSkybox(name, ext, mipmap);
7268	9296	}
7269	9297
7270	9298	public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height)
..	..	@@ -7296,8 +9324,12 @@
7296	9324	static double[] model = new double[16];
7297	9325	double[] camera2light = new double[16];
7298	9326	double[] light2camera = new double[16];
7299		- int newenvy = -1;
7300		- boolean envyoff = true; // false;
	9327	+
	9328	+ //int newenvy = -1;
	9329	+ //boolean envyoff = false;
	9330	+
	9331	+ String loadedskyboxname;
	9332	+
7301	9333	cVector light0 = new cVector(0, 0, 0); // 1,3,2);
7302	9334	//float[] light0 = { 0,0,0 };
7303	9335	cVector dirlight = new cVector(0, 0, 1); // 1,3,2);
..	..	@@ -7310,9 +9342,9 @@
7310	9342	static boolean occlusionInitialized = false;
7311	9343	boolean selection = false;
7312	9344	boolean pointselection = false;
7313		- /static/ boolean lighttouched = true;
	9345	+ ///static/ boolean lighttouched = true;
7314	9346	boolean deselect;
7315		- boolean ambientOcclusion = false;
	9347	+ private boolean ambientOcclusion = false;
7316	9348	static boolean flash = false;
7317	9349	/static/ boolean wait = false;
7318	9350	boolean displaydone = false; // after repaint() calls
..	..	@@ -7442,6 +9474,8 @@
7442	9474	//gl.glFrustum(-0.5scale, 0.5scale, -0.5scale, 0.5scale, 1, 100);
7443	9475	//glu.gluPerspective(lightshaper_fovy, 1, lightshaper_zNear, lightshaper_zFar);
7444	9476	double scale = lightCamera.SCALE / lightCamera.Distance();
	9477	+// PATCH FILLE AUX JEANS
	9478	+ //scale *= lightCamera.shaper_fovy / 25;
7445	9479	gl.glScaled(2 * scale, 2 * scale, -scale);
7446	9480	gl.glTranslated(0, 0, lightCamera.DECAL);
7447	9481
..	..	@@ -7588,17 +9622,40 @@
7588	9622	jy8[3] = 0.5f;
7589	9623	}
7590	9624
7591		- float[] options1 = new float[]{1000, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
	9625	+ float[] options1 = new float[]{100, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
7592	9626	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
	9627	+ float[] options3 = new float[]{1, 1, 1, 0}; // fog color
	9628	+ float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
7594	9629
	9630	+ void ResetOptions()
	9631	+ {
	9632	+ options1[0] = 100;
	9633	+ options1[1] = 0.025f;
	9634	+ options1[2] = 0.01f;
	9635	+ options1[3] = 0;
	9636	+ options1[4] = 0;
	9637	+
	9638	+ options2[0] = 0;
	9639	+ options2[1] = 0.75f;
	9640	+ options2[2] = 0;
	9641	+ options2[3] = 0;
	9642	+
	9643	+ options3[0] = 1;
	9644	+ options3[1] = 1;
	9645	+ options3[2] = 1;
	9646	+ options3[3] = 0;
	9647	+
	9648	+ options4[0] = 1;
	9649	+ options4[1] = 0;
	9650	+ options4[2] = 1;
	9651	+ options4[3] = 0;
	9652	+ }
	9653	+
7595	9654	static int imagecount = 0; // movie generation
7596	9655
7597	9656	static int jitter = 0;
7598	9657
7599	9658	boolean restartframe = false;
7600		-
7601		- static int framecount = 0; // general-purpose global count
7602	9659
7603	9660	void displayAntiAliased(javax.media.opengl.GL gl)
7604	9661	{
..	..	@@ -7628,14 +9685,14 @@
7628	9685
7629	9686	//System.out.println("start frame");
7630	9687	gl.glClear(gl.GL_ACCUM_BUFFER_BIT);
7631		- for (jitter = 0; jitter < ACSIZE; jitter++) //, GraphreeD.wav.cursor += LIVE ? 735 : 0)
	9688	+ for (jitter = 0; jitter < ACSIZE; jitter++) //, GrafreeD.wav.cursor += LIVE ? 735 : 0)
7632	9689	{
7633		- framecount++;
	9690	+ Globals.framecount++;
7634	9691
7635	9692	if (CameraPane.tickcount > 0)
7636	9693	CameraPane.tickcount--;
7637	9694
7638		-// GraphreeD.wav.cursor += 735; // 44100 Hz / 120 Hz * 2 (for 16 bits)
	9695	+// GrafreeD.wav.cursor += 735; // 44100 Hz / 120 Hz * 2 (for 16 bits)
7639	9696	// restartframe = true;
7640	9697	if (options1[2] > 100 && (jitter%2==0))
7641	9698	{
..	..	@@ -7668,7 +9725,7 @@
7668	9725
7669	9726	gl.glLightfv(gl.GL_LIGHT0, gl.GL_POSITION, pos, 0);
7670	9727	*/
7671		- lighttouched = true;
	9728	+ Globals.lighttouched = true;
7672	9729	//System.err.println(" shadowbuffer: " + jitter);
7673	9730	shadowbuffer.display();
7674	9731
..	..	@@ -7689,8 +9746,8 @@
7689	9746	assert (parentcam != renderCamera);
7690	9747
7691	9748	if (renderCamera != lightCamera)
7692		- for (int count = parentcam.GetTransformCount(); --count>=0;)
7693		- LA.matConcat(parentcam.toParent, matrix, matrix);
	9749	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9750	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
7694	9751
7695	9752	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
7696	9753
..	..	@@ -7705,8 +9762,8 @@
7705	9762	LA.matCopy(renderCamera.fromScreen, matrix);
7706	9763
7707	9764	if (renderCamera != lightCamera)
7708		- for (int count = parentcam.GetTransformCount(); --count>=0;)
7709		- LA.matConcat(matrix, parentcam.fromParent, matrix);
	9765	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9766	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
7710	9767
7711	9768	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
7712	9769
..	..	@@ -7752,10 +9809,12 @@
7752	9809	rati = 1 / rati;
7753	9810	gl.glOrtho(-skyscale / rati, skyscale / rati, -skyscale, skyscale, 0.001, 1000);
7754	9811	}
7755		- assert (newenvy == -1);
	9812	+
	9813	+ //assert (newenvy == -1);
	9814	+
7756	9815	gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
7757	9816	gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
7758		- DrawSkyBox(gl);
	9817	+ DrawSkyBox(gl, (float)rati);
7759	9818	gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
7760	9819	gl.glEnable(GL.GL_VERTEX_PROGRAM_ARB);
7761	9820	accPerspective(gl, renderCamera.shaper_fovy / ratio,
..	..	@@ -7778,7 +9837,7 @@
7778	9837	//gl.glFlush();
7779	9838	gl.glAccum(gl.GL_ACCUM, 1.0f / ACSIZE);
7780	9839
7781		- if (ANIMATION && ABORTED)
	9840	+ if (Globals.ANIMATION && ABORTED)
7782	9841	{
7783	9842	System.err.println(" ABORTED FRAME");
7784	9843	break;
..	..	@@ -7808,7 +9867,7 @@
7808	9867	setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
7809	9868
7810	9869	// save image
7811		- if (ANIMATION && !ABORTED)
	9870	+ if (Globals.ANIMATION && !ABORTED)
7812	9871	{
7813	9872	VPwidth = viewport[2];
7814	9873	VPheight = viewport[3];
..	..	@@ -7919,11 +9978,11 @@
7919	9978
7920	9979	// imagecount++;
7921	9980
7922		- String fullname = filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
	9981	+ String fullname = Globals.filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
7923	9982
7924	9983	if (!BOXMODE)
7925	9984	{
7926		- System.out.println("image: " + fullname + " (" + (GraphreeD.wav.cursor / 735 / 4) + ")");
	9985	+ System.out.println("image: " + fullname + " (wav cursor=" + (Grafreed.wav.cursor / 735 / 4) + ")");
7927	9986	}
7928	9987
7929	9988	if (!BOXMODE)
..	..	@@ -7951,7 +10010,7 @@
7951	10010	{
7952	10011	if (ACSIZE > 1)
7953	10012	{
7954		- // System.err.println("image #" + (GraphreeD.wav.cursor / 735 / 4));
	10013	+ // System.err.println("image #" + (GrafreeD.wav.cursor / 735 / 4));
7955	10014	}
7956	10015	}
7957	10016
..	..	@@ -7961,7 +10020,7 @@
7961	10020	ABORTED = false;
7962	10021	}
7963	10022	else
7964		- GraphreeD.wav.cursor += 735 * ACSIZE;
	10023	+ Grafreed.wav.cursor += 735 * ACSIZE;
7965	10024
7966	10025	if (false)
7967	10026	{
..	..	@@ -8615,13 +10674,6 @@
8615	10674	}
8616	10675	}
8617	10676
8618		- boolean IsFrozen()
8619		- {
8620		- boolean selectmode = drawMode == SELECTION \|\| CameraPane.DEBUG_SELECTION;
8621		-
8622		- return !selectmode && cameracount == 0; // != 0;
8623		- }
8624		-
8625	10677	boolean niceon = false;
8626	10678	javax.swing.Timer AAtimer = new javax.swing.Timer(750, this);
8627	10679	boolean currentlydrawing = false;
..	..	@@ -8631,16 +10683,16 @@
8631	10683
8632	10684	public void display(GLAutoDrawable drawable)
8633	10685	{
8634		- if (GraphreeD.savesound && GraphreeD.hassound)
	10686	+ if (Grafreed.savesound && Grafreed.hassound)
8635	10687	{
8636		- GraphreeD.wav.save();
8637		- GraphreeD.savesound = false;
8638		- GraphreeD.hassound = false;
	10688	+ Grafreed.wav.save();
	10689	+ Grafreed.savesound = false;
	10690	+ Grafreed.hassound = false;
8639	10691	}
8640	10692	// if (DEBUG_SELECTION)
8641	10693	// {
8642		-// if (drawMode != SELECTION)
8643		-// drawMode = SELECTION;
	10694	+// if (DrawMode() != SELECTION)
	10695	+// DrawMode() = SELECTION;
8644	10696	// }
8645	10697
8646	10698	if (!isRenderer)
..	..	@@ -8696,9 +10748,9 @@
8696	10748
8697	10749	//ANTIALIAS = 0;
8698	10750
8699		- if (drawMode == DEFAULT) // && CURRENTANTIALIAS > 0)
	10751	+ if (DrawMode() == DEFAULT) // && CURRENTANTIALIAS > 0)
8700	10752	{
8701		- if (niceon \|\| isLIVE())
	10753	+ if (niceon \|\| Globals.isLIVE())
8702	10754	{
8703	10755	//if(active == 0)
8704	10756	// antialiaser = null;
..	..	@@ -8711,6 +10763,7 @@
8711	10763	ANTIALIAS = 0;
8712	10764	//System.out.println("RESTART");
8713	10765	AAtimer.restart();
	10766	+ Globals.TIMERRUNNING = true;
8714	10767	}
8715	10768	}
8716	10769	}
..	..	@@ -8723,7 +10776,7 @@
8723	10776	assert eyeCamera.shaper_zFar == 1E5f; // 500.0f;
8724	10777	*/
8725	10778
8726		- if (drawMode == DEFAULT)
	10779	+ if (DrawMode() == DEFAULT)
8727	10780	{
8728	10781	currentlydrawing = true;
8729	10782	}
..	..	@@ -8754,18 +10807,18 @@
8754	10807
8755	10808	// if(Applet3D.clipboard != null)
8756	10809	// System.out.println("Clipboard = " + Applet3D.clipboard); //.get(0).parent);
8757		-//drawMode = SELECTION;
	10810	+//DrawMode() = SELECTION;
8758	10811	indexcount = 0;
8759	10812
8760		- if (drawMode == OCCLUSION)
	10813	+ if (DrawMode() == OCCLUSION)
8761	10814	{
8762		- drawMode = DEFAULT;
	10815	+ Globals.drawMode = DEFAULT; // WARNING
8763	10816	ambientOcclusion = true;
8764	10817	setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
8765	10818	Object3D theobject = object;
8766	10819	Object3D theparent = object.parent;
8767	10820	object.parent = null;
8768		- object = (Object3D)GraphreeD.clone(object);
	10821	+ object = (Object3D)Grafreed.clone(object);
8769	10822	object.Stripify();
8770	10823	if (theobject.selection == null \|\| theobject.selection.Size() == 0)
8771	10824	theobject.PreprocessOcclusion(this);
..	..	@@ -8778,26 +10831,27 @@
8778	10831	ambientOcclusion = false;
8779	10832	}
8780	10833
8781		- if (lighttouched && drawMode == DEFAULT && !lightMode) // && !FROZEN)
	10834	+ if (//Globals.lighttouched &&
	10835	+ DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
8782	10836	{
8783	10837	//if (RENDERSHADOW) // ?
8784	10838	if (!IsFrozen())
8785	10839	{
8786	10840	// dec 2012
8787		- if (!(!flash && !lightMode && drawMode == DEFAULT && ANTIALIAS > 0))
	10841	+ if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
8788	10842	{
8789		- framecount++;
	10843	+ Globals.framecount++;
8790	10844	shadowbuffer.display();
8791	10845	}
8792	10846	}
8793		- lighttouched = false; // ??
	10847	+ Globals.lighttouched = false; // ??
8794	10848	//drawing = true;
8795	10849	//lighttouched = true;
8796	10850	}
8797	10851
8798	10852	if (wait)
8799	10853	{
8800		- Sleep(500);
	10854	+ Sleep(200); // blocks everything
8801	10855
8802	10856	wait = false;
8803	10857	}
..	..	@@ -8811,9 +10865,9 @@
8811	10865	//eyeCamera.shaper_fovy = 1;
8812	10866	}
8813	10867
8814		- if ((RENDERPROGRAM != 0 \|\| ambientOcclusion \|\| spherical) && drawMode == DEFAULT) // SELECTION)
	10868	+ if ((RENDERPROGRAM != 0 \|\| ambientOcclusion \|\| spherical) && DrawMode() == DEFAULT) // SELECTION)
8815	10869	{
8816		- //System.out.println("drawMode = " + drawMode);
	10870	+ //System.out.println("DrawMode() = " + DrawMode());
8817	10871	vertexMode \|= VP_PASS;
8818	10872	//vertexMode \|= VP_PROJECTION;
8819	10873	if (!ambientOcclusion)
..	..	@@ -8873,7 +10927,7 @@
8873	10927	Camera cam = renderCamera; // lightMode?lightCamera:eyeCamera;
8874	10928	//Camera lightcam = new Camera(light0);
8875	10929
8876		- if (drawMode == SHADOW)
	10930	+ if (DrawMode() == SHADOW)
8877	10931	{
8878	10932	/*
8879	10933	gl.glMatrixMode(GL.GL_MODELVIEW);
..	..	@@ -8911,8 +10965,8 @@
8911	10965
8912	10966	// if (parentcam != renderCamera) // not a light
8913	10967	if (cam != lightCamera)
8914		- for (int count = parentcam.GetTransformCount(); --count>=0;)
8915		- LA.matConcat(parentcam.toParent, matrix, matrix);
	10968	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10969	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
8916	10970
8917	10971	for (int j = 0; j < 4; j++)
8918	10972	{
..	..	@@ -8926,8 +10980,8 @@
8926	10980
8927	10981	// if (parentcam != renderCamera) // not a light
8928	10982	if (cam != lightCamera)
8929		- for (int count = parentcam.GetTransformCount(); --count>=0;)
8930		- LA.matConcat(matrix, parentcam.fromParent, matrix);
	10983	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10984	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
8931	10985
8932	10986	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
8933	10987
..	..	@@ -8963,7 +11017,7 @@
8963	11017	gl.glClear(gl.GL_DEPTH_BUFFER_BIT);
8964	11018	} else
8965	11019	{
8966		- if (drawMode != DEFAULT)
	11020	+ if (DrawMode() != DEFAULT)
8967	11021	{
8968	11022	gl.glClearColor(1, 1, 1, 0);
8969	11023	} // 1);
..	..	@@ -9013,13 +11067,27 @@
9013	11067	gl.glOrtho(-skyscale / ratio, skyscale / ratio, -skyscale, skyscale, 0.001, 1000);
9014	11068	}
9015	11069
9016		- if (newenvy > -1)
	11070	+// if (newenvy > -1)
	11071	+// {
	11072	+// LoadEnvy(newenvy);
	11073	+// }
	11074	+//
	11075	+// newenvy = -1;
	11076	+
	11077	+ if (object.skyboxname != null)
9017	11078	{
9018		- LoadEnvy(newenvy);
	11079	+ if (!object.skyboxname.equals(this.loadedskyboxname))
	11080	+ {
	11081	+ LoadSkybox(object.skyboxname + "/", object.skyboxext, false);
	11082	+ loadedskyboxname = object.skyboxname;
	11083	+ }
9019	11084	}
9020		-
9021		- newenvy = -1;
9022		-
	11085	+ else
	11086	+ {
	11087	+ cubemap = null;
	11088	+ loadedskyboxname = null;
	11089	+ }
	11090	+
9023	11091	ratio = ((double) getWidth()) / getHeight();
9024	11092	//System.out.println("ratio = " + ratio);
9025	11093
..	..	@@ -9028,14 +11096,14 @@
9028	11096
9029	11097	fast &= !ambientOcclusion;
9030	11098
9031		- if (drawMode == DEFAULT)
	11099	+ if (DrawMode() == DEFAULT)
9032	11100	{
9033	11101	//gl.glEnable(gl.GL_ALPHA_TEST);
9034	11102	//gl.glActiveTexture(GL.GL_TEXTURE0);
9035	11103
9036	11104	if (!IsFrozen() && !ambientOcclusion)
9037	11105	{
9038		- DrawSkyBox(gl);
	11106	+ DrawSkyBox(gl, (float)ratio);
9039	11107	}
9040	11108
9041	11109	//if (selection_view == -1)
..	..	@@ -9089,6 +11157,8 @@
9089	11157	//gl.glFrustum(-0.5scale, 0.5scale, -0.5scale, 0.5scale, 1, 100);
9090	11158	//glu.gluPerspective(lightshaper_fovy, 1, lightshaper_zNear, lightshaper_zFar);
9091	11159	double scale = lightCamera.SCALE / lightCamera.Distance();
	11160	+// PATCH FILLE AUX JEANS
	11161	+ //scale *= lightCamera.shaper_fovy / 25;
9092	11162	gl.glScaled(2 * scale, 2 * scale, -scale);
9093	11163	gl.glTranslated(0, 0, lightCamera.DECAL);
9094	11164
..	..	@@ -9184,7 +11254,16 @@
9184	11254	// Bump noise
9185	11255	gl.glActiveTexture(GL.GL_TEXTURE6);
9186	11256	//gl.glBindTexture(GL.GL_TEXTURE_2D, bump_noise);
9187		- BindTexture(NOISE_TEXTURE, false, 2);
	11257	+
	11258	+ try
	11259	+ {
	11260	+ BindTexture(NOISE_TEXTURE, false, 2);
	11261	+ }
	11262	+ catch (Exception e)
	11263	+ {
	11264	+ System.err.println("FAILED: " + NOISE_TEXTURE);
	11265	+ }
	11266	+
9188	11267
9189	11268	gl.glActiveTexture(GL.GL_TEXTURE0);
9190	11269	gl.glEnable(GL.GL_TEXTURE_2D);
..	..	@@ -9207,9 +11286,9 @@
9207	11286
9208	11287	gl.glMatrixMode(GL.GL_MODELVIEW);
9209	11288
9210		-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
9211		-//gl.glEnable(gl.GL_POLYGON_SMOOTH);
9212		-//gl.glEnable(gl.GL_MULTISAMPLE);
	11289	+gl.glEnable(gl.GL_POLYGON_SMOOTH);
	11290	+gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
	11291	+gl.glEnable(gl.GL_MULTISAMPLE);
9213	11292	} else
9214	11293	{
9215	11294	//gl.glDisable(GL.GL_TEXTURE_2D);
..	..	@@ -9220,14 +11299,16 @@
9220	11299	//System.out.println("BLENDING ON");
9221	11300	gl.glEnable(GL.GL_BLEND);
9222	11301	gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
9223		-
	11302	+// gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
9224	11303	gl.glMatrixMode(gl.GL_PROJECTION);
9225	11304	gl.glLoadIdentity();
9226	11305
9227		- if (drawMode == SHADOW \|\| cam == lightCamera) // \|\| (vertexMode&VP_PROJECTION) != 0)
	11306	+ if (DrawMode() == SHADOW \|\| cam == lightCamera) // \|\| (vertexMode&VP_PROJECTION) != 0)
9228	11307	{
9229	11308	//glu.gluPerspective(lightshaper_fovy, 1, lightshaper_zNear, lightshaper_zFar);
9230	11309	double scale = lightCamera.SCALE / lightCamera.Distance();
	11310	+// PATCH FILLE AUX JEANS
	11311	+ //scale *= lightCamera.shaper_fovy / 25;
9231	11312	gl.glScaled(2 * scale, 2 * scale, -scale);
9232	11313	gl.glTranslated(0, 0, lightCamera.DECAL);
9233	11314	//System.out.println("DECAL = " + LIGHTDECAL + "; SCALE = " + LIGHTSCALE);
..	..	@@ -9280,7 +11361,7 @@
9280	11361	//gl.glPushMatrix();
9281	11362	gl.glLoadIdentity();
9282	11363
9283		- if (!ambientOcclusion) // drawMode != OCCLUSION)
	11364	+ if (!ambientOcclusion) // DrawMode() != OCCLUSION)
9284	11365	{
9285	11366	//LA.xformPos(light0, lightCamera.fromScreen, light);
9286	11367	LA.xformDir(dirlight, lightCamera.fromScreen, lightposition);
..	..	@@ -9307,8 +11388,8 @@
9307	11388	System.err.println("parentcam != renderCamera");
9308	11389
9309	11390	// if (cam != lightCamera)
9310		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9311		- LA.xformDir(lightposition, parentcam.toParent, lightposition); // may 2013
	11391	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11392	+ LA.xformDir(lightposition, parentcam.GlobalTransformInv(), lightposition); // may 2013
9312	11393	}
9313	11394
9314	11395	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -9329,8 +11410,8 @@
9329	11410	if (true) // TODO
9330	11411	{
9331	11412	if (cam != lightCamera)
9332		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9333		- LA.xformDir(light0, parentcam.toParent, light0); // may 2013
	11413	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11414	+ LA.xformDir(light0, parentcam.GlobalTransform(), light0); // may 2013
9334	11415	}
9335	11416
9336	11417	LA.xformPos(light0, cam.toScreen, light0);
..	..	@@ -9367,7 +11448,7 @@
9367	11448	}
9368	11449
9369	11450	/**/
9370		- if (true) // drawMode == SELECTION) // != DEFAULT)
	11451	+ if (true) // DrawMode() == SELECTION) // != DEFAULT)
9371	11452	gl.glDisable(gl.GL_LIGHTING);
9372	11453	else
9373	11454	gl.glEnable(gl.GL_LIGHTING);
..	..	@@ -9379,12 +11460,13 @@
9379	11460
9380	11461	gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 63, options2, 0);
9381	11462	gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 62, options3, 0);
	11463	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 61, options4, 0);
9382	11464
9383	11465	options2[0] *= renderCamera.Distance();
9384	11466
9385	11467	lightslot = 64;
9386	11468
9387		- if (!frozen && !ambientOcclusion && isRenderer && drawMode == DEFAULT)
	11469	+ if (!frozen && !ambientOcclusion && isRenderer && DrawMode() == DEFAULT)
9388	11470	{
9389	11471	DrawLights(object);
9390	11472	}
..	..	@@ -9395,7 +11477,7 @@
9395	11477	fragmentMode \|= (lightslot - 64) << 2; // 1; // first bit is available for aniso
9396	11478	//System.out.println("fragmentMode = " + fragmentMode);
9397	11479
9398		- if (drawMode == DEFAULT \|\| drawMode == SELECTION \|\| DEBUG_SELECTION)
	11480	+ if (DrawMode() == DEFAULT \|\| DrawMode() == SELECTION \|\| IsDebugSelection())
9399	11481	{
9400	11482	/*
9401	11483	if (CULLFACE \|\| (ambientOcclusion && OCCLUSION_CULLING))
..	..	@@ -9428,7 +11510,7 @@
9428	11510	}
9429	11511	}
9430	11512
9431		- if (drawMode == DEFAULT)
	11513	+ if (DrawMode() == DEFAULT)
9432	11514	{
9433	11515	if (WIREFRAME && !ambientOcclusion)
9434	11516	{
..	..	@@ -9446,7 +11528,7 @@
9446	11528	gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9447	11529	gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9448	11530
9449		- if (!fast/RENDERPROGRAM != 0/ && (drawMode == DEFAULT \|\| drawMode == SHADOW)) // && !WIREFRAME) //
	11531	+ if (!fast/RENDERPROGRAM != 0/ && (DrawMode() == DEFAULT \|\| DrawMode() == SHADOW)) // && !WIREFRAME) //
9450	11532	{
9451	11533	if (vertexMode != 0) // && !fast)
9452	11534	{
..	..	@@ -9466,7 +11548,7 @@
9466	11548	}
9467	11549	}
9468	11550
9469		- if (false) // fast && !IsFreezed() && drawMode != SELECTION && !ambientOcclusion)
	11551	+ if (false) //RENDERPROGRAM > 0 && DrawMode() == DEFAULT) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
9470	11552	{
9471	11553	//gl.glDepthFunc(GL.GL_LEQUAL);
9472	11554	//gl.glClear(gl.GL_COLOR_BUFFER_BIT \| gl.GL_DEPTH_BUFFER_BIT);
..	..	@@ -9474,27 +11556,24 @@
9474	11556
9475	11557	boolean texon = textureon;
9476	11558
9477		- if (RENDERPROGRAM > 0)
9478		- {
9479		- gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9480		- textureon = false;
9481		- }
	11559	+ gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11560	+ textureon = false;
	11561	+
9482	11562	//gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9483	11563	//System.out.println("ALLO");
9484	11564	gl.glColorMask(false, false, false, false);
9485	11565	DrawObject(gl);
9486		- if (RENDERPROGRAM > 0)
9487		- {
9488		- gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
9489		- textureon = texon;
9490		- }
	11566	+
	11567	+ gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11568	+ textureon = texon;
	11569	+
9491	11570	gl.glColorMask(true, true, true, true);
9492	11571
9493	11572	gl.glDepthFunc(GL.GL_EQUAL);
9494		- //gl.glDepthMask(false);
	11573	+ gl.glDepthMask(false);
9495	11574	}
9496	11575
9497		- if (false) // drawMode == SHADOW)
	11576	+ if (false) // DrawMode() == SHADOW)
9498	11577	{
9499	11578	//SetColumnMajorData(cameraInverseTransform, view_1);
9500	11579	//System.out.println("light = " + cameraInverseTransform);
..	..	@@ -9508,16 +11587,16 @@
9508	11587	//System.out.println("object = " + object);
9509	11588	if (!frozen && !imageLocked)
9510	11589	{
9511		- if (!flash && !lightMode && drawMode == DEFAULT && ANTIALIAS > 0)
	11590	+ if (!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0)
9512	11591	{
9513	11592	displayAntiAliased(gl);
9514	11593	} else
9515	11594	{
9516	11595	programcount = 0;
9517		- int keepmode = drawMode;
	11596	+ int keepmode = DrawMode();
9518	11597	// if (DEBUG_SELECTION)
9519	11598	// {
9520		-// drawMode = SELECTION;
	11599	+// DrawMode() = SELECTION;
9521	11600	// }
9522	11601	// for point selection
9523	11602	// gl.glGetDoublev(gl.GL_MODELVIEW_MATRIX, tempmat, 0);
..	..	@@ -9527,10 +11606,10 @@
9527	11606	DrawObject(gl);
9528	11607
9529	11608	// jan 2013 System.err.println("RESET ABORT (display)");
9530		- // if (drawMode == DEFAULT)
	11609	+ // if (DrawMode() == DEFAULT)
9531	11610	// ABORTED = false;
9532	11611	fullreset = false;
9533		- drawMode = keepmode;
	11612	+ Globals.drawMode = keepmode; // WARNING
9534	11613	//System.out.println("PROGRAM SWITCH " + programcount);
9535	11614	}
9536	11615	}
..	..	@@ -9538,11 +11617,11 @@
9538	11617	gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9539	11618	gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9540	11619
9541		- if (drawMode == DEFAULT)
	11620	+ if (DrawMode() == DEFAULT)
9542	11621	{
9543	11622	ReleaseTexture(NOISE_TEXTURE, false);
9544	11623	}
9545		- //if (drawMode == DEFAULT)
	11624	+ //if (DrawMode() == DEFAULT)
9546	11625	{
9547	11626
9548	11627	gl.glActiveTexture(GL.GL_TEXTURE1);
..	..	@@ -9554,7 +11633,7 @@
9554	11633	//else
9555	11634	//gl.glDisable(gl.GL_TEXTURE_2D);
9556	11635	//gl.glPopMatrix();
9557		- if (imageCompleted && ANTIALIAS > 0 && drawMode == DEFAULT && cam != lightCamera && !ambientOcclusion)
	11636	+ if (imageCompleted && ANTIALIAS > 0 && DrawMode() == DEFAULT && cam != lightCamera && !ambientOcclusion)
9558	11637	{
9559	11638	//new Exception().printStackTrace();
9560	11639	//System.out.println("Draw image " + width + ", " + height);
..	..	@@ -9596,7 +11675,7 @@
9596	11675	//gl.glFlush();
9597	11676	}
9598	11677
9599		- if (flash && drawMode == DEFAULT)
	11678	+ if (flash && DrawMode() == DEFAULT)
9600	11679	{
9601	11680	flash = false;
9602	11681	wait = true;
..	..	@@ -9604,9 +11683,9 @@
9604	11683	}
9605	11684
9606	11685	//drawing = false;
9607		- //if(drawMode == DEFAULT)
	11686	+ //if(DrawMode() == DEFAULT)
9608	11687	// niceon = false;
9609		- if (drawMode == DEFAULT)
	11688	+ if (DrawMode() == DEFAULT)
9610	11689	{
9611	11690	currentlydrawing = false;
9612	11691	}
..	..	@@ -9626,7 +11705,7 @@
9626	11705	repaint();
9627	11706	}
9628	11707
9629		- if (isLIVE() && drawMode == DEFAULT) // may 2013
	11708	+ if (Globals.isLIVE() && DrawMode() == DEFAULT) // may 2013
9630	11709	repaint();
9631	11710
9632	11711	displaydone = true;
..	..	@@ -9645,8 +11724,14 @@
9645	11724	{
9646	11725	renderpass++;
9647	11726	// System.out.println("Draw object... ");
	11727	+ STEP = 1;
9648	11728	if (FAST) // in case there is no script
9649		- STEP = 16;
	11729	+ STEP = 8;
	11730	+
	11731	+ if (CURRENTANTIALIAS == 0 \|\| ACSIZE == 1)
	11732	+ {
	11733	+ STEP *= 4;
	11734	+ }
9650	11735
9651	11736	//object.FullInvariants();
9652	11737
..	..	@@ -9660,23 +11745,44 @@
9660	11745	e.printStackTrace();
9661	11746	}
9662	11747
9663		- if (GraphreeD.RENDERME > 0)
9664		- GraphreeD.RENDERME--; // mechante magouille
	11748	+ if (Grafreed.RENDERME > 0)
	11749	+ Grafreed.RENDERME--; // mechante magouille
9665	11750
9666		- ONESTEP = false;
	11751	+ Globals.ONESTEP = false;
9667	11752	}
9668	11753
9669	11754	static boolean zoomonce = false;
9670	11755
	11756	+ static void CreateSelectedPoint()
	11757	+ {
	11758	+ if (selectedpoint == null)
	11759	+ {
	11760	+ debugpointG = new Sphere();
	11761	+ debugpointP = new Sphere();
	11762	+ debugpointC = new Sphere();
	11763	+ debugpointR = new Sphere();
	11764	+
	11765	+ selectedpoint = new Superellipsoid();
	11766	+
	11767	+ for (int i=0; i<8; i++)
	11768	+ {
	11769	+ debugpoints[i] = new Sphere();
	11770	+ }
	11771	+ }
	11772	+ }
	11773	+
9671	11774	void DrawObject(GL gl, boolean draw)
9672	11775	{
	11776	+ // To clear camera values
	11777	+ ResetOptions();
	11778	+
9673	11779	//System.out.println("DRAW OBJECT " + mouseDown);
9674		-// drawMode = SELECTION;
	11780	+// DrawMode() = SELECTION;
9675	11781	//GL gl = getGL();
9676	11782	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
9677	11783	{
9678		- if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && drawMode == SHADOW) // && !lightMode)
9679		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	11784	+ if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
	11785	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
9680	11786	pingthread.StepToTarget(true); // true);
9681	11787	// zoomonce = false;
9682	11788	}
..	..	@@ -9696,9 +11802,9 @@
9696	11802	callist = gl.glGenLists(1);
9697	11803	}
9698	11804
9699		- boolean selectmode = drawMode == SELECTION \|\| CameraPane.DEBUG_SELECTION;
	11805	+ boolean selectmode = DrawMode() == SELECTION \|\| IsDebugSelection();
9700	11806
9701		- boolean active = !selectmode; // drawMode != SELECTION; // mouseDown;
	11807	+ boolean active = !selectmode; // DrawMode() != SELECTION; // mouseDown;
9702	11808
9703	11809	if (!mainDL \|\| !active \|\| touched)
9704	11810	{
..	..	@@ -9725,24 +11831,32 @@
9725	11831	PushMatrix(ClickInfo.matbuffer);
9726	11832	}
9727	11833
9728		- if (drawMode == 0)
	11834	+ if (DrawMode() == 0)
9729	11835	{
9730	11836	// System.out.println("CLEAR +++++++++++++++ +++++++++++++++ +++++++++++++++ +++++++++++++++");
9731	11837
9732	11838	usedtextures.clear();
9733	11839
9734		- BindTextures(DEFAULT_TEXTURES, 2);
	11840	+ try
	11841	+ {
	11842	+ BindTextures(DEFAULT_TEXTURES, 2);
	11843	+ }
	11844	+ catch (Exception e)
	11845	+ {
	11846	+ System.err.println("FAILED: " + DEFAULT_TEXTURES);
	11847	+ }
9735	11848	}
9736	11849	//System.out.println("--> " + stackdepth);
9737		-// GraphreeD.traceon();
	11850	+// GrafreeD.traceon();
9738	11851
9739	11852	// DRAW
9740	11853	object.draw(this, /(Composite)/ object, false, false);
9741	11854
9742		- if (drawMode == DEFAULT)
	11855	+ if (DrawMode() == DEFAULT)
9743	11856	{
9744		- if (DEBUG)
	11857	+ if (Globals.DEBUG)
9745	11858	{
	11859	+ CreateSelectedPoint();
9746	11860	float radius = 0.05f;
9747	11861	if (selectedpoint.radius != radius)
9748	11862	{
..	..	@@ -9750,69 +11864,104 @@
9750	11864	selectedpoint.radius = radius;
9751	11865	selectedpoint.recalculate();
9752	11866	selectedpoint.material = new cMaterial();
9753		- selectedpoint.material.color = 0.25f;
	11867	+ selectedpoint.material.color = 0.15f; // Yellow
9754	11868	selectedpoint.material.modulation = 0.75f;
9755	11869
9756		- debugpoint.radius = radius;
9757		- debugpoint.recalculate();
9758		- debugpoint.material = new cMaterial();
9759		- debugpoint.material.color = 0.25f;
9760		- debugpoint.material.modulation = 0.75f;
	11870	+ debugpointG.radius = radius;
	11871	+ debugpointG.recalculate();
	11872	+ debugpointG.material = new cMaterial();
	11873	+ debugpointG.material.color = 0.25f; // Green
	11874	+ debugpointG.material.modulation = 0.75f;
9761	11875
9762		- debugpoint2.radius = radius;
9763		- debugpoint2.recalculate();
9764		- debugpoint2.material = new cMaterial();
9765		- debugpoint2.material.color = 0.75f;
9766		- debugpoint2.material.modulation = 0.75f;
	11876	+ debugpointP.radius = radius;
	11877	+ debugpointP.recalculate();
	11878	+ debugpointP.material = new cMaterial();
	11879	+ debugpointP.material.color = 0.75f; // Purple
	11880	+ debugpointP.material.modulation = 0.75f;
	11881	+
	11882	+ debugpointC.radius = radius;
	11883	+ debugpointC.recalculate();
	11884	+ debugpointC.material = new cMaterial();
	11885	+ debugpointC.material.color = 0.5f; // Cyan
	11886	+ debugpointC.material.modulation = 0.75f;
	11887	+
	11888	+ debugpointR.radius = radius;
	11889	+ debugpointR.recalculate();
	11890	+ debugpointR.material = new cMaterial();
	11891	+ debugpointR.material.color = 0f; // Red
	11892	+ debugpointR.material.modulation = 0.75f;
9767	11893
9768	11894	InitPoints(radius);
9769	11895	}
9770	11896	selectedpoint.draw(this, /(Composite)/ null, false, false);
9771		- //debugpoint.draw(this, /(Composite)/ null, false);
9772		- //debugpoint2.draw(this, /(Composite)/ null, false);
9773		- DrawPoints(this);
	11897	+ debugpointG.draw(this, /(Composite)/ null, false,false);
	11898	+ debugpointP.draw(this, /(Composite)/ null, false,false);
	11899	+ debugpointC.draw(this, /(Composite)/ null, false,false);
	11900	+ debugpointR.draw(this, /(Composite)/ null, false,false);
	11901	+ // DrawPoints(this);
9774	11902	}
9775	11903
9776	11904	// debugstuff.draw(this, /(Composite)/ null, false);
9777	11905	}
9778		-// GraphreeD.traceoff();
	11906	+// GrafreeD.traceoff();
9779	11907	//System.out.println(stackdepth);
9780		- if (drawMode == 0)
	11908	+ if (DrawMode() == 0)
9781	11909	{
9782	11910	ReleaseTextures(DEFAULT_TEXTURES);
9783	11911
9784	11912	if (CLEANCACHE)
9785		- for (java.util.Enumeration<String> e = textures.keys() ; e.hasMoreElements();)
	11913	+ for (java.util.Enumeration<cTexture> e = texturepigment.keys() ; e.hasMoreElements();)
9786	11914	{
9787		- String tex = e.nextElement();
	11915	+ cTexture tex = e.nextElement();
9788	11916
9789	11917	// System.out.println("Texture --------- " + tex);
9790	11918
9791		- if (tex.equals("WHITE_NOISE"))
	11919	+ if (tex.equals("WHITE_NOISE:"))
9792	11920	continue;
9793	11921
9794		- if (!usedtextures.containsKey(tex))
	11922	+ if (!usedtextures.contains(tex))
9795	11923	{
	11924	+ CacheTexture gettex = texturepigment.get(tex);
9796	11925	// System.out.println("DISPOSE +++++++++++++++ " + tex);
9797		- textures.get(tex).texture.dispose();
9798		- textures.remove(tex);
	11926	+ if (gettex != null)
	11927	+ {
	11928	+ gettex.texture.dispose();
	11929	+ texturepigment.remove(tex);
	11930	+ }
	11931	+
	11932	+ gettex = texturebump.get(tex);
	11933	+ // System.out.println("DISPOSE +++++++++++++++ " + tex);
	11934	+ if (gettex != null)
	11935	+ {
	11936	+ gettex.texture.dispose();
	11937	+ texturebump.remove(tex);
	11938	+ }
9799	11939	}
9800	11940	}
9801	11941	}
9802	11942
9803	11943	checker = null;
9804	11944
9805		- if (!ambientOcclusion && !IsFrozen() && drawMode == DEFAULT)
	11945	+ if (!ambientOcclusion && !IsFrozen() && DrawMode() == DEFAULT)
9806	11946	FindChecker(object);
9807	11947
9808		- if (checker != null && drawMode == DEFAULT)
	11948	+ if (checker != null && DrawMode() == DEFAULT)
9809	11949	{
9810		- // BindTexture(IMMORTAL_TEXTURE);
	11950	+ //BindTexture(IMMORTAL_TEXTURE);
	11951	+ try
	11952	+ {
	11953	+ BindTextures(checker.GetTextures(), checker.texres);
	11954	+ }
	11955	+ catch (Exception e)
	11956	+ {
	11957	+ System.err.println("FAILED: " + checker.GetTextures());
	11958	+ }
9811	11959	// NEAREST
9812	11960	GetGL().glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST); // GL.GL_LINEAR);
9813	11961	DrawChecker(gl);
9814	11962	//checker.Draw(this, null, false);
9815	11963	// ReleaseTexture(IMMORTAL_TEXTURE);
	11964	+ ReleaseTextures(checker.GetTextures());
9816	11965	}
9817	11966
9818	11967	if (object.parent != null)
..	..	@@ -9825,7 +11974,7 @@
9825	11974	//gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9826	11975	//gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9827	11976
9828		- if (DISPLAYTEXT && drawMode == DEFAULT)
	11977	+ if (DISPLAYTEXT && DrawMode() == DEFAULT)
9829	11978	{
9830	11979	// Draw it once, then use the raster
9831	11980	Balloon(gl, balloon.createGraphics());
..	..	@@ -9881,14 +12030,14 @@
9881	12030	int[] xs = new int[3];
9882	12031	int[] ys = new int[3];
9883	12032
9884		- void DrawString(Object3D obj) // String string)
	12033	+ public void DrawString(Object3D obj) // String string) // INTERFACE
9885	12034	{
9886		- if (!DISPLAYTEXT \|\| drawMode != DEFAULT)
	12035	+ if (!DISPLAYTEXT \|\| DrawMode() != DEFAULT)
9887	12036	{
9888	12037	return;
9889	12038	}
9890	12039
9891		- String string = obj.GetToolTip();
	12040	+ String string = obj.toString(); //.GetToolTip();
9892	12041
9893	12042	GL gl = GetGL();
9894	12043
..	..	@@ -10205,8 +12354,8 @@
10205	12354	//obj.TransformToWorld(light, light);
10206	12355	for (int i = tp.size(); --i >= 0;)
10207	12356	{
10208		- for (int count = tp.get(i).GetTransformCount(); --count>=0;)
10209		- LA.xformPos(light, tp.get(i).toParent, light);
	12357	+ //for (int count = tp.get(i).GetTransformCount(); --count>=0;)
	12358	+ LA.xformPos(light, tp.get(i).GlobalTransformInv(), light);
10210	12359	}
10211	12360
10212	12361
..	..	@@ -10223,8 +12372,8 @@
10223	12372	parentcam = cameras[0];
10224	12373	}
10225	12374
10226		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10227		- LA.xformPos(light, parentcam.toParent, light); // may 2013
	12375	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	12376	+ LA.xformPos(light, parentcam.GlobalTransform(), light); // may 2013
10228	12377
10229	12378	LA.xformPos(light, renderCamera.toScreen, light);
10230	12379
..	..	@@ -10314,8 +12463,76 @@
10314	12463
10315	12464	//gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
10316	12465
10317		- String program =
	12466	+ String programmin =
	12467	+ // Min shader
10318	12468	"!!ARBfp1.0\n" +
	12469	+ "PARAM zero123 = { 0.0, 1.0, 2, 1.25 };" +
	12470	+ "PARAM pow2 = { 0.5, 0.25, 0.125, 0.0 };" +
	12471	+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
	12472	+ "PARAM eps = { 0.001, 0.001, 0.001, 1.0 };" +
	12473	+ "PARAM infinity = { 100000000, 100000000, 100000000, 1.0 };" +
	12474	+ "PARAM light2cam0 = program.env[10];" +
	12475	+ "PARAM light2cam1 = program.env[11];" +
	12476	+ "PARAM light2cam2 = program.env[12];" +
	12477	+ "TEMP temp;" +
	12478	+ "TEMP light;" +
	12479	+ "TEMP ndotl;" +
	12480	+ "TEMP normal;" +
	12481	+ "TEMP depth;" +
	12482	+ "TEMP eye;" +
	12483	+ "TEMP pos;" +
	12484	+
	12485	+ "MAD normal, fragment.color, zero123.z, -zero123.y;" +
	12486	+ Normalize("normal") +
	12487	+ "MOV light, state.light[0].position;" +
	12488	+ "DP3 ndotl.x, light, normal;" +
	12489	+
	12490	+ // shadow
	12491	+ "MOV pos, fragment.texcoord[1];" +
	12492	+ "MOV temp, pos;" +
	12493	+ ShadowTextureFetch("depth", "temp", "1") +
	12494	+ //"TEX depth, fragment.texcoord[1], texture[1], 2D;" +
	12495	+ "SLT ndotl.z, fragment.texcoord[1].z, depth.z;" +
	12496	+
	12497	+ // No shadow when out of frustum
	12498	+ //"SGE temp.y, depth.z, zero123.y;" +
	12499	+ //"LRP temp.x, temp.y, zero123.y, temp.x;" +
	12500	+
	12501	+ "MUL ndotl.x, ndotl.x, ndotl.z;" + // Shadow
	12502	+
	12503	+ // Backlit
	12504	+ "MOV pos.w, zero123.y;" +
	12505	+ "DP4 eye.x, pos, light2cam0;" +
	12506	+ "DP4 eye.y, pos, light2cam1;" +
	12507	+ "DP4 eye.z, pos, light2cam2;" +
	12508	+ Normalize("eye") +
	12509	+
	12510	+ "DP3 ndotl.y, -eye, normal;" +
	12511	+ //"MUL ndotl.y, ndotl.y, pow2.x;" +
	12512	+ "POW ndotl.y, ndotl.y, pow2.z;" + // backlit
	12513	+ "SUB ndotl.y, zero123.y, ndotl.y;" +
	12514	+ //"SUB ndotl.y, zero123.y, ndotl.y;" +
	12515	+ //"MUL ndotl.y, ndotl.y, pow2.z;" +
	12516	+
	12517	+ //"MAX ndotl.x, ndotl.x, ndotl.y;" + // Ambient
	12518	+ //"MAX ndotl.x, ndotl.x, pow2.y;" + // Ambient
	12519	+
	12520	+ // Pigment
	12521	+ "TEX temp, fragment.texcoord[0], texture[0], 2D;" +
	12522	+ "LRP temp, zero123.w, temp, one;" + // texture proportion
	12523	+ "MUL temp, temp, ndotl.x;" +
	12524	+
	12525	+ "MUL temp, temp, zero123.z;" +
	12526	+
	12527	+ //"MUL temp, temp, ndotl.y;" +
	12528	+
	12529	+ "MOV temp.w, zero123.y;" + // reset alpha
	12530	+ "MOV result.color, temp;" +
	12531	+ "END";
	12532	+
	12533	+ String programmax =
	12534	+ "!!ARBfp1.0\n" +
	12535	+
10319	12536	//"OPTION ARB_fragment_program_shadow;" +
10320	12537	"PARAM light2cam0 = program.env[10];" +
10321	12538	"PARAM light2cam1 = program.env[11];" +
..	..	@@ -10343,11 +12560,13 @@
10343	12560	"PARAM params6 = program.env[6];" + // bump, noise, borderfade, fog punchthrough
10344	12561	"PARAM params7 = program.env[7];" + // noise power, opacity power
10345	12562	"PARAM options0 = program.env[63];" + // fog density, intensity, elevation
10346		- "PARAM options1 = program.env[62];" + // fog rgb color, image intensity
	12563	+ "PARAM options1 = program.env[62];" + // fog rgb color
	12564	+ "PARAM options2 = program.env[61];" + // image intensity, subsurface, lightsheen
10347	12565	"PARAM pointlight = program.env[127];" + // ...
10348	12566	"PARAM zero = { 0.0, 0.0, 0.0, 0.0 };" +
10349	12567	"PARAM halfhalf = { 0.25, 0.25, 0.25, 1.0 };" +
10350	12568	"PARAM half = { 0.5, 0.5, 0.5, 1.0 };" +
	12569	+ "PARAM threequarter = { 0.75, 0.75, 0.75, 1.0 };" +
10351	12570	"PARAM two = { 2.0, 2.0, 2.0, 1.0 };" +
10352	12571	"PARAM ten = { 10, 10, 10, 1.0 };" +
10353	12572	"PARAM one3rd = { 0.5, 0.33333333333, 0.333333333, 1.0 };" +
..	..	@@ -10368,6 +12587,7 @@
10368	12587	"PARAM lodbias = { 10,10,10,10 };" + // 20, -2, -20, 1.0 };" +
10369	12588	"PARAM infinity = { 100000000, 100000000, 100000000, 1.0 };" +
10370	12589	"PARAM one2048th = { 0.00048828125, 0.00048828125, 0.00048828125, 1.0 };" +
	12590	+ "PARAM ninetenth = { 0.9, 0.9, 0.9, 1.0 };" +
10371	12591	"PARAM almostone = { 0.999, 0.999, 0.999, 1.0 };" +
10372	12592	"PARAM c256 = { 256, 256, 256, 1.0 };" +
10373	12593	"PARAM c256i = { 0.00390625, 0.00390625, 0.00390625, 1.0 };" +
..	..	@@ -10408,6 +12628,10 @@
10408	12628	"TEMP R1;" +
10409	12629	"TEMP R2;" +
10410	12630	"TEMP R3;" +
	12631	+ "TEMP min;" +
	12632	+ "TEMP max;" +
	12633	+ "TEMP average;" +
	12634	+ "TEMP saturation;" +
10411	12635	"TEMP keep1;" +
10412	12636	"TEMP keep2;" +
10413	12637	"TEMP keep3;" +
..	..	@@ -10423,8 +12647,7 @@
10423	12647	"TEMP shininess;" +
10424	12648	"\n" +
10425	12649	"MOV texSamp, one;" +
10426		- //"TEX texSamp, fragment.texcoord[0], texture[0], 2D;" +
10427		-
	12650	+
10428	12651	"MOV mapgrid.x, one2048th.x;" +
10429	12652	"MOV temp, fragment.texcoord[1];" +
10430	12653	/*
..	..	@@ -10445,20 +12668,20 @@
10445	12668	"MUL temp, floor, mapgrid.x;" +
10446	12669	//"TEX depth0, temp, texture[1], 2D;" +
10447	12670	(((mode & FP_SOFTSHADOW) == 0) ? "" :
10448		- TextureFetch("depth0", "temp", "1") +
	12671	+ ShadowTextureFetch("depth0", "temp", "1") +
10449	12672	"") +
10450	12673	"ADD temp.x, temp.x, mapgrid.x;" +
10451	12674	//"TEX depth1, temp, texture[1], 2D;" +
10452	12675	(((mode & FP_SOFTSHADOW) == 0) ? "" :
10453		- TextureFetch("depth1", "temp", "1") +
	12676	+ ShadowTextureFetch("depth1", "temp", "1") +
10454	12677	"") +
10455	12678	"ADD temp.y, temp.y, mapgrid.x;" +
10456	12679	//"TEX depth2, temp, texture[1], 2D;" +
10457		- TextureFetch("depth2", "temp", "1") +
	12680	+ ShadowTextureFetch("depth2", "temp", "1") +
10458	12681	"SUB temp.x, temp.x, mapgrid.x;" +
10459	12682	//"TEX depth3, temp, texture[1], 2D;" +
10460	12683	(((mode & FP_SOFTSHADOW) == 0) ? "" :
10461		- TextureFetch("depth3", "temp", "1") +
	12684	+ ShadowTextureFetch("depth3", "temp", "1") +
10462	12685	"") +
10463	12686	//"MUL texSamp0, texSamp0, state.material.front.diffuse;" +
10464	12687	//"MOV params, material;" +
..	..	@@ -10829,10 +13052,10 @@
10829	13052	"MAD shadow.x, buffer.x, frac.y, shadow.x;" +
10830	13053	"") +
10831	13054
10832		- // display shadow only (bump == 0)
	13055	+ // display shadow only (fakedepth == 0)
10833	13056	"SUB temp.x, half.x, shadow.x;" +
10834		- "MOV temp.y, -params6.x;" +
10835		- "SLT temp.z, temp.y, zero.x;" +
	13057	+ "MOV temp.y, -params5.z;" + // params6.x;" +
	13058	+ "SLT temp.z, temp.y, -c256i.x;" +
10836	13059	"SUB temp.y, one.x, temp.z;" +
10837	13060	"MUL temp.x, temp.x, temp.y;" +
10838	13061	"KIL temp.x;" +
..	..	@@ -10938,10 +13161,42 @@
10938	13161
10939	13162	// skin?
10940	13163	// Saturation for skin
10941		- /**/ // c'est ici
10942		- (Skinshader? "DP3 temp.x, final,one;" +
	13164	+ /**/
	13165	+ (Skinshader?
	13166	+ "DP3 average.x, final,one;" +
	13167	+ "MUL average, one3rd.xxxx,average.xxxx;" +
	13168	+
	13169	+ "MIN min.x, final.x,final.y;" +
	13170	+ "MIN min.x, min.x,final.z;" +
	13171	+
	13172	+ "MAX max.x, final.x,final.y;" +
	13173	+ "MAX max.x, max.x,final.z;" +
	13174	+ "MOV max, max.xxxx;" +
	13175	+
	13176	+ "SUB saturation, max, final;" +
	13177	+
	13178	+ "ADD temp.x, max.x, one10th.x;" +
	13179	+ "RCP temp.x, temp.x;" +
	13180	+ "MUL temp.x, temp.x, half.x;" +
	13181	+ "MUL saturation, saturation, temp.xxxx;" +
	13182	+
	13183	+ "DP3 ndotl.x, normald, light;" +
	13184	+ "MAX ndotl.x, ndotl.x, -ndotl.x;" +
	13185	+
	13186	+ "SUB temp.x, one.x, ndotl.x;" +
	13187	+ // Tuning for default skin
	13188	+ //"ADD temp.x, temp.x, options2.z;" + // lightsheen
	13189	+ "MAD temp.x, options2.z, half.y, temp.x;" + // lightsheen
	13190	+ "ADD temp.y, one.y, options2.y;" + // subsurface
	13191	+ "MUL temp.x, temp.x, temp.y;" +
	13192	+
	13193	+ "MUL saturation, saturation, temp.xxxx;" +
	13194	+ "SUB_SAT temp, max, saturation;" +
	13195	+/**
	13196	+ "DP3 temp.x, final,one;" +
10943	13197	"MUL R2, one3rd.xxxx,temp.xxxx;" +
10944		- "SUB temp, final,R2;" +
	13198	+ "SUB temp, final, R2;" +
	13199	+
10945	13200	// using light angle
10946	13201	"DP3 ndotl.x, normald,light;" +
10947	13202	//"SLT ndotl.y, ndotl.x, zero.x;" +
..	..	@@ -10954,7 +13209,6 @@
10954	13209	// using light intensity
10955	13210	"MOV ndotl.z, R2.x;" +
10956	13211	"MUL ndotl.z, ndotl.z, ndotl.z;" + // tuning...
10957		-
10958	13212	// june 2014
10959	13213	"MAD R1.x, ndotl.z,slope.y,one.x;" +
10960	13214	// "SUB ndotl.x, one.x, ndotl.x;" +
..	..	@@ -10966,6 +13220,7 @@
10966	13220	//"MUL R2.y, shadow.x,R2.y;" + // avril 2014
10967	13221
10968	13222	"MAD temp.x, R2.y, ndotl.y, temp.x;" + // red shift (skin)
	13223	+/**/
10969	13224
10970	13225	// "ADD final, R2,temp;" +
10971	13226	"MOV final, temp;"
..	..	@@ -11055,7 +13310,7 @@
11055	13310	/**/
11056	13311	// HDR
11057	13312	"MOV temp.z, final.a;" +
11058		- "MUL final, final,options1.w;" +
	13313	+ "MUL final, final,options2.x;" +
11059	13314	"MOV final.a, temp.z;" +
11060	13315	/**/
11061	13316
..	..	@@ -11092,10 +13347,17 @@
11092	13347	"MOV final.z, zero.x;" +
11093	13348	"MOV final.a, one.w;":""
11094	13349	) +
	13350	+ /*
11095	13351	(NORMALdebug?"MOV final.x, normal.x;" +
11096	13352	"MOV final.y, normal.y;" +
11097	13353	"MOV final.z, normal.z;" +
11098	13354	"MOV final.a, one.w;":""
	13355	+ ) +
	13356	+ */
	13357	+ (NORMALdebug?"SUB final.x, one.x, final.x;" +
	13358	+ "SUB final.y, one.x, final.y;" +
	13359	+ "SUB final.z, one.x, final.z;" +
	13360	+ "MOV final.a, final.a;":""
11099	13361	) +
11100	13362	// "MOV final, bumpmap;" +
11101	13363	"MOV result.color, final;" +
..	..	@@ -11124,7 +13386,14 @@
11124	13386	//once = true;
11125	13387	}
11126	13388
11127		- System.out.print("Program #" + mode + "; length = " + program.length());
	13389	+ String program = programmax;
	13390	+
	13391	+ if (Globals.MINSHADER)
	13392	+ {
	13393	+ program = programmin;
	13394	+ }
	13395	+
	13396	+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
11128	13397	System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
11129	13398	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
11130	13399
..	..	@@ -11217,30 +13486,32 @@
11217	13486	return out;
11218	13487	}
11219	13488
11220		- String TextureFetch(String dest, String src, String unit)
	13489	+ // Also does frustum culling
	13490	+ String ShadowTextureFetch(String dest, String src, String unit)
11221	13491	{
11222	13492	return "TEX " + dest + ", " + src + ", texture[" + unit + "], 2D;" +
11223	13493	"SGE " + src + ".w, " + src + ".x, eps.x;" +
11224	13494	"SGE " + src + ".z, " + src + ".y, eps.x;" +
	13495	+ "SLT " + dest + ".x, " + src + ".x, one.x;" +
	13496	+ "SLT " + dest + ".y, " + src + ".y, one.x;" +
11225	13497	"MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
11226		- "SLT " + src + ".z, " + src + ".x, one.x;" +
11227		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
11228		- "SLT " + src + ".z, " + src + ".y, one.x;" +
11229		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
	13498	+ "MUL " + src + ".w, " + dest + ".x, " + src + ".w;" +
	13499	+ "MUL " + src + ".w, " + dest + ".y, " + src + ".w;" +
11230	13500	//"SWZ buffer, temp, w,w,w,w;";
11231		- "MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
	13501	+ //"MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
11232	13502	"SUB " + src + ".z, " + "one.x, " + src + ".w;" +
11233	13503	//"MUL " + src + ".z, " + src + ".z, infinity.x;" +
11234	13504	//"ADD " + dest + ".z, " + dest + ".z, " + src + ".z;";
11235		- "MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
	13505	+ //"MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
11236	13506
11237		- //"LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
11238		- //"LRP " + dest + ".z" + ", " + src + ".w, infinity.x," + dest + ".z;";
	13507	+ //?? "LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
	13508	+ "LRP " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
11239	13509	}
11240	13510
11241	13511	String Shadow(String depth, String shadow)
11242	13512	{
11243	13513	return "MAX temp.x, ndotl.x, one64th.x;" +
	13514	+ "MIN temp.x, temp.x, ninetenth.x;" +
11244	13515	/**/
11245	13516	// Sine
11246	13517	"MUL temp.y, temp.x, temp.x;" +
..	..	@@ -11256,12 +13527,16 @@
11256	13527
11257	13528	"ADD " + depth + ".z, " + depth + ".z, temp.x;" +
11258	13529	//"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing!
	13530	+
	13531	+ // Compare fragment depth in light space with shadowmap.
11259	13532	"SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" +
11260	13533	"SGE temp.y, temp.x, zero.x;" +
11261		- "SUB " + shadow + ".y, one.x, temp.y;" +
	13534	+ "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded
	13535	+
	13536	+ // Reverse comparison
11262	13537	"SUB temp.x, one.x, temp.x;" +
11263	13538	"MUL " + shadow + ".x, temp.x, temp.y;" +
11264		- "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded
	13539	+ "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse
11265	13540	"POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth
11266	13541
11267	13542	"SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" +
..	..	@@ -11275,6 +13550,10 @@
11275	13550	// No shadow for backface
11276	13551	"DP3 temp.x, normal, lightd;" +
11277	13552	"SLT temp.x, temp.x, zero.x;" + // shadoweps
	13553	+ "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
	13554	+
	13555	+ // No shadow when out of frustum
	13556	+ "SGE temp.x, " + depth + ".z, one.z;" +
11278	13557	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
11279	13558	"";
11280	13559	}
..	..	@@ -11421,7 +13700,8 @@
11421	13700	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
11422	13701	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
11423	13702	/static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
11424		- Object3D.cVector2[] vector2buffer;
	13703	+
	13704	+ //Object3D.cVector2[] vector2buffer;
11425	13705
11426	13706	// IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
11427	13707	// OUT : diff, spec
..	..	@@ -11437,9 +13717,10 @@
11437	13717	"DP3 " + dest + ".z," + "normals," + "eye;" +
11438	13718	"MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
11439	13719	//"MOV " + dest + ".w," + "normal.z;" +
11440		- "MUL " + dest + ".z," + "params2.w," + dest + ".x;" +
11441		- "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
11442		- //"MOV " + dest + ".z," + "params2.w;" +
	13720	+// "MUL " + dest + ".z," + "params2.w," + dest + ".x;" + // PRETTY HEURISTIC FOR VELVET
	13721	+// "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
	13722	+
	13723	+ "MOV " + dest + ".z," + "params2.w;" + // EXACT
11443	13724	"POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
11444	13725	"RCP " + dest + ".w," + dest + ".w;" +
11445	13726	//"RSQ " + dest + ".w," + dest + ".w;" +
..	..	@@ -11833,7 +14114,7 @@
11833	14114	public void mousePressed(MouseEvent e)
11834	14115	{
11835	14116	//System.out.println("mousePressed: " + e);
11836		- clickStart(e.getX(), e.getY(), e.getModifiersEx());
	14117	+ clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
11837	14118	}
11838	14119
11839	14120	static long prevtime = 0;
..	..	@@ -11860,14 +14141,16 @@
11860	14141
11861	14142	//System.err.println("Dtime = " + Dtime + "; units = " + e.getUnitsToScroll() + "; ratio (units/ms) = " + ratio);
11862	14143
	14144	+ if (BUTTONLESSWHEEL)
11863	14145	if (Math.abs(ratio) < 0.1 \|\| Math.abs(Dtime) == 0) // < 30)
11864	14146	{
11865	14147	return;
11866	14148	}
11867	14149
	14150	+ boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
11868	14151
11869	14152	// TIMER
11870		- if (!wheeltimer.isRunning() && e.getModifiersEx() == 0) // VR
	14153	+ if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
11871	14154	{
11872	14155	keepboxmode = BOXMODE;
11873	14156	keepsupport = SUPPORT;
..	..	@@ -11907,8 +14190,8 @@
11907	14190	// mode \|= META;
11908	14191	//}
11909	14192
11910		- SetMouseMode(WHEEL \| e.getModifiersEx());
11911		- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0);
	14193	+ SetMouseMode(e.getModifiers(), WHEEL \| e.getModifiersEx());
	14194	+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
11912	14195	anchorX = ax;
11913	14196	anchorY = ay;
11914	14197	prevX = px;
..	..	@@ -11942,6 +14225,7 @@
11942	14225	else
11943	14226	if (evt.getSource() == AAtimer)
11944	14227	{
	14228	+ Globals.TIMERRUNNING = false;
11945	14229	if (mouseDown)
11946	14230	{
11947	14231	//new Exception().printStackTrace();
..	..	@@ -11967,6 +14251,10 @@
11967	14251	// LIVE = waslive;
11968	14252	// wasliveok = true;
11969	14253	// waslive = false;
	14254	+
	14255	+ // May 2019 Forget it:
	14256	+ if (true)
	14257	+ return;
11970	14258
11971	14259	// source == timer
11972	14260	if (mouseDown)
..	..	@@ -11996,8 +14284,8 @@
11996	14284	// ObjEditor.tweenManager.update(1f / 60f);
11997	14285
11998	14286	// fev 2014???
11999		- if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && drawMode == SHADOW) // && !lightMode)
12000		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	14287	+ if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
	14288	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
12001	14289	pingthread.StepToTarget(true); // true);
12002	14290	}
12003	14291	// if (!LIVE)
..	..	@@ -12006,12 +14294,13 @@
12006	14294
12007	14295	javax.swing.Timer timer = new javax.swing.Timer(350, this);
12008	14296
12009		- void clickStart(int x, int y, int modifiers)
	14297	+ void clickStart(int x, int y, int modifiers, int modifiersex)
12010	14298	{
12011	14299	if (!wasliveok)
12012	14300	return;
12013	14301
12014	14302	AAtimer.restart(); //
	14303	+ Globals.TIMERRUNNING = true;
12015	14304
12016	14305	// waslive = LIVE;
12017	14306	// LIVE = false;
..	..	@@ -12023,7 +14312,7 @@
12023	14312	// touched = true; // main DL
12024	14313	if (isRenderer)
12025	14314	{
12026		- SetMouseMode(modifiers);
	14315	+ SetMouseMode(modifiers, modifiersex);
12027	14316	}
12028	14317
12029	14318	selectX = anchorX = x;
..	..	@@ -12036,7 +14325,7 @@
12036	14325	clicked = true;
12037	14326	hold = false;
12038	14327
12039		- if (((modifiers & ~1024) & ~0) == 0) // Single or multiple selection
	14328	+ if (((modifiersex & ~1024) & ~0) == 0) // Single or multiple selection
12040	14329	// june 2013 means CTRL_CLICK: if (((modifiers & ~1024) & ~128) == 0) // Single or multiple selection
12041	14330	{
12042	14331	// System.out.println("RESTART II " + modifiers);
..	..	@@ -12061,14 +14350,15 @@
12061	14350	drag = false;
12062	14351	//System.out.println("Mouse DOWN");
12063	14352	editObj = false;
12064		- ClickInfo info = new ClickInfo();
12065		- info.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
12066		- info.pane = this;
12067		- info.camera = renderCamera;
12068		- info.x = x;
12069		- info.y = y;
12070		- info.modifiers = modifiers;
12071		- editObj = object.doEditClick(info, 0);
	14353	+ //ClickInfo info = new ClickInfo();
	14354	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14355	+ object.clickInfo.pane = this;
	14356	+ object.clickInfo.camera = renderCamera;
	14357	+ object.clickInfo.x = x;
	14358	+ object.clickInfo.y = y;
	14359	+ object.clickInfo.modifiers = modifiersex;
	14360	+ editObj = object.doEditClick(//info,
	14361	+ 0);
12072	14362	if (!editObj)
12073	14363	{
12074	14364	hasMarquee = true;
..	..	@@ -12084,11 +14374,14 @@
12084	14374
12085	14375	public void mouseDragged(MouseEvent e)
12086	14376	{
	14377	+ Globals.MOUSEDRAGGED = true;
	14378	+
	14379	+ //System.out.println("mouseDragged: " + e);
12087	14380	if (isRenderer)
12088	14381	movingcamera = true;
	14382	+
12089	14383	//if (drawing)
12090	14384	//return;
12091		- //System.out.println("mouseDragged: " + e);
12092	14385	if ((e.getModifiersEx() & CTRL) != 0
12093	14386	\|\| (e.getModifiersEx() & COMMAND) != 0) // \|\| IsFrozen())
12094	14387	{
..	..	@@ -12096,7 +14389,7 @@
12096	14389	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
12097	14390	}
12098	14391	else
12099		- drag(e.getX(), e.getY(), e.getModifiersEx());
	14392	+ drag(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
12100	14393
12101	14394	//try { Thread.sleep(1); } catch (Exception ex) {}
12102	14395	}
..	..	@@ -12108,6 +14401,11 @@
12108	14401	cVector tmp = new cVector();
12109	14402	cVector tmp2 = new cVector();
12110	14403	boolean isMoving;
	14404	+
	14405	+ public cVector TargetLookAt()
	14406	+ {
	14407	+ return targetLookAt;
	14408	+ }
12111	14409
12112	14410	class PingThread extends Thread
12113	14411	{
..	..	@@ -12247,7 +14545,7 @@
12247	14545	//System.out.println("---------------- ---------- Paint " + tmp.length2());
12248	14546	if (lightMode)
12249	14547	{
12250		- lighttouched = true;
	14548	+ Globals.lighttouched = true;
12251	14549	}
12252	14550
12253	14551	if (OEILONCE && OEIL)
..	..	@@ -12264,6 +14562,7 @@
12264	14562
12265	14563	public void run()
12266	14564	{
	14565	+ new Exception().printStackTrace();
12267	14566	System.exit(0);
12268	14567	for (;;)
12269	14568	{
..	..	@@ -12305,7 +14604,7 @@
12305	14604	mouseDown = false;
12306	14605	if (lightMode)
12307	14606	{
12308		- lighttouched = true;
	14607	+ Globals.lighttouched = true;
12309	14608	}
12310	14609	repaint();
12311	14610	alreadypainted = true;
..	..	@@ -12313,7 +14612,7 @@
12313	14612	isMoving = false;
12314	14613	} //??
12315	14614
12316		- if (isLIVE() && !alreadypainted)
	14615	+ if (Globals.isLIVE() && !alreadypainted)
12317	14616	{
12318	14617	// FOR DEBUG BREAKPOINT USING PAUSE: while (true)
12319	14618	repaint();
..	..	@@ -12325,9 +14624,9 @@
12325	14624	{
12326	14625	if (lightMode)
12327	14626	{
12328		- lighttouched = true;
	14627	+ Globals.lighttouched = true;
12329	14628	}
12330		- drag(X, (mouseMode != 0) ? Y : anchorY, MODIFIERS);
	14629	+ drag(X, (mouseMode != 0) ? Y : anchorY, 0, MODIFIERS);
12331	14630	}
12332	14631	//else
12333	14632	}
..	..	@@ -12341,12 +14640,12 @@
12341	14640	void GoDown(int mod)
12342	14641	{
12343	14642	MODIFIERS \|= COMMAND;
12344		- /*
	14643	+ /**/
12345	14644	if((mod&SHIFT) == SHIFT)
12346		- manipCamera.RotatePosition(0, -speed);
	14645	+ manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
12347	14646	else
12348		- manipCamera.BackForth(0, -speed*delta, getWidth());
12349		- */
	14647	+ manipCamera.RotatePosition(0, -speed);
	14648	+ /**/
12350	14649	if ((mod & SHIFT) == SHIFT)
12351	14650	{
12352	14651	mouseMode = mouseMode; // VR??
..	..	@@ -12362,12 +14661,12 @@
12362	14661	void GoUp(int mod)
12363	14662	{
12364	14663	MODIFIERS \|= COMMAND;
12365		- /*
	14664	+ /**/
12366	14665	if((mod&SHIFT) == SHIFT)
12367		- manipCamera.RotatePosition(0, speed);
	14666	+ manipCamera.BackForth(0, speed*delta, 0); // getWidth());
12368	14667	else
12369		- manipCamera.BackForth(0, speed*delta, getWidth());
12370		- */
	14668	+ manipCamera.RotatePosition(0, speed);
	14669	+ /**/
12371	14670	if ((mod & SHIFT) == SHIFT)
12372	14671	{
12373	14672	mouseMode = mouseMode;
..	..	@@ -12383,12 +14682,12 @@
12383	14682	void GoLeft(int mod)
12384	14683	{
12385	14684	MODIFIERS \|= COMMAND;
12386		- /*
	14685	+ /**/
12387	14686	if((mod&SHIFT) == SHIFT)
12388		- manipCamera.RotatePosition(speed, 0);
12389		- else
12390	14687	manipCamera.Translate(speed*delta, 0, getWidth());
12391		- */
	14688	+ else
	14689	+ manipCamera.RotatePosition(speed, 0);
	14690	+ /**/
12392	14691	if ((mod & SHIFT) == SHIFT)
12393	14692	{
12394	14693	mouseMode = mouseMode;
..	..	@@ -12404,12 +14703,12 @@
12404	14703	void GoRight(int mod)
12405	14704	{
12406	14705	MODIFIERS \|= COMMAND;
12407		- /*
	14706	+ /**/
12408	14707	if((mod&SHIFT) == SHIFT)
12409		- manipCamera.RotatePosition(-speed, 0);
12410		- else
12411	14708	manipCamera.Translate(-speed*delta, 0, getWidth());
12412		- */
	14709	+ else
	14710	+ manipCamera.RotatePosition(-speed, 0);
	14711	+ /**/
12413	14712	if ((mod & SHIFT) == SHIFT)
12414	14713	{
12415	14714	mouseMode = mouseMode;
..	..	@@ -12427,7 +14726,7 @@
12427	14726	int X, Y;
12428	14727	boolean SX, SY;
12429	14728
12430		- void drag(int x, int y, int modifiers)
	14729	+ void drag(int x, int y, int modifiers, int modifiersex)
12431	14730	{
12432	14731	if (IsFrozen())
12433	14732	{
..	..	@@ -12436,17 +14735,17 @@
12436	14735
12437	14736	drag = true; // NEW
12438	14737
12439		- boolean continuous = (modifiers & COMMAND) == COMMAND;
	14738	+ boolean continuous = (modifiersex & COMMAND) == COMMAND;
12440	14739
12441	14740	X = x;
12442	14741	Y = y;
12443	14742	// floating state for animation
12444		- MODIFIERS = modifiers;
12445		- modifiers &= ~1024;
	14743	+ MODIFIERS = modifiersex;
	14744	+ modifiersex &= ~1024;
12446	14745	if (false) // modifiers != 0)
12447	14746	{
12448	14747	//new Exception().printStackTrace();
12449		- System.out.println("mouseDragged: " + modifiers);
	14748	+ System.out.println("mouseDragged: " + modifiersex);
12450	14749	System.out.println("SHIFT = " + SHIFT);
12451	14750	System.out.println("CONTROL = " + COMMAND);
12452	14751	System.out.println("META = " + META);
..	..	@@ -12459,14 +14758,16 @@
12459	14758	if (editObj)
12460	14759	{
12461	14760	drag = true;
12462		- ClickInfo info = new ClickInfo();
12463		- info.bounds.setBounds(0, 0,
	14761	+ //ClickInfo info = new ClickInfo();
	14762	+ object.clickInfo.bounds.setBounds(0, 0,
12464	14763	(int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
12465		- info.pane = this;
12466		- info.camera = renderCamera;
12467		- info.x = x;
12468		- info.y = y;
12469		- object.editWindow.copy.doEditDrag(info);
	14764	+ object.clickInfo.pane = this;
	14765	+ object.clickInfo.camera = renderCamera;
	14766	+ object.clickInfo.x = x;
	14767	+ object.clickInfo.y = y;
	14768	+ object //.GetWindow().copy
	14769	+ .doEditDrag(//info,
	14770	+ (modifiers & MouseEvent.BUTTON3_MASK) != 0);
12470	14771	} else
12471	14772	{
12472	14773	if (x < startX)
..	..	@@ -12568,6 +14869,7 @@
12568	14869	{
12569	14870	manipCamera.Translate(dx, dy, getWidth());
12570	14871	}
	14872	+ else
12571	14873	if ((mouseMode & ZOOM) == 0 && (mouseMode & VR) != 0)
12572	14874	{
12573	14875	manipCamera.RotateInterest(dx, dy);
..	..	@@ -12578,7 +14880,7 @@
12578	14880
12579	14881	if (manipCamera == lightCamera)
12580	14882	{
12581		- lighttouched = true;
	14883	+ Globals.lighttouched = true;
12582	14884	}
12583	14885	/*
12584	14886	switch (mode)
..	..	@@ -12614,23 +14916,27 @@
12614	14916	}
12615	14917	}
12616	14918
	14919	+// ClickInfo clickInfo = new ClickInfo();
	14920	+
12617	14921	public void mouseMoved(MouseEvent e)
12618	14922	{
12619	14923	//System.out.println("mouseMoved: " + e);
12620		-
12621	14924	if (isRenderer)
12622	14925	return;
12623	14926
12624		- ClickInfo ci = new ClickInfo();
12625		- ci.x = e.getX();
12626		- ci.y = e.getY();
12627		- ci.modifiers = e.getModifiersEx();
12628		- ci.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
12629		- ci.pane = this;
12630		- ci.camera = renderCamera;
	14927	+ // Mouse cursor feedback
	14928	+ object.clickInfo.x = e.getX();
	14929	+ object.clickInfo.y = e.getY();
	14930	+ object.clickInfo.modifiers = e.getModifiersEx();
	14931	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14932	+ object.clickInfo.pane = this;
	14933	+ object.clickInfo.camera = renderCamera;
12631	14934	if (!isRenderer)
12632	14935	{
12633		- if (object.editWindow.copy.doEditClick(ci, 0))
	14936	+ //ObjEditor editWindow = object.editWindow;
	14937	+ //Object3D copy = editWindow.copy;
	14938	+ if (object.doEditClick(//clickInfo,
	14939	+ 0))
12634	14940	{
12635	14941	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
12636	14942	} else
..	..	@@ -12642,7 +14948,11 @@
12642	14948
12643	14949	public void mouseReleased(MouseEvent e)
12644	14950	{
	14951	+ Globals.MOUSEDRAGGED = false;
	14952	+
12645	14953	movingcamera = false;
	14954	+ X = 0; // getBounds().width/2;
	14955	+ Y = 0; // getBounds().height/2;
12646	14956	//System.out.println("mouseReleased: " + e);
12647	14957	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
12648	14958	}
..	..	@@ -12665,9 +14975,9 @@
12665	14975	boolean control = ((modifiers & CTRL) != 0); // june 2013: for point selection
12666	14976	boolean command = ((modifiers & COMMAND) != 0); // june 2013: for multiple selection
12667	14977
12668		- if (control \|\| command \|\| IsFrozen())
	14978	+// No delay if (control \|\| command \|\| IsFrozen())
12669	14979	timeout = true;
12670		- else
	14980	+// ?? May 2019 else
12671	14981	// timer.setDelay((modifiers & 128) != 0?0:350);
12672	14982	mouseDown = false;
12673	14983	if (!control && !command) // june 2013
..	..	@@ -12777,7 +15087,7 @@
12777	15087	System.out.println("keyReleased: " + e);
12778	15088	}
12779	15089
12780		- void SetMouseMode(int modifiers)
	15090	+ void SetMouseMode(int modifiers, int modifiersex)
12781	15091	{
12782	15092	//System.out.println("SetMouseMode = " + modifiers);
12783	15093	//modifiers &= ~1024;
..	..	@@ -12789,24 +15099,27 @@
12789	15099	//if (modifiers == 0) // \|\| (modifiers == (1024 \| CONTROL)))
12790	15100	// return;
12791	15101	//System.out.println("SetMode = " + modifiers);
12792		- if ((modifiers & WHEEL) == WHEEL)
	15102	+ if ((modifiersex & WHEEL) == WHEEL)
12793	15103	{
12794	15104	mouseMode \|= ZOOM;
12795	15105	}
12796		- if ((modifiers & META) == META)
	15106	+
	15107	+ boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
	15108	+ if (capsLocked) // \|\| (modifiers & META) == META)
12797	15109	{
12798	15110	mouseMode \|= VR; // BACKFORTH;
12799	15111	}
12800		- if ((modifiers & CTRLCLICK) == CTRLCLICK)
12801		- {
12802		- mouseMode \|= SELECT; // BACKFORTH;
12803		- }
12804		- if ((modifiers & COMMAND) == COMMAND)
	15112	+ if ((modifiersex & CTRLCLICK) == CTRLCLICK)
12805	15113	{
12806	15114	mouseMode \|= SELECT;
12807	15115	}
12808		- if ((modifiers & SHIFT) == SHIFT \|\| forcetranslate)
	15116	+ if ((modifiersex & COMMAND) == COMMAND)
12809	15117	{
	15118	+ mouseMode \|= SELECT;
	15119	+ }
	15120	+ if ((modifiersex & SHIFT) == SHIFT \|\| forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
	15121	+ {
	15122	+ mouseMode &= ~VR;
12810	15123	mouseMode \|= TRANSLATE;
12811	15124	}
12812	15125	// if ((modifiers & SHIFT_META) == SHIFT_META)
..	..	@@ -12833,10 +15146,10 @@
12833	15146
12834	15147	if (isRenderer) //
12835	15148	{
12836		- SetMouseMode(modifiers);
	15149	+ SetMouseMode(0, modifiers);
12837	15150	}
12838	15151
12839		- theRenderer.keyPressed(key);
	15152	+ Globals.theRenderer.keyPressed(key);
12840	15153	}
12841	15154
12842	15155	int kompactbit = 4; // power bit
..	..	@@ -12848,7 +15161,7 @@
12848	15161	float SATPOW = 1; // 2; // 0.5f;
12849	15162	float BRIPOW = 1; // 0.5f; // 0.5f;
12850	15163
12851		- void keyPressed(int key)
	15164	+ public void keyPressed(int key)
12852	15165	{
12853	15166	if (key >= '0' && key <= '5')
12854	15167	clampbit = (key-'0');
..	..	@@ -12895,7 +15208,8 @@
12895	15208	// break;
12896	15209	case 'T':
12897	15210	CACHETEXTURE ^= true;
12898		- textures.clear();
	15211	+ texturepigment.clear();
	15212	+ texturebump.clear();
12899	15213	// repaint();
12900	15214	break;
12901	15215	case 'Y':
..	..	@@ -12963,7 +15277,7 @@
12963	15277	case 'B':
12964	15278	BRISMOOTH ^= true;
12965	15279	SHADOWCULLFACE ^= true;
12966		- lighttouched = true;
	15280	+ Globals.lighttouched = true;
12967	15281	repaint();
12968	15282	break;
12969	15283	case 'b':
..	..	@@ -12980,7 +15294,9 @@
12980	15294	case 'E' : COMPACT ^= true;
12981	15295	repaint();
12982	15296	break;
12983		- case 'W' : DEBUGHSB ^= true;
	15297	+ case 'W' : // Wide Window (fullscreen)
	15298	+ //DEBUGHSB ^= true;
	15299	+ ObjEditor.theFrame.ToggleFullScreen();
12984	15300	repaint();
12985	15301	break;
12986	15302	case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
..	..	@@ -13005,8 +15321,8 @@
13005	15321	RevertCamera();
13006	15322	repaint();
13007	15323	break;
13008		- case 'L':
13009	15324	case 'l':
	15325	+ //case 'L':
13010	15326	if (lightMode)
13011	15327	{
13012	15328	lightMode = false;
..	..	@@ -13063,27 +15379,31 @@
13063	15379	repaint();
13064	15380	break;
13065	15381	case 'O':
13066		- drawMode = OCCLUSION;
	15382	+ Globals.drawMode = OCCLUSION; // WARNING
13067	15383	repaint();
13068	15384	break;
13069	15385	case 'o':
13070	15386	OCCLUSION_CULLING ^= true;
13071	15387	System.out.println("OCCLUSION CULLING = " + OCCLUSION_CULLING);
13072	15388	break;
13073		- case '0': envyoff ^= true; repaint(); break;
	15389	+ //case '0': envyoff ^= true; repaint(); break;
13074	15390	case '1':
13075	15391	case '2':
13076	15392	case '3':
13077	15393	case '4':
13078	15394	case '5':
13079		- newenvy = Character.getNumericValue(key);
13080		- repaint();
13081		- break;
13082	15395	case '6':
13083	15396	case '7':
13084	15397	case '8':
13085	15398	case '9':
13086		- BGcolor = (key - '6')/3.f;
	15399	+ if (true) // envyoff)
	15400	+ {
	15401	+ BGcolor = (key - '1')/8.f;
	15402	+ }
	15403	+ else
	15404	+ {
	15405	+ //newenvy = Character.getNumericValue(key);
	15406	+ }
13087	15407	repaint();
13088	15408	break;
13089	15409	case '!':
..	..	@@ -13149,12 +15469,12 @@
13149	15469	case '_':
13150	15470	kompactbit = 5;
13151	15471	break;
13152		- case '+':
13153		- kompactbit = 6;
13154		- break;
	15472	+// case '+':
	15473	+// kompactbit = 6;
	15474	+// break;
13155	15475	case ' ':
13156	15476	lightMode ^= true;
13157		- lighttouched = true;
	15477	+ Globals.lighttouched = true;
13158	15478	manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
13159	15479	targetLookAt.set(manipCamera.lookAt);
13160	15480	repaint();
..	..	@@ -13163,14 +15483,15 @@
13163	15483	case ESC:
13164	15484	RENDERPROGRAM += 1;
13165	15485	RENDERPROGRAM %= 3;
	15486	+
13166	15487	repaint();
13167	15488	break;
13168	15489	case 'Z':
13169		- RESIZETEXTURE ^= true;
13170		- break;
	15490	+ //RESIZETEXTURE ^= true;
	15491	+ //break;
13171	15492	case 'z':
13172		- RENDERSHADOW ^= true;
13173		- lighttouched = true;
	15493	+ Globals.RENDERSHADOW ^= true;
	15494	+ Globals.lighttouched = true;
13174	15495	repaint();
13175	15496	break;
13176	15497	//case UP:
..	..	@@ -13196,13 +15517,15 @@
13196	15517	FlipTransform();
13197	15518	break;
13198	15519	case ENTER:
13199		- object.editWindow.ScreenFit(); // Edit();
	15520	+ // object.editWindow.ScreenFit(); // Edit();
	15521	+ ToggleLive();
13200	15522	break;
13201	15523	case DELETE:
13202	15524	ClearSelection();
13203	15525	break;
13204		- /*
13205	15526	case '+':
	15527	+
	15528	+ /*
13206	15529	//fontsize += 1;
13207	15530	bbzoom *= 2;
13208	15531	repaint();
..	..	@@ -13219,17 +15542,17 @@
13219	15542	case '=':
13220	15543	IncDepth();
13221	15544	//fontsize += 1;
13222		- object.editWindow.refreshContents(true);
	15545	+ object.GetWindow().refreshContents(true);
13223	15546	maskbit = 6;
13224	15547	break;
13225	15548	case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
13226	15549	DecDepth();
13227	15550	maskbit = 5;
13228	15551	//if(fontsize > 1) fontsize -= 1;
13229		- if (object.editWindow == null)
13230		- new Exception().printStackTrace();
13231		- else
13232		- object.editWindow.refreshContents(true);
	15552	+// if (object.editWindow == null)
	15553	+// new Exception().printStackTrace();
	15554	+// else
	15555	+ object.GetWindow().refreshContents(true);
13233	15556	break;
13234	15557	case '{':
13235	15558	manipCamera.shaper_fovy /= 1.1;
..	..	@@ -13284,6 +15607,7 @@
13284	15607	}
13285	15608	//System.out.println("shaper_fovy = " + manipCamera.shaper_fovy);
13286	15609	}
	15610	+
13287	15611	static double OCCLUSIONBOOST = 1; // 0.5;
13288	15612
13289	15613	void keyReleased(int key, int modifiers)
..	..	@@ -13291,11 +15615,11 @@
13291	15615	//mode = ROTATE;
13292	15616	if ((MODIFIERS & COMMAND) == 0) // VR??
13293	15617	{
13294		- SetMouseMode(modifiers);
	15618	+ SetMouseMode(0, modifiers);
13295	15619	}
13296	15620	}
13297	15621
13298		- protected void processKeyEvent(KeyEvent e)
	15622	+ public void processKeyEvent(KeyEvent e)
13299	15623	{
13300	15624	switch (e.getID())
13301	15625	{
..	..	@@ -13425,8 +15749,9 @@
13425	15749
13426	15750	protected void processMouseMotionEvent(MouseEvent e)
13427	15751	{
13428		- //System.out.println("processMouseMotionEvent: " + mouseMode);
13429		- if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
	15752	+ //System.out.println("processMouseMotionEvent: " + mouseMode + " " + e.getModifiers() + " " + e.getModifiersEx() + " " + e.getButton());
	15753	+ //if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
	15754	+ if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (e.getModifiers() & MouseEvent.BUTTON3_MASK) == 0 && (mouseMode & SELECT) == 0)
13430	15755	{
13431	15756	mouseMoved(e);
13432	15757	} else
..	..	@@ -13451,11 +15776,12 @@
13451	15776	}
13452	15777	*/
13453	15778
13454		- object.editWindow.EditSelection();
	15779	+ object.GetWindow().EditSelection(false);
13455	15780	}
13456	15781
13457	15782	void SelectParent()
13458	15783	{
	15784	+ new Exception().printStackTrace();
13459	15785	System.exit(0);
13460	15786	Composite group = (Composite) object;
13461	15787	java.util.Vector selectees = new java.util.Vector(group.selection);
..	..	@@ -13467,10 +15793,10 @@
13467	15793	{
13468	15794	//selectees.remove(i);
13469	15795	System.out.println("select parent of " + elem);
13470		- group.editWindow.Select(elem.parent.GetTreePath(), first, true);
	15796	+ group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
13471	15797	} else
13472	15798	{
13473		- group.editWindow.Select(elem.GetTreePath(), first, true);
	15799	+ group.GetWindow().Select(elem.GetTreePath(), first, true);
13474	15800	}
13475	15801
13476	15802	first = false;
..	..	@@ -13479,6 +15805,7 @@
13479	15805
13480	15806	void SelectChildren()
13481	15807	{
	15808	+ new Exception().printStackTrace();
13482	15809	System.exit(0);
13483	15810	/*
13484	15811	Composite group = (Composite) object;
..	..	@@ -13511,12 +15838,12 @@
13511	15838	for (int j = 0; j < group.children.size(); j++)
13512	15839	{
13513	15840	elem = (Object3D) group.children.elementAt(j);
13514		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15841	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
13515	15842	first = false;
13516	15843	}
13517	15844	} else
13518	15845	{
13519		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15846	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
13520	15847	}
13521	15848
13522	15849	first = false;
..	..	@@ -13527,21 +15854,21 @@
13527	15854	{
13528	15855	//Composite group = (Composite) object;
13529	15856	Object3D group = object;
13530		- group.editWindow.loadClipboard(true); // ClearSelection(false);
	15857	+ group.GetWindow().loadClipboard(true); // ClearSelection(false);
13531	15858	}
13532	15859
13533	15860	void ResetTransform(int mask)
13534	15861	{
13535	15862	//Composite group = (Composite) object;
13536	15863	Object3D group = object;
13537		- group.editWindow.ResetTransform(mask);
	15864	+ group.GetWindow().ResetTransform(mask);
13538	15865	}
13539	15866
13540	15867	void FlipTransform()
13541	15868	{
13542	15869	//Composite group = (Composite) object;
13543	15870	Object3D group = object;
13544		- group.editWindow.FlipTransform();
	15871	+ group.GetWindow().FlipTransform();
13545	15872	// group.editWindow.ReduceMesh(true);
13546	15873	}
13547	15874
..	..	@@ -13549,7 +15876,7 @@
13549	15876	{
13550	15877	//Composite group = (Composite) object;
13551	15878	Object3D group = object;
13552		- group.editWindow.PrintMemory();
	15879	+ group.GetWindow().PrintMemory();
13553	15880	// group.editWindow.ReduceMesh(true);
13554	15881	}
13555	15882
..	..	@@ -13557,7 +15884,7 @@
13557	15884	{
13558	15885	//Composite group = (Composite) object;
13559	15886	Object3D group = object;
13560		- group.editWindow.ResetCentroid();
	15887	+ group.GetWindow().ResetCentroid();
13561	15888	}
13562	15889
13563	15890	void IncDepth()
..	..	@@ -13639,11 +15966,11 @@
13639	15966
13640	15967	int width = getBounds().width;
13641	15968	int height = getBounds().height;
13642		- ClickInfo info = new ClickInfo();
13643		- info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
13644	15969	//Image img = CreateImage(width, height);
13645	15970	//System.out.println("width = " + width + "; height = " + height + "\n");
	15971	+
13646	15972	Graphics gr = g; // img.getGraphics();
	15973	+
13647	15974	if (!hasMarquee)
13648	15975	{
13649	15976	if (Xmin < Xmax) // !locked)
..	..	@@ -13715,40 +16042,88 @@
13715	16042	}
13716	16043	if (object != null && !hasMarquee)
13717	16044	{
	16045	+ if (object.clickInfo == null)
	16046	+ object.clickInfo = new ClickInfo();
	16047	+ ClickInfo info = object.clickInfo;
	16048	+ //ClickInfo info = new ClickInfo();
	16049	+ info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
	16050	+
13718	16051	if (isRenderer)
13719	16052	{
13720		- info.flags++;
	16053	+ object.clickInfo.flags++;
13721	16054	double frameAspect = (double) width / (double) height;
13722	16055	if (frameAspect > renderCamera.aspect)
13723	16056	{
13724	16057	int desired = (int) ((double) height * renderCamera.aspect);
13725		- info.bounds.width -= width - desired;
13726		- info.bounds.x += (width - desired) / 2;
	16058	+ object.clickInfo.bounds.width -= width - desired;
	16059	+ object.clickInfo.bounds.x += (width - desired) / 2;
13727	16060	} else
13728	16061	{
13729	16062	int desired = (int) ((double) width / renderCamera.aspect);
13730		- info.bounds.height -= height - desired;
13731		- info.bounds.y += (height - desired) / 2;
	16063	+ object.clickInfo.bounds.height -= height - desired;
	16064	+ object.clickInfo.bounds.y += (height - desired) / 2;
13732	16065	}
13733	16066	}
13734		- info.g = gr;
13735		- info.camera = renderCamera;
	16067	+
	16068	+ object.clickInfo.g = gr;
	16069	+ object.clickInfo.camera = renderCamera;
13736	16070	/*
13737	16071	// Memory intensive (brep.verticescopy)
13738	16072	if (!(object instanceof Composite))
13739	16073	object.draw(info, 0, false); // SLOW :
13740	16074	*/
13741		- if (!isRenderer)
	16075	+ if (!isRenderer) // && drag)
13742	16076	{
13743		- object.drawEditHandles(info, 0);
	16077	+ Grafreed.Assert(object != null);
	16078	+ Grafreed.Assert(object.selection != null);
	16079	+ if (object.selection.Size() > 0)
	16080	+ {
	16081	+ int hitSomething = object.selection.get(0).hitSomething;
	16082	+
	16083	+ object.clickInfo.DX = 0;
	16084	+ object.clickInfo.DY = 0;
	16085	+ object.clickInfo.W = 1;
	16086	+ if (hitSomething == Object3D.hitCenter)
	16087	+ {
	16088	+ info.DX = X;
	16089	+ if (X != 0)
	16090	+ info.DX -= info.bounds.width/2;
	16091	+
	16092	+ info.DY = Y;
	16093	+ if (Y != 0)
	16094	+ info.DY -= info.bounds.height/2;
	16095	+ }
	16096	+
	16097	+ object.drawEditHandles(//info,
	16098	+ 0);
	16099	+
	16100	+ if (drag && (X != 0 \|\| Y != 0))
	16101	+ {
	16102	+ switch (hitSomething)
	16103	+ {
	16104	+ case Object3D.hitCenter: gr.setColor(Color.pink);
	16105	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16106	+ break;
	16107	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	16108	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16109	+ break;
	16110	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	16111	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16112	+ break;
	16113	+ }
	16114	+
	16115	+ }
	16116	+ }
13744	16117	}
13745	16118	}
	16119	+
13746	16120	if (isRenderer)
13747	16121	{
13748	16122	//gr.setColor(Color.black);
13749	16123	//gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
13750	16124	//gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
13751	16125	}
	16126	+
13752	16127	if (hasMarquee)
13753	16128	{
13754	16129	gr.setXORMode(Color.white);
..	..	@@ -13771,6 +16146,7 @@
13771	16146	//if (g != gr) g.drawImage(img, 0, 0, width, height, null);
13772	16147	}
13773	16148
	16149	+ // To avoid clear.
13774	16150	public void update(Graphics g)
13775	16151	{
13776	16152	paint(g);
..	..	@@ -13860,6 +16236,7 @@
13860	16236	public boolean mouseDown(Event evt, int x, int y)
13861	16237	{
13862	16238	System.out.println("mouseDown: " + evt);
	16239	+ System.exit(0);
13863	16240	/*
13864	16241	locked = true;
13865	16242	drag = false;
..	..	@@ -13903,7 +16280,7 @@
13903	16280	{
13904	16281	keyPressed(0, modifiers);
13905	16282	}
13906		- clickStart(x, y, modifiers);
	16283	+ // clickStart(x, y, modifiers);
13907	16284	return true;
13908	16285	}
13909	16286
..	..	@@ -14021,7 +16398,7 @@
14021	16398	{
14022	16399	keyReleased(0, 0);
14023	16400	}
14024		- drag(x, y, modifiers);
	16401	+ drag(x, y, 0, modifiers);
14025	16402	return true;
14026	16403	}
14027	16404
..	..	@@ -14153,7 +16530,7 @@
14153	16530	Object3D object;
14154	16531	static Object3D trackedobject;
14155	16532	Camera renderCamera; // Light or Eye (or Occlusion)
14156		- /static/ Camera manipCamera; // Light or Eye
	16533	+ /static/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
14157	16534	/static/ Camera eyeCamera;
14158	16535	/static/ Camera lightCamera;
14159	16536	int cameracount;
..	..	@@ -14217,6 +16594,8 @@
14217	16594	private /static/ boolean firstime;
14218	16595	private /static/ cVector newView = new cVector();
14219	16596	private static final String[] suffixes = {"posx", "negx", "posy", "negy", "posz", "negz"};
	16597	+ private static final String[] suffixes2 = {"east", "west", "top", "bottom", "north", "south"};
	16598	+ private static final String[] suffixes3 = {"ft", "bk", "up", "dn", "rt", "lf"};
14220	16599	private static final int[] targets = {GL.GL_TEXTURE_CUBE_MAP_POSITIVE_X,
14221	16600	GL.GL_TEXTURE_CUBE_MAP_NEGATIVE_X,
14222	16601	GL.GL_TEXTURE_CUBE_MAP_POSITIVE_Y,
..	..	@@ -14229,29 +16608,67 @@
14229	16608	{
14230	16609	com.sun.opengl.util.texture.Texture cubemap = TextureIO.newTexture(GL.GL_TEXTURE_CUBE_MAP);
14231	16610
	16611	+ int usedsuf = 0;
	16612	+
14232	16613	for (int i = 0; i < suffixes.length; i++)
14233	16614	{
14234		- String resourceName = basename + suffixes[i] + "." + suffix;
14235		- TextureData data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
14236		- mipmapped,
14237		- FileUtil.getFileSuffix(resourceName));
14238		- if (data == null)
	16615	+ String[] suffixe = suffixes;
	16616	+ String[] fallback = suffixes2;
	16617	+ String[] fallfallback = suffixes3;
	16618	+
	16619	+ for (int c=usedsuf; --c>=0;)
14239	16620	{
14240		- throw new IOException("Unable to load texture " + resourceName);
	16621	+// String[] temp = suffixe;
	16622	+// suffixe = fallback;
	16623	+// fallback = fallfallback;
	16624	+// fallfallback = temp;
14241	16625	}
	16626	+
	16627	+ String resourceName = basename + suffixe[i] + "." + suffix;
	16628	+ TextureData data;
	16629	+
	16630	+ try
	16631	+ {
	16632	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16633	+ mipmapped,
	16634	+ FileUtil.getFileSuffix(resourceName));
	16635	+ }
	16636	+ catch (Exception e)
	16637	+ {
	16638	+ try
	16639	+ {
	16640	+ resourceName = basename + fallback[i] + "." + suffix;
	16641	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16642	+ mipmapped,
	16643	+ FileUtil.getFileSuffix(resourceName));
	16644	+ }
	16645	+ catch (Exception e2)
	16646	+ {
	16647	+ resourceName = basename + fallfallback[i] + "." + suffix;
	16648	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16649	+ mipmapped,
	16650	+ FileUtil.getFileSuffix(resourceName));
	16651	+ }
	16652	+ }
	16653	+
14242	16654	//System.out.println("Target = " + targets[i]);
14243	16655	cubemap.updateImage(data, targets[i]);
14244	16656	}
14245	16657
14246	16658	return cubemap;
14247	16659	}
	16660	+
14248	16661	int bigsphere = -1;
14249	16662
14250	16663	float BGcolor = 0.5f;
14251	16664
14252		- private void DrawSkyBox(GL gl)
	16665	+ float ambientLight[] = {1f, 1f, 1f, 1.0f};
	16666	+
	16667	+ private void DrawSkyBox(GL gl, float ratio)
14253	16668	{
14254		- if (envyoff \|\| cubemap == null)
	16669	+ if (//envyoff \|\|
	16670	+ WIREFRAME \|\|
	16671	+ cubemap == null)
14255	16672	{
14256	16673	gl.glClearColor(BGcolor, BGcolor, BGcolor, 1);
14257	16674	gl.glClear(gl.GL_COLOR_BUFFER_BIT);
..	..	@@ -14266,7 +16683,17 @@
14266	16683	// Compensates for ExaminerViewer's modification of modelview matrix
14267	16684	gl.glMatrixMode(GL.GL_MODELVIEW);
14268	16685	gl.glLoadIdentity();
	16686	+ gl.glScalef(1,ratio,1);
14269	16687
	16688	+// colorV[0] = 2;
	16689	+// colorV[1] = 2;
	16690	+// colorV[2] = 2;
	16691	+// colorV[3] = 1;
	16692	+// gl.glDisable(gl.GL_COLOR_MATERIAL);
	16693	+// gl.glMaterialfv(gl.GL_FRONT_AND_BACK, gl.GL_AMBIENT, colorV, 0);
	16694	+//
	16695	+// gl.glLightModelfv(gl.GL_LIGHT_MODEL_AMBIENT, ambientLight, 0);
	16696	+
14270	16697	//gl.glActiveTexture(GL.GL_TEXTURE1);
14271	16698	//gl.glDisable(GL.GL_TEXTURE_CUBE_MAP);
14272	16699
..	..	@@ -14298,6 +16725,7 @@
14298	16725	{
14299	16726	gl.glScalef(1.0f, -1.0f, 1.0f);
14300	16727	}
	16728	+ gl.glScalef(-1.0f, 1.0f, 1.0f);
14301	16729	gl.glMultMatrixd(viewrot_1, 0);
14302	16730	gl.glTranslatef(0, 0, 0.5f); // (float)lightCamera.Distance()); // 0.5f);
14303	16731	//viewer.updateInverseRotation(gl);
..	..	@@ -14373,7 +16801,7 @@
14373	16801	gl.glPushAttrib(GL.GL_ALL_ATTRIB_BITS);
14374	16802	gl.glPushMatrix();
14375	16803	gl.glLoadIdentity();
14376		- PushMatrix(checker.toParent);
	16804	+ //PushMatrix(checker.toParent);
14377	16805
14378	16806	gl.glMatrixMode(GL.GL_TEXTURE);
14379	16807	gl.glPushMatrix();
..	..	@@ -14396,8 +16824,8 @@
14396	16824
14397	16825	gl.glNormal3f(0.0f, 0.0f, 1.0f);
14398	16826
14399		- float step = 0.1666f; //0.25f;
14400		- float stepv = step * 1652 / 998;
	16827	+ float step = 2; // 0.1666f; //0.25f;
	16828	+ float stepv = 2; // step * 1652 / 998;
14401	16829
14402	16830	int i0 = 0;
14403	16831	/*
..	..	@@ -14433,20 +16861,21 @@
14433	16861	/**/
14434	16862	//checker.GetMaterial().opacity = 1.1f;
14435	16863	////checker.GetMaterial().ambient = 0.99f;
14436		- Object3D.materialstack[Object3D.materialdepth] = checker.material;
14437		- Object3D.selectedstack[Object3D.materialdepth] = false;
14438		- cStatic.objectstack[Object3D.materialdepth++] = checker;
	16864	+ materialstack[materialdepth] = checker.material;
	16865	+ selectedstack[materialdepth] = false;
	16866	+ cStatic.objectstack[materialdepth++] = checker;
14439	16867	//System.out.println("material " + material);
14440	16868	//Applet3D.tracein(this, selected);
14441		- vector2buffer = checker.projectedVertices;
	16869	+ //vector2buffer = checker.projectedVertices;
14442	16870
14443		- checker.GetMaterial().Draw(this, false); // true);
	16871	+ //checker.GetMaterial().Draw(this, false); // true);
	16872	+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
14444	16873
14445		- Object3D.materialdepth -= 1;
14446		- if (Object3D.materialdepth > 0)
	16874	+ materialdepth -= 1;
	16875	+ if (materialdepth > 0)
14447	16876	{
14448		- vector2buffer = cStatic.objectstack[Object3D.materialdepth - 1].projectedVertices;
14449		- Object3D.materialstack[Object3D.materialdepth - 1].Draw(this, Object3D.selectedstack[Object3D.materialdepth - 1]);
	16877	+ //vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	16878	+ DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
14450	16879	}
14451	16880	//checker.GetMaterial().opacity = 1f;
14452	16881	////checker.GetMaterial().ambient = 1f;
..	..	@@ -14467,15 +16896,27 @@
14467	16896
14468	16897	//float u = (i+1)/2;
14469	16898	//float v = (j+1)/2;
14470		- gl.glTexCoord2f((i + 1) / 2, (j + 1) / 2); // (1,0) // (i+1+step)/2,(j+1)/2);
	16899	+ if (checker.flipV)
	16900	+ gl.glTexCoord2f((i + 1) / 2, 1 - (j + 1) / 2);
	16901	+ else
	16902	+ gl.glTexCoord2f((i + 1) / 2, (j + 1) / 2); // (1,0) // (i+1+step)/2,(j+1)/2);
14471	16903	gl.glVertex3f(i, j, -0.5f);
14472	16904
	16905	+ if (checker.flipV)
	16906	+ gl.glTexCoord2f((i + 1 + step) / 2, 1 - (j + 1) / 2); // (1,1) // (i+1+step)/2,(j+1+step)/2);
	16907	+ else
14473	16908	gl.glTexCoord2f((i + 1 + step) / 2, (j + 1) / 2); // (1,1) // (i+1+step)/2,(j+1+step)/2);
14474	16909	gl.glVertex3f(i + step, j, -0.5f);
14475	16910
	16911	+ if (checker.flipV)
	16912	+ gl.glTexCoord2f((i + 1 + step) / 2, 1 - (j + 1 + stepv) / 2); // (0,1) //(i+1)/2,(j+1+step)/2);
	16913	+ else
14476	16914	gl.glTexCoord2f((i + 1 + step) / 2, (j + 1 + stepv) / 2); // (0,1) //(i+1)/2,(j+1+step)/2);
14477	16915	gl.glVertex3f(i + step, j + stepv, -0.5f);
14478	16916
	16917	+ if (checker.flipV)
	16918	+ gl.glTexCoord2f((i + 1) / 2, 1 - (j + 1 + stepv) / 2); // (0,0) //(i+1)/2,(j+1)/2);
	16919	+ else
14479	16920	gl.glTexCoord2f((i + 1) / 2, (j + 1 + stepv) / 2); // (0,0) //(i+1)/2,(j+1)/2);
14480	16921	gl.glVertex3f(i, j + stepv, -0.5f);
14481	16922	}
..	..	@@ -14487,7 +16928,7 @@
14487	16928	gl.glMatrixMode(GL.GL_PROJECTION);
14488	16929	gl.glPopMatrix();
14489	16930	gl.glMatrixMode(GL.GL_MODELVIEW);
14490		- PopMatrix(null); // checker.toParent); // null);
	16931	+ //PopMatrix(null); // checker.toParent); // null);
14491	16932	gl.glPopMatrix();
14492	16933	PopTextureMatrix(checker.toParent);
14493	16934	gl.glMatrixMode(GL.GL_TEXTURE);
..	..	@@ -14520,6 +16961,14 @@
14520	16961	}
14521	16962	}
14522	16963
	16964	+ private Object3D GetFolder()
	16965	+ {
	16966	+ Object3D folder = object.GetWindow().copy;
	16967	+ if (object.GetWindow().copy.selection.Size() > 0)
	16968	+ folder = object.GetWindow().copy.selection.elementAt(0);
	16969	+ return folder;
	16970	+ }
	16971	+
14523	16972	class SelectBuffer implements GLEventListener
14524	16973	{
14525	16974
..	..	@@ -14535,7 +16984,7 @@
14535	16984	//new Exception().printStackTrace();
14536	16985	System.out.println("select buffer init");
14537	16986	// Use debug pipeline
14538		- drawable.setGL(new DebugGL(drawable.getGL()));
	16987	+ //drawable.setGL(new DebugGL(drawable.getGL()));
14539	16988
14540	16989	GL gl = drawable.getGL();
14541	16990
..	..	@@ -14578,6 +17027,7 @@
14578	17027	{
14579	17028	if (!selection)
14580	17029	{
	17030	+ new Exception().printStackTrace();
14581	17031	System.exit(0);
14582	17032	return;
14583	17033	}
..	..	@@ -14598,17 +17048,39 @@
14598	17048
14599	17049	//gl.glDisable(GL.GL_POLYGON_OFFSET_FILL);
14600	17050
	17051	+ if (PAINTMODE)
	17052	+ {
	17053	+ if (object.GetWindow().copy.selection.Size() > 0)
	17054	+ {
	17055	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	17056	+
	17057	+ // Make what you paint not selectable.
	17058	+ paintobj.ResetSelectable();
	17059	+ }
	17060	+ }
	17061	+
14601	17062	//int tmp = selection_view;
14602	17063	//selection_view = -1;
14603		- int temp = drawMode;
14604		- drawMode = SELECTION;
	17064	+ int temp = DrawMode();
	17065	+ Globals.drawMode = SELECTION; // WARNING
14605	17066	indexcount = 0;
14606	17067	parent.display(drawable);
14607	17068	//selection_view = tmp;
14608	17069	//if (temp == SELECTION)
14609	17070	// temp = DEFAULT; // patch for selection debug
14610		- drawMode = temp;
	17071	+ Globals.drawMode = temp; // WARNING
14611	17072
	17073	+ if (PAINTMODE)
	17074	+ {
	17075	+ if (object.GetWindow().copy.selection.Size() > 0)
	17076	+ {
	17077	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	17078	+
	17079	+ // Revert.
	17080	+ paintobj.RestoreSelectable();
	17081	+ }
	17082	+ }
	17083	+
14612	17084	//gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
14613	17085
14614	17086	// trying different ways of getting the depth info over
..	..	@@ -14657,6 +17129,13 @@
14657	17129	// System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
14658	17130	// System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
14659	17131
	17132	+ CreateSelectedPoint();
	17133	+
	17134	+ // Will fit the mesh !!!
	17135	+ selectedpoint.toParent[0][0] = 0.0001;
	17136	+ selectedpoint.toParent[1][1] = 0.0001;
	17137	+ selectedpoint.toParent[2][2] = 0.0001;
	17138	+
14660	17139	glu.gluUnProject(x,y,depth,view,0,tempmat2,0,viewport,0,selectedpoint.toParent[3],0);
14661	17140
14662	17141	// if (object.selection != null && object.selection.Size() > 0)
..	..	@@ -14700,34 +17179,36 @@
14700	17179	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]));
14701	17180	}
14702	17181
14703		- previousselectedpoint = (Sphere) GraphreeD.clone(selectedpoint);
	17182	+ previousselectedpoint = (Sphere) Grafreed.clone(selectedpoint);
14704	17183	}
14705	17184	}
14706	17185
14707	17186	if (!movingcamera && !PAINTMODE)
14708		- object.editWindow.ScreenFitPoint(); // fev 2014
	17187	+ object.GetWindow().ScreenFitPoint(); // fev 2014
14709	17188
14710		- if (PAINTMODE && GraphreeD.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	17189	+ if (PAINTMODE) // && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
14711	17190	{
14712		- Object3D paintobj = GraphreeD.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
	17191	+ //Object3D paintobj; // = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
14713	17192
14714		- Object3D group = new Object3D("inst" + paintcount++);
	17193	+ if (object.GetWindow().copy.selection.Size() > 0)
	17194	+ {
	17195	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
14715	17196
14716		- group.CreateMaterial(); // use a void leaf to select instances
14717		-
14718		- group.add(paintobj); // link
14719		-
14720		- object.editWindow.SnapObject(group);
14721		-
14722		- Object3D folder = object.editWindow.copy;
14723		-
14724		- if (object.editWindow.copy.selection.Size() > 0)
14725		- folder = object.editWindow.copy.selection.elementAt(0);
14726		-
14727		- folder.add(group);
14728		-
14729		- object.editWindow.ResetModel();
14730		- object.editWindow.refreshContents();
	17197	+ Object3D inst = new Object3D("inst" + paintcount++);
	17198	+
	17199	+ inst.CreateMaterial(); // use a void leaf to select instances
	17200	+
	17201	+ inst.add(paintobj); // link
	17202	+
	17203	+ object.GetWindow().SnapObject(inst);
	17204	+
	17205	+ Object3D folder = paintFolder; // GetFolder();
	17206	+
	17207	+ folder.add(inst);
	17208	+
	17209	+ object.GetWindow().ResetModel();
	17210	+ object.GetWindow().refreshContents();
	17211	+ }
14731	17212	}
14732	17213	else
14733	17214	paintcount = 0;
..	..	@@ -14766,6 +17247,11 @@
14766	17247	//System.out.println("objects[color] = " + objects[color]);
14767	17248	//objects[color].Select();
14768	17249	indexcount = 0;
	17250	+ ObjEditor window = object.GetWindow();
	17251	+ if (window != null && deselect)
	17252	+ {
	17253	+ window.Select(null, deselect, true);
	17254	+ }
14769	17255	object.Select(color, deselect);
14770	17256	}
14771	17257
..	..	@@ -14865,7 +17351,7 @@
14865	17351	gl.glDisable(gl.GL_CULL_FACE);
14866	17352	}
14867	17353
14868		- if (!RENDERSHADOW)
	17354	+ if (!Globals.RENDERSHADOW)
14869	17355	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
14870	17356
14871	17357	// SB gl.glPolygonOffset(2.5f, 10);
..	..	@@ -14875,14 +17361,14 @@
14875	17361	//gl.glColorMask(false, false, false, false);
14876	17362
14877	17363	//render_scene_from_light_view(gl, drawable, 0, 0);
14878		- if (RENDERSHADOW && lighttouched && !movingcamera) // && !parent.IsFreezed())
	17364	+ if (Globals.RENDERSHADOW && Globals.lighttouched && (!movingcamera \|\| !Globals.FREEZEONMOVE)) // && !parent.IsFreezed())
14879	17365	{
14880	17366	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
14881	17367
14882		- int temp = drawMode;
14883		- drawMode = SHADOW;
	17368	+ int temp = DrawMode();
	17369	+ Globals.drawMode = SHADOW; // WARNING
14884	17370	parent.display(drawable);
14885		- drawMode = temp;
	17371	+ Globals.drawMode = temp; // WARNING
14886	17372	}
14887	17373
14888	17374	gl.glCullFace(gl.GL_BACK);
..	..	@@ -14935,7 +17421,6 @@
14935	17421
14936	17422	class AntialiasBuffer implements GLEventListener
14937	17423	{
14938		-
14939	17424	CameraPane parent = null;
14940	17425
14941	17426	AntialiasBuffer(CameraPane p)
..	..	@@ -15045,13 +17530,19 @@
15045	17530	gl.glFlush();
15046	17531
15047	17532	/**/
15048		- gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_BGRA, GL.GL_UNSIGNED_INT_8_8_8_8_REV, occlusionsizebuffer);
	17533	+ gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusionsizebuffer);
15049	17534
15050		- int[] pixels = occlusionsizebuffer.array();
	17535	+ float[] pixels = occlusionsizebuffer.array();
15051	17536
15052	17537	double r = 0, g = 0, b = 0;
15053	17538
15054	17539	double count = 0;
	17540	+
	17541	+ gl.glGetDoublev(gl.GL_PROJECTION_MATRIX, tempmat2, 0);
	17542	+
	17543	+ float mindepth = 1;
	17544	+
	17545	+ double FACTOR = 1;
15055	17546
15056	17547	for (int i = 0; i < pixels.length; i++)
15057	17548	{
..	..	@@ -15136,7 +17627,7 @@
15136	17627
15137	17628	double scale = ray.z; // 1; // cos
15138	17629
15139		- int p = pixels[newindex];
	17630	+ float depth = pixels[newindex];
15140	17631
15141	17632	/*
15142	17633	int newindex2 = (x + 1) * OCCLUSION_SIZE + y;
..	..	@@ -15160,10 +17651,23 @@
15160	17651	scale = (1 - modu) * modv;
15161	17652	*/
15162	17653
15163		- r += ((p >> 16) & 0xFF) * scale / 255;
15164		- g += ((p >> 8) & 0xFF) * scale / 255;
15165		- b += (p & 0xFF) * scale / 255;
	17654	+ //r += ((p >> 16) & 0xFF) * scale / 255;
	17655	+ //g += ((p >> 8) & 0xFF) * scale / 255;
	17656	+ //b += (p & 0xFF) * scale / 255;
	17657	+
	17658	+ if (mindepth > depth)
	17659	+ {
	17660	+ mindepth = depth;
	17661	+ }
15166	17662
	17663	+ double z_eye = tempmat2[34 + 2] / (depth -2.0 + 1.0 - tempmat2[2*4 + 2]);
	17664	+
	17665	+ double factor = 1 - Math.exp(-z_eye * z_eye / FACTOR);
	17666	+
	17667	+ r += factor * scale;
	17668	+ g += factor * scale;
	17669	+ b += factor * scale;
	17670	+
15167	17671	count += scale;
15168	17672	}
15169	17673
..	..	@@ -15261,12 +17765,6 @@
15261	17765	GLUT glut = new GLUT();
15262	17766
15263	17767
15264		- static final public int DEFAULT = 0;
15265		- static final public int SELECTION = 1;
15266		- static final public int SHADOW = 2;
15267		- static final public int OCCLUSION = 3;
15268		- static
15269		- public int drawMode = DEFAULT;
15270	17768	public boolean spherical = false;
15271	17769	static boolean DEBUG_OCCLUSION = false;
15272	17770	static boolean DEBUG_SELECTION = false;
..	..	@@ -15279,21 +17777,15 @@
15279	17777	int AAbuffersize = 0;
15280	17778
15281	17779	//double[] selectedpoint = new double[3];
15282		- static Sphere selectedpoint = new Sphere();
	17780	+ static Superellipsoid selectedpoint;
15283	17781	static Sphere previousselectedpoint = null;
15284		- static Sphere debugpoint = new Sphere();
15285		- static Sphere debugpoint2 = new Sphere();
	17782	+ static Sphere debugpointG;
	17783	+ static Sphere debugpointP;
	17784	+ static Sphere debugpointC;
	17785	+ static Sphere debugpointR;
15286	17786
15287	17787	static Sphere debugpoints[] = new Sphere[8];
15288	17788
15289		- static
15290		- {
15291		- for (int i=0; i<8; i++)
15292		- {
15293		- debugpoints[i] = new Sphere();
15294		- }
15295		- }
15296		-
15297	17789	static void InitPoints(float radius)
15298	17790	{
15299	17791	for (int i=0; i<8; i++)
..	..	@@ -15313,7 +17805,7 @@
15313	17805	}
15314	17806	}
15315	17807
15316		- static void DrawPoints(CameraPane cpane)
	17808	+ static void DrawPoints(iCameraPane cpane)
15317	17809	{
15318	17810	for (int i=0; i<8; i++) // first and last are red
15319	17811	{
..	..	@@ -15335,7 +17827,8 @@
15335	17827	static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
15336	17828	static IntBuffer selectsizebuffer = IntBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
15337	17829	static java.nio.FloatBuffer pointselectsizebuffer = java.nio.FloatBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
15338		- static IntBuffer occlusionsizebuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17830	+ //static IntBuffer occlusionsizebuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17831	+ static java.nio.FloatBuffer occlusionsizebuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
15339	17832	static BufferedImage bufimage = new BufferedImage(TEX_SIZE, TEX_SIZE, BufferedImage.TYPE_INT_RGB);
15340	17833	static BufferedImage textest = new cBufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB);
15341	17834	static java.util.Vector<BufferedImage> billboards = new java.util.Vector<BufferedImage>();
..	..	@@ -15344,10 +17837,11 @@
15344	17837	static IntBuffer textbuffer = null; // IntBuffer.allocate(TEXT_WIDTH88 * TEXT_HEIGHT);
15345	17838	// Depth buffer format
15346	17839	//private int depth_format;
15347		- static public void NextIndex(Object3D o, GL gl)
	17840	+
	17841	+ public void NextIndex()
15348	17842	{
15349	17843	indexcount+=16;
15350		- gl.glColor3d(((indexcount >>> 16) & 255) / 255.0, ((indexcount >>> 8) & 255) / 255.0, ((indexcount) & 255) / 255.0);
	17844	+ GetGL().glColor3d(((indexcount >>> 16) & 255) / 255.0, ((indexcount >>> 8) & 255) / 255.0, ((indexcount) & 255) / 255.0);
15351	17845	//objects[indexcount] = o;
15352	17846	//System.out.println("indexcount = " + indexcount);
15353	17847	}