~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -1,4 +1,5 @@
1	1
	2	+import com.bulletphysics.dynamics.RigidBody;
2	3	import java.awt.*;
3	4	import java.awt.event.*;
4	5	import java.awt.image.*;
..	..	@@ -18,7 +19,10 @@
18	19	import javax.imageio.ImageIO;
19	20	import javax.imageio.ImageWriteParam;
20	21	import javax.imageio.ImageWriter;
	22	+import javax.imageio.ImageReadParam;
	23	+import javax.imageio.ImageReader;
21	24	import javax.imageio.plugins.jpeg.JPEGImageWriteParam;
	25	+import javax.imageio.stream.ImageInputStream;
22	26	import javax.imageio.stream.ImageOutputStream;
23	27	import javax.imageio.ImageWriteParam;
24	28
..	..	@@ -30,6 +34,7 @@
30	34	import java.nio.*;
31	35
32	36	import gleem.linalg.Mat4f;
	37	+import javax.imageio.ImageTypeSpecifier;
33	38
34	39	class CameraPane extends GLCanvas implements iCameraPane, Runnable, GLEventListener, ActionListener, MouseWheelListener, MouseMotionListener, MouseListener, KeyListener
35	40	{
..	..	@@ -37,7 +42,6 @@
37	42	static boolean[] selectedstack = new boolean[65536];
38	43	static int materialdepth = 0;
39	44
40		- static boolean DEBUG = false;
41	45	static boolean FRUSTUM = false; // still bogus true; // frustum culling
42	46
43	47	// camera change fix
..	..	@@ -45,6 +49,39 @@
45	49	static boolean ABORTED = false;
46	50
47	51	static int STEP = 1;
	52	+
	53	+ private static BufferedImage CreateBim(byte[] bytes, int width, int height)
	54	+ {
	55	+ int[] pixels = new int[bytes.length/3];
	56	+ for (int i=pixels.length; --i>=0;)
	57	+ {
	58	+ int i3 = i*3;
	59	+ pixels[i] = 0xFF;
	60	+ pixels[i] <<= 8;
	61	+ pixels[i] \|= bytes[i3+2] & 0xFF;
	62	+ pixels[i] <<= 8;
	63	+ pixels[i] \|= bytes[i3+1] & 0xFF;
	64	+ pixels[i] <<= 8;
	65	+ pixels[i] \|= bytes[i3] & 0xFF;
	66	+ }
	67	+ /*
	68	+ int r=0,g=0,b=0,a=0;
	69	+ for (int i=0; i<width; i++)
	70	+ for (int j=0; j<height; j++)
	71	+ {
	72	+ int index = j*width+i;
	73	+ int p = pixels[index];
	74	+ a = ((p>>24) & 0xFF);
	75	+ r = ((p>>16) & 0xFF);
	76	+ g = ((p>>8) & 0xFF);
	77	+ b = (p & 0xFF);
	78	+ pixels[index] = (a<<24) \| (b<<16) \| (g<<8) \| r;
	79	+ }
	80	+ /**/
	81	+ BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
	82	+ rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
	83	+ return rendImage;
	84	+ }
48	85
49	86	/static/ private boolean CULLFACE = false; // true;
50	87	/static/ boolean NEAREST = false; // true;
..	..	@@ -56,14 +93,12 @@
56	93	static int CURRENTANTIALIAS = 0; // 1;
57	94	/static/ boolean RENDERSHADOW = true;
58	95	/static/ int RENDERPROGRAM = 2; // 0 == none, 1 == fast, 2 == normal
59		- static boolean ANIMATION = false;
60		- static String filename;
61	96
62	97	boolean DISPLAYTEXT = false;
63	98	//boolean REDUCETEXTURE = true;
64	99	boolean CACHETEXTURE = true;
65	100	boolean CLEANCACHE = false; // true;
66		- boolean MIPMAP = false; // true;
	101	+ boolean MIPMAP = false; // true; // never works...
67	102	boolean COMPRESSTEXTURE = false;
68	103	boolean KOMPACTTEXTURE = false; // true;
69	104	boolean RESIZETEXTURE = false;
..	..	@@ -76,7 +111,11 @@
76	111	//private Mat4f spotlightTransform = new Mat4f();
77	112	//private Mat4f spotlightInverseTransform = new Mat4f();
78	113	static GLContext glcontext = null;
79		- /static/ com.sun.opengl.util.texture.Texture cubemap;
	114	+ /static/ com.sun.opengl.util.texture.Texture cubemap; // Either custom or rgb
	115	+ /static/ com.sun.opengl.util.texture.Texture cubemapcustom;
	116	+ /static/ com.sun.opengl.util.texture.Texture cubemaprgb;
	117	+ boolean transformMode;
	118	+
80	119	boolean reverseUP = false;
81	120	static boolean frozen = false;
82	121	boolean enablebackspace = false; // patch for back buffer refresh
..	..	@@ -92,9 +131,11 @@
92	131
93	132	static int tickcount = 0; // slow pose issue
94	133
	134	+static boolean BUTTONLESSWHEEL = false;
	135	+static boolean ZOOMBOXMODE = false;
95	136	static boolean BOXMODE = false;
96	137	static boolean IMAGEFLIP = false;
97		-static boolean SMOOTHFOCUS = false;
	138	+static boolean SMOOTHFOCUS = true; // false;
98	139	static boolean SPEAKERMOCAP = true; // jan 2014 false;
99	140	static boolean SPEAKERCAMERA = false;
100	141	static boolean SPEAKERFOCUS = false;
..	..	@@ -106,7 +147,7 @@
106	147	static boolean OEIL = true;
107	148	static boolean OEILONCE = false; // do oeilon then oeiloff
108	149	static boolean LOOKAT = true;
109		-static boolean RANDOM = true; // false;
	150	+static boolean SWITCH = true; // false;
110	151	static boolean HANDLES = false; // selection doesn't work!!
111	152	static boolean PAINTMODE = false;
112	153
..	..	@@ -128,16 +169,16 @@
128	169
129	170
130	171	// OPTIONS
131		- boolean Skinshader = true;
	172	+ boolean Skinshader = false; // true;
132	173	boolean cameraLight = false;
133	174	boolean UVdebug = false;
134	175	boolean Udebug = false;
135	176	boolean Vdebug = false;
136	177	boolean NORMALdebug = false;
137		- static boolean doublesided = false; // true; // reversed normals are awful for conformance
	178	+ static boolean doublesided = true; // false; // reversed normals are awful for conformance
138	179	boolean anisotropy = true;
139	180	boolean softshadow = true; // slower but better false;
140		- boolean opacityhalo = false;
	181	+ boolean opacityhalo = false; // reverse the halo effect (e.g. glass)
141	182
142	183	boolean macromode = false;
143	184
..	..	@@ -149,12 +190,26 @@
149	190	defaultcaps.setAccumBlueBits(16);
150	191	defaultcaps.setAccumAlphaBits(16);
151	192	}
152		- static CameraPane theRenderer;
	193	+
	194	+ private File defaultDirectory = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory();
153	195
	196	+ public com.sun.opengl.util.texture.Texture LoadSkybox(String name, String ext, boolean mipmap) throws GLException
	197	+ {
	198	+ try
	199	+ {
	200	+ return LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
	201	+ } catch (IOException e)
	202	+ {
	203	+ System.out.println("NAME = " + name);
	204	+ e.printStackTrace(); // throw new RuntimeException(e);
	205	+ return null;
	206	+ }
	207	+ }
	208	+
154	209	void SetAsGLRenderer(boolean b)
155	210	{
156	211	isRenderer = b;
157		- theRenderer = this;
	212	+ Globals.theRenderer = this;
158	213	}
159	214
160	215	CameraPane(Object3D o, Camera cam, boolean withcontext)
..	..	@@ -167,9 +222,10 @@
167	222	cameras = new Camera[2];
168	223	targetLookAts = new cVector[2];
169	224
170		- SetCamera(cam);
	225	+ SetCamera(cam, true);
171	226
172		- SetLight(new Camera(new cVector(10, 10, -20)));
	227	+ // Warning: not used.
	228	+ //SetLight(new Camera(new cVector(15, 10, -20)));
173	229
174	230	object = o;
175	231
..	..	@@ -192,9 +248,43 @@
192	248
193	249	/// INTERFACE
194	250
	251	+ public javax.media.opengl.GL GetGL0()
	252	+ {
	253	+ return null;
	254	+ }
	255	+
	256	+ public int GenList()
	257	+ {
	258	+ javax.media.opengl.GL gl = GetGL();
	259	+ return gl.glGenLists(1);
	260	+ }
	261	+
	262	+ public void NewList(int id)
	263	+ {
	264	+ javax.media.opengl.GL gl = GetGL();
	265	+ gl.glNewList(id, gl.GL_COMPILE); //_AND_EXECUTE);
	266	+ }
	267	+
	268	+ public void CallList(int id)
	269	+ {
	270	+ javax.media.opengl.GL gl = GetGL();
	271	+ gl.glCallList(id);
	272	+ }
	273	+
	274	+ public void EndList()
	275	+ {
	276	+ javax.media.opengl.GL gl = GetGL();
	277	+ gl.glEndList();
	278	+ }
	279	+
195	280	public boolean IsBoxMode()
196	281	{
197	282	return BOXMODE;
	283	+ }
	284	+
	285	+ public boolean IsZoomBoxMode()
	286	+ {
	287	+ return ZOOMBOXMODE;
198	288	}
199	289
200	290	public void ClearDepth()
..	..	@@ -236,9 +326,14 @@
236	326	return this.ambientOcclusion;
237	327	}
238	328
	329	+ public boolean IsDebugSelection()
	330	+ {
	331	+ return DEBUG_SELECTION;
	332	+ }
	333	+
239	334	public boolean IsFrozen()
240	335	{
241		- boolean selectmode = this.DrawMode() == SELECTION \|\| CameraPane.DEBUG_SELECTION;
	336	+ boolean selectmode = this.DrawMode() == SELECTION \|\| this.IsDebugSelection();
242	337
243	338	return !selectmode && cameracount == 0; // != 0;
244	339	}
..	..	@@ -259,9 +354,19 @@
259	354	return lightCamera;
260	355	}
261	356
	357	+ public Camera ManipCamera()
	358	+ {
	359	+ return manipCamera;
	360	+ }
	361	+
262	362	public Camera RenderCamera()
263	363	{
264	364	return renderCamera;
	365	+ }
	366	+
	367	+ public Camera[] Cameras()
	368	+ {
	369	+ return cameras;
265	370	}
266	371
267	372	public void PushMaterial(Object3D obj, boolean selected)
..	..	@@ -277,7 +382,7 @@
277	382	cStatic.objectstack[materialdepth++] = obj;
278	383	//System.out.println("material " + material);
279	384	//Applet3D.tracein(this, selected);
280		- display.vector2buffer = obj.projectedVertices;
	385	+ //display.vector2buffer = obj.projectedVertices;
281	386	if (obj instanceof Camera)
282	387	{
283	388	display.options1[0] = material.shift;
..	..	@@ -286,14 +391,28 @@
286	391	display.options1[2] = material.shadowbias;
287	392	display.options1[3] = material.aniso;
288	393	display.options1[4] = material.anisoV;
	394	+// System.out.println("display.options1[0] " + display.options1[0]);
	395	+// System.out.println("display.options1[1] " + display.options1[1]);
	396	+// System.out.println("display.options1[2] " + display.options1[2]);
	397	+// System.out.println("display.options1[3] " + display.options1[3]);
	398	+// System.out.println("display.options1[4] " + display.options1[4]);
289	399	display.options2[0] = material.opacity;
290	400	display.options2[1] = material.diffuse;
291	401	display.options2[2] = material.factor;
	402	+// System.out.println("display.options2[0] " + display.options2[0]);
	403	+// System.out.println("display.options2[1] " + display.options2[1]);
	404	+// System.out.println("display.options2[2] " + display.options2[2]);
292	405
293	406	cColor.HSBtoRGB(material.color, material.modulation, 1, display.options3);
	407	+// System.out.println("display.options3[0] " + display.options3[0]);
	408	+// System.out.println("display.options3[1] " + display.options3[1]);
	409	+// System.out.println("display.options3[2] " + display.options3[2]);
294	410	display.options4[0] = material.cameralight/0.2f;
295	411	display.options4[1] = material.subsurface;
296	412	display.options4[2] = material.sheen;
	413	+// System.out.println("display.options4[0] " + display.options4[0]);
	414	+// System.out.println("display.options4[1] " + display.options4[1]);
	415	+// System.out.println("display.options4[2] " + display.options4[2]);
297	416
298	417	// if (display.CURRENTANTIALIAS > 0)
299	418	// display.options3[3] /= 4;
..	..	@@ -309,7 +428,7 @@
309	428	/**/
310	429	} else
311	430	{
312		- DrawMaterial(material, selected);
	431	+ DrawMaterial(material, selected, obj.projectedVertices);
313	432	}
314	433	} else
315	434	{
..	..	@@ -333,8 +452,8 @@
333	452	cStatic.objectstack[materialdepth++] = obj;
334	453	//System.out.println("material " + material);
335	454	//Applet3D.tracein("selected ", selected);
336		- display.vector2buffer = obj.projectedVertices;
337		- display.DrawMaterial(material, selected);
	455	+ //display.vector2buffer = obj.projectedVertices;
	456	+ display.DrawMaterial(material, selected, obj.projectedVertices);
338	457	}
339	458	}
340	459
..	..	@@ -351,8 +470,8 @@
351	470	materialdepth -= 1;
352	471	if (materialdepth > 0)
353	472	{
354		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
355		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	473	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	474	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
356	475	}
357	476	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
358	477	} else if (selected && CameraPane.flash && obj.GetMaterial() != null)
..	..	@@ -372,8 +491,8 @@
372	491	materialdepth -= 1;
373	492	if (materialdepth > 0)
374	493	{
375		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
376		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	494	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	495	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
377	496	}
378	497	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
379	498	//else
..	..	@@ -408,21 +527,24 @@
408	527
409	528	javax.media.opengl.GL gl = display.GetGL();
410	529
411		- boolean selectmode = display.DrawMode() == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
	530	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
412	531
413	532	//System.out.println("p = " + pv + "; q = " + qv + "; r = " + rv);
414	533	if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
415	534	{
416	535	//gl.glBegin(gl.GL_TRIANGLES);
417		- boolean hasnorm = pv.norm != null; // && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0);
	536	+ boolean hasnorm = pv.norm != null && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0)
	537	+ // TEST LIVE NORMALS && !obj.dontselect
	538	+ ;
418	539	if (!hasnorm)
419	540	{
420		- // System.out.println("FUCK!!");
	541	+ // System.out.println("Mesh normal");
421	542	LA.vecSub(pv/.pos/, qv/.pos/, obj.v0);
422	543	LA.vecSub(pv/.pos/, rv/.pos/, obj.v1);
423	544	LA.vecCross(obj.v0, obj.v1, obj.v2);
424	545	LA.vecNormalize(obj.v2);
425		- gl.glNormal3f((float) obj.v2.x, (float) obj.v2.y, (float) obj.v2.z);
	546	+
	547	+ SetGLNormal(gl, (float) obj.v2.x, (float) obj.v2.y, (float) obj.v2.z);
426	548	}
427	549
428	550	// P
..	..	@@ -444,7 +566,7 @@
444	566	y += ny * obj.NORMALPUSH;
445	567	z += nz * obj.NORMALPUSH;
446	568
447		- gl.glNormal3f(nx, ny, nz);
	569	+ SetGLNormal(gl, nx, ny, nz);
448	570	}
449	571	gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
450	572	SetColor(obj, pv);
..	..	@@ -476,7 +598,7 @@
476	598	y += ny * obj.NORMALPUSH;
477	599	z += nz * obj.NORMALPUSH;
478	600
479		- gl.glNormal3f(nx, ny, nz);
	601	+ SetGLNormal(gl, nx, ny, nz);
480	602	}
481	603	//System.out.println("vertexq = " + qv.s + ", " + qv.t);
482	604	// boolean locked = false;
..	..	@@ -524,7 +646,7 @@
524	646	y += ny * obj.NORMALPUSH;
525	647	z += nz * obj.NORMALPUSH;
526	648
527		- gl.glNormal3f(nx, ny, nz);
	649	+ SetGLNormal(gl, nx, ny, nz);
528	650	}
529	651
530	652	// if ((dot&4) == 0)
..	..	@@ -760,8 +882,630 @@
760	882	//// tris.postdraw(this);
761	883	}
762	884
	885	+ static Camera localAOcamera = new Camera();
	886	+ static cVector from = new cVector();
	887	+ static cVector to = new cVector();
	888	+
	889	+ public void PrepOcclusion(BoundaryRep br, double[][] transform)
	890	+ {
	891	+ CameraPane cp = this;
	892	+
	893	+ Camera keep = cp.RenderCamera();
	894	+ cp.renderCamera = localAOcamera;
	895	+
	896	+ if (br.trimmed)
	897	+ {
	898	+ float[] colors = new float[br.positions.length / 3];
	899	+
	900	+ int i3 = 0;
	901	+ for (int i = 0; i < br.positions.length / 3; i++, i3 += 3)
	902	+ {
	903	+ if (br.normals[i3] == 0 && br.normals[i3+1] == 0 && br.normals[i3+2] == 0)
	904	+ continue;
	905	+
	906	+ from.set(br.positions[i3], br.positions[i3 + 1], br.positions[i3 + 2]);
	907	+ to.set(br.positions[i3] + br.normals[i3],
	908	+ br.positions[i3 + 1] + br.normals[i3 + 1],
	909	+ br.positions[i3 + 2] + br.normals[i3 + 2]);
	910	+ LA.xformPos(from, transform, from);
	911	+ LA.xformPos(to, transform, to); // RIGID ONLY
	912	+ localAOcamera.setAim(from, to);
	913	+
	914	+ CameraPane.occlusionbuffer.display();
	915	+
	916	+ if (CameraPane.DEBUG_OCCLUSION)
	917	+ cp.display(); // debug
	918	+
	919	+ colors[i] = cp.vertexOcclusion.r;
	920	+ //colors[i3 + 1] = cp.vertexOcclusion.g;
	921	+ //colors[i3 + 2] = cp.vertexOcclusion.b;
	922	+
	923	+ if ((i % 100) == 0 && i != 0)
	924	+ {
	925	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	926	+ //System.out.println("Color = " + cp.vertexOcclusion.r + ", " + cp.vertexOcclusion.g + ", " + cp.vertexOcclusion.b + "; " + (int)(100.0*i/(positions.length/3)) + "% done");
	927	+ System.out.println((int) (100.0 * i / (br.positions.length / 3)) + "% (" + i + " of " + (br.positions.length / 3) + ")");
	928	+ }
	929	+ }
	930	+
	931	+ br.colors = colors;
	932	+ }
	933	+ else
	934	+ {
	935	+ for (int i = 0; i < br.VertexCount(); i++)
	936	+ {
	937	+ Vertex v = br.GetVertex(i);
	938	+
	939	+ if (v.norm == null \|\| v.norm.x == 0 && v.norm.y == 0 && v.norm.z == 0)
	940	+ continue;
	941	+
	942	+ from.set(v.x, v.y, v.z);
	943	+ to.set(v.x+v.norm.x, v.y+v.norm.y, v.z+v.norm.z);
	944	+ LA.xformPos(from, transform, from);
	945	+ LA.xformPos(to, transform, to); // RIGID ONLY
	946	+ localAOcamera.setAim(from, to);
	947	+
	948	+ CameraPane.occlusionbuffer.display();
	949	+
	950	+ if (CameraPane.DEBUG_OCCLUSION)
	951	+ cp.display(); // debug
	952	+
	953	+ v.AO = cp.vertexOcclusion.r;
	954	+
	955	+ if ((i % 100) == 0 && i != 0)
	956	+ {
	957	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	958	+ //System.out.println("Color = " + cp.vertexOcclusion.r + ", " + cp.vertexOcclusion.g + ", " + cp.vertexOcclusion.b + "; " + (int)(100.0*i/(positions.length/3)) + "% done");
	959	+ System.out.println((int) (100.0 * i / br.VertexCount()) + "% (" + i + " of " + br.VertexCount() + ")");
	960	+ }
	961	+ }
	962	+ }
	963	+
	964	+ //System.out.println("done.");
	965	+
	966	+ cp.renderCamera = keep;
	967	+ }
	968	+
	969	+ void DrawPointFLow(PointFlow pointFlow, Object3D /Composite/ root, boolean selected, boolean blocked)
	970	+ {
	971	+ CameraPane display = this;
	972	+ pointFlow.CreateHT();
	973	+
	974	+ float r = display.modelParams0[0];
	975	+ float g = display.modelParams0[1];
	976	+ float b = display.modelParams0[2];
	977	+ float opacity = display.modelParams5[1];
	978	+
	979	+ //final GL gl = GLU.getCurrentGL();
	980	+ GL gl = display.GetGL(); // getGL();
	981	+
	982	+ int s = pointFlow.points.size();
	983	+
	984	+ boolean cf = gl.glIsEnabled(gl.GL_CULL_FACE);
	985	+ gl.glEnable(gl.GL_CULL_FACE);
	986	+
	987	+ for (int i=s; --i>=0;)
	988	+ //for (int i=0; i<s; i++)
	989	+ {
	990	+ cVector v = pointFlow.points.get(i);
	991	+
	992	+ double mindist = Double.MAX_VALUE;
	993	+
	994	+ double size = pointFlow.minimumSize;
	995	+
	996	+ double distancenext = 0;
	997	+
	998	+ if (i > 0)
	999	+ {
	1000	+ cVector w = pointFlow.points.get(i-1);
	1001	+
	1002	+ double dist = w.distance(v);
	1003	+
	1004	+ distancenext = dist;
	1005	+
	1006	+ if (mindist > dist)
	1007	+ {
	1008	+ mindist = dist;
	1009	+ size = mindist*pointFlow.resizefactor;
	1010	+ }
	1011	+ }
	1012	+
	1013	+ if (i < s-1)
	1014	+ {
	1015	+ cVector w = pointFlow.points.get(i+1);
	1016	+
	1017	+ double dist = w.distance(v);
	1018	+
	1019	+ if (mindist > dist)
	1020	+ {
	1021	+ mindist = dist;
	1022	+ size = mindist*pointFlow.resizefactor;
	1023	+ }
	1024	+ }
	1025	+
	1026	+ if (size < pointFlow.minimumSize)
	1027	+ size = pointFlow.minimumSize;
	1028	+ if (size > pointFlow.maximumSize)
	1029	+ size = pointFlow.maximumSize;
	1030	+
	1031	+ double tx = v.x;
	1032	+ double ty = v.y;
	1033	+ double tz = v.z;
	1034	+
	1035	+ // if (tx == 0 && ty == 0 && tz == 0)
	1036	+ // continue;
	1037	+
	1038	+ gl.glMatrixMode(gl.GL_TEXTURE);
	1039	+ gl.glPushMatrix();
	1040	+ pointFlow.texmat[12] = pointFlow.texmat[13] = pointFlow.texmat[14] = i;
	1041	+
	1042	+ gl.glMultMatrixf(pointFlow.texmat, 0);
	1043	+
	1044	+ gl.glMatrixMode(gl.GL_MODELVIEW);
	1045	+ gl.glPushMatrix();
	1046	+
	1047	+ gl.glTranslated(tx,ty,tz);
	1048	+
	1049	+ gl.glScaled(size,size,size);
	1050	+
	1051	+// float cr = colorBuf.get(index4);
	1052	+// float cg = colorBuf.get(index4+1);
	1053	+// float cb = colorBuf.get(index4+2);
	1054	+// float ca = colorBuf.get(index4+3);
	1055	+//
	1056	+// display.modelParams0[0] = r * cr;
	1057	+// display.modelParams0[1] = g * cg;
	1058	+// display.modelParams0[2] = b * cb;
	1059	+//
	1060	+// display.modelParams5[1] = opacity * ca;
	1061	+//
	1062	+// gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 0, display.modelParams0, 0);
	1063	+// gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 5, display.modelParams5, 0);
	1064	+//
	1065	+// RandomNode.globalseed = (int)sizeBuf.get(index3+2); // i;
	1066	+// RandomNode.globalseed2 = RandomNode.globalseed;
	1067	+//
	1068	+//// gl.glColor4f(cr,cg,cb,ca);
	1069	+// // gl.glScalef(1024/16,1024/16,1024/16);
	1070	+ pointFlow.geo.Draw/Node/(display,null,selected, blocked);
	1071	+
	1072	+ gl.glPopMatrix();
	1073	+
	1074	+ double step = size/4; //
	1075	+
	1076	+ if (i == 0 \|\| size == 0 \|\| distancenext > 8*size \|\| distancenext < step)
	1077	+ continue;
	1078	+
	1079	+ int nbsteps = (int)(distancenext/step);
	1080	+
	1081	+ step = distancenext/nbsteps;
	1082	+
	1083	+ cVector next = pointFlow.points.get(i-1);
	1084	+
	1085	+ tmp.set(next);
	1086	+ tmp.sub(v);
	1087	+ tmp.normalize();
	1088	+ tmp.mul(step);
	1089	+
	1090	+ // calculate next size
	1091	+ mindist = Double.MAX_VALUE;
	1092	+
	1093	+ double nextsize = pointFlow.minimumSize;
	1094	+
	1095	+ if (i > 1)
	1096	+ {
	1097	+ cVector w = pointFlow.points.get(i-2);
	1098	+
	1099	+ double dist = w.distance(next);
	1100	+
	1101	+ if (mindist > dist)
	1102	+ {
	1103	+ mindist = dist;
	1104	+ nextsize = mindist*pointFlow.resizefactor;
	1105	+ }
	1106	+ }
	1107	+
	1108	+ double dist = v.distance(next);
	1109	+
	1110	+ if (mindist > dist)
	1111	+ {
	1112	+ mindist = dist;
	1113	+ nextsize = mindist*pointFlow.resizefactor;
	1114	+ }
	1115	+
	1116	+ if (nextsize < pointFlow.minimumSize)
	1117	+ nextsize = pointFlow.minimumSize;
	1118	+ if (nextsize > pointFlow.maximumSize)
	1119	+ nextsize = pointFlow.maximumSize;
	1120	+ //
	1121	+
	1122	+ double count = 0;
	1123	+
	1124	+ while (distancenext > 0.000000001) // step
	1125	+ {
	1126	+ gl.glPushMatrix();
	1127	+
	1128	+ gl.glTranslated(tx + tmp.xcount, ty + tmp.ycount, tz + tmp.z*count);
	1129	+
	1130	+ double K = count/nbsteps;
	1131	+
	1132	+ double intersize = Knextsize + (1-K)size;
	1133	+
	1134	+ gl.glScaled(intersize,intersize,intersize);
	1135	+
	1136	+ pointFlow.geo.Draw/Node/(display,null,selected,blocked);
	1137	+
	1138	+ count++;
	1139	+
	1140	+ distancenext -= step;
	1141	+
	1142	+ gl.glPopMatrix();
	1143	+ }
	1144	+
	1145	+ if (count != nbsteps)
	1146	+ assert(count == nbsteps);
	1147	+
	1148	+ // gl.glScalef(16.0f/1024,16.0f/1024,16.0f/1024);
	1149	+ //gl.glTranslatef(-tx,-ty,-tz);
	1150	+
	1151	+ gl.glMatrixMode(gl.GL_TEXTURE);
	1152	+ gl.glPopMatrix();
	1153	+ }
	1154	+
	1155	+ if (!cf)
	1156	+ gl.glDisable(gl.GL_CULL_FACE);
	1157	+
	1158	+// display.modelParams0[0] = r;
	1159	+// display.modelParams0[1] = g;
	1160	+// display.modelParams0[2] = b;
	1161	+//
	1162	+// display.modelParams5[1] = opacity;
	1163	+//
	1164	+// gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 0, display.modelParams0, 0);
	1165	+// gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 5, display.modelParams5, 0);
	1166	+
	1167	+ gl.glMatrixMode(gl.GL_MODELVIEW);
	1168	+ }
	1169	+
	1170	+ public void DrawBox(cVector min, cVector max)
	1171	+ {
	1172	+ javax.media.opengl.GL gl = GetGL();
	1173	+ gl.glBegin(gl.GL_LINES);
	1174	+
	1175	+ gl.glVertex3d(min.x, min.y, min.z);
	1176	+ gl.glVertex3d(min.x, min.y, max.z);
	1177	+ gl.glVertex3d(min.x, min.y, min.z);
	1178	+ gl.glVertex3d(min.x, max.y, min.z);
	1179	+ gl.glVertex3d(min.x, min.y, min.z);
	1180	+ gl.glVertex3d(max.x, min.y, min.z);
	1181	+
	1182	+ gl.glVertex3d(max.x, max.y, max.z);
	1183	+ gl.glVertex3d(min.x, max.y, max.z);
	1184	+ gl.glVertex3d(max.x, max.y, max.z);
	1185	+ gl.glVertex3d(max.x, min.y, max.z);
	1186	+ gl.glVertex3d(max.x, max.y, max.z);
	1187	+ gl.glVertex3d(max.x, max.y, min.z);
	1188	+
	1189	+ gl.glEnd();
	1190	+ }
	1191	+
	1192	+ public void DrawGeometry(BoundaryRep bRep, boolean flipV, boolean selectmode)
	1193	+ {
	1194	+ int[] strips = bRep.getRawIndices();
	1195	+
	1196	+ javax.media.opengl.GL gl = GetGL();
	1197	+
	1198	+ // TRIANGLE STRIP ARRAY
	1199	+ if (bRep.trimmed)
	1200	+ {
	1201	+ float[] v = bRep.getRawVertices();
	1202	+ float[] n = bRep.getRawNormals();
	1203	+ float[] c = bRep.getRawColors();
	1204	+ float[] uv = bRep.getRawUVMap();
	1205	+
	1206	+ int count2 = 0;
	1207	+ int count3 = 0;
	1208	+
	1209	+ if (n.length > 0)
	1210	+ {
	1211	+ for (int i = 0; i < strips.length; i++)
	1212	+ {
	1213	+ gl.glBegin(gl.GL_TRIANGLE_STRIP);
	1214	+
	1215	+ /*
	1216	+ boolean locked = false;
	1217	+ float eps = 0.1f;
	1218	+ boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
	1219	+
	1220	+ int dot = 0;
	1221	+
	1222	+ if ((dot&1) == 0)
	1223	+ dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
	1224	+
	1225	+ if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
	1226	+ gl.glTexCoord2f((float) qv.s, (float) qv.t);
	1227	+ else
	1228	+ {
	1229	+ locked = true;
	1230	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	1231	+ }
	1232	+ //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
	1233	+ gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
	1234	+ if (hasnorm)
	1235	+ {
	1236	+ //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
	1237	+ gl.glNormal3f((float) rv.norm.x, (float) rv.norm.y, (float) rv.norm.z);
	1238	+ }
	1239	+
	1240	+ if ((dot&4) == 0)
	1241	+ dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
	1242	+
	1243	+ if (wrap \|\| !locked && (dot&8) != 0)
	1244	+ gl.glTexCoord2f((float) rv.s, (float) rv.t);
	1245	+ else
	1246	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	1247	+
	1248	+ f.dot = dot;
	1249	+ */
	1250	+
	1251	+ if (!selectmode)
	1252	+ {
	1253	+ if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
	1254	+ {
	1255	+ SetGLNormal(gl, n[count3], n[count3 + 1], n[count3 + 2]);
	1256	+ } else
	1257	+ {
	1258	+ SetGLNormal(gl, 0, 0, 1);
	1259	+ }
	1260	+
	1261	+ if (c != null)
	1262	+ //System.out.println("glcolor = " + c[count3] + ", " + c[count3+1] + ", " + c[count3+2]);
	1263	+ {
	1264	+ gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
	1265	+ }
	1266	+ }
	1267	+
	1268	+ if (flipV)
	1269	+ gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
	1270	+ else
	1271	+ gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1272	+
	1273	+ //System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
	1274	+ gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1275	+
	1276	+ count2 += 2;
	1277	+ count3 += 3;
	1278	+ if (!selectmode)
	1279	+ {
	1280	+ if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
	1281	+ {
	1282	+ SetGLNormal(gl, n[count3], n[count3 + 1], n[count3 + 2]);
	1283	+ } else
	1284	+ {
	1285	+ SetGLNormal(gl, 0, 0, 1);
	1286	+ }
	1287	+ if (c != null)
	1288	+ {
	1289	+ gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
	1290	+ }
	1291	+ }
	1292	+
	1293	+ if (flipV)
	1294	+ gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
	1295	+ else
	1296	+ gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1297	+
	1298	+ //System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
	1299	+ gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1300	+
	1301	+ count2 += 2;
	1302	+ count3 += 3;
	1303	+ for (int j = 0; j < strips[i] - 2; j++)
	1304	+ {
	1305	+ //gl.glTexCoord2d(...);
	1306	+ if (!selectmode)
	1307	+ {
	1308	+ if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
	1309	+ {
	1310	+ SetGLNormal(gl, n[count3], n[count3 + 1], n[count3 + 2]);
	1311	+ } else
	1312	+ {
	1313	+ SetGLNormal(gl, 0, 0, 1);
	1314	+ }
	1315	+ if (c != null)
	1316	+ {
	1317	+ gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
	1318	+ }
	1319	+ }
	1320	+
	1321	+ if (flipV)
	1322	+ gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
	1323	+ else
	1324	+ gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1325	+
	1326	+ //System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
	1327	+ gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1328	+
	1329	+ count2 += 2;
	1330	+ count3 += 3;
	1331	+ }
	1332	+
	1333	+ gl.glEnd();
	1334	+ }
	1335	+ }
	1336	+
	1337	+ assert count3 == v.length;
	1338	+ }
	1339	+ else // !trimmed
	1340	+ {
	1341	+ int count = 0;
	1342	+ for (int i = 0; i < strips.length; i++)
	1343	+ {
	1344	+ gl.glBegin(gl.GL_TRIANGLE_STRIP);
	1345	+
	1346	+ Vertex p = bRep.GetVertex(bRep.indices[count++]);
	1347	+ Vertex q = bRep.GetVertex(bRep.indices[count++]);
	1348	+
	1349	+ drawVertex(gl, p, flipV, selectmode);
	1350	+ drawVertex(gl, q, flipV, selectmode);
	1351	+
	1352	+ for (int j = 0; j < strips[i] - 2; j++)
	1353	+ {
	1354	+ Vertex r = bRep.GetVertex(bRep.indices[count++]);
	1355	+
	1356	+ // if (j%2 == 0)
	1357	+ // drawFace(p, q, r, display, null);
	1358	+ // else
	1359	+ // drawFace(p, r, q, display, null);
	1360	+
	1361	+ // p = q;
	1362	+ // q = r;
	1363	+ drawVertex(gl, r, flipV, selectmode);
	1364	+ }
	1365	+
	1366	+ gl.glEnd();
	1367	+ }
	1368	+ }
	1369	+ }
	1370	+
	1371	+ static cSpring.Point3D temp = new cSpring.Point3D();
	1372	+ static cSpring.Point3D temp2 = new cSpring.Point3D();
	1373	+ static cSpring.Point3D temp3 = new cSpring.Point3D();
	1374	+
	1375	+ public void DrawDynamicMesh(cMesh mesh)
	1376	+ {
	1377	+ GL gl = GetGL(); // getGL();
	1378	+
	1379	+ cSpring.PhysicsController3D Phys = mesh.Phys;
	1380	+
	1381	+ gl.glDisable(gl.GL_LIGHTING);
	1382	+
	1383	+ gl.glLineWidth(1);
	1384	+ gl.glColor3f(1,1,1);
	1385	+ gl.glBegin(gl.GL_LINES);
	1386	+ double scale = 0;
	1387	+ int count = 0;
	1388	+ for (int s=0; s<Phys.allSprings.size(); s++)
	1389	+ {
	1390	+ cSpring.Spring spring = Phys.allSprings.get(s);
	1391	+ if(s == 0)
	1392	+ {
	1393	+ //System.out.println(" spring : " + spring.a.position + "; " + spring.b.position);
	1394	+ }
	1395	+ if (mesh.showsprings)
	1396	+ {
	1397	+ temp.set(spring.a.position);
	1398	+ temp.add(spring.b.position);
	1399	+ temp.mul(0.5);
	1400	+ temp2.set(spring.a.position);
	1401	+ temp2.sub(spring.b.position);
	1402	+ temp2.mul(spring.restLength/2);
	1403	+ temp.sub(temp2);
	1404	+ gl.glVertex3f((float)temp.x, (float)temp.y, (float)temp.z);
	1405	+ temp.add(temp2);
	1406	+ temp.add(temp2);
	1407	+ gl.glVertex3f((float)temp.x, (float)temp.y, (float)temp.z);
	1408	+ }
	1409	+
	1410	+ if (spring.isHandle)
	1411	+ continue;
	1412	+
	1413	+ //if (scale < spring.restLength)
	1414	+ scale += spring.restLength;
	1415	+ count++;
	1416	+ }
	1417	+ gl.glEnd();
	1418	+
	1419	+ if (count == 0)
	1420	+ scale = 0.01;
	1421	+ else
	1422	+ scale /= count * 3;
	1423	+
	1424	+ //scale = 0.25;
	1425	+
	1426	+ if (mesh.ShowInfo())
	1427	+ {
	1428	+ gl.glLineWidth(4);
	1429	+ for (int s=0; s<Phys.allNodes.size(); s++)
	1430	+ {
	1431	+ cSpring.DynamicNode node = Phys.allNodes.get(s);
	1432	+ if (node.mass == 0)
	1433	+ continue;
	1434	+
	1435	+ int i = node.springs==null?-1:node.springs.size();
	1436	+ gl.glColor3f((i>>2)&1,(i>>1)&1,i&1);
	1437	+ //temp.set(node.springForce.x, node.springForce.y, node.springForce.z);
	1438	+ //temp.normalize();
	1439	+ //gl.glColor3d((temp.x+1)/2, (temp.y+1)/2, (temp.z+1)/2);
	1440	+ gl.glBegin(gl.GL_LINES);
	1441	+ gl.glVertex3d(node.position.x, node.position.y, node.position.z);
	1442	+ //gl.glVertex3d(node.position.x + node.normal.xscale, node.position.y + node.normal.yscale, node.position.z + node.normal.z*scale);
	1443	+ gl.glVertex3d(node.position.x + mesh.bRep.GetVertex(s).norm.x*scale,
	1444	+ node.position.y + mesh.bRep.GetVertex(s).norm.y*scale,
	1445	+ node.position.z + mesh.bRep.GetVertex(s).norm.z*scale);
	1446	+ gl.glEnd();
	1447	+ }
	1448	+
	1449	+ gl.glLineWidth(8);
	1450	+ for (int s=0; s<Phys.allNodes.size(); s++)
	1451	+ {
	1452	+ cSpring.DynamicNode node = Phys.allNodes.get(s);
	1453	+
	1454	+ if (node.springs != null)
	1455	+ {
	1456	+ for (int i=0; i<node.springs.size(); i+=1)
	1457	+ {
	1458	+ cSpring.DynamicNode f = node.springs.get(i).GetOther(node);
	1459	+
	1460	+ int c = i+1;
	1461	+ // c = node.springs.get(i).nbcopies;
	1462	+
	1463	+ gl.glColor3f((c>>2)&1,(c>>1)&1,c&1);
	1464	+ gl.glBegin(gl.GL_LINES);
	1465	+ gl.glVertex3d(node.position.x, node.position.y, node.position.z);
	1466	+ 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);
	1467	+ gl.glEnd();
	1468	+ }
	1469	+ }
	1470	+ }
	1471	+
	1472	+ gl.glLineWidth(1);
	1473	+ }
	1474	+
	1475	+ gl.glEnable(gl.GL_LIGHTING);
	1476	+ }
	1477	+
763	1478	/// INTERFACE
764	1479
	1480	+ public void StartTriangles()
	1481	+ {
	1482	+ javax.media.opengl.GL gl = GetGL();
	1483	+ gl.glBegin(gl.GL_TRIANGLES);
	1484	+ }
	1485	+
	1486	+ public void EndTriangles()
	1487	+ {
	1488	+ GetGL().glEnd();
	1489	+ }
	1490	+
	1491	+ void drawVertex(javax.media.opengl.GL gl, Vertex pv, boolean flipV, boolean selectmode)
	1492	+ {
	1493	+ if (!selectmode)
	1494	+ {
	1495	+ SetGLNormal(gl, (float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
	1496	+ gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
	1497	+
	1498	+ if (flipV)
	1499	+ gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
	1500	+ else
	1501	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	1502	+ }
	1503	+
	1504	+ gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
	1505	+ }
	1506	+
	1507	+ float[] colorV = new float[4];
	1508	+
765	1509	void SetColor(Object3D obj, Vertex p0)
766	1510	{
767	1511	CameraPane display = this;
..	..	@@ -829,8 +1573,6 @@
829	1573	{
830	1574	return;
831	1575	}
832		-
833		- float[] colorV = new float[3];
834	1576
835	1577	if (false) // marked)
836	1578	{
..	..	@@ -939,7 +1681,7 @@
939	1681	// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
940	1682	}
941	1683
942		- void DrawMaterial(cMaterial material, boolean selected)
	1684	+ void DrawMaterial(cMaterial material, boolean selected, Object3D.cVector2[] others)
943	1685	{
944	1686	CameraPane display = this;
945	1687	//new Exception().printStackTrace();
..	..	@@ -955,18 +1697,18 @@
955	1697	//col.getColorComponents(ColorSpace.getInstance(ColorSpace.CS_LINEAR_RGB), CameraPane.modelParams0);
956	1698	if (!material.multiply)
957	1699	{
958		- display.color = color;
	1700	+ display.color = material.color;
959	1701	display.saturation = material.modulation;
960	1702	}
961	1703	else
962	1704	{
963		- display.color = color2;
	1705	+ display.color = material.color2;
964	1706	display.saturation = material.modulation2;
965	1707	}
966	1708
967	1709	cColor.HSBtoRGB(display.color, display.saturation, 1, display.modelParams0);
968	1710
969		- float[] colorV = GrafreeD.colorV;
	1711	+ float[] colorV = Grafreed.colorV;
970	1712
971	1713	/**/
972	1714	if (display.DrawMode() == display.DEFAULT) // && display.RENDERPROGRAM == 0)
..	..	@@ -974,7 +1716,7 @@
974	1716	colorV[0] = display.modelParams0[0] * material.diffuse;
975	1717	colorV[1] = display.modelParams0[1] * material.diffuse;
976	1718	colorV[2] = display.modelParams0[2] * material.diffuse;
977		- colorV[3] = material.opacity;
	1719	+ colorV[3] = 1; // material.opacity;
978	1720
979	1721	gl.glColor4f(colorV[0], colorV[1], colorV[2], material.opacity);
980	1722	//System.out.println("Opacity = " + opacity);
..	..	@@ -1079,12 +1821,12 @@
1079	1821
1080	1822	display.modelParams7[0] = 0;
1081	1823	display.modelParams7[1] = 1000;
1082		- display.modelParams7[2] = 0;
	1824	+ display.modelParams7[2] = material.parallax;
1083	1825	display.modelParams7[3] = 0;
1084	1826
1085		- display.modelParams6[0] = 100; // criss de bug de bump
	1827	+ //display.modelParams6[0] = 100; // criss de bug de bump
1086	1828
1087		- Object3D.cVector2[] extparams = display.vector2buffer;
	1829	+ Object3D.cVector2[] extparams = others; // display.vector2buffer;
1088	1830	if (extparams != null && extparams.length > 0 && extparams[0] != null)
1089	1831	{
1090	1832	display.modelParams6[0] = extparams[0].x / 1000.0f; // bump
..	..	@@ -1226,7 +1968,7 @@
1226	1968	void PushMatrix(double[][] matrix)
1227	1969	{
1228	1970	// GrafreeD.tracein(matrix);
1229		- PushMatrix(matrix,1);
	1971	+ PushMatrix(matrix, 1);
1230	1972	}
1231	1973
1232	1974	void PushMatrix()
..	..	@@ -1312,9 +2054,9 @@
1312	2054	switch(viewcode)
1313	2055	{
1314	2056	case 0: return "main";
1315		- case 1: return "one";
1316		- case 2: return "two";
1317		- case 3: return "three";
	2057	+ case 1: return "Red";
	2058	+ case 2: return "Green";
	2059	+ case 3: return "Blue";
1318	2060	case 4: return "light";
1319	2061	}
1320	2062
..	..	@@ -1323,7 +2065,7 @@
1323	2065
1324	2066	static int camerachangeframe;
1325	2067
1326		- boolean SetCamera(Camera cam)
	2068	+ public boolean SetCamera(Camera cam, boolean set)
1327	2069	{
1328	2070	// may 2014 if (cam == cameras[0] \|\| cam == cameras[1])
1329	2071	// return false;
..	..	@@ -1341,7 +2083,8 @@
1341	2083
1342	2084	camerachangeframe = Globals.framecount;
1343	2085
1344		- cam.hAspect = -1; // Read only
	2086	+ if (cam != null)
	2087	+ cam.hAspect = -1; // Read only
1345	2088
1346	2089	cameras[0] = cam;
1347	2090	targetLookAts[0] = new cVector(cam.lookAt);
..	..	@@ -1351,11 +2094,14 @@
1351	2094	{
1352	2095	cameras[i] = new Camera(cam.viewCode);
1353	2096	}
1354		-
1355		- cameras[i].setAim(cam.location, cam.lookAt);
1356		- cameras[i].shaper_fovy = cam.shaper_fovy;
1357		- cameras[i].UP.set(cam.UP);
1358		- targetLookAts[i] = new cVector(cameras[i].lookAt);
	2097	+
	2098	+ if (set)
	2099	+ {
	2100	+ cameras[i].setAim(cam.location, cam.lookAt);
	2101	+ cameras[i].shaper_fovy = cam.shaper_fovy;
	2102	+ cameras[i].UP.set(cam.UP);
	2103	+ targetLookAts[i] = new cVector(cameras[i].lookAt);
	2104	+ }
1359	2105	}
1360	2106	cameracount = 0;
1361	2107	targetLookAt = targetLookAts[cameracount];
..	..	@@ -1364,7 +2110,7 @@
1364	2110	// Start with free camera
1365	2111	SwitchCameras(true);
1366	2112
1367		- pingthread.jump = true; // optional?
	2113	+// pingthread.jump = true; // optional?
1368	2114
1369	2115	if (TRACKONCE)
1370	2116	{
..	..	@@ -1380,7 +2126,7 @@
1380	2126	//System.err.println("Oeil on");
1381	2127	OEIL = true;
1382	2128	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
1383		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	2129	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
1384	2130	//pingthread.StepToTarget(true);
1385	2131	}
1386	2132
..	..	@@ -1451,33 +2197,6 @@
1451	2197	mainDL ^= true;
1452	2198	}
1453	2199
1454		- void ToggleTexture()
1455		- {
1456		- textureon ^= true;
1457		- }
1458		-
1459		- void ToggleLive()
1460		- {
1461		- Globals.setLIVE(Globals.isLIVE() ^ true);
1462		-
1463		- System.err.println("LIVE = " + Globals.isLIVE());
1464		-
1465		- if (!Globals.isLIVE()) // save sound
1466		- GrafreeD.savesound = true; // wav.save();
1467		- // else
1468		- repaint(); // start loop // may 2013
1469		- }
1470		-
1471		- void ToggleSupport()
1472		- {
1473		- SUPPORT ^= true;
1474		- }
1475		-
1476		- void ToggleAbort()
1477		- {
1478		- ABORTMODE ^= true;
1479		- }
1480		-
1481	2200	void ToggleFullScreen()
1482	2201	{
1483	2202	FULLSCREEN ^= true;
..	..	@@ -1488,24 +2207,119 @@
1488	2207	Globals.CROWD ^= true;
1489	2208	}
1490	2209
1491		- void ToggleInertia()
1492		- {
1493		- INERTIA ^= true;
1494		- }
1495		-
1496	2210	void ToggleLocal()
1497	2211	{
1498	2212	LOCALTRANSFORM ^= true;
1499	2213	}
1500	2214
1501		- void ToggleFast()
	2215	+ public void ToggleTexture()
	2216	+ {
	2217	+ textureon ^= true;
	2218	+ }
	2219	+
	2220	+ public void ToggleLive()
	2221	+ {
	2222	+ Globals.setLIVE(Globals.isLIVE() ^ true);
	2223	+
	2224	+ System.err.println("LIVE = " + Globals.isLIVE());
	2225	+
	2226	+ if (!Globals.isLIVE()) // save sound
	2227	+ Grafreed.savesound = true; // wav.save();
	2228	+ // else
	2229	+ repaint(); // start loop // may 2013
	2230	+ }
	2231	+
	2232	+ public void ToggleSupport()
	2233	+ {
	2234	+ SUPPORT ^= true;
	2235	+ }
	2236	+
	2237	+ public void ToggleAbort()
	2238	+ {
	2239	+ ABORTMODE ^= true;
	2240	+ }
	2241	+
	2242	+ public void ToggleInertia()
	2243	+ {
	2244	+ INERTIA ^= true;
	2245	+ }
	2246	+
	2247	+ public void ToggleFast()
1502	2248	{
1503	2249	FAST ^= true;
1504	2250	}
1505	2251
1506		- void ToggleSlowPose()
	2252	+ public void ToggleSlowPose()
1507	2253	{
1508	2254	SLOWPOSE ^= true;
	2255	+ }
	2256	+
	2257	+ public void ToggleBoxMode()
	2258	+ {
	2259	+ BOXMODE ^= true;
	2260	+ }
	2261	+
	2262	+ public void ToggleZoomBoxMode()
	2263	+ {
	2264	+ ZOOMBOXMODE ^= true;
	2265	+ }
	2266	+
	2267	+ public void ToggleSmoothFocus()
	2268	+ {
	2269	+ SMOOTHFOCUS ^= true;
	2270	+ }
	2271	+
	2272	+ public void ToggleImageFlip()
	2273	+ {
	2274	+ IMAGEFLIP ^= true;
	2275	+ }
	2276	+
	2277	+ public void ToggleSpeakerMocap()
	2278	+ {
	2279	+ SPEAKERMOCAP ^= true;
	2280	+ }
	2281	+
	2282	+ public void ToggleSpeakerCamera()
	2283	+ {
	2284	+ SPEAKERCAMERA ^= true;
	2285	+ }
	2286	+
	2287	+ public void ToggleSpeakerFocus()
	2288	+ {
	2289	+ SPEAKERFOCUS ^= true;
	2290	+ }
	2291	+
	2292	+ public void ToggleFrustum()
	2293	+ {
	2294	+ FRUSTUM ^= true;
	2295	+ }
	2296	+
	2297	+ public void ToggleTrack()
	2298	+ {
	2299	+ TRACK ^= true;
	2300	+
	2301	+ repaint();
	2302	+ }
	2303	+
	2304	+ public void ToggleTrackOnce()
	2305	+ {
	2306	+ TRACKONCE ^= true;
	2307	+ }
	2308	+
	2309	+ public void ToggleShadowTrack()
	2310	+ {
	2311	+ SHADOWTRACK ^= true;
	2312	+ repaint();
	2313	+ }
	2314	+
	2315	+ public void ToggleOeil()
	2316	+ {
	2317	+ OEIL ^= true;
	2318	+ }
	2319	+
	2320	+ public void ToggleOeilOnce()
	2321	+ {
	2322	+ OEILONCE ^= true;
1509	2323	}
1510	2324
1511	2325	void ToggleFootContact()
..	..	@@ -1513,84 +2327,9 @@
1513	2327	FOOTCONTACT ^= true;
1514	2328	}
1515	2329
1516		- void ToggleBoxMode()
1517		- {
1518		- BOXMODE ^= true;
1519		- }
1520		-
1521		- void ToggleSmoothFocus()
1522		- {
1523		- SMOOTHFOCUS ^= true;
1524		- }
1525		-
1526		- void ToggleImageFlip()
1527		- {
1528		- IMAGEFLIP ^= true;
1529		- }
1530		-
1531		- void ToggleSpeakerMocap()
1532		- {
1533		- SPEAKERMOCAP ^= true;
1534		- }
1535		-
1536		- void ToggleSpeakerCamera()
1537		- {
1538		- SPEAKERCAMERA ^= true;
1539		- }
1540		-
1541		- void ToggleSpeakerFocus()
1542		- {
1543		- SPEAKERFOCUS ^= true;
1544		- }
1545		-
1546	2330	void ToggleDebug()
1547	2331	{
1548		- DEBUG ^= true;
1549		- }
1550		-
1551		- void ToggleFrustum()
1552		- {
1553		- FRUSTUM ^= true;
1554		- }
1555		-
1556		- void ToggleTrack()
1557		- {
1558		- TRACK ^= true;
1559		- if (TRACK)
1560		- {
1561		- if (object.selection != null &&
1562		- object.selection.size() > 0 &&
1563		- object.selection.elementAt(0) != null &&
1564		- !(object.selection.elementAt(0) instanceof Camera) &&
1565		- !(object.selection.elementAt(0) instanceof ScriptNode))
1566		- {
1567		- trackedobject = object.selection.elementAt(0);
1568		- repaint();
1569		- }
1570		- }
1571		-
1572		- repaint();
1573		- }
1574		-
1575		- void ToggleTrackOnce()
1576		- {
1577		- TRACKONCE ^= true;
1578		- }
1579		-
1580		- void ToggleShadowTrack()
1581		- {
1582		- SHADOWTRACK ^= true;
1583		- repaint();
1584		- }
1585		-
1586		- void ToggleOeil()
1587		- {
1588		- OEIL ^= true;
1589		- }
1590		-
1591		- void ToggleOeilOnce()
1592		- {
1593		- OEILONCE ^= true;
	2332	+ Globals.DEBUG ^= true;
1594	2333	}
1595	2334
1596	2335	void ToggleLookAt()
..	..	@@ -1598,9 +2337,9 @@
1598	2337	LOOKAT ^= true;
1599	2338	}
1600	2339
1601		- void ToggleRandom()
	2340	+ void ToggleSwitch()
1602	2341	{
1603		- RANDOM ^= true;
	2342	+ SWITCH ^= true;
1604	2343	}
1605	2344
1606	2345	void ToggleHandles()
..	..	@@ -1608,10 +2347,17 @@
1608	2347	HANDLES ^= true;
1609	2348	}
1610	2349
	2350	+ Object3D paintFolder;
	2351	+
1611	2352	void TogglePaint()
1612	2353	{
1613	2354	PAINTMODE ^= true;
1614	2355	paintcount = 0;
	2356	+
	2357	+ if (PAINTMODE)
	2358	+ {
	2359	+ paintFolder = GetFolder();
	2360	+ }
1615	2361	}
1616	2362
1617	2363	void SwapCamera(int a, int b)
..	..	@@ -1642,7 +2388,8 @@
1642	2388	{
1643	2389	//System.out.println("PROTECTION = " + cam.hAspect);
1644	2390	//assert (cam.hAspect == 0);
1645		- cam.hAspect = 0;
	2391	+ if (cam != null)
	2392	+ cam.hAspect = 0;
1646	2393	lightCamera = cam;
1647	2394	}
1648	2395
..	..	@@ -1707,7 +2454,34 @@
1707	2454	{
1708	2455	return currentGL;
1709	2456	}
1710		-
	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	+
	2473	+ private void SetGLNormal(javax.media.opengl.GL gl, float nx, float ny, float nz)
	2474	+ {
	2475	+ gl.glNormal3f(nx, ny, nz);
	2476	+
	2477	+ if (ny > 0.9 \|\| ny < -0.9)
	2478	+ // Ground or ceiling
	2479	+ gl.glVertexAttrib3f(4, 1, 0, 0);
	2480	+ else
	2481	+ // Walls
	2482	+ gl.glVertexAttrib3f(4, 0, 1, 0);
	2483	+ }
	2484	+
1711	2485	/**/
1712	2486	class CacheTexture
1713	2487	{
..	..	@@ -1716,28 +2490,31 @@
1716	2490
1717	2491	int resolution;
1718	2492
1719		- CacheTexture(com.sun.opengl.util.texture.Texture tex, int res)
	2493	+ CacheTexture(com.sun.opengl.util.texture.TextureData texdata, int res)
1720	2494	{
1721		- texture = tex;
	2495	+ texture = com.sun.opengl.util.texture.TextureIO.newTexture(texdata);
	2496	+ texturedata = texdata;
1722	2497	resolution = res;
1723	2498	}
1724	2499	}
1725	2500	/**/
1726	2501
1727	2502	// TEXTURE static Texture texture;
1728		- static public java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/> textures
1729		- = new java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/>();
1730		- static public java.util.Hashtable<String, String> usedtextures = new java.util.Hashtable<String, String>();
	2503	+ static public Hashtable<cTexture, CacheTexture> texturepigment = new Hashtable<cTexture, CacheTexture>();
	2504	+ static public Hashtable<cTexture, CacheTexture> texturebump = new Hashtable<cTexture, CacheTexture>();
	2505	+ static public Hashtable<byte[], CacheTexture> bimtextures = new Hashtable<byte[], CacheTexture>();
	2506	+ static public java.util.HashSet<cTexture> usedtextures = new java.util.HashSet<cTexture>();
	2507	+
1731	2508	int pigmentdepth = 0;
1732	2509	public com.sun.opengl.util.texture.Texture[] pigmentstack = new com.sun.opengl.util.texture.Texture[65536];
1733	2510	int bumpdepth = 0;
1734	2511	public com.sun.opengl.util.texture.Texture[] bumpstack = new com.sun.opengl.util.texture.Texture[65536];
1735	2512	//public static String DEFAULT_TEXTURE = "DEFAULT_TEXTURE";
1736	2513	public static cTexture DEFAULT_TEXTURES = new cTexture("DEFAULT_TEXTURE" + ":" + "DEFAULT_TEXTURE_BUMP");
1737		- public static String NOISE_TEXTURE = "WHITE_NOISE";
	2514	+ public static cTexture NOISE_TEXTURE = new cTexture("WHITE_NOISE:");
1738	2515	// public static cTexture IMMORTAL_TEXTURE = new cTexture("IMMORTAL");
1739	2516
1740		- com.sun.opengl.util.texture.Texture GetResourceTexture(String name, boolean bump)
	2517	+ com.sun.opengl.util.texture.TextureData GetResourceTexture(String name, boolean bump)
1741	2518	{
1742	2519	TextureData texturedata = null;
1743	2520
..	..	@@ -1747,7 +2524,7 @@
1747	2524	com.sun.opengl.util.texture.TextureIO.newTextureData(
1748	2525	getClass().getClassLoader().getResourceAsStream(name),
1749	2526	true,
1750		- com.sun.opengl.util.texture.TextureIO.PNG);
	2527	+ GetFormat(name)); // com.sun.opengl.util.texture.TextureIO.PNG);
1751	2528	} catch (java.io.IOException e)
1752	2529	{
1753	2530	throw new javax.media.opengl.GLException(e);
..	..	@@ -1756,13 +2533,34 @@
1756	2533	if (bump)
1757	2534	texturedata = ConvertBump(texturedata, false);
1758	2535
1759		- com.sun.opengl.util.texture.Texture texture =
1760		- com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
	2536	+// com.sun.opengl.util.texture.Texture texture =
	2537	+// com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
1761	2538
1762		- texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
1763		- texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
	2539	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
	2540	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
1764	2541
1765		- return texture;
	2542	+ return texturedata;
	2543	+ }
	2544	+
	2545	+ com.sun.opengl.util.texture.TextureData GetBimTexture(BufferedImage bim, boolean bump)
	2546	+ {
	2547	+ TextureData texturedata = null;
	2548	+
	2549	+ try
	2550	+ {
	2551	+ texturedata =
	2552	+ com.sun.opengl.util.texture.TextureIO.newTextureData(
	2553	+ bim,
	2554	+ true);
	2555	+ } catch (Exception e)
	2556	+ {
	2557	+ throw new javax.media.opengl.GLException(e);
	2558	+ }
	2559	+
	2560	+ if (bump)
	2561	+ texturedata = ConvertBump(texturedata, false);
	2562	+
	2563	+ return texturedata;
1766	2564	}
1767	2565
1768	2566	boolean HUESMOOTH = true; // wrap around bug... true;
..	..	@@ -2792,6 +3590,8 @@
2792	3590	};
2793	3591	/**/
2794	3592
	3593	+ static Object3D lastObject;
	3594	+
2795	3595	//com.sun.opengl.util.texture.Texture
2796	3596	TextureData
2797	3597	GetFileTexture(String name, boolean bump, int resolution)
..	..	@@ -2828,6 +3628,8 @@
2828	3628	// return null;
2829	3629	//if (i == 2)
2830	3630	// return null;
	3631	+ // TIFF issue sept 2019
	3632	+ System.err.println("lastObject = " + lastObject);
2831	3633	e.printStackTrace();
2832	3634	name = name.split("\\.tif")[0] + ".jpg";
2833	3635	}
..	..	@@ -2835,6 +3637,8 @@
2835	3637
2836	3638	System.out.println("LOADING TEXTURE : " + name);
2837	3639
	3640	+ Object x = texturedata.getMipmapData(); // .getBuffer();
	3641	+
2838	3642	//
2839	3643	if (false) // compressbit > 0)
2840	3644	{
..	..	@@ -3539,6 +4343,7 @@
3539	4343
3540	4344	com.sun.opengl.util.texture.Texture CompressTexture2(String name)
3541	4345	{
	4346	+ new Exception().printStackTrace();
3542	4347	System.exit(0);
3543	4348	com.sun.opengl.util.texture.Texture texture = null;
3544	4349
..	..	@@ -6157,30 +6962,30 @@
6157	6962	short residu = 0;
6158	6963
6159	6964	// wraparound workarounds
6160		- short fuck = (short) (buffer[i] & 0xFF);
	6965	+ short ww = (short) (buffer[i] & 0xFF);
6161	6966	/*
6162		- residu += (fuck%2);
6163		- if(fuck/2 < 256-residu/2)
	6967	+ residu += (ww%2);
	6968	+ if(ww/2 < 256-residu/2)
6164	6969	{
6165		- fuck = (short)((fuck/2) + residu/2);
	6970	+ ww = (short)((ww/2) + residu/2);
6166	6971	if(residu == 2)
6167	6972	residu = 0;
6168	6973	}
6169	6974	else
6170	6975	{
6171	6976	residu = 0;
6172		- fuck /= 2;
	6977	+ ww /= 2;
6173	6978	}
6174	6979	*/
6175		- if (i < imglength / 3 \|\| rnd.nextFloat() < 0.5 \|\| fuck >= 254)
	6980	+ if (i < imglength / 3 \|\| rnd.nextFloat() < 0.5 \|\| ww >= 254)
6176	6981	{
6177		- fuck /= 2;
	6982	+ ww /= 2;
6178	6983	} else
6179	6984	{
6180		- fuck = (short) ((fuck / 2) + fuck % 2);
	6985	+ ww = (short) ((ww / 2) + ww % 2);
6181	6986	}
6182	6987
6183		- buffer[i] = (byte) fuck;
	6988	+ buffer[i] = (byte) ww;
6184	6989	}
6185	6990	//System.out.print(bytes[i] + " ");
6186	6991	//if(buffer[i] >= 0 && buffer[i]<=eps-1) buffer[i] = eps;
..	..	@@ -7232,7 +8037,7 @@
7232	8037	String pigment = Object3D.GetPigment(tex);
7233	8038	String bump = Object3D.GetBump(tex);
7234	8039
7235		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8040	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7236	8041	{
7237	8042	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7238	8043	// System.out.println("; bump = " + bump);
..	..	@@ -7247,11 +8052,69 @@
7247	8052	pigment = null;
7248	8053	}
7249	8054
7250		- ReleaseTexture(bump, true);
7251		- ReleaseTexture(pigment, false);
	8055	+ ReleaseTexture(tex, true);
	8056	+ ReleaseTexture(tex, false);
7252	8057	}
7253	8058
7254		- void ReleaseTexture(String tex, boolean bump)
	8059	+ public void ReleasePigmentTexture(cTexture tex) // INTERFACE
	8060	+ {
	8061	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	8062	+ {
	8063	+ return;
	8064	+ }
	8065	+
	8066	+ if (tex == null)
	8067	+ {
	8068	+ ReleaseTexture(null, false);
	8069	+ return;
	8070	+ }
	8071	+
	8072	+ String pigment = Object3D.GetPigment(tex);
	8073	+
	8074	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8075	+ {
	8076	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	8077	+ // System.out.println("; bump = " + bump);
	8078	+ }
	8079	+
	8080	+ if (pigment.equals(""))
	8081	+ {
	8082	+ pigment = null;
	8083	+ }
	8084	+
	8085	+ ReleaseTexture(tex, false);
	8086	+ }
	8087	+
	8088	+ public void ReleaseBumpTexture(cTexture tex) // INTERFACE
	8089	+ {
	8090	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	8091	+ {
	8092	+ return;
	8093	+ }
	8094	+
	8095	+ if (tex == null)
	8096	+ {
	8097	+ ReleaseTexture(null, true);
	8098	+ return;
	8099	+ }
	8100	+
	8101	+ String bump = Object3D.GetBump(tex);
	8102	+
	8103	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8104	+ {
	8105	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	8106	+ // System.out.println("; bump = " + bump);
	8107	+ }
	8108	+
	8109	+ if (bump.equals(""))
	8110	+ {
	8111	+ bump = null;
	8112	+ }
	8113	+
	8114	+ ReleaseTexture(tex, true);
	8115	+ }
	8116	+
	8117	+ void ReleaseTexture(cTexture tex, boolean bump)
7255	8118	{
7256	8119	if (// DrawMode() != 0 \|\| /tex == null \|\|/
7257	8120	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -7262,7 +8125,7 @@
7262	8125	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
7263	8126
7264	8127	if (tex != null)
7265		- texture = textures.get(tex);
	8128	+ texture = bump ? texturebump.get(tex) : texturepigment.get(tex);
7266	8129
7267	8130	// //assert( texture != null );
7268	8131	// if (texture == null)
..	..	@@ -7354,7 +8217,55 @@
7354	8217	}
7355	8218	}
7356	8219
7357		- /boolean/ public void BindTextures(cTexture tex, int resolution) // INTERFACE
	8220	+ /boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
	8221	+ {
	8222	+// if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8223	+// ambientOcclusion ) // \|\| !textureon)
	8224	+// {
	8225	+// return; // false;
	8226	+// }
	8227	+//
	8228	+// if (tex == null)
	8229	+// {
	8230	+// BindTexture(null,false,resolution);
	8231	+// BindTexture(null,true,resolution);
	8232	+// return;
	8233	+// }
	8234	+//
	8235	+// String pigment = Object3D.GetPigment(tex);
	8236	+// String bump = Object3D.GetBump(tex);
	8237	+//
	8238	+// usedtextures.add(pigment);
	8239	+// usedtextures.add(bump);
	8240	+//
	8241	+// //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8242	+// {
	8243	+// // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8244	+// // System.out.println("; bump = " + bump);
	8245	+// }
	8246	+//
	8247	+// if (bump.equals(""))
	8248	+// {
	8249	+// bump = null;
	8250	+// }
	8251	+// if (pigment.equals(""))
	8252	+// {
	8253	+// pigment = null;
	8254	+// }
	8255	+//
	8256	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8257	+// BindTexture(pigment, false, resolution);
	8258	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
	8259	+// BindTexture(bump, true, resolution);
	8260	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8261	+//
	8262	+// return; // true;
	8263	+
	8264	+ BindPigmentTexture(tex, resolution);
	8265	+ BindBumpTexture(tex, resolution);
	8266	+ }
	8267	+
	8268	+ /boolean/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
7358	8269	{
7359	8270	if (// DrawMode() != 0 \|\| /tex == null \|\|/
7360	8271	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -7365,17 +8276,47 @@
7365	8276	if (tex == null)
7366	8277	{
7367	8278	BindTexture(null,false,resolution);
7368		- BindTexture(null,true,resolution);
7369	8279	return;
7370	8280	}
7371	8281
7372	8282	String pigment = Object3D.GetPigment(tex);
	8283	+
	8284	+ usedtextures.add(tex);
	8285	+
	8286	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8287	+ {
	8288	+ // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8289	+ // System.out.println("; bump = " + bump);
	8290	+ }
	8291	+
	8292	+ if (pigment.equals(""))
	8293	+ {
	8294	+ pigment = null;
	8295	+ }
	8296	+
	8297	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8298	+ BindTexture(tex, false, resolution);
	8299	+ }
	8300	+
	8301	+ /boolean/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8302	+ {
	8303	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8304	+ ambientOcclusion ) // \|\| !textureon)
	8305	+ {
	8306	+ return; // false;
	8307	+ }
	8308	+
	8309	+ if (tex == null)
	8310	+ {
	8311	+ BindTexture(null,true,resolution);
	8312	+ return;
	8313	+ }
	8314	+
7373	8315	String bump = Object3D.GetBump(tex);
7374	8316
7375		- usedtextures.put(pigment, pigment);
7376		- usedtextures.put(bump, bump);
	8317	+ usedtextures.add(tex);
7377	8318
7378		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8319	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7379	8320	{
7380	8321	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
7381	8322	// System.out.println("; bump = " + bump);
..	..	@@ -7385,43 +8326,94 @@
7385	8326	{
7386	8327	bump = null;
7387	8328	}
7388		- if (pigment.equals(""))
7389		- {
7390		- pigment = null;
7391		- }
7392	8329
7393		- GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
7394		- BindTexture(pigment, false, resolution);
7395	8330	GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
7396		- BindTexture(bump, true, resolution);
	8331	+ BindTexture(tex, true, resolution);
7397	8332	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
7398		-
7399		- return; // true;
7400	8333	}
7401	8334
7402		- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution)
	8335	+ java.util.HashSet<String> missingTextures = new java.util.HashSet<String>();
	8336	+
	8337	+ private boolean FileExists(String tex)
7403	8338	{
7404		- CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
	8339	+ if (missingTextures.contains(tex))
	8340	+ {
	8341	+ return false;
	8342	+ }
	8343	+
	8344	+ boolean fileExists = new File(tex).exists();
	8345	+
	8346	+ if (!fileExists)
	8347	+ {
	8348	+ // If file exists, the "new File()" is not executed sgain
	8349	+ missingTextures.add(tex);
	8350	+ }
	8351	+
	8352	+ return fileExists;
	8353	+ }
	8354	+
	8355	+ CacheTexture GetCacheTexture(cTexture tex, boolean bump, int resolution) throws Exception
	8356	+ {
	8357	+ CacheTexture texturecache = null;
7405	8358
7406	8359	if (tex != null)
7407	8360	{
7408		- String texname = tex;
	8361	+ String texname = bump ? Object3D.GetBump(tex) : Object3D.GetPigment(tex);
	8362	+ byte[] texdata = bump ? tex.bumpdata : tex.pigmentdata;
7409	8363
7410		- String[] split = tex.split("Textures");
7411		- if (split.length > 1)
7412		- texname = "/Users/nbriere/Textures" + split[split.length-1];
7413		- else
7414		- if (!texname.startsWith("/"))
7415		- texname = "/Users/nbriere/Textures/" + texname;
	8364	+ if (texname.equals("") && texdata == null)
	8365	+ {
	8366	+ return null;
	8367	+ }
	8368	+
	8369	+ String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
	8370	+
	8371	+// String[] split = tex.split("Textures");
	8372	+// if (split.length > 1)
	8373	+// texname = "/Users/nbriere/Textures" + split[split.length-1];
	8374	+// else
	8375	+// if (!texname.startsWith("/"))
	8376	+// texname = "/Users/nbriere/Textures/" + texname;
	8377	+ if (!FileExists(texname) && !texname.startsWith("@"))
	8378	+ {
	8379	+ texname = fallbackTextureName;
	8380	+ }
7416	8381
7417	8382	if (CACHETEXTURE)
7418		- texture = textures.get(texname); // TEXTURE CACHE
7419		-
7420		- TextureData texturedata = null;
7421		-
7422		- if (texture == null \|\| texture.resolution < resolution)
7423	8383	{
7424		- if (tex.equals("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
	8384	+ if (texdata == null)
	8385	+ texturecache = bump ? texturebump.get(tex) : texturepigment.get(tex);
	8386	+ else
	8387	+ texturecache = bimtextures.get(texdata);
	8388	+ }
	8389	+
	8390	+ if (texturecache == null \|\| texturecache.resolution != -1 && texturecache.resolution < resolution)
	8391	+ {
	8392	+ TextureData texturedata = null;
	8393	+
	8394	+ if (texdata != null && textureon)
	8395	+ {
	8396	+ BufferedImage bim; // = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
	8397	+
	8398	+ try
	8399	+ {
	8400	+ bim = DecompressJPEG(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8401	+ }
	8402	+ catch (Exception e)
	8403	+ {
	8404	+ bim = CreateBim(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8405	+ }
	8406	+
	8407	+ texturecache = new CacheTexture(GetBimTexture(bim, bump), -1);
	8408	+ bimtextures.put(texdata, texturecache);
	8409	+
	8410	+ //BufferedImage bim3 = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
	8411	+
	8412	+ //Object bim2 = CreateBim(texturecache.texturedata);
	8413	+ //bim2 = bim;
	8414	+ }
	8415	+ else
	8416	+ if (texname.endsWith("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
7425	8417	{
7426	8418	assert(!bump);
7427	8419	// if (bump)
..	..	@@ -7432,19 +8424,23 @@
7432	8424	// }
7433	8425	// else
7434	8426	// {
7435		- texture = textures.get(tex);
7436		- if (texture == null)
	8427	+ // texturecache = textures.get(texname); // suspicious
	8428	+ if (texturecache == null)
7437	8429	{
7438		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8430	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
7439	8431	}
	8432	+ else
	8433	+ new Exception().printStackTrace();
7440	8434	// }
7441	8435	} else
7442		- if (tex.equals("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
	8436	+ if (texname.endsWith("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
7443	8437	{
7444	8438	assert(bump);
7445		- texture = textures.get(tex);
7446		- if (texture == null)
7447		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8439	+ // texturecache = textures.get(texname); // suspicious
	8440	+ if (texturecache == null)
	8441	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8442	+ else
	8443	+ new Exception().printStackTrace();
7448	8444	} else
7449	8445	{
7450	8446	//if (tex.equals("IMMORTAL"))
..	..	@@ -7452,11 +8448,22 @@
7452	8448	// texture = GetResourceTexture("default.png");
7453	8449	//} else
7454	8450	//{
7455		- if (tex.equals("WHITE_NOISE"))
	8451	+ if (texname.endsWith("WHITE_NOISE"))
7456	8452	{
7457		- texture = textures.get(tex);
7458		- if (texture == null)
7459		- texture = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8453	+ // texturecache = textures.get(texname); // suspicious
	8454	+ if (texturecache == null)
	8455	+ texturecache = new CacheTexture(GetResourceTexture("whitenoise.jpg", bump),resolution);
	8456	+ else
	8457	+ new Exception().printStackTrace();
	8458	+ } else
	8459	+ {
	8460	+ if (texname.startsWith("@") && textureon)
	8461	+ {
	8462	+ // texturecache = textures.get(texname); // suspicious
	8463	+ if (texturecache == null)
	8464	+ texturecache = new CacheTexture(GetResourceTexture(texname.substring(1), bump),resolution);
	8465	+ else
	8466	+ new Exception().printStackTrace();
7460	8467	} else
7461	8468	{
7462	8469	if (textureon)
..	..	@@ -7481,7 +8488,7 @@
7481	8488	}
7482	8489
7483	8490	cachename = texname.substring(0, texname.length()-4)+ext+".jpg";
7484		- if (!new File(cachename).exists())
	8491	+ if (!FileExists(cachename))
7485	8492	cachename = texname;
7486	8493	else
7487	8494	processbump = false; // don't process bump map again
..	..	@@ -7503,7 +8510,7 @@
7503	8510	}
7504	8511
7505	8512	cachename = texname.substring(0, texname.length()-4)+ext+".png";
7506		- if (!new File(cachename).exists())
	8513	+ if (!FileExists(cachename))
7507	8514	cachename = texname;
7508	8515	else
7509	8516	processbump = false; // don't process bump map again
..	..	@@ -7512,20 +8519,23 @@
7512	8519	texturedata = GetFileTexture(cachename, processbump, resolution);
7513	8520
7514	8521
7515		- if (texturedata != null)
7516		- texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
	8522	+ if (texturedata == null)
	8523	+ throw new Exception();
	8524	+
	8525	+ texturecache = new CacheTexture(texturedata,resolution);
7517	8526	//texture = GetTexture(tex, bump);
7518	8527	}
	8528	+ }
7519	8529	}
7520	8530	//}
7521	8531	}
7522	8532
7523		- if (/CACHETEXTURE &&/ texture != null && textureon)
	8533	+ if (texdata == null && /CACHETEXTURE &&/ texturecache != null && textureon)
7524	8534	{
7525	8535	//return false;
7526	8536
7527	8537	// System.out.println("CACHE +++++++++++++++ TEXTURE : " + texname + " (" + texture.getEstimatedMemorySize() + ")");
7528		- if (texturedata != null && (texname.endsWith(".jpg") \|\| texname.endsWith(".JPG")))
	8538	+ if (texturedata != null && texname.toLowerCase().endsWith(".jpg"))
7529	8539	{
7530	8540	// String ext = "_highres";
7531	8541	// if (REDUCETEXTURE)
..	..	@@ -7542,52 +8552,17 @@
7542	8552	File cachefile = new File(texname.substring(0, texname.length()-4)+ext+".jpg");
7543	8553	if (!cachefile.exists())
7544	8554	{
7545		- // cache to disk
7546		- Buffer buffer = texturedata.getBuffer(); // getMipmapData();
7547		- //buffers[0].
7548		-
7549		- ByteBuffer bytebuf = (ByteBuffer)buffer; // ).asIntBuffer();
7550		- int[] pixels = new int[bytebuf.capacity()/3];
7551		-
7552		- // squared size heuristic...
7553		- if ((int)Math.sqrt(pixels.length) == Math.sqrt(pixels.length))
	8555	+ //if (texturedata.getWidth() == texturedata.getHeight())
7554	8556	{
7555		- for (int i=pixels.length; --i>=0;)
7556		- {
7557		- int i3 = i*3;
7558		- pixels[i] = 0xFF;
7559		- pixels[i] <<= 8;
7560		- pixels[i] \|= bytebuf.get(i3+2) & 0xFF;
7561		- pixels[i] <<= 8;
7562		- pixels[i] \|= bytebuf.get(i3+1) & 0xFF;
7563		- pixels[i] <<= 8;
7564		- pixels[i] \|= bytebuf.get(i3) & 0xFF;
7565		- }
7566		-
7567		- /*
7568		- int r=0,g=0,b=0,a=0;
7569		- for (int i=0; i<width; i++)
7570		- for (int j=0; j<height; j++)
7571		- {
7572		- int index = j*width+i;
7573		- int p = pixels[index];
7574		- a = ((p>>24) & 0xFF);
7575		- r = ((p>>16) & 0xFF);
7576		- g = ((p>>8) & 0xFF);
7577		- b = (p & 0xFF);
7578		- pixels[index] = (a<<24) \| (b<<16) \| (g<<8) \| r;
7579		- }
7580		- /**/
7581		- int width = (int)Math.sqrt(pixels.length); // squared
7582		- int height = width;
7583		- BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
7584		- rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
	8557	+ BufferedImage rendImage = CreateBim(texturedata);
	8558	+
7585	8559	ImageWriter writer = null;
7586	8560	Iterator iter = ImageIO.getImageWritersByFormatName("jpg");
7587	8561	if (iter.hasNext()) {
7588	8562	writer = (ImageWriter)iter.next();
7589	8563	}
7590		- float compressionQuality = 0.9f;
	8564	+
	8565	+ float compressionQuality = 0.85f;
7591	8566	try
7592	8567	{
7593	8568	ImageOutputStream ios = ImageIO.createImageOutputStream(cachefile);
..	..	@@ -7604,18 +8579,20 @@
7604	8579	}
7605	8580	}
7606	8581	}
7607		-
	8582	+
	8583	+ Hashtable<cTexture, CacheTexture> textures = bump ? texturebump : texturepigment;
	8584	+
7608	8585	//System.out.println("Texture = " + tex);
7609		- if (textures.containsKey(texname))
	8586	+ if (textures.containsKey(tex))
7610	8587	{
7611		- CacheTexture thetex = textures.get(texname);
	8588	+ CacheTexture thetex = textures.get(tex);
7612	8589	thetex.texture.disable();
7613	8590	thetex.texture.dispose();
7614		- textures.remove(texname);
	8591	+ textures.remove(tex);
7615	8592	}
7616	8593
7617		- texture.texturedata = texturedata;
7618		- textures.put(texname, texture);
	8594	+ //texture.texturedata = texturedata;
	8595	+ textures.put(tex, texturecache);
7619	8596
7620	8597	// newtex = true;
7621	8598	}
..	..	@@ -7631,10 +8608,46 @@
7631	8608	}
7632	8609	}
7633	8610
7634		- return texture;
	8611	+ return texturecache;
7635	8612	}
7636	8613
7637		- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution)
	8614	+ static void EmbedTextures(cTexture tex)
	8615	+ {
	8616	+ if (tex.pigmentdata == null)
	8617	+ {
	8618	+ //String texname = Object3D.GetPigment(tex);
	8619	+
	8620	+ CacheTexture texturecache = texturepigment.get(tex);
	8621	+
	8622	+ if (texturecache != null)
	8623	+ {
	8624	+ tex.pw = texturecache.texturedata.getWidth();
	8625	+ tex.ph = texturecache.texturedata.getHeight();
	8626	+ tex.pigmentdata = //CompressJPEG(CreateBim
	8627	+ ((ByteBuffer)texturecache.texturedata.getBuffer()).array()
	8628	+ ;
	8629	+ //, tex.pw, tex.ph), 0.5f);
	8630	+ }
	8631	+ }
	8632	+
	8633	+ if (tex.bumpdata == null)
	8634	+ {
	8635	+ //String texname = Object3D.GetBump(tex);
	8636	+
	8637	+ CacheTexture texturecache = texturebump.get(tex);
	8638	+
	8639	+ if (texturecache != null)
	8640	+ {
	8641	+ tex.bw = texturecache.texturedata.getWidth();
	8642	+ tex.bh = texturecache.texturedata.getHeight();
	8643	+ tex.bumpdata = //CompressJPEG(CreateBim(
	8644	+ ((ByteBuffer)texturecache.texturedata.getBuffer()).array();
	8645	+ //, tex.bw, tex.bh), 0.5f);
	8646	+ }
	8647	+ }
	8648	+ }
	8649	+
	8650	+ com.sun.opengl.util.texture.Texture GetTexture(cTexture tex, boolean bump, int resolution) throws Exception
7638	8651	{
7639	8652	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
7640	8653
..	..	@@ -7652,21 +8665,21 @@
7652	8665	return texture!=null?texture.texture:null;
7653	8666	}
7654	8667
7655		- com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution)
	8668	+ public com.sun.opengl.util.texture.TextureData GetTextureData(cTexture tex, boolean bump, int resolution) throws Exception
7656	8669	{
7657	8670	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
7658	8671
7659	8672	return texture!=null?texture.texturedata:null;
7660	8673	}
7661	8674
7662		- boolean BindTexture(String tex, boolean bump, int resolution)
	8675	+ boolean BindTexture(cTexture tex, boolean bump, int resolution) throws Exception
7663	8676	{
7664	8677	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
7665	8678	{
7666	8679	return false;
7667	8680	}
7668	8681
7669		- boolean newtex = false;
	8682	+ //boolean newtex = false;
7670	8683
7671	8684	com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
7672	8685
..	..	@@ -7698,9 +8711,75 @@
7698	8711	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_S, GetGL().GL_REPEAT);
7699	8712	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_T, GetGL().GL_REPEAT);
7700	8713
7701		- return newtex;
	8714	+ return true; // Warning: not used.
7702	8715	}
7703	8716
	8717	+ public static byte[] CompressJPEG(BufferedImage image, float quality)
	8718	+ {
	8719	+ try
	8720	+ {
	8721	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	8722	+ Iterator<ImageWriter> writers = ImageIO.getImageWritersByFormatName("jpg");
	8723	+ ImageWriter writer = writers.next();
	8724	+
	8725	+ ImageWriteParam param = writer.getDefaultWriteParam();
	8726	+ param.setCompressionMode(ImageWriteParam.MODE_EXPLICIT);
	8727	+ param.setCompressionQuality(quality);
	8728	+
	8729	+ ImageOutputStream ios = ImageIO.createImageOutputStream(baos);
	8730	+ writer.setOutput(ios);
	8731	+ writer.write(null, new IIOImage(image, null, null), param);
	8732	+
	8733	+ byte[] data = baos.toByteArray();
	8734	+ writer.dispose();
	8735	+ return data;
	8736	+ }
	8737	+ catch (Exception e)
	8738	+ {
	8739	+ e.printStackTrace();
	8740	+ return null;
	8741	+ }
	8742	+ }
	8743	+
	8744	+ public static BufferedImage DecompressJPEG(byte[] image, int w, int h) throws IOException
	8745	+ {
	8746	+ ByteArrayInputStream baos = new ByteArrayInputStream(image);
	8747	+ Iterator<ImageReader> writers = ImageIO.getImageReadersByFormatName("jpg");
	8748	+ ImageReader reader = writers.next();
	8749	+
	8750	+ BufferedImage bim = new BufferedImage(w, h, BufferedImage.TYPE_INT_RGB);
	8751	+
	8752	+ ImageReadParam param = reader.getDefaultReadParam();
	8753	+ param.setDestination(bim);
	8754	+ //param.setDestinationType(ImageTypeSpecifier.createFromBufferedImageType(BufferedImage.TYPE_INT_RGB));
	8755	+
	8756	+ ImageInputStream ios = ImageIO.createImageInputStream(baos);
	8757	+ reader.setInput(ios);
	8758	+ BufferedImage bim2 = reader.read(0, param);
	8759	+ reader.dispose();
	8760	+
	8761	+// WritableRaster raster = bim2.getRaster();
	8762	+// DataBufferByte data = (DataBufferByte) raster.getDataBuffer();
	8763	+// byte[] bytes = data.getData();
	8764	+//
	8765	+// int[] pixels = new int[bytes.length/3];
	8766	+// for (int i=pixels.length; --i>=0;)
	8767	+// {
	8768	+// int i3 = i*3;
	8769	+// pixels[i] = 0xFF;
	8770	+// pixels[i] <<= 8;
	8771	+// pixels[i] \|= bytes[i3+2] & 0xFF;
	8772	+// pixels[i] <<= 8;
	8773	+// pixels[i] \|= bytes[i3+1] & 0xFF;
	8774	+// pixels[i] <<= 8;
	8775	+// pixels[i] \|= bytes[i3] & 0xFF;
	8776	+// }
	8777	+//
	8778	+// bim.setRGB(0,0,w,h, pixels, w*(h-1),-w);
	8779	+
	8780	+ return bim;
	8781	+ }
	8782	+
7704	8783	ShadowBuffer shadowPBuf;
7705	8784	AntialiasBuffer antialiasPBuf;
7706	8785	int MAXSTACK;
..	..	@@ -7717,10 +8796,12 @@
7717	8796
7718	8797	gl.glGetIntegerv(GL.GL_MAX_TEXTURE_STACK_DEPTH, temp, 0);
7719	8798	MAXSTACK = temp[0];
7720		- System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
	8799	+ if (Globals.DEBUG)
	8800	+ System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
7721	8801	gl.glGetIntegerv(GL.GL_MAX_MODELVIEW_STACK_DEPTH, temp, 0);
7722	8802	MAXSTACK = temp[0];
7723		- System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
	8803	+ if (Globals.DEBUG)
	8804	+ System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
7724	8805
7725	8806	// Use debug pipeline
7726	8807	//drawable.setGL(new DebugGL(gl)); //
..	..	@@ -7728,7 +8809,8 @@
7728	8809	gl = drawable.getGL(); //
7729	8810
7730	8811	GL gl3 = getGL();
7731		- System.out.println("INIT GL IS: " + gl.getClass().getName());
	8812	+ if (Globals.DEBUG)
	8813	+ System.out.println("INIT GL IS: " + gl.getClass().getName());
7732	8814
7733	8815
7734	8816	//float pos[] = { 100, 100, 100, 0 };
..	..	@@ -7893,7 +8975,7 @@
7893	8975
7894	8976	if (cubemap == null)
7895	8977	{
7896		- LoadEnvy(5);
	8978	+ //LoadEnvy(1);
7897	8979	}
7898	8980
7899	8981	//cubemap.enable();
..	..	@@ -8169,6 +9251,8 @@
8169	9251
8170	9252	void LoadEnvy(int which)
8171	9253	{
	9254	+ assert(false);
	9255	+
8172	9256	String name;
8173	9257	String ext;
8174	9258
..	..	@@ -8180,37 +9264,58 @@
8180	9264	cubemap = null;
8181	9265	return;
8182	9266	case 1:
8183		- name = "cubemaps/box_";
8184		- ext = "png";
	9267	+ name = "cubemaps/rgb/";
	9268	+ ext = "jpg";
8185	9269	reverseUP = false;
8186	9270	break;
8187	9271	case 2:
8188		- name = "cubemaps/uffizi_";
8189		- ext = "png";
8190		- break; // reverseUP = true; break;
	9272	+ name = "cubemaps/uffizi/";
	9273	+ ext = "jpg";
	9274	+ reverseUP = false;
	9275	+ break;
8191	9276	case 3:
8192		- name = "cubemaps/CloudyHills_";
8193		- ext = "tga";
	9277	+ name = "cubemaps/CloudyHills/";
	9278	+ ext = "jpg";
8194	9279	reverseUP = false;
8195	9280	break;
8196	9281	case 4:
8197		- name = "cubemaps/cornell_";
	9282	+ name = "cubemaps/cornell/";
8198	9283	ext = "png";
8199	9284	reverseUP = false;
8200	9285	break;
	9286	+ case 5:
	9287	+ name = "cubemaps/skycube/";
	9288	+ ext = "jpg";
	9289	+ reverseUP = false;
	9290	+ break;
	9291	+ case 6:
	9292	+ name = "cubemaps/SaintLazarusChurch3/";
	9293	+ ext = "jpg";
	9294	+ reverseUP = false;
	9295	+ break;
	9296	+ case 7:
	9297	+ name = "cubemaps/Sodermalmsallen/";
	9298	+ ext = "jpg";
	9299	+ reverseUP = false;
	9300	+ break;
	9301	+ case 8:
	9302	+ name = "cubemaps/Sodermalmsallen2/";
	9303	+ ext = "jpg";
	9304	+ reverseUP = false;
	9305	+ break;
	9306	+ case 9:
	9307	+ name = "cubemaps/UnionSquare/";
	9308	+ ext = "jpg";
	9309	+ reverseUP = false;
	9310	+ break;
8201	9311	default:
8202		- name = "cubemaps/rgb_";
8203		- ext = "png"; /mipmap = true;/ reverseUP = false;
	9312	+ name = "cubemaps/box/";
	9313	+ ext = "png"; /mipmap = true;/
	9314	+ reverseUP = false;
8204	9315	break;
8205	9316	}
8206		-
8207		- try
8208		- {
8209		- cubemap = LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
8210		- } catch (IOException e)
8211		- {
8212		- throw new RuntimeException(e);
8213		- }
	9317	+
	9318	+ LoadSkybox(name, ext, mipmap);
8214	9319	}
8215	9320
8216	9321	public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height)
..	..	@@ -8242,8 +9347,12 @@
8242	9347	static double[] model = new double[16];
8243	9348	double[] camera2light = new double[16];
8244	9349	double[] light2camera = new double[16];
8245		- int newenvy = -1;
8246		- boolean envyoff = true; // false;
	9350	+
	9351	+ //int newenvy = -1;
	9352	+ //boolean envyoff = false;
	9353	+
	9354	+ String loadedskyboxname;
	9355	+
8247	9356	cVector light0 = new cVector(0, 0, 0); // 1,3,2);
8248	9357	//float[] light0 = { 0,0,0 };
8249	9358	cVector dirlight = new cVector(0, 0, 1); // 1,3,2);
..	..	@@ -8536,11 +9645,35 @@
8536	9645	jy8[3] = 0.5f;
8537	9646	}
8538	9647
8539		- float[] options1 = new float[]{1000, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
	9648	+ float[] options1 = new float[]{100, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
8540	9649	float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
8541	9650	float[] options3 = new float[]{1, 1, 1, 0}; // fog color
8542	9651	float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
8543	9652
	9653	+ void ResetOptions()
	9654	+ {
	9655	+ options1[0] = 100;
	9656	+ options1[1] = 0.025f;
	9657	+ options1[2] = 0.01f;
	9658	+ options1[3] = 0;
	9659	+ options1[4] = 0;
	9660	+
	9661	+ options2[0] = 0;
	9662	+ options2[1] = 0.75f;
	9663	+ options2[2] = 0;
	9664	+ options2[3] = 0;
	9665	+
	9666	+ options3[0] = 1;
	9667	+ options3[1] = 1;
	9668	+ options3[2] = 1;
	9669	+ options3[3] = 0;
	9670	+
	9671	+ options4[0] = 1;
	9672	+ options4[1] = 0;
	9673	+ options4[2] = 1;
	9674	+ options4[3] = 0;
	9675	+ }
	9676	+
8544	9677	static int imagecount = 0; // movie generation
8545	9678
8546	9679	static int jitter = 0;
..	..	@@ -8636,8 +9769,8 @@
8636	9769	assert (parentcam != renderCamera);
8637	9770
8638	9771	if (renderCamera != lightCamera)
8639		- for (int count = parentcam.GetTransformCount(); --count>=0;)
8640		- LA.matConcat(matrix, parentcam.toParent, matrix);
	9772	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9773	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
8641	9774
8642	9775	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
8643	9776
..	..	@@ -8652,8 +9785,8 @@
8652	9785	LA.matCopy(renderCamera.fromScreen, matrix);
8653	9786
8654	9787	if (renderCamera != lightCamera)
8655		- for (int count = parentcam.GetTransformCount(); --count>=0;)
8656		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	9788	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9789	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
8657	9790
8658	9791	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
8659	9792
..	..	@@ -8699,13 +9832,18 @@
8699	9832	rati = 1 / rati;
8700	9833	gl.glOrtho(-skyscale / rati, skyscale / rati, -skyscale, skyscale, 0.001, 1000);
8701	9834	}
8702		- assert (newenvy == -1);
	9835	+
	9836	+ //assert (newenvy == -1);
	9837	+
8703	9838	gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
8704	9839	gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
8705		- DrawSkyBox(gl);
	9840	+ DrawSkyBox(gl, (float)rati);
8706	9841	gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
8707	9842	gl.glEnable(GL.GL_VERTEX_PROGRAM_ARB);
8708		- accPerspective(gl, renderCamera.shaper_fovy / ratio,
	9843	+
	9844	+ boolean vr = capsLocked && !lightMode;
	9845	+
	9846	+ accPerspective(gl, renderCamera.shaper_fovy / ratio * (vr ? 1.2 : 1),
8709	9847	ratio,
8710	9848	//near_plane, far_plane,
8711	9849	renderCamera.shaper_zNear * renderCamera.Distance(), renderCamera.shaper_zFar * renderCamera.Distance(),
..	..	@@ -8725,7 +9863,7 @@
8725	9863	//gl.glFlush();
8726	9864	gl.glAccum(gl.GL_ACCUM, 1.0f / ACSIZE);
8727	9865
8728		- if (ANIMATION && ABORTED)
	9866	+ if (Globals.ANIMATION && ABORTED)
8729	9867	{
8730	9868	System.err.println(" ABORTED FRAME");
8731	9869	break;
..	..	@@ -8755,7 +9893,7 @@
8755	9893	setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
8756	9894
8757	9895	// save image
8758		- if (ANIMATION && !ABORTED)
	9896	+ if (Globals.ANIMATION && !ABORTED)
8759	9897	{
8760	9898	VPwidth = viewport[2];
8761	9899	VPheight = viewport[3];
..	..	@@ -8866,11 +10004,11 @@
8866	10004
8867	10005	// imagecount++;
8868	10006
8869		- String fullname = filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
	10007	+ String fullname = Globals.filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
8870	10008
8871	10009	if (!BOXMODE)
8872	10010	{
8873		- System.out.println("image: " + fullname + " (wav cursor=" + (GrafreeD.wav.cursor / 735 / 4) + ")");
	10011	+ System.out.println("image: " + fullname + " (wav cursor=" + (Grafreed.wav.cursor / 735 / 4) + ")");
8874	10012	}
8875	10013
8876	10014	if (!BOXMODE)
..	..	@@ -8908,7 +10046,7 @@
8908	10046	ABORTED = false;
8909	10047	}
8910	10048	else
8911		- GrafreeD.wav.cursor += 735 * ACSIZE;
	10049	+ Grafreed.wav.cursor += 735 * ACSIZE;
8912	10050
8913	10051	if (false)
8914	10052	{
..	..	@@ -9568,14 +10706,23 @@
9568	10706	static boolean init = false;
9569	10707
9570	10708	double[][] matrix = LA.newMatrix();
	10709	+
	10710	+ // This is to refresh the UI of the material panel.
	10711	+ ObjEditor patchMaterial;
9571	10712
9572	10713	public void display(GLAutoDrawable drawable)
9573	10714	{
9574		- if (GrafreeD.savesound && GrafreeD.hassound)
	10715	+ if (patchMaterial.patchMaterial)
9575	10716	{
9576		- GrafreeD.wav.save();
9577		- GrafreeD.savesound = false;
9578		- GrafreeD.hassound = false;
	10717	+ patchMaterial.patchMaterial = false;
	10718	+ patchMaterial.objectTabbedPane.setSelectedIndex(1);
	10719	+ }
	10720	+
	10721	+ if (Grafreed.savesound && Grafreed.hassound)
	10722	+ {
	10723	+ Grafreed.wav.save();
	10724	+ Grafreed.savesound = false;
	10725	+ Grafreed.hassound = false;
9579	10726	}
9580	10727	// if (DEBUG_SELECTION)
9581	10728	// {
..	..	@@ -9651,6 +10798,7 @@
9651	10798	ANTIALIAS = 0;
9652	10799	//System.out.println("RESTART");
9653	10800	AAtimer.restart();
	10801	+ Globals.TIMERRUNNING = true;
9654	10802	}
9655	10803	}
9656	10804	}
..	..	@@ -9665,6 +10813,112 @@
9665	10813
9666	10814	if (DrawMode() == DEFAULT)
9667	10815	{
	10816	+ if (manipCamera == lightCamera)
	10817	+ {
	10818	+// switch (e.getKeyCode())
	10819	+// {
	10820	+// case DOWN_ARROW:
	10821	+// lightCamera.DECAL /= 2;
	10822	+// repaint();
	10823	+// break;
	10824	+// case UP_ARROW:
	10825	+// lightCamera.DECAL *= 2;
	10826	+// repaint();
	10827	+// break;
	10828	+// case LEFT_ARROW:
	10829	+// lightCamera.SCALE /= 2;
	10830	+// repaint();
	10831	+// break;
	10832	+// case RIGHT_ARROW:
	10833	+// lightCamera.SCALE *= 2;
	10834	+// repaint();
	10835	+// break;
	10836	+// default:
	10837	+// break;
	10838	+ if (keys[DOWN_ARROW])
	10839	+ {
	10840	+ lightCamera.DECAL /= 2;
	10841	+ }
	10842	+
	10843	+ if (keys[UP_ARROW])
	10844	+ {
	10845	+ lightCamera.DECAL *= 2;
	10846	+ }
	10847	+
	10848	+ if (keys[LEFT_ARROW])
	10849	+ {
	10850	+ lightCamera.SCALE /= 2;
	10851	+ }
	10852	+
	10853	+ if (keys[RIGHT_ARROW])
	10854	+ {
	10855	+ lightCamera.SCALE *= 2;
	10856	+ }
	10857	+ }
	10858	+ else
	10859	+ {
	10860	+ //pingthread.mute = true;
	10861	+
	10862	+ boolean keyon = false;
	10863	+
	10864	+ if (keys[DOWN_ARROW])
	10865	+ {
	10866	+ speed = ++speedkey[DOWN_ARROW];
	10867	+ if (speed > 20)
	10868	+ speed = 20;
	10869	+ GoDown(modifiers);
	10870	+ keyon = true;
	10871	+ }
	10872	+ else
	10873	+ speedkey[DOWN_ARROW] = 0;
	10874	+
	10875	+ if (keys[UP_ARROW])
	10876	+ {
	10877	+ speed = ++speedkey[UP_ARROW];
	10878	+ if (speed > 20)
	10879	+ speed = 20;
	10880	+ GoUp(modifiers);
	10881	+ keyon = true;
	10882	+ }
	10883	+ else
	10884	+ speedkey[UP_ARROW] = 0;
	10885	+
	10886	+ if (keys[LEFT_ARROW])
	10887	+ {
	10888	+ speed = ++speedkey[LEFT_ARROW];
	10889	+ if (speed > 20)
	10890	+ speed = 20;
	10891	+ GoLeft(modifiers);
	10892	+ keyon = true;
	10893	+ }
	10894	+ else
	10895	+ speedkey[LEFT_ARROW] = 0;
	10896	+
	10897	+ if (keys[RIGHT_ARROW])
	10898	+ {
	10899	+ speed = ++speedkey[RIGHT_ARROW];
	10900	+ if (speed > 20)
	10901	+ speed = 20;
	10902	+ GoRight(modifiers);
	10903	+ keyon = true;
	10904	+ }
	10905	+ else
	10906	+ speedkey[RIGHT_ARROW] = 0;
	10907	+
	10908	+ if (Globals.WALK && capsLocked)
	10909	+ {
	10910	+ Walk();
	10911	+ keyon = true;
	10912	+ }
	10913	+
	10914	+ if (keyon)
	10915	+ {
	10916	+ repaint();
	10917	+ }
	10918	+
	10919	+ //pingthread.mute = false;
	10920	+ }
	10921	+
9668	10922	currentlydrawing = true;
9669	10923	}
9670	10924
..	..	@@ -9705,7 +10959,7 @@
9705	10959	Object3D theobject = object;
9706	10960	Object3D theparent = object.parent;
9707	10961	object.parent = null;
9708		- object = (Object3D)GrafreeD.clone(object);
	10962	+ object = (Object3D)Grafreed.clone(object);
9709	10963	object.Stripify();
9710	10964	if (theobject.selection == null \|\| theobject.selection.Size() == 0)
9711	10965	theobject.PreprocessOcclusion(this);
..	..	@@ -9718,13 +10972,14 @@
9718	10972	ambientOcclusion = false;
9719	10973	}
9720	10974
9721		- if (Globals.lighttouched && DrawMode() == DEFAULT && !lightMode) // && !FROZEN)
	10975	+ if (//Globals.lighttouched &&
	10976	+ DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
9722	10977	{
9723	10978	//if (RENDERSHADOW) // ?
9724	10979	if (!IsFrozen())
9725	10980	{
9726	10981	// dec 2012
9727		- if (!ambientOcclusion && !(!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0))
	10982	+ if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
9728	10983	{
9729	10984	Globals.framecount++;
9730	10985	shadowbuffer.display();
..	..	@@ -9737,7 +10992,7 @@
9737	10992
9738	10993	if (wait)
9739	10994	{
9740		- Sleep(500);
	10995	+ Sleep(200); // blocks everything
9741	10996
9742	10997	wait = false;
9743	10998	}
..	..	@@ -9851,8 +11106,8 @@
9851	11106
9852	11107	// if (parentcam != renderCamera) // not a light
9853	11108	if (cam != lightCamera)
9854		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9855		- LA.matConcat(matrix, parentcam.toParent, matrix);
	11109	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11110	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
9856	11111
9857	11112	for (int j = 0; j < 4; j++)
9858	11113	{
..	..	@@ -9866,8 +11121,8 @@
9866	11121
9867	11122	// if (parentcam != renderCamera) // not a light
9868	11123	if (cam != lightCamera)
9869		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9870		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	11124	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11125	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
9871	11126
9872	11127	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
9873	11128
..	..	@@ -9953,13 +11208,43 @@
9953	11208	gl.glOrtho(-skyscale / ratio, skyscale / ratio, -skyscale, skyscale, 0.001, 1000);
9954	11209	}
9955	11210
9956		- if (newenvy > -1)
	11211	+// if (newenvy > -1)
	11212	+// {
	11213	+// LoadEnvy(newenvy);
	11214	+// }
	11215	+//
	11216	+// newenvy = -1;
	11217	+
	11218	+ if (transformMode) // object.skyboxname != null && object.skyboxname.equals("cubemaps/default-skyboxes/rgb"))
9957	11219	{
9958		- LoadEnvy(newenvy);
	11220	+ if (cubemaprgb == null)
	11221	+ {
	11222	+ cubemaprgb = LoadSkybox("cubemaps/default-skyboxes/rgb2" + "/", "jpg", false);
	11223	+ }
	11224	+
	11225	+ cubemap = cubemaprgb;
9959	11226	}
9960		-
9961		- newenvy = -1;
9962		-
	11227	+ else
	11228	+ {
	11229	+ if (object.skyboxname != null)
	11230	+ {
	11231	+ if (!object.skyboxname.equals(this.loadedskyboxname))
	11232	+ {
	11233	+ if (cubemap != null && cubemap != cubemaprgb)
	11234	+ cubemap.dispose();
	11235	+ cubemapcustom = LoadSkybox(object.skyboxname + "/", object.skyboxext, false);
	11236	+ loadedskyboxname = object.skyboxname;
	11237	+ }
	11238	+ }
	11239	+ else
	11240	+ {
	11241	+ cubemapcustom = null;
	11242	+ loadedskyboxname = null;
	11243	+ }
	11244	+
	11245	+ cubemap = cubemapcustom;
	11246	+ }
	11247	+
9963	11248	ratio = ((double) getWidth()) / getHeight();
9964	11249	//System.out.println("ratio = " + ratio);
9965	11250
..	..	@@ -9975,7 +11260,7 @@
9975	11260
9976	11261	if (!IsFrozen() && !ambientOcclusion)
9977	11262	{
9978		- DrawSkyBox(gl);
	11263	+ DrawSkyBox(gl, (float)ratio);
9979	11264	}
9980	11265
9981	11266	//if (selection_view == -1)
..	..	@@ -10126,7 +11411,16 @@
10126	11411	// Bump noise
10127	11412	gl.glActiveTexture(GL.GL_TEXTURE6);
10128	11413	//gl.glBindTexture(GL.GL_TEXTURE_2D, bump_noise);
10129		- BindTexture(NOISE_TEXTURE, false, 2);
	11414	+
	11415	+ try
	11416	+ {
	11417	+ BindTexture(NOISE_TEXTURE, false, 2);
	11418	+ }
	11419	+ catch (Exception e)
	11420	+ {
	11421	+ System.err.println("FAILED: " + NOISE_TEXTURE);
	11422	+ }
	11423	+
10130	11424
10131	11425	gl.glActiveTexture(GL.GL_TEXTURE0);
10132	11426	gl.glEnable(GL.GL_TEXTURE_2D);
..	..	@@ -10149,8 +11443,8 @@
10149	11443
10150	11444	gl.glMatrixMode(GL.GL_MODELVIEW);
10151	11445
10152		-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
10153	11446	//gl.glEnable(gl.GL_POLYGON_SMOOTH);
	11447	+//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
10154	11448	//gl.glEnable(gl.GL_MULTISAMPLE);
10155	11449	} else
10156	11450	{
..	..	@@ -10162,7 +11456,7 @@
10162	11456	//System.out.println("BLENDING ON");
10163	11457	gl.glEnable(GL.GL_BLEND);
10164	11458	gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
10165		-
	11459	+// gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
10166	11460	gl.glMatrixMode(gl.GL_PROJECTION);
10167	11461	gl.glLoadIdentity();
10168	11462
..	..	@@ -10212,7 +11506,10 @@
10212	11506	//gl.glOrtho(-BOOST, BOOST, -BOOST, BOOST, 0.001, 1000);
10213	11507	} else
10214	11508	{
10215		- glu.gluPerspective(cam.shaper_fovy / ratio, ratio, cam.shaper_zNear * cam.Distance(), cam.shaper_zFar * cam.Distance());
	11509	+ boolean vr = capsLocked && !lightMode;
	11510	+
	11511	+ glu.gluPerspective(cam.shaper_fovy / ratio * (vr ? 1.2 : 1),
	11512	+ ratio, cam.shaper_zNear * cam.Distance(), cam.shaper_zFar * cam.Distance());
10216	11513	}
10217	11514	}
10218	11515
..	..	@@ -10251,8 +11548,8 @@
10251	11548	System.err.println("parentcam != renderCamera");
10252	11549
10253	11550	// if (cam != lightCamera)
10254		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10255		- LA.xformDir(lightposition, parentcam.toParent, lightposition); // may 2013
	11551	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11552	+ LA.xformDir(lightposition, parentcam.GlobalTransformInv(), lightposition); // may 2013
10256	11553	}
10257	11554
10258	11555	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -10273,8 +11570,8 @@
10273	11570	if (true) // TODO
10274	11571	{
10275	11572	if (cam != lightCamera)
10276		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10277		- LA.xformDir(light0, parentcam.toParent, light0); // may 2013
	11573	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11574	+ LA.xformDir(light0, parentcam.GlobalTransform(), light0); // may 2013
10278	11575	}
10279	11576
10280	11577	LA.xformPos(light0, cam.toScreen, light0);
..	..	@@ -10340,7 +11637,7 @@
10340	11637	fragmentMode \|= (lightslot - 64) << 2; // 1; // first bit is available for aniso
10341	11638	//System.out.println("fragmentMode = " + fragmentMode);
10342	11639
10343		- if (DrawMode() == DEFAULT \|\| DrawMode() == SELECTION \|\| DEBUG_SELECTION)
	11640	+ if (DrawMode() == DEFAULT \|\| DrawMode() == SELECTION \|\| IsDebugSelection())
10344	11641	{
10345	11642	/*
10346	11643	if (CULLFACE \|\| (ambientOcclusion && OCCLUSION_CULLING))
..	..	@@ -10411,7 +11708,7 @@
10411	11708	}
10412	11709	}
10413	11710
10414		- if (false) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
	11711	+ if (false) //RENDERPROGRAM > 0 && DrawMode() == DEFAULT) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
10415	11712	{
10416	11713	//gl.glDepthFunc(GL.GL_LEQUAL);
10417	11714	//gl.glClear(gl.GL_COLOR_BUFFER_BIT \| gl.GL_DEPTH_BUFFER_BIT);
..	..	@@ -10419,24 +11716,21 @@
10419	11716
10420	11717	boolean texon = textureon;
10421	11718
10422		- if (RENDERPROGRAM > 0)
10423		- {
10424		- gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
10425		- textureon = false;
10426		- }
	11719	+ gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11720	+ textureon = false;
	11721	+
10427	11722	//gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
10428	11723	//System.out.println("ALLO");
10429	11724	gl.glColorMask(false, false, false, false);
10430	11725	DrawObject(gl);
10431		- if (RENDERPROGRAM > 0)
10432		- {
10433		- gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
10434		- textureon = texon;
10435		- }
	11726	+
	11727	+ gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11728	+ textureon = texon;
	11729	+
10436	11730	gl.glColorMask(true, true, true, true);
10437	11731
10438	11732	gl.glDepthFunc(GL.GL_EQUAL);
10439		- //gl.glDepthMask(false);
	11733	+ gl.glDepthMask(false);
10440	11734	}
10441	11735
10442	11736	if (false) // DrawMode() == SHADOW)
..	..	@@ -10571,8 +11865,11 @@
10571	11865	repaint();
10572	11866	}
10573	11867
10574		- if (Globals.isLIVE() && DrawMode() == DEFAULT) // may 2013
	11868	+ if (Globals.isLIVE() && DrawMode() == DEFAULT \|\| pingthread.live) // may 2013
	11869	+ {
	11870	+ renderCamera.computeTransform();
10575	11871	repaint();
	11872	+ }
10576	11873
10577	11874	displaydone = true;
10578	11875	}
..	..	@@ -10590,8 +11887,14 @@
10590	11887	{
10591	11888	renderpass++;
10592	11889	// System.out.println("Draw object... ");
	11890	+ STEP = 1;
10593	11891	if (FAST) // in case there is no script
10594		- STEP = 16;
	11892	+ STEP = 8;
	11893	+
	11894	+ if (CURRENTANTIALIAS == 0 \|\| ACSIZE == 1)
	11895	+ {
	11896	+ STEP *= 4;
	11897	+ }
10595	11898
10596	11899	//object.FullInvariants();
10597	11900
..	..	@@ -10605,24 +11908,59 @@
10605	11908	e.printStackTrace();
10606	11909	}
10607	11910
10608		- if (GrafreeD.RENDERME > 0)
10609		- GrafreeD.RENDERME--; // mechante magouille
	11911	+ if (Grafreed.RENDERME > 0)
	11912	+ Grafreed.RENDERME--; // mechante magouille
10610	11913
10611	11914	Globals.ONESTEP = false;
10612	11915	}
10613	11916
10614	11917	static boolean zoomonce = false;
10615	11918
	11919	+ static void CreateSelectedPoint()
	11920	+ {
	11921	+ if (selectedpoint == null)
	11922	+ {
	11923	+ debugpointG = new Sphere();
	11924	+ debugpointP = new Sphere();
	11925	+ debugpointC = new Sphere();
	11926	+ debugpointR = new Sphere();
	11927	+
	11928	+ selectedpoint = new Superellipsoid();
	11929	+
	11930	+ for (int i=0; i<8; i++)
	11931	+ {
	11932	+ debugpoints[i] = new Sphere();
	11933	+ }
	11934	+ }
	11935	+ }
	11936	+
10616	11937	void DrawObject(GL gl, boolean draw)
10617	11938	{
	11939	+ // To clear camera values
	11940	+ ResetOptions();
	11941	+
10618	11942	//System.out.println("DRAW OBJECT " + mouseDown);
10619	11943	// DrawMode() = SELECTION;
10620	11944	//GL gl = getGL();
10621	11945	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
10622	11946	{
	11947	+ if (TRACK)
	11948	+ {
	11949	+ if (object.selection != null &&
	11950	+ object.selection.size() > 0 &&
	11951	+ object.selection.elementAt(0) != null &&
	11952	+ !(object.selection.elementAt(0) instanceof Camera) &&
	11953	+ !(object.selection.elementAt(0) instanceof ScriptNode))
	11954	+ {
	11955	+ trackedobject = object.selection.elementAt(0);
	11956	+ //repaint();
	11957	+ }
	11958	+ else
	11959	+ trackedobject = null;
	11960	+ }
10623	11961	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
10624		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
10625		- pingthread.StepToTarget(true); // true);
	11962	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	11963	+ pingthread.StepToTarget(); // true);
10626	11964	// zoomonce = false;
10627	11965	}
10628	11966
..	..	@@ -10641,7 +11979,7 @@
10641	11979	callist = gl.glGenLists(1);
10642	11980	}
10643	11981
10644		- boolean selectmode = DrawMode() == SELECTION \|\| CameraPane.DEBUG_SELECTION;
	11982	+ boolean selectmode = DrawMode() == SELECTION \|\| IsDebugSelection();
10645	11983
10646	11984	boolean active = !selectmode; // DrawMode() != SELECTION; // mouseDown;
10647	11985
..	..	@@ -10676,7 +12014,14 @@
10676	12014
10677	12015	usedtextures.clear();
10678	12016
10679		- BindTextures(DEFAULT_TEXTURES, 2);
	12017	+ try
	12018	+ {
	12019	+ BindTextures(DEFAULT_TEXTURES, 2);
	12020	+ }
	12021	+ catch (Exception e)
	12022	+ {
	12023	+ System.err.println("FAILED: " + DEFAULT_TEXTURES);
	12024	+ }
10680	12025	}
10681	12026	//System.out.println("--> " + stackdepth);
10682	12027	// GrafreeD.traceon();
..	..	@@ -10686,8 +12031,9 @@
10686	12031
10687	12032	if (DrawMode() == DEFAULT)
10688	12033	{
10689		- if (DEBUG)
	12034	+ if (Globals.DEBUG)
10690	12035	{
	12036	+ CreateSelectedPoint();
10691	12037	float radius = 0.05f;
10692	12038	if (selectedpoint.radius != radius)
10693	12039	{
..	..	@@ -10741,20 +12087,32 @@
10741	12087	ReleaseTextures(DEFAULT_TEXTURES);
10742	12088
10743	12089	if (CLEANCACHE)
10744		- for (java.util.Enumeration<String> e = textures.keys() ; e.hasMoreElements();)
	12090	+ for (java.util.Enumeration<cTexture> e = texturepigment.keys() ; e.hasMoreElements();)
10745	12091	{
10746		- String tex = e.nextElement();
	12092	+ cTexture tex = e.nextElement();
10747	12093
10748	12094	// System.out.println("Texture --------- " + tex);
10749	12095
10750		- if (tex.equals("WHITE_NOISE"))
	12096	+ if (tex.equals("WHITE_NOISE:"))
10751	12097	continue;
10752	12098
10753		- if (!usedtextures.containsKey(tex))
	12099	+ if (!usedtextures.contains(tex))
10754	12100	{
	12101	+ CacheTexture gettex = texturepigment.get(tex);
10755	12102	// System.out.println("DISPOSE +++++++++++++++ " + tex);
10756		- textures.get(tex).texture.dispose();
10757		- textures.remove(tex);
	12103	+ if (gettex != null)
	12104	+ {
	12105	+ gettex.texture.dispose();
	12106	+ texturepigment.remove(tex);
	12107	+ }
	12108	+
	12109	+ gettex = texturebump.get(tex);
	12110	+ // System.out.println("DISPOSE +++++++++++++++ " + tex);
	12111	+ if (gettex != null)
	12112	+ {
	12113	+ gettex.texture.dispose();
	12114	+ texturebump.remove(tex);
	12115	+ }
10758	12116	}
10759	12117	}
10760	12118	}
..	..	@@ -10767,7 +12125,14 @@
10767	12125	if (checker != null && DrawMode() == DEFAULT)
10768	12126	{
10769	12127	//BindTexture(IMMORTAL_TEXTURE);
10770		- BindTextures(checker.GetTextures(), checker.texres);
	12128	+ try
	12129	+ {
	12130	+ BindTextures(checker.GetTextures(), checker.texres);
	12131	+ }
	12132	+ catch (Exception e)
	12133	+ {
	12134	+ System.err.println("FAILED: " + checker.GetTextures());
	12135	+ }
10771	12136	// NEAREST
10772	12137	GetGL().glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST); // GL.GL_LINEAR);
10773	12138	DrawChecker(gl);
..	..	@@ -10849,7 +12214,7 @@
10849	12214	return;
10850	12215	}
10851	12216
10852		- String string = obj.GetToolTip();
	12217	+ String string = obj.toString(); //.GetToolTip();
10853	12218
10854	12219	GL gl = GetGL();
10855	12220
..	..	@@ -11166,8 +12531,8 @@
11166	12531	//obj.TransformToWorld(light, light);
11167	12532	for (int i = tp.size(); --i >= 0;)
11168	12533	{
11169		- for (int count = tp.get(i).GetTransformCount(); --count>=0;)
11170		- LA.xformPos(light, tp.get(i).toParent, light);
	12534	+ //for (int count = tp.get(i).GetTransformCount(); --count>=0;)
	12535	+ LA.xformPos(light, tp.get(i).GlobalTransformInv(), light);
11171	12536	}
11172	12537
11173	12538
..	..	@@ -11184,8 +12549,8 @@
11184	12549	parentcam = cameras[0];
11185	12550	}
11186	12551
11187		- for (int count = parentcam.GetTransformCount(); --count>=0;)
11188		- LA.xformPos(light, parentcam.toParent, light); // may 2013
	12552	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	12553	+ LA.xformPos(light, parentcam.GlobalTransform(), light); // may 2013
11189	12554
11190	12555	LA.xformPos(light, renderCamera.toScreen, light);
11191	12556
..	..	@@ -11275,8 +12640,82 @@
11275	12640
11276	12641	//gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
11277	12642
11278		- String program =
	12643	+ String programmin =
	12644	+ // Min shader
11279	12645	"!!ARBfp1.0\n" +
	12646	+ "PARAM zero12t = { 0.0, 1.0, 2, 1.25 };" +
	12647	+ "PARAM pow_2 = { 0.5, 0.25, 0.125, 0.0 };" +
	12648	+ "PARAM pow2 = { 2, 4, 8, 0.0 };" +
	12649	+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
	12650	+ "PARAM eps = { 0.001, 0.001, 0.001, 1.0 };" +
	12651	+ "PARAM infinity = { 100000000, 100000000, 100000000, 1.0 };" +
	12652	+ "PARAM light2cam0 = program.env[10];" +
	12653	+ "PARAM light2cam1 = program.env[11];" +
	12654	+ "PARAM light2cam2 = program.env[12];" +
	12655	+ "TEMP temp;" +
	12656	+ "TEMP light;" +
	12657	+ "TEMP ndotl;" +
	12658	+ "TEMP normal;" +
	12659	+ "TEMP depth;" +
	12660	+ "TEMP eye;" +
	12661	+ "TEMP pos;" +
	12662	+
	12663	+ "MAD normal, fragment.color, zero12t.z, -zero12t.y;" +
	12664	+ Normalize("normal") +
	12665	+ "MOV light, state.light[0].position;" +
	12666	+ "DP3 ndotl.x, light, normal;" +
	12667	+ "MAX ndotl.x, ndotl.x, zero12t.x;" +
	12668	+
	12669	+ // shadow
	12670	+ "MOV pos, fragment.texcoord[1];" +
	12671	+ "MOV temp, pos;" +
	12672	+ ShadowTextureFetch("depth", "temp", "1") +
	12673	+ //"TEX depth, fragment.texcoord[1], texture[1], 2D;" +
	12674	+ "SLT ndotl.z, fragment.texcoord[1].z, depth.z;" +
	12675	+
	12676	+ // No shadow when out of frustum
	12677	+ //"SGE temp.y, depth.z, zero123.y;" +
	12678	+ //"LRP temp.x, temp.y, zero123.y, temp.x;" +
	12679	+
	12680	+ "MUL ndotl.x, ndotl.x, ndotl.z;" + // Shadow
	12681	+
	12682	+ // Backlit
	12683	+ "MOV pos.w, zero12t.y;" + // one
	12684	+ "DP4 eye.x, pos, light2cam0;" +
	12685	+ "DP4 eye.y, pos, light2cam1;" +
	12686	+ "DP4 eye.z, pos, light2cam2;" +
	12687	+ Normalize("eye") +
	12688	+
	12689	+ "DP3 ndotl.y, -eye, normal;" +
	12690	+ //"MUL ndotl.y, ndotl.y, pow2.x;" +
	12691	+ "POW ndotl.y, ndotl.y, pow2.x;" + // backlit
	12692	+ "SUB ndotl.y, zero12t.y, ndotl.y;" + // 1 - y
	12693	+ //"POW ndotl.y, ndotl.y, pow2.z;" + // backlit
	12694	+ //"SUB ndotl.y, zero123.y, ndotl.y;" +
	12695	+ //"MUL ndotl.y, ndotl.y, pow2.z;" +
	12696	+ "ADD ndotl.y, ndotl.y, one.x;" +
	12697	+ "MUL ndotl.y, ndotl.y, pow_2.x;" +
	12698	+
	12699	+ //"MAX ndotl.x, ndotl.x, ndotl.y;" + // Ambient
	12700	+ //"MAX ndotl.x, ndotl.x, pow2.y;" + // Ambient
	12701	+
	12702	+ // Pigment
	12703	+ "TEX temp, fragment.texcoord[0], texture[0], 2D;" +
	12704	+ "LRP temp, zero12t.w, temp, one;" + // texture proportion
	12705	+ "MUL temp, temp, zero12t.w;" + // Times x
	12706	+
	12707	+ //"MUL temp, temp, ndotl.y;" +
	12708	+ "MAD ndotl.x, pow_2.xxxx, ndotl.yyyy, ndotl.x;" +
	12709	+
	12710	+ "MUL temp, temp, ndotl.x;" + // lambert
	12711	+
	12712	+ "MOV temp.w, zero12t.y;" + // reset alpha
	12713	+ "MOV result.color, temp;" +
	12714	+ "END";
	12715	+
	12716	+ String programmax =
	12717	+ "!!ARBfp1.0\n" +
	12718	+
11280	12719	//"OPTION ARB_fragment_program_shadow;" +
11281	12720	"PARAM light2cam0 = program.env[10];" +
11282	12721	"PARAM light2cam1 = program.env[11];" +
..	..	@@ -11302,7 +12741,7 @@
11302	12741	"PARAM params4 = program.env[4];" + // anisoV, cameralight, selfshadow, shadow
11303	12742	"PARAM params5 = program.env[5];" + // texture, opacity, fakedepth, shadowbias
11304	12743	"PARAM params6 = program.env[6];" + // bump, noise, borderfade, fog punchthrough
11305		- "PARAM params7 = program.env[7];" + // noise power, opacity power
	12744	+ "PARAM params7 = program.env[7];" + // noise power, opacity power, parallax
11306	12745	"PARAM options0 = program.env[63];" + // fog density, intensity, elevation
11307	12746	"PARAM options1 = program.env[62];" + // fog rgb color
11308	12747	"PARAM options2 = program.env[61];" + // image intensity, subsurface, lightsheen
..	..	@@ -11391,8 +12830,7 @@
11391	12830	"TEMP shininess;" +
11392	12831	"\n" +
11393	12832	"MOV texSamp, one;" +
11394		- //"TEX texSamp, fragment.texcoord[0], texture[0], 2D;" +
11395		-
	12833	+
11396	12834	"MOV mapgrid.x, one2048th.x;" +
11397	12835	"MOV temp, fragment.texcoord[1];" +
11398	12836	/*
..	..	@@ -11413,20 +12851,20 @@
11413	12851	"MUL temp, floor, mapgrid.x;" +
11414	12852	//"TEX depth0, temp, texture[1], 2D;" +
11415	12853	(((mode & FP_SOFTSHADOW) == 0) ? "" :
11416		- TextureFetch("depth0", "temp", "1") +
	12854	+ ShadowTextureFetch("depth0", "temp", "1") +
11417	12855	"") +
11418	12856	"ADD temp.x, temp.x, mapgrid.x;" +
11419	12857	//"TEX depth1, temp, texture[1], 2D;" +
11420	12858	(((mode & FP_SOFTSHADOW) == 0) ? "" :
11421		- TextureFetch("depth1", "temp", "1") +
	12859	+ ShadowTextureFetch("depth1", "temp", "1") +
11422	12860	"") +
11423	12861	"ADD temp.y, temp.y, mapgrid.x;" +
11424	12862	//"TEX depth2, temp, texture[1], 2D;" +
11425		- TextureFetch("depth2", "temp", "1") +
	12863	+ ShadowTextureFetch("depth2", "temp", "1") +
11426	12864	"SUB temp.x, temp.x, mapgrid.x;" +
11427	12865	//"TEX depth3, temp, texture[1], 2D;" +
11428	12866	(((mode & FP_SOFTSHADOW) == 0) ? "" :
11429		- TextureFetch("depth3", "temp", "1") +
	12867	+ ShadowTextureFetch("depth3", "temp", "1") +
11430	12868	"") +
11431	12869	//"MUL texSamp0, texSamp0, state.material.front.diffuse;" +
11432	12870	//"MOV params, material;" +
..	..	@@ -11548,7 +12986,7 @@
11548	12986	"POW texSamp.a, texSamp.a, params6.w;" + // fog punch through shortcut
11549	12987	// mar 2013 ??? "KIL alpha.a;" +
11550	12988	"MOV alpha, texSamp.aaaa;" + // y;" +
11551		- "KIL alpha.a;" +
	12989	+ "KIL alpha.a;" + // not sure with parallax mapping
11552	12990	/*
11553	12991	"MUL temp.xy, temp, two;" +
11554	12992	"TXB bump, temp, texture[0], 2D;" +
..	..	@@ -11634,11 +13072,6 @@
11634	13072	"SUB bump0, bump0, half;" +
11635	13073	"ADD bump, bump, bump0;" +
11636	13074
11637		- "MOV temp.x, texSamp.a;" +
11638		- "LRP texSamp, params5.x, texSamp, one;" + // texture proportion
11639		- //"LRP texSamp0, params5.x, texSamp0, one;" +
11640		- "MOV texSamp.a, temp.x;" +
11641		-
11642	13075	// double-sided
11643	13076	/**/
11644	13077	(doublesided?"DP3 temp.z, normal, eye;" +
..	..	@@ -11648,26 +13081,73 @@
11648	13081	"ADD temp.x, temp.x, one.x;" +
11649	13082	"MUL normal, normal, temp.xxxx;":""
11650	13083	) +
11651		- /**/
11652		-//// Normalize("normal") +
11653		-//// "MAX normal.z, eps.x, normal.z;" +
11654		-// Normalize("normal") +
11655		- "MOV normald, normal;" +
11656		- "MOV normals, normal;" +
	13084	+ /**/
	13085	+
	13086	+ "MOV temp, fragment.texcoord[4];" +
11657	13087
11658	13088	// UV base
11659	13089	//"DP3 UP.x,state.matrix.modelview.row[0],Y;" +
11660	13090	//"DP3 UP.y,state.matrix.modelview.row[1],Y;" +
11661	13091	//"DP3 UP.z,state.matrix.modelview.row[2],Y;" +
11662		- "DP3 UP.x,state.matrix.texture[7].row[0],Y;" +
11663		- "DP3 UP.y,state.matrix.texture[7].row[1],Y;" +
11664		- "DP3 UP.z,state.matrix.texture[7].row[2],Y;" +
	13092	+ "DP3 UP.x,state.matrix.texture[7].row[0],temp;" +
	13093	+ "DP3 UP.y,state.matrix.texture[7].row[1],temp;" +
	13094	+ "DP3 UP.z,state.matrix.texture[7].row[2],temp;" +
	13095	+ Normalize("UP") +
	13096	+
11665	13097	"XPD V, normal, UP;" +
11666	13098	Normalize("V") +
11667	13099	"XPD U, V, normal;" +
11668	13100	Normalize("U") +
11669	13101
	13102	+ "MOV temp, fragment.texcoord[0];" +
	13103	+
	13104	+// "MAD normal, -temp.x, U, normal;" +
	13105	+// "MAD normal, -temp.y, V, normal;" +
	13106	+// Normalize("normal") +
	13107	+
	13108	+//// "MAX normal.z, eps.x, normal.z;" +
	13109	+// Normalize("normal") +
	13110	+ "MOV normald, normal;" +
	13111	+ "MOV normals, normal;" +
	13112	+
11670	13113	// parallax mapping
	13114	+
	13115	+ "DP3 temp2.x, V, eye;" +
	13116	+ "DP3 temp2.y, U, eye;" +
	13117	+ "DP3 temp2.z, normal, eye;" +
	13118	+ "RCP temp2.z, temp2.z;" +
	13119	+
	13120	+ "DP3 temp2.w, texSamp, texSamp;" + // Height
	13121	+ "RSQ temp2.w, temp2.w;" +
	13122	+ "RCP temp2.w, temp2.w;" +
	13123	+
	13124	+ "SUB temp2.w, temp2.w, half;" +
	13125	+ // "SGE temp.x, temp2.w, eps.x;" +
	13126	+ // "MUL temp2.w, temp2.w, temp.x;" +
	13127	+
	13128	+ // "MOV texSamp, U;" +
	13129	+
	13130	+ "MUL temp2.z, temp2.z, temp2.w;" +
	13131	+ "MUL temp2.z, temp2.z, params7.z;" + // parallax
	13132	+
	13133	+ "MUL temp2, temp2, temp2.z;" +
	13134	+
	13135	+ "SUB temp, temp, temp2;" +
	13136	+
	13137	+ "TEX temp, temp, texture[0], 2D;" +
	13138	+ "POW temp.a, temp.a, params6.w;" + // punch through
	13139	+
	13140	+ "ADD texSamp, temp, texSamp;" +
	13141	+ "MUL texSamp.xyz, half, texSamp;" +
	13142	+
	13143	+ "MOV alpha, texSamp.aaaa;" +
	13144	+
	13145	+// parallax mapping
	13146	+
	13147	+ "MOV temp.x, texSamp.a;" +
	13148	+ "LRP texSamp, params5.x, texSamp, one;" + // texture proportion
	13149	+ //"LRP texSamp0, params5.x, texSamp0, one;" +
	13150	+ "MOV texSamp.a, temp.x;" +
11671	13151
11672	13152	//"MOV temp, fragment.texcoord[0];" +
11673	13153	//
..	..	@@ -11797,10 +13277,10 @@
11797	13277	"MAD shadow.x, buffer.x, frac.y, shadow.x;" +
11798	13278	"") +
11799	13279
11800		- // display shadow only (bump == 0)
	13280	+ // display shadow only (fakedepth == 0)
11801	13281	"SUB temp.x, half.x, shadow.x;" +
11802		- "MOV temp.y, -params6.x;" +
11803		- "SLT temp.z, temp.y, zero.x;" +
	13282	+ "MOV temp.y, -params5.z;" + // params6.x;" +
	13283	+ "SLT temp.z, temp.y, -c256i.x;" +
11804	13284	"SUB temp.y, one.x, temp.z;" +
11805	13285	"MUL temp.x, temp.x, temp.y;" +
11806	13286	"KIL temp.x;" +
..	..	@@ -11929,8 +13409,10 @@
11929	13409	"MAX ndotl.x, ndotl.x, -ndotl.x;" +
11930	13410
11931	13411	"SUB temp.x, one.x, ndotl.x;" +
11932		- "ADD temp.x, temp.x, options2.z;" + // lightsheen
11933		- "ADD temp.y, one.y, options2.y;" + // sursurface
	13412	+ // Tuning for default skin
	13413	+ //"ADD temp.x, temp.x, options2.z;" + // lightsheen
	13414	+ "MAD temp.x, options2.z, half.y, temp.x;" + // lightsheen
	13415	+ "ADD temp.y, one.y, options2.y;" + // subsurface
11934	13416	"MUL temp.x, temp.x, temp.y;" +
11935	13417
11936	13418	"MUL saturation, saturation, temp.xxxx;" +
..	..	@@ -12129,8 +13611,19 @@
12129	13611	//once = true;
12130	13612	}
12131	13613
12132		- System.out.print("Program #" + mode + "; length = " + program.length());
12133		- System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
	13614	+ String program = programmax;
	13615	+
	13616	+ if (Globals.MINSHADER)
	13617	+ {
	13618	+ program = programmin;
	13619	+ }
	13620	+
	13621	+ if (Globals.DEBUG)
	13622	+ {
	13623	+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
	13624	+ System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
	13625	+ }
	13626	+
12134	13627	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
12135	13628
12136	13629	//gl.glNewList(displayListID, GL.GL_COMPILE);
..	..	@@ -12177,7 +13670,8 @@
12177	13670	"\n" +
12178	13671	"END\n";
12179	13672
12180		- System.out.println("Program shadow #" + 0 + "; length = " + program.length());
	13673	+ if (Globals.DEBUG)
	13674	+ System.out.println("Program shadow #" + 0 + "; length = " + program.length());
12181	13675	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
12182	13676
12183	13677	//gl.glNewList(displayListID, GL.GL_COMPILE);
..	..	@@ -12222,25 +13716,26 @@
12222	13716	return out;
12223	13717	}
12224	13718
12225		- String TextureFetch(String dest, String src, String unit)
	13719	+ // Also does frustum culling
	13720	+ String ShadowTextureFetch(String dest, String src, String unit)
12226	13721	{
12227	13722	return "TEX " + dest + ", " + src + ", texture[" + unit + "], 2D;" +
12228	13723	"SGE " + src + ".w, " + src + ".x, eps.x;" +
12229	13724	"SGE " + src + ".z, " + src + ".y, eps.x;" +
	13725	+ "SLT " + dest + ".x, " + src + ".x, one.x;" +
	13726	+ "SLT " + dest + ".y, " + src + ".y, one.x;" +
12230	13727	"MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
12231		- "SLT " + src + ".z, " + src + ".x, one.x;" +
12232		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
12233		- "SLT " + src + ".z, " + src + ".y, one.x;" +
12234		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
	13728	+ "MUL " + src + ".w, " + dest + ".x, " + src + ".w;" +
	13729	+ "MUL " + src + ".w, " + dest + ".y, " + src + ".w;" +
12235	13730	//"SWZ buffer, temp, w,w,w,w;";
12236		- "MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
	13731	+ //"MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
12237	13732	"SUB " + src + ".z, " + "one.x, " + src + ".w;" +
12238	13733	//"MUL " + src + ".z, " + src + ".z, infinity.x;" +
12239	13734	//"ADD " + dest + ".z, " + dest + ".z, " + src + ".z;";
12240		- "MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
	13735	+ //"MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
12241	13736
12242		- //"LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
12243		- //"LRP " + dest + ".z" + ", " + src + ".w, infinity.x," + dest + ".z;";
	13737	+ //?? "LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
	13738	+ "LRP " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
12244	13739	}
12245	13740
12246	13741	String Shadow(String depth, String shadow)
..	..	@@ -12262,12 +13757,16 @@
12262	13757
12263	13758	"ADD " + depth + ".z, " + depth + ".z, temp.x;" +
12264	13759	//"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing!
	13760	+
	13761	+ // Compare fragment depth in light space with shadowmap.
12265	13762	"SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" +
12266	13763	"SGE temp.y, temp.x, zero.x;" +
12267		- "SUB " + shadow + ".y, one.x, temp.y;" +
	13764	+ "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded
	13765	+
	13766	+ // Reverse comparison
12268	13767	"SUB temp.x, one.x, temp.x;" +
12269	13768	"MUL " + shadow + ".x, temp.x, temp.y;" +
12270		- "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded
	13769	+ "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse
12271	13770	"POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth
12272	13771
12273	13772	"SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" +
..	..	@@ -12281,6 +13780,10 @@
12281	13780	// No shadow for backface
12282	13781	"DP3 temp.x, normal, lightd;" +
12283	13782	"SLT temp.x, temp.x, zero.x;" + // shadoweps
	13783	+ "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
	13784	+
	13785	+ // No shadow when out of frustum
	13786	+ "SGE temp.x, " + depth + ".z, one.z;" +
12284	13787	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
12285	13788	"";
12286	13789	}
..	..	@@ -12426,8 +13929,9 @@
12426	13929	/static/ float[] modelParams4 = new float[]{0, 0, 0, 0}; // anisoV, cameralight, selfshadow, shadow
12427	13930	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
12428	13931	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
12429		- /static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
12430		- Object3D.cVector2[] vector2buffer;
	13932	+ /static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power, parallax
	13933	+
	13934	+ //Object3D.cVector2[] vector2buffer;
12431	13935
12432	13936	// IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
12433	13937	// OUT : diff, spec
..	..	@@ -12443,9 +13947,10 @@
12443	13947	"DP3 " + dest + ".z," + "normals," + "eye;" +
12444	13948	"MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
12445	13949	//"MOV " + dest + ".w," + "normal.z;" +
12446		- "MUL " + dest + ".z," + "params2.w," + dest + ".x;" +
12447		- "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
12448		- //"MOV " + dest + ".z," + "params2.w;" +
	13950	+// "MUL " + dest + ".z," + "params2.w," + dest + ".x;" + // PRETTY HEURISTIC FOR VELVET
	13951	+// "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
	13952	+
	13953	+ "MOV " + dest + ".z," + "params2.w;" + // EXACT
12449	13954	"POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
12450	13955	"RCP " + dest + ".w," + dest + ".w;" +
12451	13956	//"RSQ " + dest + ".w," + dest + ".w;" +
..	..	@@ -12591,7 +14096,7 @@
12591	14096	"PARAM p[4] = { state.matrix.projection }; # modelview projection matrix\n" +
12592	14097	"PARAM zero = { 0.0, 0.0, 0.0, 1.0 };" +
12593	14098	"PARAM half = { 0.5, 0.5, 0.5, 1.0 };" +
12594		- "PARAM one = { 1.0, 1.0, 1.0, 0.0 };" +
	14099	+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
12595	14100	"PARAM two = { 2.0, 2.0, 2.0, 1.0 };" +
12596	14101	"PARAM third = { 0.33333333333, 0.33333333333, 0.33333333333, 1.0 };" +
12597	14102	//"PARAM v256 = { 256.0, 256.0, 256.0, 1.0 };" +
..	..	@@ -12652,7 +14157,7 @@
12652	14157	"DP4 temp.x,state.matrix.texture[0].inverse.row[0],vertex.texcoord;" +
12653	14158	"DP4 temp.y,state.matrix.texture[0].inverse.row[1],vertex.texcoord;" +
12654	14159	"DP4 temp.z,state.matrix.texture[0].inverse.row[2],vertex.texcoord;" +
12655		- //"MOV result.texcoord, vertex.texcoord;" +
	14160	+ //"MOV result.texcoord, vertex.fogcoord;" +
12656	14161	"MOV result.texcoord, temp;" +
12657	14162	// border fade
12658	14163	"MOV result.texcoord[3], vertex.texcoord;" +
..	..	@@ -12699,7 +14204,9 @@
12699	14204
12700	14205	//"ADD temp.z, temp.z, one;" +
12701	14206
12702		- "MOV result.color, temp;"
	14207	+ "MOV result.texcoord[4], vertex.attrib[4];" + // U dir
	14208	+
	14209	+ "MOV result.color, temp;" // Normal
12703	14210	: "MOV result.color, vertex.color;") +
12704	14211	((mode & VP_PROJECTION) != 0 ? "MOV result.color, zero;"
12705	14212	: "") +
..	..	@@ -12834,12 +14341,15 @@
12834	14341	public void mouseClicked(MouseEvent e)
12835	14342	{
12836	14343	System.out.println("mouseClicked: " + e);
	14344	+ System.exit(0);
12837	14345	}
12838	14346
12839	14347	public void mousePressed(MouseEvent e)
12840	14348	{
	14349	+ RigidBody.justclicked = true;
	14350	+ System.out.println("justclicked: " + e);
12841	14351	//System.out.println("mousePressed: " + e);
12842		- clickStart(e.getX(), e.getY(), e.getModifiersEx());
	14352	+ clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
12843	14353	}
12844	14354
12845	14355	static long prevtime = 0;
..	..	@@ -12866,15 +14376,18 @@
12866	14376
12867	14377	//System.err.println("Dtime = " + Dtime + "; units = " + e.getUnitsToScroll() + "; ratio (units/ms) = " + ratio);
12868	14378
	14379	+ if (BUTTONLESSWHEEL)
12869	14380	if (Math.abs(ratio) < 0.1 \|\| Math.abs(Dtime) == 0) // < 30)
12870	14381	{
12871	14382	return;
12872	14383	}
12873	14384
12874		- boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
	14385	+ //boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
	14386	+
	14387	+ boolean vr = capsLocked && !lightMode;
12875	14388
12876	14389	// TIMER
12877		- if (!wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
	14390	+ if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !vr) // VR
12878	14391	{
12879	14392	keepboxmode = BOXMODE;
12880	14393	keepsupport = SUPPORT;
..	..	@@ -12914,8 +14427,8 @@
12914	14427	// mode \|= META;
12915	14428	//}
12916	14429
12917		- SetMouseMode(WHEEL \| e.getModifiersEx());
12918		- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0);
	14430	+ SetMouseMode(e.getModifiers(), WHEEL \| e.getModifiersEx());
	14431	+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, e.getModifiers(), e.getModifiersEx());
12919	14432	anchorX = ax;
12920	14433	anchorY = ay;
12921	14434	prevX = px;
..	..	@@ -12949,6 +14462,7 @@
12949	14462	else
12950	14463	if (evt.getSource() == AAtimer)
12951	14464	{
	14465	+ Globals.TIMERRUNNING = false;
12952	14466	if (mouseDown)
12953	14467	{
12954	14468	//new Exception().printStackTrace();
..	..	@@ -12974,6 +14488,10 @@
12974	14488	// LIVE = waslive;
12975	14489	// wasliveok = true;
12976	14490	// waslive = false;
	14491	+
	14492	+ // May 2019 Forget it:
	14493	+ if (true)
	14494	+ return;
12977	14495
12978	14496	// source == timer
12979	14497	if (mouseDown)
..	..	@@ -13004,21 +14522,23 @@
13004	14522
13005	14523	// fev 2014???
13006	14524	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
13007		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
13008		- pingthread.StepToTarget(true); // true);
	14525	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	14526	+ pingthread.StepToTarget(); // true);
13009	14527	}
	14528	+
13010	14529	// if (!LIVE)
13011	14530	super.repaint();
13012	14531	}
13013	14532
13014	14533	javax.swing.Timer timer = new javax.swing.Timer(350, this);
13015	14534
13016		- void clickStart(int x, int y, int modifiers)
	14535	+ void clickStart(int x, int y, int modifiers, int modifiersex)
13017	14536	{
13018	14537	if (!wasliveok)
13019	14538	return;
13020	14539
13021	14540	AAtimer.restart(); //
	14541	+ Globals.TIMERRUNNING = true;
13022	14542
13023	14543	// waslive = LIVE;
13024	14544	// LIVE = false;
..	..	@@ -13030,7 +14550,7 @@
13030	14550	// touched = true; // main DL
13031	14551	if (isRenderer)
13032	14552	{
13033		- SetMouseMode(modifiers);
	14553	+ SetMouseMode(modifiers, modifiersex);
13034	14554	}
13035	14555
13036	14556	selectX = anchorX = x;
..	..	@@ -13043,7 +14563,7 @@
13043	14563	clicked = true;
13044	14564	hold = false;
13045	14565
13046		- if (((modifiers & ~1024) & ~0) == 0) // Single or multiple selection
	14566	+ if (((modifiersex & ~1024) & ~0) == 0) // Single or multiple selection
13047	14567	// june 2013 means CTRL_CLICK: if (((modifiers & ~1024) & ~128) == 0) // Single or multiple selection
13048	14568	{
13049	14569	// System.out.println("RESTART II " + modifiers);
..	..	@@ -13068,14 +14588,15 @@
13068	14588	drag = false;
13069	14589	//System.out.println("Mouse DOWN");
13070	14590	editObj = false;
13071		- ClickInfo info = new ClickInfo();
13072		- info.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
13073		- info.pane = this;
13074		- info.camera = renderCamera;
13075		- info.x = x;
13076		- info.y = y;
13077		- info.modifiers = modifiers;
13078		- editObj = object.doEditClick(info, 0);
	14591	+ //ClickInfo info = new ClickInfo();
	14592	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14593	+ object.clickInfo.pane = this;
	14594	+ object.clickInfo.camera = renderCamera;
	14595	+ object.clickInfo.x = x;
	14596	+ object.clickInfo.y = y;
	14597	+ object.clickInfo.modifiers = modifiersex;
	14598	+ editObj = object.doEditClick(//info,
	14599	+ 0);
13079	14600	if (!editObj)
13080	14601	{
13081	14602	hasMarquee = true;
..	..	@@ -13091,19 +14612,22 @@
13091	14612
13092	14613	public void mouseDragged(MouseEvent e)
13093	14614	{
	14615	+ Globals.MOUSEDRAGGED = true;
	14616	+
	14617	+ //System.out.println("mouseDragged: " + e);
13094	14618	if (isRenderer)
13095	14619	movingcamera = true;
	14620	+
13096	14621	//if (drawing)
13097	14622	//return;
13098		- //System.out.println("mouseDragged: " + e);
13099		- if ((e.getModifiersEx() & CTRL) != 0
13100		- \|\| (e.getModifiersEx() & COMMAND) != 0) // \|\| IsFrozen())
	14623	+ if ((e.getModifiersEx() & CTRL) != 0 \|\|
	14624	+ (e.getModifiersEx() & COMMAND) != 0) // \|\| IsFrozen())
13101	14625	{
13102	14626	//System.out.println("mouseDragged: " + e);
13103	14627	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
13104	14628	}
13105	14629	else
13106		- drag(e.getX(), e.getY(), e.getModifiersEx());
	14630	+ drag(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13107	14631
13108	14632	//try { Thread.sleep(1); } catch (Exception ex) {}
13109	14633	}
..	..	@@ -13116,9 +14640,22 @@
13116	14640	cVector tmp2 = new cVector();
13117	14641	boolean isMoving;
13118	14642
	14643	+ public cVector TargetLookAt()
	14644	+ {
	14645	+ return targetLookAt;
	14646	+ }
	14647	+
	14648	+ javax.vecmath.Point3d eye = new javax.vecmath.Point3d();
	14649	+ javax.vecmath.Point3d eye2 = new javax.vecmath.Point3d();
	14650	+ javax.vecmath.Vector3d dir = new javax.vecmath.Vector3d();
	14651	+
	14652	+
13119	14653	class PingThread extends Thread
13120	14654	{
13121	14655	boolean jump;
	14656	+ boolean live;
	14657	+
	14658	+ boolean mute;
13122	14659
13123	14660	// void JumpToTarget()
13124	14661	// {
..	..	@@ -13134,6 +14671,88 @@
13134	14671	// only one thread!? synchronized
13135	14672	void StepToTarget(boolean jump)
13136	14673	{
	14674	+ RigidBody.pos.x = 0;
	14675	+ RigidBody.pos.y = 0;
	14676	+ RigidBody.pos.z = 0;
	14677	+ if (RigidBody.justclicked)
	14678	+ {
	14679	+ RigidBody.pos.x = (float)manipCamera.lookAt.x;
	14680	+ RigidBody.pos.y = (float)manipCamera.lookAt.y;
	14681	+ RigidBody.pos.z = (float)manipCamera.lookAt.z;
	14682	+ RigidBody.wind.set(RigidBody.pos);
	14683	+ RigidBody.wind.x -= (float)manipCamera.location.x;
	14684	+ RigidBody.wind.y -= (float)manipCamera.location.y;
	14685	+ RigidBody.wind.z -= (float)manipCamera.location.z;
	14686	+ RigidBody.wind.normalize();
	14687	+ }
	14688	+
	14689	+ if (mute)
	14690	+ return;
	14691	+
	14692	+ if (capsLocked && manipCamera.viewCode == 0)
	14693	+ {
	14694	+ eye.x = manipCamera.location.x;
	14695	+ eye.y = manipCamera.location.y + 0.25;
	14696	+ eye.z = manipCamera.location.z;
	14697	+
	14698	+ dir.y = -1;
	14699	+
	14700	+ Ray ray = new Ray(eye, dir);
	14701	+
	14702	+ IntersectResult res = new IntersectResult();
	14703	+ res.t = Double.POSITIVE_INFINITY;
	14704	+
	14705	+ tmp.set(targetLookAt);
	14706	+ tmp.sub(manipCamera.location);
	14707	+
	14708	+ double dist = tmp.length();
	14709	+
	14710	+ tmp.normalize();
	14711	+
	14712	+ eye2.x = manipCamera.location.x + tmp.x * 0.25;
	14713	+ eye2.y = manipCamera.location.y + 0.25;
	14714	+ eye2.z = manipCamera.location.z + tmp.z * 0.25;
	14715	+
	14716	+ Ray ray2 = new Ray(eye2, dir);
	14717	+
	14718	+ IntersectResult res2 = new IntersectResult();
	14719	+ res2.t = Double.POSITIVE_INFINITY;
	14720	+
	14721	+ if (object.intersect(ray, res) && object.intersect(ray2, res2) && Math.abs(res.t - res2.t) < 0.25)
	14722	+ {
	14723	+ //tmp.set(manipCamera.location);
	14724	+
	14725	+ manipCamera.location.x = ray.eyePoint.x + ray.viewDirection.x * res.t;
	14726	+ manipCamera.location.y = ray.eyePoint.y + ray.viewDirection.y * res.t + 0.5;
	14727	+ manipCamera.location.z = ray.eyePoint.z + ray.viewDirection.z * res.t;
	14728	+
	14729	+ //tmp.sub(manipCamera.location);
	14730	+
	14731	+ targetLookAt.x = ray2.eyePoint.x + ray2.viewDirection.x * res2.t;
	14732	+ targetLookAt.y = ray2.eyePoint.y + ray2.viewDirection.y * res2.t + 0.5;
	14733	+ targetLookAt.z = ray2.eyePoint.z + ray2.viewDirection.z * res2.t;
	14734	+
	14735	+ targetLookAt.sub(manipCamera.location);
	14736	+ targetLookAt.normalize();
	14737	+ targetLookAt.mul(dist);
	14738	+ targetLookAt.add(manipCamera.location);
	14739	+
	14740	+ //if (tmp.dot(tmp) > 0.000001)
	14741	+ // System.out.println("INTERSECTION " + manipCamera.location);
	14742	+
	14743	+ manipCamera.lookAt.set(targetLookAt);
	14744	+
	14745	+ tmp.x = res.n.x;
	14746	+ tmp.y = res.n.y;
	14747	+ tmp.z = res.n.z;
	14748	+ tmp.x += res2.n.x;
	14749	+ tmp.y += res2.n.y;
	14750	+ tmp.z += res2.n.z;
	14751	+ tmp.normalize();
	14752	+ manipCamera.UP.set(tmp);
	14753	+ }
	14754	+ }
	14755	+
13137	14756	tmp.set(targetLookAt);
13138	14757	tmp.sub(manipCamera.lookAt); // june 2014
13139	14758
..	..	@@ -13171,7 +14790,7 @@
13171	14790
13172	14791	if (tmp.dot(tmp) > 1) // may 2014. far away: jump to target
13173	14792	{
13174		- jump = true; // step = 1;
	14793	+ // sep 2019 jump = true; // step = 1;
13175	14794	}
13176	14795
13177	14796	if (OEILONCE && OEIL)
..	..	@@ -13206,7 +14825,10 @@
13206	14825	if (tmp.dot(tmp) < 0.00001)
13207	14826	{
13208	14827	zoomonce = false;
	14828	+ live = false;
13209	14829	}
	14830	+ else
	14831	+ live = true;
13210	14832
13211	14833	tmp.mul(step > step2 ? step : step2);
13212	14834	}
..	..	@@ -13233,7 +14855,7 @@
13233	14855	{
13234	14856	if (LOOKAT)
13235	14857	manipCamera.lookAt.add(tmp);
13236		- if (OEIL)
	14858	+ if (OEIL && !capsLocked)
13237	14859	manipCamera.location.add(tmp);
13238	14860
13239	14861	{
..	..	@@ -13248,7 +14870,10 @@
13248	14870	lightCamera.computeTransform();
13249	14871	}
13250	14872	}
13251		- manipCamera.computeTransform();
	14873	+ if (tmp.x != 0 \|\| tmp.y != 0 \|\| tmp.z != 0)
	14874	+ {
	14875	+ manipCamera.computeTransform();
	14876	+ }
13252	14877	}
13253	14878	// ?????? mouseDown = true;
13254	14879	//System.out.println("---------------- ---------- Paint " + tmp.length2());
..	..	@@ -13271,6 +14896,7 @@
13271	14896
13272	14897	public void run()
13273	14898	{
	14899	+ new Exception().printStackTrace();
13274	14900	System.exit(0);
13275	14901	for (;;)
13276	14902	{
..	..	@@ -13334,55 +14960,113 @@
13334	14960	{
13335	14961	Globals.lighttouched = true;
13336	14962	}
13337		- drag(X, (mouseMode != 0) ? Y : anchorY, MODIFIERS);
	14963	+ drag(X, (mouseMode != 0) ? Y : anchorY, 0, MODIFIERS);
13338	14964	}
13339	14965	//else
13340	14966	}
13341	14967	}
13342	14968	}
	14969	+
13343	14970	PingThread pingthread = new PingThread();
13344		- int delta = 5;
13345		- int speed = 5;
	14971	+ int delta = 1;
	14972	+ int speed = 1;
	14973	+ int walk = 8;
13346	14974	boolean autorepeat = false;
13347	14975
	14976	+ void Walk()
	14977	+ {
	14978	+ manipCamera.BackForth(0, walk, 1000);
	14979	+
	14980	+ targetLookAt.set(manipCamera.lookAt);
	14981	+ }
	14982	+
	14983	+ void ViewAngle(float dy)
	14984	+ {
	14985	+ double factor = Math.exp(-dy/300.0); // (1 + dy/100);
	14986	+
	14987	+ if (manipCamera.shaper_fovy * factor > 1 &&
	14988	+ manipCamera.shaper_fovy * factor < 150)
	14989	+ {
	14990	+ manipCamera.shaper_fovy *= factor;
	14991	+ //System.out.println("fovy = " + shaper_fovy);
	14992	+ }
	14993	+ }
	14994	+
13348	14995	void GoDown(int mod)
13349	14996	{
13350	14997	MODIFIERS \|= COMMAND;
13351		- /*
	14998	+ boolean isVR = (mouseMode&VR)!=0;
	14999	+ /**/
13352	15000	if((mod&SHIFT) == SHIFT)
13353		- manipCamera.RotatePosition(0, -speed);
13354		- else
13355		- manipCamera.BackForth(0, -speed*delta, getWidth());
13356		- */
13357		- if ((mod & SHIFT) == SHIFT)
13358	15001	{
13359		- mouseMode = mouseMode; // VR??
13360		- } else
13361		- {
13362		- mouseMode \|= BACKFORTH;
	15002	+// if (isVR)
	15003	+// manipCamera.RotateInterest(0, speed);
	15004	+// else
	15005	+ if (isVR)
	15006	+ ViewAngle(-speed*delta);
	15007	+ else
	15008	+ manipCamera.Translate(0, -speed*delta, getWidth());
13363	15009	}
	15010	+ else
	15011	+ {
	15012	+ if (isVR)
	15013	+ manipCamera.BackForth(0, -speed*delta, isVR?1000:0); // getWidth());
	15014	+ else
	15015	+ manipCamera.RotatePosition(0, -speed);
	15016	+ }
	15017	+
	15018	+ /**/
	15019	+// if ((mod & SHIFT) == SHIFT)
	15020	+// {
	15021	+// mouseMode = mouseMode; // VR??
	15022	+// } else
	15023	+// {
	15024	+// mouseMode \|= BACKFORTH;
	15025	+// }
13364	15026
	15027	+ targetLookAt.set(manipCamera.lookAt);
	15028	+
13365	15029	//prevX = X = anchorX;
13366	15030	prevY = Y = anchorY - (int) (renderCamera.Distance());
13367	15031	}
13368	15032
13369	15033	void GoUp(int mod)
13370	15034	{
	15035	+ RigidBody.justclicked = true;
	15036	+
13371	15037	MODIFIERS \|= COMMAND;
13372		- /*
	15038	+ /**/
	15039	+ boolean isVR = (mouseMode&VR)!=0;
	15040	+
13373	15041	if((mod&SHIFT) == SHIFT)
13374		- manipCamera.RotatePosition(0, speed);
13375		- else
13376		- manipCamera.BackForth(0, speed*delta, getWidth());
13377		- */
13378		- if ((mod & SHIFT) == SHIFT)
13379	15042	{
13380		- mouseMode = mouseMode;
13381		- } else
13382		- {
13383		- mouseMode \|= BACKFORTH;
	15043	+// if (isVR)
	15044	+// manipCamera.RotateInterest(0, -speed);
	15045	+// else
	15046	+ if (isVR)
	15047	+ ViewAngle(speed*delta);
	15048	+ else
	15049	+ manipCamera.Translate(0, speed*delta, getWidth());
13384	15050	}
	15051	+ else
	15052	+ {
	15053	+ if (isVR)
	15054	+ manipCamera.BackForth(0, speed*delta, isVR?1000:0); // getWidth());
	15055	+ else
	15056	+ manipCamera.RotatePosition(0, speed);
	15057	+ }
	15058	+
	15059	+ /**/
	15060	+// if ((mod & SHIFT) == SHIFT)
	15061	+// {
	15062	+// mouseMode = mouseMode;
	15063	+// } else
	15064	+// {
	15065	+// mouseMode \|= BACKFORTH;
	15066	+// }
13385	15067
	15068	+ targetLookAt.set(manipCamera.lookAt);
	15069	+
13386	15070	//prevX = X = anchorX;
13387	15071	prevY = Y = anchorY + (int) (renderCamera.Distance());
13388	15072	}
..	..	@@ -13390,20 +15074,31 @@
13390	15074	void GoLeft(int mod)
13391	15075	{
13392	15076	MODIFIERS \|= COMMAND;
13393		- /*
	15077	+ /**/
13394	15078	if((mod&SHIFT) == SHIFT)
13395		- manipCamera.RotatePosition(speed, 0);
	15079	+ manipCamera.Translate(speed, 0, getWidth());
13396	15080	else
13397		- manipCamera.Translate(speed*delta, 0, getWidth());
13398		- */
13399		- if ((mod & SHIFT) == SHIFT)
13400	15081	{
13401		- mouseMode = mouseMode;
13402		- } else
13403		- {
13404		- mouseMode \|= ROTATE;
13405		- } // TRANSLATE;
	15082	+ if ((mouseMode&VR)!=0)
	15083	+ manipCamera.RotateInterest(-speed*manipCamera.shaper_fovy/90, 0);
	15084	+ else
	15085	+ manipCamera.RotatePosition(speed*manipCamera.shaper_fovy/90, 0);
	15086	+ }
	15087	+
	15088	+ /**/
	15089	+// if ((mod & SHIFT) == SHIFT)
	15090	+// {
	15091	+// mouseMode = mouseMode;
	15092	+// } else
	15093	+// {
	15094	+// mouseMode \|= ROTATE;
	15095	+// } // TRANSLATE;
13406	15096
	15097	+ //System.err.println("lookAt = " + manipCamera.lookAt);
	15098	+ //System.err.println("location = " + manipCamera.location);
	15099	+
	15100	+ targetLookAt.set(manipCamera.lookAt);
	15101	+
13407	15102	prevX = X = anchorX - 10; // (int)(10*renderCamera.Distance());
13408	15103	prevY = Y = anchorY;
13409	15104	}
..	..	@@ -13411,20 +15106,28 @@
13411	15106	void GoRight(int mod)
13412	15107	{
13413	15108	MODIFIERS \|= COMMAND;
13414		- /*
	15109	+ /**/
13415	15110	if((mod&SHIFT) == SHIFT)
13416		- manipCamera.RotatePosition(-speed, 0);
	15111	+ manipCamera.Translate(-speed, 0, getWidth());
13417	15112	else
13418		- manipCamera.Translate(-speed*delta, 0, getWidth());
13419		- */
13420		- if ((mod & SHIFT) == SHIFT)
13421	15113	{
13422		- mouseMode = mouseMode;
13423		- } else
13424		- {
13425		- mouseMode \|= ROTATE;
13426		- } // TRANSLATE;
	15114	+ if ((mouseMode&VR)!=0)
	15115	+ manipCamera.RotateInterest(speed*manipCamera.shaper_fovy/90, 0);
	15116	+ else
	15117	+ manipCamera.RotatePosition(-speed*manipCamera.shaper_fovy/90, 0);
	15118	+ }
	15119	+
	15120	+ /**/
	15121	+// if ((mod & SHIFT) == SHIFT)
	15122	+// {
	15123	+// mouseMode = mouseMode;
	15124	+// } else
	15125	+// {
	15126	+// mouseMode \|= ROTATE;
	15127	+// } // TRANSLATE;
13427	15128
	15129	+ targetLookAt.set(manipCamera.lookAt);
	15130	+
13428	15131	prevX = X = anchorX + 10; // (int)(10*renderCamera.Distance());
13429	15132	prevY = Y = anchorY;
13430	15133	}
..	..	@@ -13434,7 +15137,7 @@
13434	15137	int X, Y;
13435	15138	boolean SX, SY;
13436	15139
13437		- void drag(int x, int y, int modifiers)
	15140	+ void drag(int x, int y, int modifiers, int modifiersex)
13438	15141	{
13439	15142	if (IsFrozen())
13440	15143	{
..	..	@@ -13443,17 +15146,17 @@
13443	15146
13444	15147	drag = true; // NEW
13445	15148
13446		- boolean continuous = (modifiers & COMMAND) == COMMAND;
	15149	+ boolean continuous = (modifiersex & COMMAND) == COMMAND;
13447	15150
13448	15151	X = x;
13449	15152	Y = y;
13450	15153	// floating state for animation
13451		- MODIFIERS = modifiers;
13452		- modifiers &= ~1024;
	15154	+ MODIFIERS = modifiersex;
	15155	+ modifiersex &= ~1024;
13453	15156	if (false) // modifiers != 0)
13454	15157	{
13455	15158	//new Exception().printStackTrace();
13456		- System.out.println("mouseDragged: " + modifiers);
	15159	+ System.out.println("mouseDragged: " + modifiersex);
13457	15160	System.out.println("SHIFT = " + SHIFT);
13458	15161	System.out.println("CONTROL = " + COMMAND);
13459	15162	System.out.println("META = " + META);
..	..	@@ -13466,14 +15169,16 @@
13466	15169	if (editObj)
13467	15170	{
13468	15171	drag = true;
13469		- ClickInfo info = new ClickInfo();
13470		- info.bounds.setBounds(0, 0,
	15172	+ //ClickInfo info = new ClickInfo();
	15173	+ object.clickInfo.bounds.setBounds(0, 0,
13471	15174	(int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
13472		- info.pane = this;
13473		- info.camera = renderCamera;
13474		- info.x = x;
13475		- info.y = y;
13476		- object.editWindow.copy.doEditDrag(info);
	15175	+ object.clickInfo.pane = this;
	15176	+ object.clickInfo.camera = renderCamera;
	15177	+ object.clickInfo.x = x;
	15178	+ object.clickInfo.y = y;
	15179	+ object //.GetWindow().copy
	15180	+ .doEditDrag(//info,
	15181	+ (modifiers & MouseEvent.BUTTON3_MASK) != 0);
13477	15182	} else
13478	15183	{
13479	15184	if (x < startX)
..	..	@@ -13556,6 +15261,11 @@
13556	15261	if ((mouseMode & ZOOM) != 0)
13557	15262	{
13558	15263	//if ((mouseMode & BACKFORTH) != 0)
	15264	+ if ((modifiersex & SHIFT) == SHIFT)
	15265	+ {
	15266	+ ViewAngle(dy);
	15267	+ }
	15268	+ else
13559	15269	if ((mouseMode & VR) != 0)
13560	15270	manipCamera.BackForth(dx, dy, getWidth());
13561	15271	else
..	..	@@ -13622,23 +15332,30 @@
13622	15332	}
13623	15333	}
13624	15334
	15335	+// ClickInfo clickInfo = new ClickInfo();
	15336	+
13625	15337	public void mouseMoved(MouseEvent e)
13626	15338	{
13627		- //System.out.println("mouseMoved: " + e);
	15339	+//object.editWindow.frame.
	15340	+ setCursor(Cursor.getDefaultCursor());
13628	15341
	15342	+ //System.out.println("mouseMoved: " + e);
13629	15343	if (isRenderer)
13630	15344	return;
13631	15345
13632		- ClickInfo ci = new ClickInfo();
13633		- ci.x = e.getX();
13634		- ci.y = e.getY();
13635		- ci.modifiers = e.getModifiersEx();
13636		- ci.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
13637		- ci.pane = this;
13638		- ci.camera = renderCamera;
	15346	+ // Mouse cursor feedback
	15347	+ object.clickInfo.x = e.getX();
	15348	+ object.clickInfo.y = e.getY();
	15349	+ object.clickInfo.modifiers = e.getModifiersEx();
	15350	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	15351	+ object.clickInfo.pane = this;
	15352	+ object.clickInfo.camera = renderCamera;
13639	15353	if (!isRenderer)
13640	15354	{
13641		- if (object.editWindow.copy.doEditClick(ci, 0))
	15355	+ //ObjEditor editWindow = object.editWindow;
	15356	+ //Object3D copy = editWindow.copy;
	15357	+ if (object.doEditClick(//clickInfo,
	15358	+ 0))
13642	15359	{
13643	15360	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
13644	15361	} else
..	..	@@ -13650,7 +15367,11 @@
13650	15367
13651	15368	public void mouseReleased(MouseEvent e)
13652	15369	{
	15370	+ Globals.MOUSEDRAGGED = false;
	15371	+
13653	15372	movingcamera = false;
	15373	+ X = 0; // getBounds().width/2;
	15374	+ Y = 0; // getBounds().height/2;
13654	15375	//System.out.println("mouseReleased: " + e);
13655	15376	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
13656	15377	}
..	..	@@ -13673,9 +15394,9 @@
13673	15394	boolean control = ((modifiers & CTRL) != 0); // june 2013: for point selection
13674	15395	boolean command = ((modifiers & COMMAND) != 0); // june 2013: for multiple selection
13675	15396
13676		- if (control \|\| command \|\| IsFrozen())
	15397	+// No delay if (control \|\| command \|\| IsFrozen())
13677	15398	timeout = true;
13678		- else
	15399	+// ?? May 2019 else
13679	15400	// timer.setDelay((modifiers & 128) != 0?0:350);
13680	15401	mouseDown = false;
13681	15402	if (!control && !command) // june 2013
..	..	@@ -13785,7 +15506,7 @@
13785	15506	System.out.println("keyReleased: " + e);
13786	15507	}
13787	15508
13788		- void SetMouseMode(int modifiers)
	15509	+ void SetMouseMode(int modifiers, int modifiersex)
13789	15510	{
13790	15511	//System.out.println("SetMouseMode = " + modifiers);
13791	15512	//modifiers &= ~1024;
..	..	@@ -13797,25 +15518,28 @@
13797	15518	//if (modifiers == 0) // \|\| (modifiers == (1024 \| CONTROL)))
13798	15519	// return;
13799	15520	//System.out.println("SetMode = " + modifiers);
13800		- if ((modifiers & WHEEL) == WHEEL)
	15521	+ if ((modifiersex & WHEEL) == WHEEL)
13801	15522	{
13802	15523	mouseMode \|= ZOOM;
13803	15524	}
13804	15525
13805		- boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
13806		- if (capsLocked \|\| (modifiers & META) == META)
	15526	+ //boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
	15527	+ boolean vr = capsLocked && !lightMode;
	15528	+
	15529	+ if (vr) // \|\| (modifiers & META) == META)
13807	15530	{
13808	15531	mouseMode \|= VR; // BACKFORTH;
13809	15532	}
13810		- if ((modifiers & CTRLCLICK) == CTRLCLICK)
	15533	+ if ((modifiersex & CTRLCLICK) == CTRLCLICK)
13811	15534	{
13812	15535	mouseMode \|= SELECT;
13813	15536	}
13814		- if ((modifiers & COMMAND) == COMMAND)
	15537	+ if ((modifiersex & COMMAND) == COMMAND)
13815	15538	{
13816	15539	mouseMode \|= SELECT;
13817	15540	}
13818		- if ((modifiers & SHIFT) == SHIFT \|\| forcetranslate)
	15541	+ if (//(modifiersex & SHIFT) == SHIFT \|\|
	15542	+ forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
13819	15543	{
13820	15544	mouseMode &= ~VR;
13821	15545	mouseMode \|= TRANSLATE;
..	..	@@ -13844,10 +15568,10 @@
13844	15568
13845	15569	if (isRenderer) //
13846	15570	{
13847		- SetMouseMode(modifiers);
	15571	+ SetMouseMode(0, modifiers);
13848	15572	}
13849	15573
13850		- theRenderer.keyPressed(key);
	15574	+ Globals.theRenderer.keyPressed(key);
13851	15575	}
13852	15576
13853	15577	int kompactbit = 4; // power bit
..	..	@@ -13859,8 +15583,18 @@
13859	15583	float SATPOW = 1; // 2; // 0.5f;
13860	15584	float BRIPOW = 1; // 0.5f; // 0.5f;
13861	15585
13862		- void keyPressed(int key)
	15586	+static BufferedImage cursorImg = new BufferedImage(16, 16, BufferedImage.TYPE_INT_ARGB);
	15587	+
	15588	+// Create a new blank cursor.
	15589	+static Cursor blankCursor = Toolkit.getDefaultToolkit().createCustomCursor(
	15590	+ cursorImg, new Point(0, 0), "blank cursor");
	15591	+
	15592	+ public void keyPressed(int key)
13863	15593	{
	15594	+// Set the blank cursor to the JFrame.
	15595	+//object.editWindow.frame.
	15596	+ setCursor(blankCursor);
	15597	+
13864	15598	if (key >= '0' && key <= '5')
13865	15599	clampbit = (key-'0');
13866	15600
..	..	@@ -13906,7 +15640,8 @@
13906	15640	// break;
13907	15641	case 'T':
13908	15642	CACHETEXTURE ^= true;
13909		- textures.clear();
	15643	+ texturepigment.clear();
	15644	+ texturebump.clear();
13910	15645	// repaint();
13911	15646	break;
13912	15647	case 'Y':
..	..	@@ -13916,8 +15651,8 @@
13916	15651	case 'K':
13917	15652	KOMPACTTEXTURE ^= true;
13918	15653	//textures.clear();
13919		- break;
13920		- case 'P': // Texture Projection macros
	15654	+ // break;
	15655	+ //case 'P': // Texture Projection macros
13921	15656	// SAVETEXTURE ^= true;
13922	15657	macromode = true;
13923	15658	Udebug = Vdebug = NORMALdebug = false; programInitialized = false;
..	..	@@ -13991,7 +15726,9 @@
13991	15726	case 'E' : COMPACT ^= true;
13992	15727	repaint();
13993	15728	break;
13994		- case 'W' : DEBUGHSB ^= true;
	15729	+ case 'W' : // Wide Window (fullscreen)
	15730	+ //DEBUGHSB ^= true;
	15731	+ ObjEditor.theFrame.ToggleFullScreen();
13995	15732	repaint();
13996	15733	break;
13997	15734	case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
..	..	@@ -14016,8 +15753,8 @@
14016	15753	RevertCamera();
14017	15754	repaint();
14018	15755	break;
	15756	+ //case 'l':
14019	15757	case 'L':
14020		- case 'l':
14021	15758	if (lightMode)
14022	15759	{
14023	15760	lightMode = false;
..	..	@@ -14036,7 +15773,7 @@
14036	15773	targetLookAt.set(manipCamera.lookAt);
14037	15774	repaint();
14038	15775	break;
14039		- case 'p':
	15776	+ case 'P': // p':
14040	15777	// c'est quoi ca au juste? spherical ^= true;
14041	15778	Skinshader ^= true; programInitialized = false;
14042	15779	repaint();
..	..	@@ -14047,7 +15784,8 @@
14047	15784	break;
14048	15785	case 'm':
14049	15786	{
14050		- PrintMemory();
	15787	+ //PrintMemory();
	15788	+ ToggleImageFlip();
14051	15789	break;
14052	15790	}
14053	15791	case 'M':
..	..	@@ -14074,27 +15812,31 @@
14074	15812	repaint();
14075	15813	break;
14076	15814	case 'O':
14077		- Globals.drawMode = OCCLUSION; // WARNING
14078		- repaint();
14079		- break;
	15815	+ // Too dangerous. Use menu. Globals.drawMode = OCCLUSION; // WARNING
	15816	+ //repaint();
	15817	+ //break;
14080	15818	case 'o':
14081	15819	OCCLUSION_CULLING ^= true;
14082	15820	System.out.println("OCCLUSION CULLING = " + OCCLUSION_CULLING);
14083	15821	break;
14084		- case '0': envyoff ^= true; repaint(); break;
	15822	+ //case '0': envyoff ^= true; repaint(); break;
14085	15823	case '1':
14086	15824	case '2':
14087	15825	case '3':
14088	15826	case '4':
14089	15827	case '5':
14090		- newenvy = Character.getNumericValue(key);
14091		- repaint();
14092		- break;
14093	15828	case '6':
14094	15829	case '7':
14095	15830	case '8':
14096	15831	case '9':
14097		- BGcolor = (key - '6')/3.f;
	15832	+ if (true) // envyoff)
	15833	+ {
	15834	+ BGcolor = (key - '1')/8.f;
	15835	+ }
	15836	+ else
	15837	+ {
	15838	+ //newenvy = Character.getNumericValue(key);
	15839	+ }
14098	15840	repaint();
14099	15841	break;
14100	15842	case '!':
..	..	@@ -14160,11 +15902,25 @@
14160	15902	case '_':
14161	15903	kompactbit = 5;
14162	15904	break;
14163		- case '+':
14164		- kompactbit = 6;
14165		- break;
	15905	+// case '+':
	15906	+// kompactbit = 6;
	15907	+// break;
14166	15908	case ' ':
	15909	+ capsLocked ^= true;
	15910	+ repaint();
	15911	+ break;
	15912	+ case 'l':
14167	15913	lightMode ^= true;
	15914	+ if (lightMode)
	15915	+ {
	15916	+ keepshadow = Globals.RENDERSHADOW;
	15917	+ Globals.RENDERSHADOW = false;
	15918	+ }
	15919	+ else
	15920	+ {
	15921	+ Globals.RENDERSHADOW = keepshadow;
	15922	+ }
	15923	+
14168	15924	Globals.lighttouched = true;
14169	15925	manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
14170	15926	targetLookAt.set(manipCamera.lookAt);
..	..	@@ -14172,15 +15928,20 @@
14172	15928	break;
14173	15929	//case '`' :
14174	15930	case ESC:
	15931	+ if (FULLSCREEN)
	15932	+ object.editWindow.ToggleFullScreen();
	15933	+ break;
	15934	+ case 'p':
14175	15935	RENDERPROGRAM += 1;
14176	15936	RENDERPROGRAM %= 3;
	15937	+
14177	15938	repaint();
14178	15939	break;
14179	15940	case 'Z':
14180	15941	//RESIZETEXTURE ^= true;
14181	15942	//break;
14182	15943	case 'z':
14183		- RENDERSHADOW ^= true;
	15944	+ Globals.RENDERSHADOW ^= true;
14184	15945	Globals.lighttouched = true;
14185	15946	repaint();
14186	15947	break;
..	..	@@ -14209,12 +15970,17 @@
14209	15970	case ENTER:
14210	15971	// object.editWindow.ScreenFit(); // Edit();
14211	15972	ToggleLive();
	15973	+ if (capsLocked)
	15974	+ {
	15975	+ Globals.WALK ^= true;
	15976	+ }
14212	15977	break;
14213	15978	case DELETE:
14214	15979	ClearSelection();
14215	15980	break;
14216		- /*
14217	15981	case '+':
	15982	+
	15983	+ /*
14218	15984	//fontsize += 1;
14219	15985	bbzoom *= 2;
14220	15986	repaint();
..	..	@@ -14231,30 +15997,36 @@
14231	15997	case '=':
14232	15998	IncDepth();
14233	15999	//fontsize += 1;
14234		- object.editWindow.refreshContents(true);
	16000	+ object.GetWindow().refreshContents(true);
14235	16001	maskbit = 6;
14236	16002	break;
14237	16003	case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
14238	16004	DecDepth();
14239	16005	maskbit = 5;
14240	16006	//if(fontsize > 1) fontsize -= 1;
14241		- if (object.editWindow == null)
14242		- new Exception().printStackTrace();
14243		- else
14244		- object.editWindow.refreshContents(true);
	16007	+// if (object.editWindow == null)
	16008	+// new Exception().printStackTrace();
	16009	+// else
	16010	+ object.GetWindow().refreshContents(true);
14245	16011	break;
14246	16012	case '{':
14247		- manipCamera.shaper_fovy /= 1.1;
	16013	+ double factor = 1.1;
	16014	+ if (manipCamera.shaper_fovy / factor > 0.1)
	16015	+ manipCamera.shaper_fovy /= factor;
14248	16016	System.out.println("FOV = " + manipCamera.shaper_fovy);
14249	16017	repaint();
14250	16018	break;
14251	16019	case '}':
14252		- manipCamera.shaper_fovy *= 1.1;
	16020	+ factor = 1.1;
	16021	+ if (manipCamera.shaper_fovy * factor < 150)
	16022	+ manipCamera.shaper_fovy *= factor;
14253	16023	System.out.println("FOV = " + manipCamera.shaper_fovy);
14254	16024	repaint();
14255	16025	break;
14256	16026	case '[':
14257		- manipCamera.shaper_fovy /= 1.01;
	16027	+ factor = 1.01;
	16028	+ if (manipCamera.shaper_fovy / factor > 0.1)
	16029	+ manipCamera.shaper_fovy /= factor;
14258	16030	if (false) //manipCamera.hAspect == 0)
14259	16031	{
14260	16032	double x = Math.tan(manipCamera.shaper_fovy * Math.PI / 180 / 2);
..	..	@@ -14270,7 +16042,9 @@
14270	16042	break;
14271	16043	case ']':
14272	16044	//manipCamera.shaper_fovy += (180 - manipCamera.shaper_fovy)*0.1;
14273		- manipCamera.shaper_fovy *= 1.01;
	16045	+ factor = 1.01;
	16046	+ if (manipCamera.shaper_fovy * factor < 150)
	16047	+ manipCamera.shaper_fovy *= factor;
14274	16048	if (false) //manipCamera.hAspect == 0)
14275	16049	{
14276	16050	double x = Math.tan(manipCamera.shaper_fovy * Math.PI / 180 / 2);
..	..	@@ -14296,6 +16070,7 @@
14296	16070	}
14297	16071	//System.out.println("shaper_fovy = " + manipCamera.shaper_fovy);
14298	16072	}
	16073	+
14299	16074	static double OCCLUSIONBOOST = 1; // 0.5;
14300	16075
14301	16076	void keyReleased(int key, int modifiers)
..	..	@@ -14303,102 +16078,117 @@
14303	16078	//mode = ROTATE;
14304	16079	if ((MODIFIERS & COMMAND) == 0) // VR??
14305	16080	{
14306		- SetMouseMode(modifiers);
	16081	+ SetMouseMode(0, modifiers);
14307	16082	}
14308	16083	}
14309	16084
14310		- protected void processKeyEvent(KeyEvent e)
	16085	+ boolean keys[] = new boolean[256];
	16086	+ int speedkey[] = new int[256];
	16087	+ int modifiers = 0;
	16088	+
	16089	+ public void processKeyEvent(KeyEvent e)
14311	16090	{
14312	16091	switch (e.getID())
14313	16092	{
14314	16093	case KeyEvent.KEY_PRESSED:
14315		- if (!autorepeat)
14316		- {
14317		- //System.out.println("processKeyEvent: " + KeyEvent.getKeyText(e.getKeyCode()));
14318		- keyPressed(e.getKeyChar(), e.getModifiersEx());
14319		- }
14320		- if (manipCamera == lightCamera)
14321		- {
14322		- switch (e.getKeyCode())
14323		- {
14324		- case DOWN_ARROW:
14325		- lightCamera.DECAL /= 2;
14326		- repaint();
14327		- break;
14328		- case UP_ARROW:
14329		- lightCamera.DECAL *= 2;
14330		- repaint();
14331		- break;
14332		- case LEFT_ARROW:
14333		- lightCamera.SCALE /= 2;
14334		- repaint();
14335		- break;
14336		- case RIGHT_ARROW:
14337		- lightCamera.SCALE *= 2;
14338		- repaint();
14339		- break;
14340		- default:
14341		- break;
14342		- }
14343		-
14344		- System.out.println("DECAL = " + lightCamera.DECAL + "; SCALE = " + lightCamera.SCALE);
14345		- } else
14346		- {
14347		- if (true) // !autorepeat)
14348		- {
14349		- boolean reset = true;
14350		-
14351		- switch (e.getKeyCode())
14352		- {
14353		- case DOWN_ARROW:
14354		- GoDown(e.getModifiersEx());
14355		- repaint();
14356		- break;
14357		- case UP_ARROW:
14358		- GoUp(e.getModifiersEx());
14359		- repaint();
14360		- break;
14361		- case LEFT_ARROW:
14362		- GoLeft(e.getModifiersEx());
14363		- repaint();
14364		- break;
14365		- case RIGHT_ARROW:
14366		- GoRight(e.getModifiersEx());
14367		- repaint();
14368		- break;
14369		- default:
14370		- reset = false;
14371		- break;
14372		- }
14373		-
14374		- if (reset)
14375		- {
14376		- autorepeat = true;
14377		-
14378		- targetLookAt.set(manipCamera.lookAt);
14379		- }
14380		- }
14381		- }
	16094	+ keys[e.getKeyCode()] = true;
	16095	+ modifiers = e.getModifiersEx();
	16096	+ keyPressed(e.getKeyChar(), modifiers);
	16097	+ //Globals.theRenderer.keyPressed(e.getKeyChar());
	16098	+ repaint();
14382	16099	break;
14383		- case KeyEvent.KEY_TYPED:
14384		- break;
	16100	+// if (!autorepeat)
	16101	+// {
	16102	+// //System.out.println("processKeyEvent: " + KeyEvent.getKeyText(e.getKeyCode()));
	16103	+// keyPressed(e.getKeyChar(), e.getModifiersEx());
	16104	+// }
	16105	+// if (manipCamera == lightCamera)
	16106	+// {
	16107	+// switch (e.getKeyCode())
	16108	+// {
	16109	+// case DOWN_ARROW:
	16110	+// lightCamera.DECAL /= 2;
	16111	+// repaint();
	16112	+// break;
	16113	+// case UP_ARROW:
	16114	+// lightCamera.DECAL *= 2;
	16115	+// repaint();
	16116	+// break;
	16117	+// case LEFT_ARROW:
	16118	+// lightCamera.SCALE /= 2;
	16119	+// repaint();
	16120	+// break;
	16121	+// case RIGHT_ARROW:
	16122	+// lightCamera.SCALE *= 2;
	16123	+// repaint();
	16124	+// break;
	16125	+// default:
	16126	+// break;
	16127	+// }
	16128	+//
	16129	+// System.out.println("DECAL = " + lightCamera.DECAL + "; SCALE = " + lightCamera.SCALE);
	16130	+// } else
	16131	+// {
	16132	+// if (true) // !autorepeat)
	16133	+// {
	16134	+// boolean reset = true;
	16135	+//
	16136	+// switch (e.getKeyCode())
	16137	+// {
	16138	+// case DOWN_ARROW:
	16139	+// GoDown(e.getModifiersEx());
	16140	+// repaint();
	16141	+// break;
	16142	+// case UP_ARROW:
	16143	+// GoUp(e.getModifiersEx());
	16144	+// repaint();
	16145	+// break;
	16146	+// case LEFT_ARROW:
	16147	+// GoLeft(e.getModifiersEx());
	16148	+// repaint();
	16149	+// break;
	16150	+// case RIGHT_ARROW:
	16151	+// GoRight(e.getModifiersEx());
	16152	+// repaint();
	16153	+// break;
	16154	+// default:
	16155	+// reset = false;
	16156	+// break;
	16157	+// }
	16158	+//
	16159	+// if (reset)
	16160	+// {
	16161	+// autorepeat = true;
	16162	+//
	16163	+// targetLookAt.set(manipCamera.lookAt);
	16164	+// }
	16165	+// }
	16166	+// }
	16167	+// break;
	16168	+// case KeyEvent.KEY_TYPED:
	16169	+// break;
14385	16170	case KeyEvent.KEY_RELEASED:
14386		- {
14387		- switch (e.getKeyCode())
14388		- {
14389		- case DOWN_ARROW:
14390		- case UP_ARROW:
14391		- case LEFT_ARROW:
14392		- case RIGHT_ARROW:
14393		- MODIFIERS &= ~COMMAND;
14394		- autorepeat = false;
14395		- break;
14396		- default:
14397		- break;
14398		- }
	16171	+ keys[e.getKeyCode()] = false;
	16172	+ modifiers = e.getModifiersEx();
14399	16173	keyReleased(e.getKeyChar(), e.getModifiersEx());
	16174	+ repaint();
14400	16175	break;
14401		- }
	16176	+// {
	16177	+// switch (e.getKeyCode())
	16178	+// {
	16179	+// case DOWN_ARROW:
	16180	+// case UP_ARROW:
	16181	+// case LEFT_ARROW:
	16182	+// case RIGHT_ARROW:
	16183	+// MODIFIERS &= ~COMMAND;
	16184	+// autorepeat = false;
	16185	+// break;
	16186	+// default:
	16187	+// break;
	16188	+// }
	16189	+// keyReleased(e.getKeyChar(), e.getModifiersEx());
	16190	+// break;
	16191	+// }
14402	16192	default:
14403	16193	break;
14404	16194	}
..	..	@@ -14437,8 +16227,9 @@
14437	16227
14438	16228	protected void processMouseMotionEvent(MouseEvent e)
14439	16229	{
14440		- //System.out.println("processMouseMotionEvent: " + mouseMode);
14441		- if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
	16230	+ //System.out.println("processMouseMotionEvent: " + mouseMode + " " + e.getModifiers() + " " + e.getModifiersEx() + " " + e.getButton());
	16231	+ //if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
	16232	+ if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (e.getModifiers() & MouseEvent.BUTTON3_MASK) == 0 && (mouseMode & SELECT) == 0)
14442	16233	{
14443	16234	mouseMoved(e);
14444	16235	} else
..	..	@@ -14463,11 +16254,12 @@
14463	16254	}
14464	16255	*/
14465	16256
14466		- object.editWindow.EditSelection();
	16257	+ object.GetWindow().EditSelection(false);
14467	16258	}
14468	16259
14469	16260	void SelectParent()
14470	16261	{
	16262	+ new Exception().printStackTrace();
14471	16263	System.exit(0);
14472	16264	Composite group = (Composite) object;
14473	16265	java.util.Vector selectees = new java.util.Vector(group.selection);
..	..	@@ -14479,10 +16271,10 @@
14479	16271	{
14480	16272	//selectees.remove(i);
14481	16273	System.out.println("select parent of " + elem);
14482		- group.editWindow.Select(elem.parent.GetTreePath(), first, true);
	16274	+ group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
14483	16275	} else
14484	16276	{
14485		- group.editWindow.Select(elem.GetTreePath(), first, true);
	16277	+ group.GetWindow().Select(elem.GetTreePath(), first, true);
14486	16278	}
14487	16279
14488	16280	first = false;
..	..	@@ -14491,6 +16283,7 @@
14491	16283
14492	16284	void SelectChildren()
14493	16285	{
	16286	+ new Exception().printStackTrace();
14494	16287	System.exit(0);
14495	16288	/*
14496	16289	Composite group = (Composite) object;
..	..	@@ -14523,12 +16316,12 @@
14523	16316	for (int j = 0; j < group.children.size(); j++)
14524	16317	{
14525	16318	elem = (Object3D) group.children.elementAt(j);
14526		- object.editWindow.Select(elem.GetTreePath(), first, true);
	16319	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
14527	16320	first = false;
14528	16321	}
14529	16322	} else
14530	16323	{
14531		- object.editWindow.Select(elem.GetTreePath(), first, true);
	16324	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
14532	16325	}
14533	16326
14534	16327	first = false;
..	..	@@ -14539,21 +16332,21 @@
14539	16332	{
14540	16333	//Composite group = (Composite) object;
14541	16334	Object3D group = object;
14542		- group.editWindow.loadClipboard(true); // ClearSelection(false);
	16335	+ group.GetWindow().loadClipboard(true); // ClearSelection(false);
14543	16336	}
14544	16337
14545	16338	void ResetTransform(int mask)
14546	16339	{
14547	16340	//Composite group = (Composite) object;
14548	16341	Object3D group = object;
14549		- group.editWindow.ResetTransform(mask);
	16342	+ group.GetWindow().ResetTransform(mask);
14550	16343	}
14551	16344
14552	16345	void FlipTransform()
14553	16346	{
14554	16347	//Composite group = (Composite) object;
14555	16348	Object3D group = object;
14556		- group.editWindow.FlipTransform();
	16349	+ group.GetWindow().FlipTransform();
14557	16350	// group.editWindow.ReduceMesh(true);
14558	16351	}
14559	16352
..	..	@@ -14561,7 +16354,7 @@
14561	16354	{
14562	16355	//Composite group = (Composite) object;
14563	16356	Object3D group = object;
14564		- group.editWindow.PrintMemory();
	16357	+ group.GetWindow().PrintMemory();
14565	16358	// group.editWindow.ReduceMesh(true);
14566	16359	}
14567	16360
..	..	@@ -14569,7 +16362,7 @@
14569	16362	{
14570	16363	//Composite group = (Composite) object;
14571	16364	Object3D group = object;
14572		- group.editWindow.ResetCentroid();
	16365	+ group.GetWindow().ResetCentroid();
14573	16366	}
14574	16367
14575	16368	void IncDepth()
..	..	@@ -14651,11 +16444,11 @@
14651	16444
14652	16445	int width = getBounds().width;
14653	16446	int height = getBounds().height;
14654		- ClickInfo info = new ClickInfo();
14655		- info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
14656	16447	//Image img = CreateImage(width, height);
14657	16448	//System.out.println("width = " + width + "; height = " + height + "\n");
	16449	+
14658	16450	Graphics gr = g; // img.getGraphics();
	16451	+
14659	16452	if (!hasMarquee)
14660	16453	{
14661	16454	if (Xmin < Xmax) // !locked)
..	..	@@ -14727,44 +16520,92 @@
14727	16520	}
14728	16521	if (object != null && !hasMarquee)
14729	16522	{
	16523	+ if (object.clickInfo == null)
	16524	+ object.clickInfo = new ClickInfo();
	16525	+ ClickInfo info = object.clickInfo;
	16526	+ //ClickInfo info = new ClickInfo();
	16527	+ info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
	16528	+
14730	16529	if (isRenderer)
14731	16530	{
14732		- info.flags++;
	16531	+ object.clickInfo.flags++;
14733	16532	double frameAspect = (double) width / (double) height;
14734	16533	if (frameAspect > renderCamera.aspect)
14735	16534	{
14736	16535	int desired = (int) ((double) height * renderCamera.aspect);
14737		- info.bounds.width -= width - desired;
14738		- info.bounds.x += (width - desired) / 2;
	16536	+ object.clickInfo.bounds.width -= width - desired;
	16537	+ object.clickInfo.bounds.x += (width - desired) / 2;
14739	16538	} else
14740	16539	{
14741	16540	int desired = (int) ((double) width / renderCamera.aspect);
14742		- info.bounds.height -= height - desired;
14743		- info.bounds.y += (height - desired) / 2;
	16541	+ object.clickInfo.bounds.height -= height - desired;
	16542	+ object.clickInfo.bounds.y += (height - desired) / 2;
14744	16543	}
14745	16544	}
14746		- info.g = gr;
14747		- info.camera = renderCamera;
	16545	+
	16546	+ object.clickInfo.g = gr;
	16547	+ object.clickInfo.camera = renderCamera;
14748	16548	/*
14749	16549	// Memory intensive (brep.verticescopy)
14750	16550	if (!(object instanceof Composite))
14751	16551	object.draw(info, 0, false); // SLOW :
14752	16552	*/
14753		- if (!isRenderer)
	16553	+ if (!isRenderer) // && drag)
14754	16554	{
14755		- object.drawEditHandles(info, 0);
	16555	+ Grafreed.Assert(object != null);
	16556	+ Grafreed.Assert(object.selection != null);
	16557	+ if (object.selection.Size() > 0)
	16558	+ {
	16559	+ int hitSomething = object.selection.get(0).hitSomething;
	16560	+
	16561	+ object.clickInfo.DX = 0;
	16562	+ object.clickInfo.DY = 0;
	16563	+ object.clickInfo.W = 1;
	16564	+ if (hitSomething == Object3D.hitCenter)
	16565	+ {
	16566	+ info.DX = X;
	16567	+ if (X != 0)
	16568	+ info.DX -= info.bounds.width/2;
	16569	+
	16570	+ info.DY = Y;
	16571	+ if (Y != 0)
	16572	+ info.DY -= info.bounds.height/2;
	16573	+ }
	16574	+
	16575	+ object.drawEditHandles(//info,
	16576	+ 0);
	16577	+
	16578	+ if (drag && (X != 0 \|\| Y != 0))
	16579	+ {
	16580	+ switch (hitSomething)
	16581	+ {
	16582	+ case Object3D.hitCenter: gr.setColor(Color.white);
	16583	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16584	+ break;
	16585	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	16586	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16587	+ break;
	16588	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	16589	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16590	+ break;
	16591	+ }
	16592	+
	16593	+ }
	16594	+ }
14756	16595	}
14757	16596	}
	16597	+
14758	16598	if (isRenderer)
14759	16599	{
14760	16600	//gr.setColor(Color.black);
14761	16601	//gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
14762	16602	//gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
14763	16603	}
	16604	+
14764	16605	if (hasMarquee)
14765	16606	{
14766	16607	gr.setXORMode(Color.white);
14767		- gr.setColor(Color.red);
	16608	+ gr.setColor(Color.white);
14768	16609	if (!firstime)
14769	16610	{
14770	16611	gr.drawRect(prevmarqX, prevmarqY, prevmarqW, prevmarqH);
..	..	@@ -14873,6 +16714,7 @@
14873	16714	public boolean mouseDown(Event evt, int x, int y)
14874	16715	{
14875	16716	System.out.println("mouseDown: " + evt);
	16717	+ System.exit(0);
14876	16718	/*
14877	16719	locked = true;
14878	16720	drag = false;
..	..	@@ -14916,13 +16758,14 @@
14916	16758	{
14917	16759	keyPressed(0, modifiers);
14918	16760	}
14919		- clickStart(x, y, modifiers);
	16761	+ // clickStart(x, y, modifiers);
14920	16762	return true;
14921	16763	}
14922	16764
14923	16765	public boolean mouseDrag(Event evt, int x, int y)
14924	16766	{
14925		- //System.out.println("mouseDrag: " + evt);
	16767	+ System.out.println("mouseDrag: " + evt);
	16768	+ System.exit(0);
14926	16769	/*
14927	16770	drag = true;
14928	16771	//System.out.println("Mouse DRAG");
..	..	@@ -15034,13 +16877,14 @@
15034	16877	{
15035	16878	keyReleased(0, 0);
15036	16879	}
15037		- drag(x, y, modifiers);
	16880	+ drag(x, y, 0, modifiers);
15038	16881	return true;
15039	16882	}
15040	16883
15041	16884	public boolean mouseUp(Event evt, int x, int y)
15042	16885	{
15043	16886	System.out.println("mouseUp: " + evt);
	16887	+ System.exit(0);
15044	16888	/*
15045	16889	locked = false;
15046	16890	if (isRenderer)
..	..	@@ -15166,7 +17010,7 @@
15166	17010	Object3D object;
15167	17011	static Object3D trackedobject;
15168	17012	Camera renderCamera; // Light or Eye (or Occlusion)
15169		- /static/ Camera manipCamera; // Light or Eye
	17013	+ /static/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
15170	17014	/static/ Camera eyeCamera;
15171	17015	/static/ Camera lightCamera;
15172	17016	int cameracount;
..	..	@@ -15230,6 +17074,8 @@
15230	17074	private /static/ boolean firstime;
15231	17075	private /static/ cVector newView = new cVector();
15232	17076	private static final String[] suffixes = {"posx", "negx", "posy", "negy", "posz", "negz"};
	17077	+ private static final String[] suffixes2 = {"east", "west", "top", "bottom", "north", "south"};
	17078	+ private static final String[] suffixes3 = {"ft", "bk", "up", "dn", "rt", "lf"};
15233	17079	private static final int[] targets = {GL.GL_TEXTURE_CUBE_MAP_POSITIVE_X,
15234	17080	GL.GL_TEXTURE_CUBE_MAP_NEGATIVE_X,
15235	17081	GL.GL_TEXTURE_CUBE_MAP_POSITIVE_Y,
..	..	@@ -15242,29 +17088,67 @@
15242	17088	{
15243	17089	com.sun.opengl.util.texture.Texture cubemap = TextureIO.newTexture(GL.GL_TEXTURE_CUBE_MAP);
15244	17090
	17091	+ int usedsuf = 0;
	17092	+
15245	17093	for (int i = 0; i < suffixes.length; i++)
15246	17094	{
15247		- String resourceName = basename + suffixes[i] + "." + suffix;
15248		- TextureData data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
15249		- mipmapped,
15250		- FileUtil.getFileSuffix(resourceName));
15251		- if (data == null)
	17095	+ String[] suffixe = suffixes;
	17096	+ String[] fallback = suffixes2;
	17097	+ String[] fallfallback = suffixes3;
	17098	+
	17099	+ for (int c=usedsuf; --c>=0;)
15252	17100	{
15253		- throw new IOException("Unable to load texture " + resourceName);
	17101	+// String[] temp = suffixe;
	17102	+// suffixe = fallback;
	17103	+// fallback = fallfallback;
	17104	+// fallfallback = temp;
15254	17105	}
	17106	+
	17107	+ String resourceName = basename + suffixe[i] + "." + suffix;
	17108	+ TextureData data;
	17109	+
	17110	+ try
	17111	+ {
	17112	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	17113	+ mipmapped,
	17114	+ FileUtil.getFileSuffix(resourceName));
	17115	+ }
	17116	+ catch (Exception e)
	17117	+ {
	17118	+ try
	17119	+ {
	17120	+ resourceName = basename + fallback[i] + "." + suffix;
	17121	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	17122	+ mipmapped,
	17123	+ FileUtil.getFileSuffix(resourceName));
	17124	+ }
	17125	+ catch (Exception e2)
	17126	+ {
	17127	+ resourceName = basename + fallfallback[i] + "." + suffix;
	17128	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	17129	+ mipmapped,
	17130	+ FileUtil.getFileSuffix(resourceName));
	17131	+ }
	17132	+ }
	17133	+
15255	17134	//System.out.println("Target = " + targets[i]);
15256	17135	cubemap.updateImage(data, targets[i]);
15257	17136	}
15258	17137
15259	17138	return cubemap;
15260	17139	}
	17140	+
15261	17141	int bigsphere = -1;
15262	17142
15263	17143	float BGcolor = 0.5f;
15264	17144
15265		- private void DrawSkyBox(GL gl)
	17145	+ float ambientLight[] = {1f, 1f, 1f, 1.0f};
	17146	+
	17147	+ private void DrawSkyBox(GL gl, float ratio)
15266	17148	{
15267		- if (envyoff \|\| cubemap == null)
	17149	+ if (//envyoff \|\|
	17150	+ WIREFRAME \|\|
	17151	+ cubemap == null)
15268	17152	{
15269	17153	gl.glClearColor(BGcolor, BGcolor, BGcolor, 1);
15270	17154	gl.glClear(gl.GL_COLOR_BUFFER_BIT);
..	..	@@ -15279,7 +17163,17 @@
15279	17163	// Compensates for ExaminerViewer's modification of modelview matrix
15280	17164	gl.glMatrixMode(GL.GL_MODELVIEW);
15281	17165	gl.glLoadIdentity();
	17166	+ gl.glScalef(1,ratio,1);
15282	17167
	17168	+// colorV[0] = 2;
	17169	+// colorV[1] = 2;
	17170	+// colorV[2] = 2;
	17171	+// colorV[3] = 1;
	17172	+// gl.glDisable(gl.GL_COLOR_MATERIAL);
	17173	+// gl.glMaterialfv(gl.GL_FRONT_AND_BACK, gl.GL_AMBIENT, colorV, 0);
	17174	+//
	17175	+// gl.glLightModelfv(gl.GL_LIGHT_MODEL_AMBIENT, ambientLight, 0);
	17176	+
15283	17177	//gl.glActiveTexture(GL.GL_TEXTURE1);
15284	17178	//gl.glDisable(GL.GL_TEXTURE_CUBE_MAP);
15285	17179
..	..	@@ -15311,6 +17205,7 @@
15311	17205	{
15312	17206	gl.glScalef(1.0f, -1.0f, 1.0f);
15313	17207	}
	17208	+ gl.glScalef(-1.0f, 1.0f, 1.0f);
15314	17209	gl.glMultMatrixd(viewrot_1, 0);
15315	17210	gl.glTranslatef(0, 0, 0.5f); // (float)lightCamera.Distance()); // 0.5f);
15316	17211	//viewer.updateInverseRotation(gl);
..	..	@@ -15351,7 +17246,8 @@
15351	17246	gl.glDisable(GL.GL_TEXTURE_GEN_R);
15352	17247
15353	17248	cubemap.disable();
15354		- ////cubemap.unbind();
	17249	+ //cubemap.dispose();
	17250	+
15355	17251	if (CULLFACE)
15356	17252	{
15357	17253	gl.glEnable(gl.GL_CULL_FACE);
..	..	@@ -15407,7 +17303,7 @@
15407	17303	gl.glScalef(1.0f, -1.0f, 1.0f);
15408	17304	}
15409	17305
15410		- gl.glNormal3f(0.0f, 0.0f, 1.0f);
	17306	+ SetGLNormal(gl, 0.0f, 0.0f, 1.0f);
15411	17307
15412	17308	float step = 2; // 0.1666f; //0.25f;
15413	17309	float stepv = 2; // step * 1652 / 998;
..	..	@@ -15451,16 +17347,16 @@
15451	17347	cStatic.objectstack[materialdepth++] = checker;
15452	17348	//System.out.println("material " + material);
15453	17349	//Applet3D.tracein(this, selected);
15454		- vector2buffer = checker.projectedVertices;
	17350	+ //vector2buffer = checker.projectedVertices;
15455	17351
15456	17352	//checker.GetMaterial().Draw(this, false); // true);
15457		- DrawMaterial(checker.GetMaterial(), false); // true);
	17353	+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
15458	17354
15459	17355	materialdepth -= 1;
15460	17356	if (materialdepth > 0)
15461	17357	{
15462		- vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
15463		- DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	17358	+ //vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	17359	+ DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
15464	17360	}
15465	17361	//checker.GetMaterial().opacity = 1f;
15466	17362	////checker.GetMaterial().ambient = 1f;
..	..	@@ -15546,6 +17442,14 @@
15546	17442	}
15547	17443	}
15548	17444
	17445	+ private Object3D GetFolder()
	17446	+ {
	17447	+ Object3D folder = object.GetWindow().copy;
	17448	+ if (object.GetWindow().copy.selection.Size() > 0)
	17449	+ folder = object.GetWindow().copy.selection.elementAt(0);
	17450	+ return folder;
	17451	+ }
	17452	+
15549	17453	class SelectBuffer implements GLEventListener
15550	17454	{
15551	17455
..	..	@@ -15561,7 +17465,7 @@
15561	17465	//new Exception().printStackTrace();
15562	17466	System.out.println("select buffer init");
15563	17467	// Use debug pipeline
15564		- drawable.setGL(new DebugGL(drawable.getGL()));
	17468	+ //drawable.setGL(new DebugGL(drawable.getGL()));
15565	17469
15566	17470	GL gl = drawable.getGL();
15567	17471
..	..	@@ -15604,6 +17508,7 @@
15604	17508	{
15605	17509	if (!selection)
15606	17510	{
	17511	+ new Exception().printStackTrace();
15607	17512	System.exit(0);
15608	17513	return;
15609	17514	}
..	..	@@ -15624,6 +17529,17 @@
15624	17529
15625	17530	//gl.glDisable(GL.GL_POLYGON_OFFSET_FILL);
15626	17531
	17532	+ if (PAINTMODE)
	17533	+ {
	17534	+ if (object.GetWindow().copy.selection.Size() > 0)
	17535	+ {
	17536	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	17537	+
	17538	+ // Make what you paint not selectable.
	17539	+ paintobj.ResetSelectable();
	17540	+ }
	17541	+ }
	17542	+
15627	17543	//int tmp = selection_view;
15628	17544	//selection_view = -1;
15629	17545	int temp = DrawMode();
..	..	@@ -15635,6 +17551,17 @@
15635	17551	// temp = DEFAULT; // patch for selection debug
15636	17552	Globals.drawMode = temp; // WARNING
15637	17553
	17554	+ if (PAINTMODE)
	17555	+ {
	17556	+ if (object.GetWindow().copy.selection.Size() > 0)
	17557	+ {
	17558	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	17559	+
	17560	+ // Revert.
	17561	+ paintobj.RestoreSelectable();
	17562	+ }
	17563	+ }
	17564	+
15638	17565	//gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
15639	17566
15640	17567	// trying different ways of getting the depth info over
..	..	@@ -15665,7 +17592,7 @@
15665	17592
15666	17593	float depth = depths[y * TEX_SIZE + x];
15667	17594
15668		- if (pointselection && mouseMode == SELECT && depth != 0 && depth != 1)
	17595	+ if (pointselection && (mouseMode & SELECT) == SELECT && depth != 0 && depth != 1)
15669	17596	{
15670	17597	pointselection = false;
15671	17598
..	..	@@ -15682,6 +17609,8 @@
15682	17609	// System.err.println("view = " + view[4] + " " + view[5] + " " + view[6] + " " + view[7]);
15683	17610	// System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
15684	17611	// System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
	17612	+
	17613	+ CreateSelectedPoint();
15685	17614
15686	17615	// Will fit the mesh !!!
15687	17616	selectedpoint.toParent[0][0] = 0.0001;
..	..	@@ -15731,34 +17660,36 @@
15731	17660	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]));
15732	17661	}
15733	17662
15734		- previousselectedpoint = (Sphere) GrafreeD.clone(selectedpoint);
	17663	+ previousselectedpoint = (Sphere) Grafreed.clone(selectedpoint);
15735	17664	}
15736	17665	}
15737	17666
15738	17667	if (!movingcamera && !PAINTMODE)
15739		- object.editWindow.ScreenFitPoint(); // fev 2014
	17668	+ object.GetWindow().ScreenFitPoint(); // fev 2014
15740	17669
15741		- if (PAINTMODE && GrafreeD.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	17670	+ if (PAINTMODE) // && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
15742	17671	{
15743		- Object3D paintobj = GrafreeD.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
	17672	+ //Object3D paintobj; // = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
15744	17673
15745		- Object3D group = new Object3D("inst" + paintcount++);
	17674	+ if (object.GetWindow().copy.selection.Size() > 0)
	17675	+ {
	17676	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
15746	17677
15747		- group.CreateMaterial(); // use a void leaf to select instances
15748		-
15749		- group.add(paintobj); // link
15750		-
15751		- object.editWindow.SnapObject(group);
15752		-
15753		- Object3D folder = object.editWindow.copy;
15754		-
15755		- if (object.editWindow.copy.selection.Size() > 0)
15756		- folder = object.editWindow.copy.selection.elementAt(0);
15757		-
15758		- folder.add(group);
15759		-
15760		- object.editWindow.ResetModel();
15761		- object.editWindow.refreshContents();
	17678	+ Object3D inst = new Object3D("inst" + paintcount++);
	17679	+
	17680	+ inst.CreateMaterial(); // use a void leaf to select instances
	17681	+
	17682	+ inst.add(paintobj); // link
	17683	+
	17684	+ object.GetWindow().SnapObject(inst);
	17685	+
	17686	+ Object3D folder = paintFolder; // GetFolder();
	17687	+
	17688	+ folder.add(inst);
	17689	+
	17690	+ object.GetWindow().ResetModel();
	17691	+ object.GetWindow().refreshContents();
	17692	+ }
15762	17693	}
15763	17694	else
15764	17695	paintcount = 0;
..	..	@@ -15797,6 +17728,11 @@
15797	17728	//System.out.println("objects[color] = " + objects[color]);
15798	17729	//objects[color].Select();
15799	17730	indexcount = 0;
	17731	+ ObjEditor window = object.GetWindow();
	17732	+ if (window != null && deselect)
	17733	+ {
	17734	+ window.Select(null, deselect, true);
	17735	+ }
15800	17736	object.Select(color, deselect);
15801	17737	}
15802	17738
..	..	@@ -15847,6 +17783,7 @@
15847	17783
15848	17784	public void init(GLAutoDrawable drawable)
15849	17785	{
	17786	+ if (Globals.DEBUG)
15850	17787	System.out.println("shadow buffer init");
15851	17788
15852	17789	GL gl = drawable.getGL();
..	..	@@ -15896,7 +17833,7 @@
15896	17833	gl.glDisable(gl.GL_CULL_FACE);
15897	17834	}
15898	17835
15899		- if (!RENDERSHADOW)
	17836	+ if (!Globals.RENDERSHADOW)
15900	17837	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
15901	17838
15902	17839	// SB gl.glPolygonOffset(2.5f, 10);
..	..	@@ -15906,7 +17843,7 @@
15906	17843	//gl.glColorMask(false, false, false, false);
15907	17844
15908	17845	//render_scene_from_light_view(gl, drawable, 0, 0);
15909		- if (RENDERSHADOW && Globals.lighttouched && !movingcamera) // && !parent.IsFreezed())
	17846	+ if (Globals.RENDERSHADOW && Globals.lighttouched && (!movingcamera \|\| !Globals.FREEZEONMOVE)) // && !parent.IsFreezed())
15910	17847	{
15911	17848	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
15912	17849
..	..	@@ -15966,7 +17903,6 @@
15966	17903
15967	17904	class AntialiasBuffer implements GLEventListener
15968	17905	{
15969		-
15970	17906	CameraPane parent = null;
15971	17907
15972	17908	AntialiasBuffer(CameraPane p)
..	..	@@ -16076,10 +18012,14 @@
16076	18012	gl.glFlush();
16077	18013
16078	18014	/**/
16079		- gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusionsizebuffer);
	18015	+ gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusiondepthbuffer);
16080	18016
16081		- float[] pixels = occlusionsizebuffer.array();
	18017	+ float[] depths = occlusiondepthbuffer.array();
16082	18018
	18019	+ gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_BGRA, GL.GL_UNSIGNED_INT_8_8_8_8_REV, occlusioncolorbuffer);
	18020	+
	18021	+ int[] pixels = selectsizebuffer.array();
	18022	+
16083	18023	double r = 0, g = 0, b = 0;
16084	18024
16085	18025	double count = 0;
..	..	@@ -16090,7 +18030,7 @@
16090	18030
16091	18031	double FACTOR = 1;
16092	18032
16093		- for (int i = 0; i < pixels.length; i++)
	18033	+ for (int i = 0; i < depths.length; i++)
16094	18034	{
16095	18035	int x = i / OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
16096	18036	int y = i % OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
..	..	@@ -16173,7 +18113,7 @@
16173	18113
16174	18114	double scale = ray.z; // 1; // cos
16175	18115
16176		- float depth = pixels[newindex];
	18116	+ float depth = depths[newindex];
16177	18117
16178	18118	/*
16179	18119	int newindex2 = (x + 1) * OCCLUSION_SIZE + y;
..	..	@@ -16316,6 +18256,11 @@
16316	18256	static boolean DEBUG_SELECTION = false;
16317	18257	boolean OCCLUSION_CULLING = false; //true;
16318	18258	public boolean lightMode = false;
	18259	+
	18260	+ private boolean keepshadow;
	18261	+
	18262	+ static public boolean capsLocked = false; // VR
	18263	+
16319	18264	static public int indexcount = 0;
16320	18265	/static/ cColor vertexOcclusion = new cColor();
16321	18266	//private int selection_view = -1;
..	..	@@ -16323,23 +18268,15 @@
16323	18268	int AAbuffersize = 0;
16324	18269
16325	18270	//double[] selectedpoint = new double[3];
16326		- static Superellipsoid selectedpoint = new Superellipsoid();
	18271	+ static Superellipsoid selectedpoint;
16327	18272	static Sphere previousselectedpoint = null;
16328		- static Sphere debugpointG = new Sphere();
16329		- static Sphere debugpointP = new Sphere();
16330		- static Sphere debugpointC = new Sphere();
16331		- static Sphere debugpointR = new Sphere();
	18273	+ static Sphere debugpointG;
	18274	+ static Sphere debugpointP;
	18275	+ static Sphere debugpointC;
	18276	+ static Sphere debugpointR;
16332	18277
16333	18278	static Sphere debugpoints[] = new Sphere[8];
16334	18279
16335		- static
16336		- {
16337		- for (int i=0; i<8; i++)
16338		- {
16339		- debugpoints[i] = new Sphere();
16340		- }
16341		- }
16342		-
16343	18280	static void InitPoints(float radius)
16344	18281	{
16345	18282	for (int i=0; i<8; i++)
..	..	@@ -16359,7 +18296,7 @@
16359	18296	}
16360	18297	}
16361	18298
16362		- static void DrawPoints(CameraPane cpane)
	18299	+ static void DrawPoints(iCameraPane cpane)
16363	18300	{
16364	18301	for (int i=0; i<8; i++) // first and last are red
16365	18302	{
..	..	@@ -16378,11 +18315,14 @@
16378	18315	static IntBuffer AAbuffer; // = IntBuffer.allocate(MAX_SIZE*MAX_SIZE);
16379	18316	static IntBuffer bigAAbuffer;
16380	18317	static java.nio.FloatBuffer histogram = BufferUtil.newFloatBuffer(HISTOGRAM_SIZE * 3);
16381		- static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
	18318	+ //static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
16382	18319	static IntBuffer selectsizebuffer = IntBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
16383	18320	static java.nio.FloatBuffer pointselectsizebuffer = java.nio.FloatBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
16384	18321	//static IntBuffer occlusionsizebuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
16385		- static java.nio.FloatBuffer occlusionsizebuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	18322	+ static java.nio.FloatBuffer occlusiondepthbuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	18323	+
	18324	+ static IntBuffer occlusioncolorbuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	18325	+
16386	18326	static BufferedImage bufimage = new BufferedImage(TEX_SIZE, TEX_SIZE, BufferedImage.TYPE_INT_RGB);
16387	18327	static BufferedImage textest = new cBufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB);
16388	18328	static java.util.Vector<BufferedImage> billboards = new java.util.Vector<BufferedImage>();
..	..	@@ -16391,10 +18331,11 @@
16391	18331	static IntBuffer textbuffer = null; // IntBuffer.allocate(TEXT_WIDTH88 * TEXT_HEIGHT);
16392	18332	// Depth buffer format
16393	18333	//private int depth_format;
16394		- static public void NextIndex(Object3D o, GL gl)
	18334	+
	18335	+ public void NextIndex()
16395	18336	{
16396	18337	indexcount+=16;
16397		- gl.glColor3d(((indexcount >>> 16) & 255) / 255.0, ((indexcount >>> 8) & 255) / 255.0, ((indexcount) & 255) / 255.0);
	18338	+ GetGL().glColor3d(((indexcount >>> 16) & 255) / 255.0, ((indexcount >>> 8) & 255) / 255.0, ((indexcount) & 255) / 255.0);
16398	18339	//objects[indexcount] = o;
16399	18340	//System.out.println("indexcount = " + indexcount);
16400	18341	}