~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,10 +34,14 @@
30	34	import java.nio.*;
31	35
32	36	import gleem.linalg.Mat4f;
	37	+import javax.imageio.ImageTypeSpecifier;
33	38
34		-class CameraPane extends GLCanvas implements Runnable, GLEventListener, ActionListener, MouseWheelListener, MouseMotionListener, MouseListener, KeyListener
	39	+class CameraPane extends GLCanvas implements iCameraPane, Runnable, GLEventListener, ActionListener, MouseWheelListener, MouseMotionListener, MouseListener, KeyListener
35	40	{
36		- static boolean DEBUG = false;
	41	+ static cMaterial[] materialstack = new cMaterial[65536];
	42	+ static boolean[] selectedstack = new boolean[65536];
	43	+ static int materialdepth = 0;
	44	+
37	45	static boolean FRUSTUM = false; // still bogus true; // frustum culling
38	46
39	47	// camera change fix
..	..	@@ -42,25 +50,40 @@
42	50
43	51	static int STEP = 1;
44	52
45		- static boolean ONESTEP = false; // do LIVE once
46		-
47		- /**
48		- * @return the LIVE
49		- */
50		- public static boolean isLIVE()
	53	+ private static BufferedImage CreateBim(byte[] bytes, int width, int height)
51	54	{
52		- return LIVE \|\| ONESTEP;
	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;
53	84	}
54	85
55		- /**
56		- * @param aLIVE the LIVE to set
57		- */
58		- public static void setLIVE(boolean aLIVE)
59		- {
60		- LIVE = aLIVE;
61		- }
62		-
63		- /static/ boolean CULLFACE = false; // true;
	86	+ /static/ private boolean CULLFACE = false; // true;
64	87	/static/ boolean NEAREST = false; // true;
65	88	/static/ boolean WIREFRAME = false; // true;
66	89
..	..	@@ -70,14 +93,12 @@
70	93	static int CURRENTANTIALIAS = 0; // 1;
71	94	/static/ boolean RENDERSHADOW = true;
72	95	/static/ int RENDERPROGRAM = 2; // 0 == none, 1 == fast, 2 == normal
73		- static boolean ANIMATION = false;
74		- static String filename;
75	96
76	97	boolean DISPLAYTEXT = false;
77	98	//boolean REDUCETEXTURE = true;
78	99	boolean CACHETEXTURE = true;
79	100	boolean CLEANCACHE = false; // true;
80		- boolean MIPMAP = false; // true;
	101	+ boolean MIPMAP = false; // true; // never works...
81	102	boolean COMPRESSTEXTURE = false;
82	103	boolean KOMPACTTEXTURE = false; // true;
83	104	boolean RESIZETEXTURE = false;
..	..	@@ -90,27 +111,31 @@
90	111	//private Mat4f spotlightTransform = new Mat4f();
91	112	//private Mat4f spotlightInverseTransform = new Mat4f();
92	113	static GLContext glcontext = null;
93		- /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	+
94	119	boolean reverseUP = false;
95	120	static boolean frozen = false;
96	121	boolean enablebackspace = false; // patch for back buffer refresh
97	122
98	123	static boolean textureon = true;
99	124	static boolean LOCALTRANSFORM = false;
100		-private static boolean LIVE = false;
101	125	static boolean FULLSCREEN = false;
102	126	static boolean SUPPORT = true;
103		-static boolean CROWD = false;
104		-static boolean INERTIA = true;
	127	+static boolean INERTIA = false; // true;
105	128	static boolean FAST = false;
106	129	static boolean SLOWPOSE = false;
107	130	static boolean FOOTCONTACT = true;
108	131
109	132	static int tickcount = 0; // slow pose issue
110	133
	134	+static boolean BUTTONLESSWHEEL = false;
	135	+static boolean ZOOMBOXMODE = false;
111	136	static boolean BOXMODE = false;
112	137	static boolean IMAGEFLIP = false;
113		-static boolean SMOOTHFOCUS = false;
	138	+static boolean SMOOTHFOCUS = true; // false;
114	139	static boolean SPEAKERMOCAP = true; // jan 2014 false;
115	140	static boolean SPEAKERCAMERA = false;
116	141	static boolean SPEAKERFOCUS = false;
..	..	@@ -122,7 +147,7 @@
122	147	static boolean OEIL = true;
123	148	static boolean OEILONCE = false; // do oeilon then oeiloff
124	149	static boolean LOOKAT = true;
125		-static boolean RANDOM = true; // false;
	150	+static boolean SWITCH = true; // false;
126	151	static boolean HANDLES = false; // selection doesn't work!!
127	152	static boolean PAINTMODE = false;
128	153
..	..	@@ -144,16 +169,16 @@
144	169
145	170
146	171	// OPTIONS
147		- boolean Skinshader = true;
	172	+ boolean Skinshader = false; // true;
148	173	boolean cameraLight = false;
149	174	boolean UVdebug = false;
150	175	boolean Udebug = false;
151	176	boolean Vdebug = false;
152	177	boolean NORMALdebug = false;
153		- static boolean doublesided = false; // true; // reversed normals are awful for conformance
	178	+ static boolean doublesided = true; // false; // reversed normals are awful for conformance
154	179	boolean anisotropy = true;
155	180	boolean softshadow = true; // slower but better false;
156		- boolean opacityhalo = false;
	181	+ boolean opacityhalo = false; // reverse the halo effect (e.g. glass)
157	182
158	183	boolean macromode = false;
159	184
..	..	@@ -165,12 +190,55 @@
165	190	defaultcaps.setAccumBlueBits(16);
166	191	defaultcaps.setAccumAlphaBits(16);
167	192	}
168		- static CameraPane theRenderer;
	193	+
	194	+ private File defaultDirectory = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory();
169	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	+
170	209	void SetAsGLRenderer(boolean b)
171	210	{
172	211	isRenderer = b;
173		- theRenderer = this;
	212	+ Globals.theRenderer = this;
	213	+ }
	214	+
	215	+ CameraPane(Object3D o, Camera cam, boolean withcontext)
	216	+ {
	217	+ super(defaultcaps, null, withcontext?glcontext:null, null);
	218	+
	219	+ //System.out.println("AMERICA AREA = " + (9458886 + 9210755 + 8480395 + 2736391 + 1943018 + 1289475 + 1141569 + 1069350 + 911559 + 721229 + 395886 + 377972 + 246700 + 211156 + 173985 + 141133 + 118279 + 112079 + 108523));
	220	+ glcontext = getContext();
	221	+
	222	+ cameras = new Camera[2];
	223	+ targetLookAts = new cVector[2];
	224	+
	225	+ SetCamera(cam, true);
	226	+
	227	+ // Warning: not used.
	228	+ //SetLight(new Camera(new cVector(15, 10, -20)));
	229	+
	230	+ object = o;
	231	+
	232	+ setBackground(Color.white);
	233	+
	234	+ addKeyListener(this);
	235	+ addMouseListener(this);
	236	+ addMouseMotionListener(this);
	237	+ addMouseWheelListener(this);
	238	+ //System.out.println("addGLEventListener: " + this);
	239	+ addGLEventListener(this);
	240	+
	241	+// pingthread.start(); // may 2013
174	242	}
175	243
176	244	static boolean AntialiasingEnabled()
..	..	@@ -178,12 +246,53 @@
178	246	return CURRENTANTIALIAS > 0;
179	247	}
180	248
181		- void ClearDepth()
	249	+ /// INTERFACE
	250	+
	251	+ public javax.media.opengl.GL GetGL0()
	252	+ {
	253	+ return currentGL;
	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	+
	280	+ public boolean IsBoxMode()
	281	+ {
	282	+ return BOXMODE;
	283	+ }
	284	+
	285	+ public boolean IsZoomBoxMode()
	286	+ {
	287	+ return ZOOMBOXMODE;
	288	+ }
	289	+
	290	+ public void ClearDepth()
182	291	{
183	292	GetGL().glClear(GetGL().GL_DEPTH_BUFFER_BIT);
184	293	}
185	294
186		- void DepthTest(boolean depthtest)
	295	+ public void DepthTest(boolean depthtest)
187	296	{
188	297	if (depthtest)
189	298	GetGL().glDepthFunc(GL.GL_LEQUAL);
..	..	@@ -191,7 +300,7 @@
191	300	GetGL().glDepthFunc(GL.GL_ALWAYS);
192	301	}
193	302
194		- void DepthWrite(boolean depthwrite)
	303	+ public void DepthWrite(boolean depthwrite)
195	304	{
196	305	if (depthwrite)
197	306	GetGL().glDepthMask(true);
..	..	@@ -199,12 +308,1617 @@
199	308	GetGL().glDepthMask(false);
200	309	}
201	310
202		- void BackFaceCull(boolean bfc)
	311	+ public void BackFaceCull(boolean bfc)
203	312	{
204	313	if (bfc)
205	314	GetGL().glEnable(GetGL().GL_CULL_FACE);
206	315	else
207	316	GetGL().glDisable(GetGL().GL_CULL_FACE);
	317	+ }
	318	+
	319	+ public boolean BackFaceCullMode()
	320	+ {
	321	+ return this.CULLFACE;
	322	+ }
	323	+
	324	+ public boolean IsAmbientOcclusionOn()
	325	+ {
	326	+ return this.ambientOcclusion;
	327	+ }
	328	+
	329	+ public boolean IsDebugSelection()
	330	+ {
	331	+ return DEBUG_SELECTION;
	332	+ }
	333	+
	334	+ public boolean IsFrozen()
	335	+ {
	336	+ boolean selectmode = this.DrawMode() == SELECTION \|\| this.IsDebugSelection();
	337	+
	338	+ return !selectmode && cameracount == 0; // != 0;
	339	+ }
	340	+
	341	+ // Currently in Globals
	342	+ public int DrawMode()
	343	+ {
	344	+ return Globals.DrawMode();
	345	+ }
	346	+
	347	+ public Camera EyeCamera()
	348	+ {
	349	+ return eyeCamera;
	350	+ }
	351	+
	352	+ public Camera LightCamera()
	353	+ {
	354	+ return lightCamera;
	355	+ }
	356	+
	357	+ public Camera ManipCamera()
	358	+ {
	359	+ return manipCamera;
	360	+ }
	361	+
	362	+ public Camera RenderCamera()
	363	+ {
	364	+ return renderCamera;
	365	+ }
	366	+
	367	+ public Camera[] Cameras()
	368	+ {
	369	+ return cameras;
	370	+ }
	371	+
	372	+ public void PushMaterial(Object3D obj, boolean selected)
	373	+ {
	374	+ CameraPane display = this;
	375	+ javax.media.opengl.GL gl = display.GetGL();
	376	+ cMaterial material = obj.material;
	377	+
	378	+ if (material != null)
	379	+ {
	380	+ materialstack[materialdepth] = material;
	381	+ selectedstack[materialdepth] = selected;
	382	+ cStatic.objectstack[materialdepth++] = obj;
	383	+ //System.out.println("material " + material);
	384	+ //Applet3D.tracein(this, selected);
	385	+ //display.vector2buffer = obj.projectedVertices;
	386	+ if (obj instanceof Camera)
	387	+ {
	388	+ display.options1[0] = material.shift;
	389	+ //System.out.println("shift " + material.shift);
	390	+ display.options1[1] = material.lightarea;
	391	+ display.options1[2] = material.shadowbias;
	392	+ display.options1[3] = material.aniso;
	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]);
	399	+ display.options2[0] = material.opacity;
	400	+ display.options2[1] = material.diffuse;
	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]);
	405	+
	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]);
	410	+ display.options4[0] = material.cameralight/0.2f;
	411	+ display.options4[1] = material.subsurface;
	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]);
	416	+
	417	+ // if (display.CURRENTANTIALIAS > 0)
	418	+ // display.options3[3] /= 4;
	419	+
	420	+ /*
	421	+ System.out.println("Focus = " + display.options1[0]);
	422	+ System.out.println("Aperture = " + display.options1[1]);
	423	+ System.out.println("ShadowBlur = " + display.options1[2]);
	424	+ System.out.println("Antialiasing = " + display.options1[3]);
	425	+ System.out.println("Fog = " + display.options2[0]);
	426	+ System.out.println("Intensity = " + display.options2[1]);
	427	+ System.out.println("Elevation = " + display.options2[2]);
	428	+ /**/
	429	+ } else
	430	+ {
	431	+ DrawMaterial(material, selected, obj.projectedVertices);
	432	+ }
	433	+ } else
	434	+ {
	435	+ if (selected && CameraPane.flash)
	436	+ {
	437	+ display.modelParams4[1] = 100;
	438	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 4, display.modelParams4, 0);
	439	+ }
	440	+ }
	441	+ }
	442	+
	443	+ public void PushMaterial2(Object3D obj, boolean selected)
	444	+ {
	445	+ CameraPane display = this;
	446	+ cMaterial material = obj.material;
	447	+
	448	+ if (material != null)
	449	+ {
	450	+ materialstack[materialdepth] = material;
	451	+ selectedstack[materialdepth] = selected;
	452	+ cStatic.objectstack[materialdepth++] = obj;
	453	+ //System.out.println("material " + material);
	454	+ //Applet3D.tracein("selected ", selected);
	455	+ //display.vector2buffer = obj.projectedVertices;
	456	+ display.DrawMaterial(material, selected, obj.projectedVertices);
	457	+ }
	458	+ }
	459	+
	460	+ public void PopMaterial(Object3D obj, boolean selected)
	461	+ {
	462	+ CameraPane display = this;
	463	+ javax.media.opengl.GL gl = display.GetGL();
	464	+ cMaterial material = obj.material;
	465	+
	466	+ //if (parent != null && parent.GetMaterial() != null)
	467	+ // parent.GetMaterial().Draw(display, parent.IsSelected(this));
	468	+ if (material != null)
	469	+ {
	470	+ materialdepth -= 1;
	471	+ if (materialdepth > 0)
	472	+ {
	473	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	474	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
	475	+ }
	476	+ //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
	477	+ } else if (selected && CameraPane.flash && obj.GetMaterial() != null)
	478	+ {
	479	+ display.modelParams4[1] = obj.GetMaterial().cameralight;
	480	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 4, display.modelParams4, 0);
	481	+ }
	482	+ }
	483	+
	484	+ public void PopMaterial2(Object3D obj)
	485	+ {
	486	+ CameraPane display = this;
	487	+ cMaterial material = obj.material;
	488	+
	489	+ if (material != null)
	490	+ {
	491	+ materialdepth -= 1;
	492	+ if (materialdepth > 0)
	493	+ {
	494	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	495	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
	496	+ }
	497	+ //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
	498	+ //else
	499	+ //material.Draw(display, false);
	500	+ }
	501	+ }
	502	+
	503	+ public void DrawFace(Object3D obj, Vertex pv, Vertex qv, Vertex rv, Face face)
	504	+ {
	505	+ CameraPane display = this;
	506	+
	507	+ if (pv.y == -10000 \|\|
	508	+ qv.y == -10000 \|\|
	509	+ rv.y == -10000)
	510	+ return;
	511	+
	512	+// float b = f.nbiterations & 1;
	513	+// float g = (f.nbiterations>>1) & 1;
	514	+// float r = (f.nbiterations>>2) & 1;
	515	+//
	516	+// //if (f.weight == 10000)
	517	+// //{
	518	+// // r = 1; g = b = 0;
	519	+// //}
	520	+// //else
	521	+// //{
	522	+// // assert(f.weight < 10000);
	523	+// r = g = b = (float)bRep.FaceWeight(f)*100;
	524	+// if (r<0)
	525	+// assert(r>=0);
	526	+// //}
	527	+
	528	+ javax.media.opengl.GL gl = display.GetGL();
	529	+
	530	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
	531	+
	532	+ //System.out.println("p = " + pv + "; q = " + qv + "; r = " + rv);
	533	+ if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
	534	+ {
	535	+ //gl.glBegin(gl.GL_TRIANGLES);
	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	+ ;
	539	+ if (!hasnorm)
	540	+ {
	541	+ // System.out.println("Mesh normal");
	542	+ LA.vecSub(pv/.pos/, qv/.pos/, obj.v0);
	543	+ LA.vecSub(pv/.pos/, rv/.pos/, obj.v1);
	544	+ LA.vecCross(obj.v0, obj.v1, obj.v2);
	545	+ LA.vecNormalize(obj.v2);
	546	+
	547	+ SetGLNormal(gl, (float) obj.v2.x, (float) obj.v2.y, (float) obj.v2.z);
	548	+ }
	549	+
	550	+ // P
	551	+ float x = (float)pv.x;
	552	+ float y = (float)pv.y;
	553	+ float z = (float)pv.z;
	554	+
	555	+ if (hasnorm)
	556	+ {
	557	+// if (!pv.norm.normalized())
	558	+// assert(pv.norm.normalized());
	559	+
	560	+ //System.out.println("normalp = " + pv.norm.x + ", " + pv.norm.y + ", " + pv.norm.z);
	561	+ float nx = (float)pv.norm.x;
	562	+ float ny = (float)pv.norm.y;
	563	+ float nz = (float)pv.norm.z;
	564	+
	565	+ x += nx * obj.NORMALPUSH;
	566	+ y += ny * obj.NORMALPUSH;
	567	+ z += nz * obj.NORMALPUSH;
	568	+
	569	+ SetGLNormal(gl, nx, ny, nz);
	570	+ }
	571	+ gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
	572	+ SetColor(obj, pv);
	573	+ //gl.glColor4f(r, g, b, 1);
	574	+ //gl.glColor4f(pv.boundary, pv.boundary, pv.boundary, 1);
	575	+ if (obj.flipV)
	576	+ gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
	577	+ else
	578	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	579	+ //System.out.println("vertexp = " + pv.x + ", " + pv.y + ", " + pv.z);
	580	+
	581	+ gl.glVertex3f(x, y, z);
	582	+
	583	+ // Q
	584	+ x = (float)qv.x;
	585	+ y = (float)qv.y;
	586	+ z = (float)qv.z;
	587	+
	588	+// Print(pv);
	589	+ if (hasnorm)
	590	+ {
	591	+// assert(qv.norm.normalized());
	592	+ //System.out.println("normalq = " + qv.norm.x + ", " + qv.norm.y + ", " + qv.norm.z);
	593	+ float nx = (float)qv.norm.x;
	594	+ float ny = (float)qv.norm.y;
	595	+ float nz = (float)qv.norm.z;
	596	+
	597	+ x += nx * obj.NORMALPUSH;
	598	+ y += ny * obj.NORMALPUSH;
	599	+ z += nz * obj.NORMALPUSH;
	600	+
	601	+ SetGLNormal(gl, nx, ny, nz);
	602	+ }
	603	+ //System.out.println("vertexq = " + qv.s + ", " + qv.t);
	604	+ // boolean locked = false;
	605	+ // float eps = 0.1f;
	606	+ // boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
	607	+
	608	+ // int dot = 0; //*/ (int)f.dot;
	609	+
	610	+ // if ((dot&1) == 0)
	611	+ // dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
	612	+
	613	+ // if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
	614	+ if (obj.flipV)
	615	+ gl.glTexCoord2f((float) qv.s, 1-(float) qv.t);
	616	+ else
	617	+ gl.glTexCoord2f((float) qv.s, (float) qv.t);
	618	+ // else
	619	+ // {
	620	+ // locked = true;
	621	+ // gl.glTexCoord2f((float) pv.s, (float) pv.t);
	622	+ // }
	623	+ gl.glColor4f(qv.AO, qv.AO, qv.AO, 1);
	624	+ SetColor(obj, qv);
	625	+
	626	+ gl.glVertex3f(x, y, z);
	627	+ //gl.glColor4f(r, g, b, 1);
	628	+ //gl.glColor4f(qv.boundary, qv.boundary, qv.boundary, 1);
	629	+ //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
	630	+// Print(qv);
	631	+
	632	+ // R
	633	+ x = (float)rv.x;
	634	+ y = (float)rv.y;
	635	+ z = (float)rv.z;
	636	+
	637	+ if (hasnorm)
	638	+ {
	639	+// assert(rv.norm.normalized());
	640	+ //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
	641	+ float nx = (float)rv.norm.x;
	642	+ float ny = (float)rv.norm.y;
	643	+ float nz = (float)rv.norm.z;
	644	+
	645	+ x += nx * obj.NORMALPUSH;
	646	+ y += ny * obj.NORMALPUSH;
	647	+ z += nz * obj.NORMALPUSH;
	648	+
	649	+ SetGLNormal(gl, nx, ny, nz);
	650	+ }
	651	+
	652	+ // if ((dot&4) == 0)
	653	+ // dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
	654	+
	655	+ // if (wrap \|\| !locked && (dot&8) != 0)
	656	+ if (obj.flipV)
	657	+ gl.glTexCoord2f((float) rv.s, 1-(float) rv.t);
	658	+ else
	659	+ gl.glTexCoord2f((float) rv.s, (float) rv.t);
	660	+ // else
	661	+ // gl.glTexCoord2f((float) pv.s, (float) pv.t);
	662	+
	663	+ // f.dot = dot;
	664	+
	665	+ gl.glColor4f(rv.AO, rv.AO, rv.AO, 1);
	666	+ SetColor(obj, rv);
	667	+ //gl.glColor4f(r, g, b, 1);
	668	+ //gl.glColor4f(rv.boundary, rv.boundary, rv.boundary, 1);
	669	+ //System.out.println("vertexr = " + rv.x + ", " + rv.y + ", " + rv.z);
	670	+ gl.glVertex3f(x, y, z);
	671	+// Print(rv);
	672	+ //gl.glEnd();
	673	+ }
	674	+ else
	675	+ {
	676	+ gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
	677	+ gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
	678	+ gl.glVertex3f((float) rv.x, (float) rv.y, (float) rv.z);
	679	+
	680	+ }
	681	+
	682	+ if (false) // (attributes & WIREFRAME) != 0)
	683	+ {
	684	+ gl.glDisable(gl.GL_LIGHTING);
	685	+
	686	+ gl.glBegin(gl.GL_LINE_LOOP);
	687	+ gl.glVertex3d(pv./pos./x, pv./pos./y, pv./pos./z);
	688	+ gl.glVertex3d(qv./pos./x, qv./pos./y, qv./pos./z);
	689	+ gl.glVertex3d(rv./pos./x, rv./pos./y, rv./pos./z);
	690	+ gl.glEnd();
	691	+
	692	+ gl.glEnable(gl.GL_LIGHTING);
	693	+ }
	694	+ }
	695	+
	696	+ /**
	697	+ * <code>draw</code> renders a <code>TriMesh</code> object including
	698	+ * it's normals, colors, textures and vertices.
	699	+ *
	700	+ * @see Renderer#draw(TriMesh)
	701	+ * @param tris
	702	+ * the mesh to render.
	703	+ */
	704	+ public void DrawParticles(TriMesh geo, Object3D shape, boolean selected, boolean rotate) // TriMesh tris)
	705	+ {
	706	+ CameraPane display = this;
	707	+
	708	+ float r = display.modelParams0[0];
	709	+ float g = display.modelParams0[1];
	710	+ float b = display.modelParams0[2];
	711	+ float opacity = display.modelParams5[1];
	712	+
	713	+ //final GL gl = GLU.getCurrentGL();
	714	+ GL gl = display.GetGL(); // getGL();
	715	+
	716	+ FloatBuffer vertBuf = geo.vertBuf;
	717	+
	718	+ int v = vertBuf.capacity();
	719	+
	720	+ int count = 0;
	721	+
	722	+ boolean cf = gl.glIsEnabled(gl.GL_CULL_FACE);
	723	+ gl.glEnable(gl.GL_CULL_FACE);
	724	+ // gl.glScalef(1.0f/1024,1.0f/1024,1.0f/1024);
	725	+ for (int i=0; i<v/3; i++)
	726	+ {
	727	+ int index3 = i*3;
	728	+
	729	+ if (geo.sizeBuf.get(index3+1) == 0)
	730	+ continue;
	731	+
	732	+ count++;
	733	+
	734	+ int index4 = i*4;
	735	+
	736	+ float tx = vertBuf.get(index3);
	737	+ float ty = vertBuf.get(index3+1);
	738	+ float tz = vertBuf.get(index3+2);
	739	+
	740	+ // if (tx == 0 && ty == 0 && tz == 0)
	741	+ // continue;
	742	+
	743	+ gl.glMatrixMode(gl.GL_TEXTURE);
	744	+ gl.glPushMatrix();
	745	+
	746	+ float[] texmat = geo.texmat;
	747	+ texmat[12] = texmat[13] = texmat[14] = i;
	748	+
	749	+ gl.glMultMatrixf(texmat, 0);
	750	+
	751	+ gl.glMatrixMode(gl.GL_MODELVIEW);
	752	+ gl.glPushMatrix();
	753	+
	754	+ gl.glTranslatef(tx,ty,tz);
	755	+
	756	+ if (rotate)
	757	+ gl.glRotatef(i, 0, 1, 0);
	758	+
	759	+ float size = geo.sizeBuf.get(index3) / 100;
	760	+ gl.glScalef(size,size,size);
	761	+
	762	+ float cr = geo.colorBuf.get(index4);
	763	+ float cg = geo.colorBuf.get(index4+1);
	764	+ float cb = geo.colorBuf.get(index4+2);
	765	+ float ca = geo.colorBuf.get(index4+3);
	766	+
	767	+ display.modelParams0[0] = r * cr;
	768	+ display.modelParams0[1] = g * cg;
	769	+ display.modelParams0[2] = b * cb;
	770	+
	771	+ display.modelParams5[1] = opacity * ca;
	772	+
	773	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 0, display.modelParams0, 0);
	774	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 5, display.modelParams5, 0);
	775	+
	776	+ RandomNode.globalseed = (int)geo.sizeBuf.get(index3+2); // i;
	777	+ RandomNode.globalseed2 = RandomNode.globalseed;
	778	+
	779	+// gl.glColor4f(cr,cg,cb,ca);
	780	+ // gl.glScalef(1024/16,1024/16,1024/16);
	781	+ shape.Draw/Node/(display,null,selected,false); // blocked
	782	+ // gl.glScalef(16.0f/1024,16.0f/1024,16.0f/1024);
	783	+ //gl.glTranslatef(-tx,-ty,-tz);
	784	+ gl.glPopMatrix();
	785	+
	786	+ gl.glMatrixMode(gl.GL_TEXTURE);
	787	+ gl.glPopMatrix();
	788	+ }
	789	+ // gl.glScalef(1024,1024,1024);
	790	+ if (!cf)
	791	+ gl.glDisable(gl.GL_CULL_FACE);
	792	+
	793	+ display.modelParams0[0] = r;
	794	+ display.modelParams0[1] = g;
	795	+ display.modelParams0[2] = b;
	796	+
	797	+ display.modelParams5[1] = opacity;
	798	+
	799	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 0, display.modelParams0, 0);
	800	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 5, display.modelParams5, 0);
	801	+
	802	+ gl.glMatrixMode(gl.GL_MODELVIEW);
	803	+
	804	+// System.err.println("total = " + v/3 + "; displayed = " + count);
	805	+ if (true)
	806	+ return;
	807	+
	808	+//// if (!tris.predraw(this))
	809	+//// {
	810	+//// return;
	811	+//// }
	812	+//// if (Debug.stats)
	813	+//// {
	814	+//// StatCollector.addStat(StatType.STAT_TRIANGLE_COUNT, tris.getTriangleCount());
	815	+//// StatCollector.addStat(StatType.STAT_VERTEX_COUNT, tris.getVertexCount());
	816	+//// StatCollector.addStat(StatType.STAT_GEOM_COUNT, 1);
	817	+//// }
	818	+////
	819	+//// if (tris.getDisplayListID() != -1)
	820	+//// {
	821	+//// renderDisplayList(tris);
	822	+//// return;
	823	+//// }
	824	+////
	825	+//// if (!generatingDisplayList)
	826	+//// {
	827	+//// applyStates(tris.states, tris);
	828	+//// }
	829	+//// if (Debug.stats)
	830	+//// {
	831	+//// StatCollector.startStat(StatType.STAT_RENDER_TIMER);
	832	+//// }
	833	+//// boolean transformed = doTransforms(tris);
	834	+//
	835	+// int glMode = GL.GL_TRIANGLES;
	836	+// switch (getMode())
	837	+// {
	838	+// case Triangles:
	839	+// glMode = GL.GL_TRIANGLES;
	840	+// break;
	841	+// case Strip:
	842	+// glMode = GL.GL_TRIANGLE_STRIP;
	843	+// break;
	844	+// case Fan:
	845	+// glMode = GL.GL_TRIANGLE_FAN;
	846	+// break;
	847	+// }
	848	+//
	849	+// if (!predrawGeometry(gl))
	850	+// {
	851	+// // make sure only the necessary indices are sent through on old
	852	+// // cards.
	853	+// IntBuffer indices = this.getIndexBuffer();
	854	+// if (indices == null)
	855	+// {
	856	+// logger.severe("missing indices on geometry object: " + this.toString());
	857	+// } else
	858	+// {
	859	+// indices.rewind();
	860	+// indices.limit(this.getMaxIndex());
	861	+//
	862	+// gl.glDrawElements(glMode, indices.limit(), GL.GL_UNSIGNED_INT, indices); // TODO Check <count> and assumed <type> of GL_UNSIGNED_INT
	863	+//
	864	+// indices.clear();
	865	+// }
	866	+// } else
	867	+// {
	868	+// gl.glDrawElements(glMode, this.getIndexBuffer().limit(),
	869	+// GL.GL_UNSIGNED_INT, 0);
	870	+// }
	871	+//
	872	+//// postdrawGeometry(tris);
	873	+//// if (transformed)
	874	+//// {
	875	+//// undoTransforms(tris);
	876	+//// }
	877	+////
	878	+//// if (Debug.stats)
	879	+//// {
	880	+//// StatCollector.endStat(StatType.STAT_RENDER_TIMER);
	881	+//// }
	882	+//// tris.postdraw(this);
	883	+ }
	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	+
	1478	+ /// INTERFACE
	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	+
	1509	+ void SetColor(Object3D obj, Vertex p0)
	1510	+ {
	1511	+ CameraPane display = this;
	1512	+ BoundaryRep bRep = obj.bRep;
	1513	+
	1514	+ if (RENDERPROGRAM == 0)
	1515	+ {
	1516	+ float r = 0;
	1517	+ if (bRep != null)
	1518	+ {
	1519	+ if (bRep.stripified)
	1520	+ {
	1521	+ r = 1;
	1522	+ }
	1523	+ }
	1524	+ float g = 0;
	1525	+ if (bRep != null)
	1526	+ {
	1527	+ if (bRep.trimmed)
	1528	+ {
	1529	+ g = 1;
	1530	+ }
	1531	+ }
	1532	+ float b = 0;
	1533	+ if (obj.support != null && obj.Link2Support())
	1534	+ {
	1535	+ b = 1;
	1536	+ }
	1537	+ display.GetGL().glColor3f(rp0.AO, gp0.AO, b*p0.AO);
	1538	+ return;
	1539	+ }
	1540	+
	1541	+ if (display.DrawMode() != CameraPane.SHADOW)
	1542	+ return;
	1543	+
	1544	+ javax.media.opengl.GL gl = display.GetGL();
	1545	+// if (true) return;
	1546	+// float ao = p.AO;
	1547	+//
	1548	+// // if (ao == 0 && !bRep.AOdone) // transient problem!
	1549	+// // ao = 1;
	1550	+//
	1551	+// gl.glColor4f(ao, ao, ao, 1);
	1552	+
	1553	+// CameraPane.selectedpoint.
	1554	+// getAverage(cStatic.point1, true);
	1555	+ if (CameraPane.pointflow == null) // !random) // live)
	1556	+ {
	1557	+ return;
	1558	+ }
	1559	+
	1560	+ cStatic.point1.set(0,0,0);
	1561	+ LA.xformPos(cStatic.point1, CameraPane.selectedpoint.toParent, cStatic.point1);
	1562	+
	1563	+ cStatic.point1.sub(p0);
	1564	+
	1565	+
	1566	+// if (marked && (p0.vertexlinks == null \|\| support == null \|\| support.bRep == null)) // no position delta?
	1567	+// {
	1568	+// return;
	1569	+// }
	1570	+
	1571	+ //if (true)
	1572	+ if (cStatic.point1.dot(cStatic.point1) > 0.000001)
	1573	+ {
	1574	+ return;
	1575	+ }
	1576	+
	1577	+ if (false) // marked)
	1578	+ {
	1579	+ // debug rigging weights
	1580	+ for (int object = 0; object < p0.vertexlinks.length; object++)
	1581	+ {
	1582	+ float weight = p0.weights[object] / p0.totalweight;
	1583	+
	1584	+ // if (weight < 0.1)
	1585	+ // {
	1586	+ // assert(weight == 0);
	1587	+ // continue;
	1588	+ // }
	1589	+
	1590	+ if (p0.vertexlinks[object] == -1)
	1591	+ continue;
	1592	+
	1593	+ Vertex q = obj.support.bRep.GetVertex(p0.vertexlinks[object]);
	1594	+
	1595	+ int color = //1 << object; //
	1596	+ //p.vertexlinks.length;
	1597	+ obj.support.bRep.supports[p0.closestsupport].links[object];
	1598	+ colorV[2] += (color & 1) * weight;
	1599	+ colorV[1] += ((color & 2) >> 1) * weight;
	1600	+ colorV[0] += ((color & 4) >> 2) * weight;
	1601	+ }
	1602	+ }
	1603	+ else
	1604	+ {
	1605	+ if (obj.drawingstarted)
	1606	+ {
	1607	+ // find next point
	1608	+ if (bRep.GetVertex(0).faceindices == null)
	1609	+ {
	1610	+ bRep.InitFaceIndices();
	1611	+ }
	1612	+
	1613	+ double ymin = p0.y;
	1614	+
	1615	+ Vertex newp = p0;
	1616	+
	1617	+ for (int fii = 0; fii < p0.faceindices.length; fii++)
	1618	+ {
	1619	+ int fi = p0.faceindices[fii];
	1620	+
	1621	+ if (fi == -1)
	1622	+ break;
	1623	+
	1624	+ Face f = bRep.GetFace(fi);
	1625	+
	1626	+ Vertex p = bRep.GetVertex(f.p);
	1627	+ Vertex q = bRep.GetVertex(f.q);
	1628	+ Vertex r = bRep.GetVertex(f.r);
	1629	+
	1630	+ int swap = (int)(Math.random()*3);
	1631	+
	1632	+// for (int s=swap; --s>=0;)
	1633	+// {
	1634	+// Vertex t = p;
	1635	+// p = q;
	1636	+// q = r;
	1637	+// r = t;
	1638	+// }
	1639	+ if (ymin > p.y)
	1640	+ {
	1641	+ ymin = p.y;
	1642	+ newp = p;
	1643	+// break;
	1644	+ }
	1645	+ if (ymin > q.y)
	1646	+ {
	1647	+ ymin = q.y;
	1648	+ newp = q;
	1649	+// break;
	1650	+ }
	1651	+ if (ymin > r.y)
	1652	+ {
	1653	+ ymin = r.y;
	1654	+ newp = r;
	1655	+// break;
	1656	+ }
	1657	+ }
	1658	+
	1659	+ CameraPane.selectedpoint.toParent[3][0] = newp.x;
	1660	+ CameraPane.selectedpoint.toParent[3][1] = newp.y;
	1661	+ CameraPane.selectedpoint.toParent[3][2] = newp.z;
	1662	+
	1663	+ obj.drawingstarted = false;
	1664	+
	1665	+ // return;
	1666	+ }
	1667	+
	1668	+ if (false) // CameraPane.DRAW
	1669	+ {
	1670	+ p0.AO = colorV[0] = 2;
	1671	+ colorV[1] = 2;
	1672	+ colorV[2] = 2;
	1673	+ }
	1674	+
	1675	+ CameraPane.pointflow.add(p0);
	1676	+ CameraPane.pointflow.Touch();
	1677	+ }
	1678	+
	1679	+// gl.glColor3f(colorV[0], colorV[1], colorV[2]);
	1680	+// gl.glMaterialfv(gl.GL_FRONT, gl.GL_DIFFUSE, colorV, 0);
	1681	+// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
	1682	+ }
	1683	+
	1684	+ void DrawMaterial(cMaterial material, boolean selected, Object3D.cVector2[] others)
	1685	+ {
	1686	+ CameraPane display = this;
	1687	+ //new Exception().printStackTrace();
	1688	+
	1689	+ if (display.IsFrozen() && !selected \|\| display.IsAmbientOcclusionOn()) // \|\| display.drawMode == display.SHADOW)
	1690	+ {
	1691	+ return;
	1692	+ }
	1693	+
	1694	+ javax.media.opengl.GL gl = display.GetGL();
	1695	+
	1696	+ //Color col = Color.getHSBColor(color,modulation,1);
	1697	+ //col.getColorComponents(ColorSpace.getInstance(ColorSpace.CS_LINEAR_RGB), CameraPane.modelParams0);
	1698	+ if (!material.multiply)
	1699	+ {
	1700	+ display.color = material.color;
	1701	+ display.saturation = material.modulation;
	1702	+ }
	1703	+ else
	1704	+ {
	1705	+ display.color = material.color2;
	1706	+ display.saturation = material.modulation2;
	1707	+ }
	1708	+
	1709	+ cColor.HSBtoRGB(display.color, display.saturation, 1, display.modelParams0);
	1710	+
	1711	+ float[] colorV = Grafreed.colorV;
	1712	+
	1713	+ /**/
	1714	+ if (display.DrawMode() == display.DEFAULT) // && display.RENDERPROGRAM == 0)
	1715	+ {
	1716	+ colorV[0] = display.modelParams0[0] * material.diffuse;
	1717	+ colorV[1] = display.modelParams0[1] * material.diffuse;
	1718	+ colorV[2] = display.modelParams0[2] * material.diffuse;
	1719	+ colorV[3] = 1; // material.opacity;
	1720	+
	1721	+ gl.glColor4f(colorV[0], colorV[1], colorV[2], material.opacity);
	1722	+ //System.out.println("Opacity = " + opacity);
	1723	+
	1724	+ gl.glMaterialfv(gl.GL_FRONT, gl.GL_DIFFUSE, colorV, 0);
	1725	+ //color[0] /= 2; color[1] /= 2; color[2] /= 2;
	1726	+ gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
	1727	+
	1728	+ float amb = material.ambient;
	1729	+ if (amb < material.cameralight)
	1730	+ {
	1731	+ amb = material.cameralight;
	1732	+ }
	1733	+ colorV[0] = display.modelParams0[0] * material.diffuse * amb;
	1734	+ colorV[1] = display.modelParams0[1] * material.diffuse * amb;
	1735	+ colorV[2] = display.modelParams0[2] * material.diffuse * amb;
	1736	+ gl.glMaterialfv(gl.GL_FRONT, gl.GL_AMBIENT, colorV, 0);
	1737	+ //color[0] /= 2; color[1] /= 2; color[2] /= 2;
	1738	+ gl.glMaterialfv(gl.GL_BACK, gl.GL_AMBIENT, colorV, 0);
	1739	+
	1740	+ /**/
	1741	+ colorV[0] = ((1 - material.metalness) + display.modelParams0[0] * material.metalness) * material.specular;
	1742	+ colorV[1] = ((1 - material.metalness) + display.modelParams0[1] * material.metalness) * material.specular;
	1743	+ colorV[2] = ((1 - material.metalness) + display.modelParams0[2] * material.metalness) * material.specular;
	1744	+ gl.glMaterialfv(gl.GL_FRONT, gl.GL_SPECULAR, colorV, 0);
	1745	+ //color[0] /= 2; color[1] /= 2; color[2] /= 2;
	1746	+ gl.glMaterialfv(gl.GL_BACK, gl.GL_SPECULAR, colorV, 0);
	1747	+ colorV[0] = 10 / material.shininess; // 1/0.005f;
	1748	+ //System.out.println("shininess = " + colorV[0]);
	1749	+ if (colorV[0] > 128)
	1750	+ {
	1751	+ colorV[0] = 128;
	1752	+ }
	1753	+ gl.glMaterialfv(gl.GL_FRONT, gl.GL_SHININESS, colorV, 0);
	1754	+ gl.glMaterialfv(gl.GL_BACK, gl.GL_SHININESS, colorV, 0);
	1755	+ /**/
	1756	+ }
	1757	+ /**/
	1758	+
	1759	+ //selected = false;
	1760	+ selected = selected && display.flash;
	1761	+
	1762	+ //display.modelParams0[0] = 0; // pigment.r;
	1763	+ //display.modelParams0[1] = 0; // pigment.g;
	1764	+ //display.modelParams0[2] = 0; // pigment.b;
	1765	+ if (!material.multiply)
	1766	+ {
	1767	+ display.modelParams0[3] = material.metalness;
	1768	+ display.modelParams1[0] = material.diffuse;
	1769	+ display.modelParams1[1] = material.specular;
	1770	+ display.modelParams1[2] = 1 / material.shininess;
	1771	+ display.modelParams1[3] = material.shift;
	1772	+ display.modelParams2[0] = material.ambient;
	1773	+ display.modelParams2[1] = material.lightarea;
	1774	+ //System.out.println("light area = " + lightarea);
	1775	+ display.modelParams2[2] = 1 / material.factor; // diffuseness
	1776	+ display.modelParams2[3] = material.velvet;
	1777	+ display.modelParams3[0] = material.sheen;
	1778	+ display.modelParams3[1] = material.subsurface;
	1779	+ display.modelParams3[2] = material.bump; // backlit
	1780	+ display.modelParams3[3] = material.aniso;
	1781	+ display.modelParams4[0] = material.anisoV;
	1782	+ display.modelParams4[1] = selected ? 100 : material.cameralight;
	1783	+ //System.out.println("selected = " + selected);
	1784	+ display.modelParams4[2] = material.diffuseness;
	1785	+ display.modelParams4[3] = material.shadow;
	1786	+ display.modelParams5[0] = material.texture;
	1787	+ display.modelParams5[1] = material.opacity;
	1788	+ display.modelParams5[2] = material.fakedepth;
	1789	+ display.modelParams5[3] = CameraPane.SHADOWCULLFACE ? 0f : (material.shadowbias - 0.005f) / 10;
	1790	+ }
	1791	+ else
	1792	+ {
	1793	+ display.modelParams0[3] = material.metalness2;
	1794	+ display.modelParams1[0] = material.diffuse2;
	1795	+ display.modelParams1[1] = material.specular2;
	1796	+ display.modelParams1[2] = material.shininess2;
	1797	+ display.modelParams1[3] = material.shift2;
	1798	+ display.modelParams2[0] = material.ambient2;
	1799	+ display.modelParams2[1] = material.lightarea2;
	1800	+ display.modelParams2[2] = material.factor2;
	1801	+ display.modelParams2[3] = material.velvet2;
	1802	+ display.modelParams3[0] = material.sheen2;
	1803	+ display.modelParams3[1] = material.subsurface2;
	1804	+ display.modelParams3[2] = material.bump2;
	1805	+ display.modelParams3[3] = material.aniso2;
	1806	+ display.modelParams4[0] = material.anisoV2;
	1807	+ display.modelParams4[1] = material.cameralight2;
	1808	+ //System.out.println("selected = " + selected);
	1809	+ display.modelParams4[2] = material.diffuseness2;
	1810	+ display.modelParams4[3] = material.shadow2;
	1811	+ display.modelParams5[0] = material.texture2;
	1812	+ display.modelParams5[1] = material.opacity2;
	1813	+ display.modelParams5[2] = material.fakedepth2;
	1814	+ display.modelParams5[3] = material.shadowbias2;
	1815	+ }
	1816	+
	1817	+ display.modelParams6[0] = 0;
	1818	+ display.modelParams6[1] = 0;
	1819	+ display.modelParams6[2] = 0;
	1820	+ display.modelParams6[3] = 0;
	1821	+
	1822	+ display.modelParams7[0] = 0;
	1823	+ display.modelParams7[1] = 1000;
	1824	+ display.modelParams7[2] = material.parallax;
	1825	+ display.modelParams7[3] = 0;
	1826	+
	1827	+ //display.modelParams6[0] = 100; // criss de bug de bump
	1828	+
	1829	+ Object3D.cVector2[] extparams = others; // display.vector2buffer;
	1830	+ if (extparams != null && extparams.length > 0 && extparams[0] != null)
	1831	+ {
	1832	+ display.modelParams6[0] = extparams[0].x / 1000.0f; // bump
	1833	+ display.modelParams6[1] = extparams[0].y / 1000.0f; // noise
	1834	+ if (extparams.length > 1)
	1835	+ {
	1836	+ display.modelParams6[2] = extparams[1].x / 1000.0f; // borderfade
	1837	+ display.modelParams6[3] = extparams[1].y / 1000.0f; // (float)Math.exp(-extparams[1].y / 1000.0f); // fog punchthrough
	1838	+ if (extparams.length > 2)
	1839	+ {
	1840	+ display.modelParams7[0] = extparams[2].x / 1000.0f; // noise power
	1841	+ float x = extparams[2].y / 1000.0f;
	1842	+ //if (x == 0)
	1843	+ // x = 1f;
	1844	+ display.modelParams7[1] = 1 / x / x / x / x / x / x / x / x / x / x / x / x / x; // (float)Math.pow(-Math.log((extparams[2].y+0.00) / 1000.0f), 1); // opacity power
	1845	+ if (extparams[2].y > 0)
	1846	+ {
	1847	+ //System.out.println("extparams[1].y = " + extparams[1].y);
	1848	+ //System.out.println("extparams[2].y = " + extparams[2].y);
	1849	+ //System.out.println("opacity power = " + display.modelParams7[1]);
	1850	+ }
	1851	+ }
	1852	+ }
	1853	+ }
	1854	+
	1855	+ //if (display.modelParams6[2] != 0)
	1856	+ /*
	1857	+ System.out.println("modelParams0[0] = " + display.modelParams0[0]);
	1858	+ System.out.println("modelParams0[1] = " + display.modelParams0[1]);
	1859	+ System.out.println("modelParams0[2] = " + display.modelParams0[2]);
	1860	+ System.out.println("modelParams0[3] = " + display.modelParams0[3]);
	1861	+ System.out.println("modelParams1[0] = " + display.modelParams1[0]);
	1862	+ System.out.println("modelParams1[1] = " + display.modelParams1[1]);
	1863	+ System.out.println("modelParams1[2] = " + display.modelParams1[2]);
	1864	+ System.out.println("modelParams1[3] = " + display.modelParams1[3]);
	1865	+ System.out.println("modelParams2[0] = " + display.modelParams2[0]);
	1866	+ System.out.println("modelParams2[1] = " + display.modelParams2[1]);
	1867	+ System.out.println("modelParams2[2] = " + display.modelParams2[2]);
	1868	+ System.out.println("modelParams2[3] = " + display.modelParams2[3]);
	1869	+ System.out.println("modelParams3[0] = " + display.modelParams3[0]);
	1870	+ System.out.println("modelParams3[1] = " + display.modelParams3[1]);
	1871	+ System.out.println("modelParams3[2] = " + display.modelParams3[2]);
	1872	+ System.out.println("modelParams3[3] = " + display.modelParams3[3]);
	1873	+ System.out.println("modelParams4[0] = " + display.modelParams4[0]);
	1874	+ System.out.println("modelParams4[1] = " + display.modelParams4[1]);
	1875	+ System.out.println("modelParams4[2] = " + display.modelParams4[2]);
	1876	+ System.out.println("modelParams4[3] = " + display.modelParams4[3]);
	1877	+ System.out.println("modelParams5[0] = " + display.modelParams5[0]);
	1878	+ System.out.println("modelParams5[1] = " + display.modelParams5[1]);
	1879	+ System.out.println("modelParams5[2] = " + display.modelParams5[2]);
	1880	+ System.out.println("modelParams5[3] = " + display.modelParams5[3]);
	1881	+ System.out.println("modelParams6[0] = " + display.modelParams6[0]);
	1882	+ System.out.println("modelParams6[1] = " + display.modelParams6[1]);
	1883	+ System.out.println("modelParams6[2] = " + display.modelParams6[2]);
	1884	+ System.out.println("modelParams6[3] = " + display.modelParams6[3]);
	1885	+ System.out.println("modelParams7[0] = " + display.modelParams7[0]);
	1886	+ System.out.println("modelParams7[1] = " + display.modelParams7[1]);
	1887	+ System.out.println("modelParams7[2] = " + display.modelParams7[2]);
	1888	+ System.out.println("modelParams7[3] = " + display.modelParams7[3]);
	1889	+ /**/
	1890	+ //assert (display.modelParams6[2] == 0);
	1891	+
	1892	+ //System.out.println("noise power = " + display.modelParams7[0]);
	1893	+ //System.out.println("shadowbias = " + shadowbias);
	1894	+
	1895	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 0, display.modelParams0, 0);
	1896	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 1, display.modelParams1, 0);
	1897	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 2, display.modelParams2, 0);
	1898	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 3, display.modelParams3, 0);
	1899	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 4, display.modelParams4, 0);
	1900	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 5, display.modelParams5, 0);
	1901	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 6, display.modelParams6, 0);
	1902	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 7, display.modelParams7, 0);
	1903	+
	1904	+ int mode = display.FP_SHADER;
	1905	+
	1906	+ if (material.aniso != material.anisoV \|\| material.aniso > 0.002)
	1907	+ {
	1908	+ mode \|= display.FP_ANISO;
	1909	+ }
	1910	+
	1911	+ display.EnableProgram(mode);
	1912	+
	1913	+ //System.out.println("opacity power = " + display.modelParams7[1]);
	1914	+
	1915	+ if (!material.multiply)
	1916	+ {
	1917	+ if (Globals.drawMode == CameraPane.SHADOW)
	1918	+ gl.glDepthMask(material.opacity >= 0.9 && display.modelParams7[1] > 0.1);
	1919	+ else
	1920	+ gl.glDepthMask(material.opacity >= 0.99);
	1921	+ }
208	1922	}
209	1923
210	1924	int matrixdepth = 0; // 10000; // CONFLICT WITH cMESH... WARNING WARNING WARNING WARNING WARNING WARNING !!!!!!!!!!!! 0;
..	..	@@ -225,10 +1939,10 @@
225	1939	currentGL.glMultMatrixd(model, 0);
226	1940	}
227	1941
228		- void PushMatrix(double[][] matrix, int count)
	1942	+ public void PushMatrix(double[][] matrix, int count) // INTERFACE
229	1943	{
230	1944	matrixdepth++;
231		- // GraphreeD.tracein(matrix);
	1945	+ // GrafreeD.tracein(matrix);
232	1946	if (matrix == null)
233	1947	return; // Identity
234	1948
..	..	@@ -253,13 +1967,13 @@
253	1967
254	1968	void PushMatrix(double[][] matrix)
255	1969	{
256		- // GraphreeD.tracein(matrix);
257		- PushMatrix(matrix,1);
	1970	+ // GrafreeD.tracein(matrix);
	1971	+ PushMatrix(matrix, 1);
258	1972	}
259	1973
260	1974	void PushMatrix()
261	1975	{
262		- // GraphreeD.tracein(null);
	1976	+ // GrafreeD.tracein(null);
263	1977	if (matrixdepth++ < MAXSTACK - 1)
264	1978	{
265	1979	currentGL.glPushMatrix();
..	..	@@ -270,11 +1984,11 @@
270	1984
271	1985	double[][] tmpmat = new double[4][4];
272	1986
273		- void PopMatrix(double[][] inverse)
	1987	+ public void PopMatrix(double[][] inverse) // INTERFACE
274	1988	{
275	1989	--matrixdepth;
276	1990
277		- // GraphreeD.traceout(inverse);
	1991	+ // GrafreeD.traceout(inverse);
278	1992	if (inverse == null)
279	1993	return; // Identity
280	1994
..	..	@@ -292,7 +2006,7 @@
292	2006
293	2007	void PopMatrix()
294	2008	{
295		- // GraphreeD.traceout(null);
	2009	+ // GrafreeD.traceout(null);
296	2010	// inverse == null??
297	2011	if (--matrixdepth < MAXSTACK - 1)
298	2012	{
..	..	@@ -310,7 +2024,7 @@
310	2024	PushTextureMatrix(matrix, 1);
311	2025	}
312	2026
313		- void PushTextureMatrix(double[][] matrix, int count)
	2027	+ public void PushTextureMatrix(double[][] matrix, int count) // INTERFACE
314	2028	{
315	2029	currentGL.glActiveTexture(GetGL().GL_TEXTURE0);
316	2030
..	..	@@ -324,7 +2038,7 @@
324	2038	currentGL.glMatrixMode(GetGL().GL_MODELVIEW);
325	2039	}
326	2040
327		- void PopTextureMatrix(double[][] inverse)
	2041	+ public void PopTextureMatrix(double[][] inverse) // INTERFACE
328	2042	{
329	2043	currentGL.glActiveTexture(GetGL().GL_TEXTURE0);
330	2044	currentGL.glMatrixMode(GetGL().GL_TEXTURE);
..	..	@@ -340,9 +2054,9 @@
340	2054	switch(viewcode)
341	2055	{
342	2056	case 0: return "main";
343		- case 1: return "one";
344		- case 2: return "two";
345		- case 3: return "three";
	2057	+ case 1: return "Red";
	2058	+ case 2: return "Green";
	2059	+ case 3: return "Blue";
346	2060	case 4: return "light";
347	2061	}
348	2062
..	..	@@ -351,15 +2065,15 @@
351	2065
352	2066	static int camerachangeframe;
353	2067
354		- boolean SetCamera(Camera cam)
	2068	+ public boolean SetCamera(Camera cam, boolean set)
355	2069	{
356	2070	// may 2014 if (cam == cameras[0] \|\| cam == cameras[1])
357	2071	// return false;
358	2072
359		- if (REFUSEMODE && isLIVE() && camerachangeframe != 0 && camerachangeframe != framecount)
	2073	+ if (REFUSEMODE && Globals.isLIVE() && camerachangeframe != 0 && camerachangeframe != Globals.framecount)
360	2074	{
361	2075	// check for last change
362		- if (framecount < camerachangeframe + 400) // 120 == 1 second
	2076	+ if (Globals.framecount < camerachangeframe + 400) // 120 == 1 second
363	2077	{
364	2078	// refuse the camera change
365	2079	System.err.println("Camera " + cam + " REFUSED");
..	..	@@ -367,9 +2081,10 @@
367	2081	}
368	2082	}
369	2083
370		- camerachangeframe = framecount;
	2084	+ camerachangeframe = Globals.framecount;
371	2085
372		- cam.hAspect = -1; // Read only
	2086	+ if (cam != null)
	2087	+ cam.hAspect = -1; // Read only
373	2088
374	2089	cameras[0] = cam;
375	2090	targetLookAts[0] = new cVector(cam.lookAt);
..	..	@@ -379,11 +2094,14 @@
379	2094	{
380	2095	cameras[i] = new Camera(cam.viewCode);
381	2096	}
382		-
383		- cameras[i].setAim(cam.location, cam.lookAt);
384		- cameras[i].shaper_fovy = cam.shaper_fovy;
385		- cameras[i].UP.set(cam.UP);
386		- 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	+ }
387	2105	}
388	2106	cameracount = 0;
389	2107	targetLookAt = targetLookAts[cameracount];
..	..	@@ -392,13 +2110,13 @@
392	2110	// Start with free camera
393	2111	SwitchCameras(true);
394	2112
395		- pingthread.jump = true; // optional?
	2113	+// pingthread.jump = true; // optional?
396	2114
397	2115	if (TRACKONCE)
398	2116	{
399	2117	//System.err.println("Oeil on");
400	2118	TRACK = true;
401		-// JUNE 2014 if (TRACK && trackedobject != null && drawMode == SHADOW) // && !lightMode)
	2119	+// JUNE 2014 if (TRACK && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
402	2120	// object.editWindow.ScreenFit(trackedobject);
403	2121	//pingthread.StepToTarget(true);
404	2122	}
..	..	@@ -407,8 +2125,8 @@
407	2125	{
408	2126	//System.err.println("Oeil on");
409	2127	OEIL = true;
410		- if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && drawMode == SHADOW) // && !lightMode)
411		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	2128	+ if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
	2129	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
412	2130	//pingthread.StepToTarget(true);
413	2131	}
414	2132
..	..	@@ -471,39 +2189,12 @@
471	2189	{
472	2190	frozen ^= true;
473	2191	// Weird...
474		- lighttouched = true;
	2192	+ Globals.lighttouched = true;
475	2193	}
476	2194
477	2195	void ToggleDL()
478	2196	{
479	2197	mainDL ^= true;
480		- }
481		-
482		- void ToggleTexture()
483		- {
484		- textureon ^= true;
485		- }
486		-
487		- void ToggleLive()
488		- {
489		- setLIVE(isLIVE() ^ true);
490		-
491		- System.err.println("LIVE = " + isLIVE());
492		-
493		- if (!isLIVE()) // save sound
494		- GraphreeD.savesound = true; // wav.save();
495		- // else
496		- repaint(); // start loop // may 2013
497		- }
498		-
499		- void ToggleSupport()
500		- {
501		- SUPPORT ^= true;
502		- }
503		-
504		- void ToggleAbort()
505		- {
506		- ABORTMODE ^= true;
507	2198	}
508	2199
509	2200	void ToggleFullScreen()
..	..	@@ -513,12 +2204,7 @@
513	2204
514	2205	void ToggleCrowd()
515	2206	{
516		- CROWD ^= true;
517		- }
518		-
519		- void ToggleInertia()
520		- {
521		- INERTIA ^= true;
	2207	+ Globals.CROWD ^= true;
522	2208	}
523	2209
524	2210	void ToggleLocal()
..	..	@@ -526,14 +2212,114 @@
526	2212	LOCALTRANSFORM ^= true;
527	2213	}
528	2214
529		- 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()
530	2248	{
531	2249	FAST ^= true;
532	2250	}
533	2251
534		- void ToggleSlowPose()
	2252	+ public void ToggleSlowPose()
535	2253	{
536	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;
537	2323	}
538	2324
539	2325	void ToggleFootContact()
..	..	@@ -541,84 +2327,9 @@
541	2327	FOOTCONTACT ^= true;
542	2328	}
543	2329
544		- void ToggleBoxMode()
545		- {
546		- BOXMODE ^= true;
547		- }
548		-
549		- void ToggleSmoothFocus()
550		- {
551		- SMOOTHFOCUS ^= true;
552		- }
553		-
554		- void ToggleImageFlip()
555		- {
556		- IMAGEFLIP ^= true;
557		- }
558		-
559		- void ToggleSpeakerMocap()
560		- {
561		- SPEAKERMOCAP ^= true;
562		- }
563		-
564		- void ToggleSpeakerCamera()
565		- {
566		- SPEAKERCAMERA ^= true;
567		- }
568		-
569		- void ToggleSpeakerFocus()
570		- {
571		- SPEAKERFOCUS ^= true;
572		- }
573		-
574	2330	void ToggleDebug()
575	2331	{
576		- DEBUG ^= true;
577		- }
578		-
579		- void ToggleFrustum()
580		- {
581		- FRUSTUM ^= true;
582		- }
583		-
584		- void ToggleTrack()
585		- {
586		- TRACK ^= true;
587		- if (TRACK)
588		- {
589		- if (object.selection != null &&
590		- object.selection.size() > 0 &&
591		- object.selection.elementAt(0) != null &&
592		- !(object.selection.elementAt(0) instanceof Camera) &&
593		- !(object.selection.elementAt(0) instanceof ScriptNode))
594		- {
595		- trackedobject = object.selection.elementAt(0);
596		- repaint();
597		- }
598		- }
599		-
600		- repaint();
601		- }
602		-
603		- void ToggleTrackOnce()
604		- {
605		- TRACKONCE ^= true;
606		- }
607		-
608		- void ToggleShadowTrack()
609		- {
610		- SHADOWTRACK ^= true;
611		- repaint();
612		- }
613		-
614		- void ToggleOeil()
615		- {
616		- OEIL ^= true;
617		- }
618		-
619		- void ToggleOeilOnce()
620		- {
621		- OEILONCE ^= true;
	2332	+ Globals.DEBUG ^= true;
622	2333	}
623	2334
624	2335	void ToggleLookAt()
..	..	@@ -626,9 +2337,9 @@
626	2337	LOOKAT ^= true;
627	2338	}
628	2339
629		- void ToggleRandom()
	2340	+ void ToggleSwitch()
630	2341	{
631		- RANDOM ^= true;
	2342	+ SWITCH ^= true;
632	2343	}
633	2344
634	2345	void ToggleHandles()
..	..	@@ -636,10 +2347,17 @@
636	2347	HANDLES ^= true;
637	2348	}
638	2349
	2350	+ Object3D paintFolder;
	2351	+
639	2352	void TogglePaint()
640	2353	{
641	2354	PAINTMODE ^= true;
642	2355	paintcount = 0;
	2356	+
	2357	+ if (PAINTMODE)
	2358	+ {
	2359	+ paintFolder = GetFolder();
	2360	+ }
643	2361	}
644	2362
645	2363	void SwapCamera(int a, int b)
..	..	@@ -670,36 +2388,9 @@
670	2388	{
671	2389	//System.out.println("PROTECTION = " + cam.hAspect);
672	2390	//assert (cam.hAspect == 0);
673		- cam.hAspect = 0;
	2391	+ if (cam != null)
	2392	+ cam.hAspect = 0;
674	2393	lightCamera = cam;
675		- }
676		-
677		- CameraPane(Object3D o, Camera cam, boolean withcontext)
678		- {
679		- super(defaultcaps, null, withcontext?glcontext:null, null);
680		-
681		- //System.out.println("AMERICA AREA = " + (9458886 + 9210755 + 8480395 + 2736391 + 1943018 + 1289475 + 1141569 + 1069350 + 911559 + 721229 + 395886 + 377972 + 246700 + 211156 + 173985 + 141133 + 118279 + 112079 + 108523));
682		- glcontext = getContext();
683		-
684		- cameras = new Camera[2];
685		- targetLookAts = new cVector[2];
686		-
687		- SetCamera(cam);
688		-
689		- SetLight(new Camera(new cVector(10, 10, -20)));
690		-
691		- object = o;
692		-
693		- setBackground(Color.white);
694		-
695		- addKeyListener(this);
696		- addMouseListener(this);
697		- addMouseMotionListener(this);
698		- addMouseWheelListener(this);
699		- //System.out.println("addGLEventListener: " + this);
700		- addGLEventListener(this);
701		-
702		-// pingthread.start(); // may 2013
703	2394	}
704	2395
705	2396	private static void ApplyTransform(GL gl, Mat4f xform)
..	..	@@ -759,39 +2450,71 @@
759	2450
760	2451	GL currentGL;
761	2452
762		- GL GetGL()
	2453	+ public GL GetGL() // INTERFACE
763	2454	{
764	2455	return currentGL;
765	2456	}
766		-
	2457	+
	2458	+ static private BufferedImage CreateBim(TextureData texturedata)
	2459	+ {
	2460	+ Grafreed.Assert(texturedata != null);
	2461	+
	2462	+ int width = texturedata.getWidth();
	2463	+ int height = texturedata.getHeight();
	2464	+
	2465	+ Buffer buffer = texturedata.getBuffer();
	2466	+ ByteBuffer bytebuf = (ByteBuffer)buffer;
	2467	+
	2468	+ byte[] bytes = bytebuf.array();
	2469	+
	2470	+ return CreateBim(bytes, width, height);
	2471	+ }
	2472	+
	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	+
767	2485	/**/
768	2486	class CacheTexture
769	2487	{
770	2488	com.sun.opengl.util.texture.Texture texture;
	2489	+ com.sun.opengl.util.texture.TextureData texturedata;
	2490	+
771	2491	int resolution;
772	2492
773		- CacheTexture(com.sun.opengl.util.texture.Texture tex, int res)
	2493	+ CacheTexture(com.sun.opengl.util.texture.TextureData texdata, int res)
774	2494	{
775		- texture = tex;
	2495	+ texture = com.sun.opengl.util.texture.TextureIO.newTexture(texdata);
	2496	+ texturedata = texdata;
776	2497	resolution = res;
777	2498	}
778	2499	}
779	2500	/**/
780	2501
781	2502	// TEXTURE static Texture texture;
782		- static public java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/> textures
783		- = new java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/>();
784		- static public java.util.Hashtable<String, String> usedtextures = new java.util.Hashtable<String, String>();
	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	+
785	2508	int pigmentdepth = 0;
786	2509	public com.sun.opengl.util.texture.Texture[] pigmentstack = new com.sun.opengl.util.texture.Texture[65536];
787	2510	int bumpdepth = 0;
788	2511	public com.sun.opengl.util.texture.Texture[] bumpstack = new com.sun.opengl.util.texture.Texture[65536];
789	2512	//public static String DEFAULT_TEXTURE = "DEFAULT_TEXTURE";
790	2513	public static cTexture DEFAULT_TEXTURES = new cTexture("DEFAULT_TEXTURE" + ":" + "DEFAULT_TEXTURE_BUMP");
791		- public static String NOISE_TEXTURE = "WHITE_NOISE";
	2514	+ public static cTexture NOISE_TEXTURE = new cTexture("WHITE_NOISE:");
792	2515	// public static cTexture IMMORTAL_TEXTURE = new cTexture("IMMORTAL");
793	2516
794		- com.sun.opengl.util.texture.Texture GetResourceTexture(String name, boolean bump)
	2517	+ com.sun.opengl.util.texture.TextureData GetResourceTexture(String name, boolean bump)
795	2518	{
796	2519	TextureData texturedata = null;
797	2520
..	..	@@ -801,7 +2524,7 @@
801	2524	com.sun.opengl.util.texture.TextureIO.newTextureData(
802	2525	getClass().getClassLoader().getResourceAsStream(name),
803	2526	true,
804		- com.sun.opengl.util.texture.TextureIO.PNG);
	2527	+ GetFormat(name)); // com.sun.opengl.util.texture.TextureIO.PNG);
805	2528	} catch (java.io.IOException e)
806	2529	{
807	2530	throw new javax.media.opengl.GLException(e);
..	..	@@ -810,13 +2533,34 @@
810	2533	if (bump)
811	2534	texturedata = ConvertBump(texturedata, false);
812	2535
813		- com.sun.opengl.util.texture.Texture texture =
814		- 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);
815	2538
816		- texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
817		- texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
	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);
818	2541
819		- 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;
820	2564	}
821	2565
822	2566	boolean HUESMOOTH = true; // wrap around bug... true;
..	..	@@ -1846,6 +3590,8 @@
1846	3590	};
1847	3591	/**/
1848	3592
	3593	+ static Object3D lastObject;
	3594	+
1849	3595	//com.sun.opengl.util.texture.Texture
1850	3596	TextureData
1851	3597	GetFileTexture(String name, boolean bump, int resolution)
..	..	@@ -1882,6 +3628,8 @@
1882	3628	// return null;
1883	3629	//if (i == 2)
1884	3630	// return null;
	3631	+ // TIFF issue sept 2019
	3632	+ System.err.println("lastObject = " + lastObject);
1885	3633	e.printStackTrace();
1886	3634	name = name.split("\\.tif")[0] + ".jpg";
1887	3635	}
..	..	@@ -1889,6 +3637,8 @@
1889	3637
1890	3638	System.out.println("LOADING TEXTURE : " + name);
1891	3639
	3640	+ Object x = texturedata.getMipmapData(); // .getBuffer();
	3641	+
1892	3642	//
1893	3643	if (false) // compressbit > 0)
1894	3644	{
..	..	@@ -1998,10 +3748,12 @@
1998	3748	*/
1999	3749	TextureData ReduceTexture(TextureData texturedata, int resolution) // String name)
2000	3750	{
	3751	+ int pixelformat = texturedata.getPixelFormat();
	3752	+
2001	3753	int stride = 1;
2002		- if (texturedata.getPixelFormat() == GetGL().GL_RGB \|\| texturedata.getPixelFormat() == GetGL().GL_BGR) // \|\| texturedata.getPixelFormat() == GL.GL_LUMINANCE)
	3754	+ if (pixelformat == GetGL().GL_RGB \|\| pixelformat == GetGL().GL_BGR) // \|\| texturedata.getPixelFormat() == GL.GL_LUMINANCE)
2003	3755	stride = 3;
2004		- if (texturedata.getPixelFormat() == GetGL().GL_RGBA \|\| texturedata.getPixelFormat() == GetGL().GL_BGRA) // \|\| texturedata.getPixelFormat() == GL.GL_LUMINANCE_ALPHA)
	3756	+ if (pixelformat == GetGL().GL_RGBA \|\| pixelformat == GetGL().GL_BGRA) // \|\| texturedata.getPixelFormat() == GL.GL_LUMINANCE_ALPHA)
2005	3757	stride = 4;
2006	3758
2007	3759	int width = texturedata.getWidth();
..	..	@@ -2591,6 +4343,7 @@
2591	4343
2592	4344	com.sun.opengl.util.texture.Texture CompressTexture2(String name)
2593	4345	{
	4346	+ new Exception().printStackTrace();
2594	4347	System.exit(0);
2595	4348	com.sun.opengl.util.texture.Texture texture = null;
2596	4349
..	..	@@ -5209,30 +6962,30 @@
5209	6962	short residu = 0;
5210	6963
5211	6964	// wraparound workarounds
5212		- short fuck = (short) (buffer[i] & 0xFF);
	6965	+ short ww = (short) (buffer[i] & 0xFF);
5213	6966	/*
5214		- residu += (fuck%2);
5215		- if(fuck/2 < 256-residu/2)
	6967	+ residu += (ww%2);
	6968	+ if(ww/2 < 256-residu/2)
5216	6969	{
5217		- fuck = (short)((fuck/2) + residu/2);
	6970	+ ww = (short)((ww/2) + residu/2);
5218	6971	if(residu == 2)
5219	6972	residu = 0;
5220	6973	}
5221	6974	else
5222	6975	{
5223	6976	residu = 0;
5224		- fuck /= 2;
	6977	+ ww /= 2;
5225	6978	}
5226	6979	*/
5227		- if (i < imglength / 3 \|\| rnd.nextFloat() < 0.5 \|\| fuck >= 254)
	6980	+ if (i < imglength / 3 \|\| rnd.nextFloat() < 0.5 \|\| ww >= 254)
5228	6981	{
5229		- fuck /= 2;
	6982	+ ww /= 2;
5230	6983	} else
5231	6984	{
5232		- fuck = (short) ((fuck / 2) + fuck % 2);
	6985	+ ww = (short) ((ww / 2) + ww % 2);
5233	6986	}
5234	6987
5235		- buffer[i] = (byte) fuck;
	6988	+ buffer[i] = (byte) ww;
5236	6989	}
5237	6990	//System.out.print(bytes[i] + " ");
5238	6991	//if(buffer[i] >= 0 && buffer[i]<=eps-1) buffer[i] = eps;
..	..	@@ -6267,7 +8020,7 @@
6267	8020	return null;
6268	8021	}
6269	8022
6270		- void ReleaseTextures(cTexture tex)
	8023	+ public void ReleaseTextures(cTexture tex) // INTERFACE
6271	8024	{
6272	8025	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
6273	8026	{
..	..	@@ -6284,7 +8037,7 @@
6284	8037	String pigment = Object3D.GetPigment(tex);
6285	8038	String bump = Object3D.GetBump(tex);
6286	8039
6287		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8040	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
6288	8041	{
6289	8042	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
6290	8043	// System.out.println("; bump = " + bump);
..	..	@@ -6299,13 +8052,71 @@
6299	8052	pigment = null;
6300	8053	}
6301	8054
6302		- ReleaseTexture(bump, true);
6303		- ReleaseTexture(pigment, false);
	8055	+ ReleaseTexture(tex, true);
	8056	+ ReleaseTexture(tex, false);
6304	8057	}
6305	8058
6306		- void ReleaseTexture(String tex, boolean bump)
	8059	+ public void ReleasePigmentTexture(cTexture tex) // INTERFACE
6307	8060	{
6308		- if (// drawMode != 0 \|\| /tex == null \|\|/
	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)
	8118	+ {
	8119	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
6309	8120	ambientOcclusion ) // \|\| !textureon)
6310	8121	{
6311	8122	return;
..	..	@@ -6314,7 +8125,7 @@
6314	8125	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
6315	8126
6316	8127	if (tex != null)
6317		- texture = textures.get(tex);
	8128	+ texture = bump ? texturebump.get(tex) : texturepigment.get(tex);
6318	8129
6319	8130	// //assert( texture != null );
6320	8131	// if (texture == null)
..	..	@@ -6331,7 +8142,7 @@
6331	8142	{
6332	8143	bumpdepth--;
6333	8144
6334		- // GraphreeD.trace("POP " + tex + "(" + pigmentdepth + ")" + " : " + pigmentstack[pigmentdepth] + " vs " + texture);
	8145	+ // GrafreeD.trace("POP " + tex + "(" + pigmentdepth + ")" + " : " + pigmentstack[pigmentdepth] + " vs " + texture);
6335	8146	if (bumpstack[bumpdepth] != (texture!=null?texture.texture:null))
6336	8147	{
6337	8148	// assert (bumpstack[bumpdepth] == texture);
..	..	@@ -6361,7 +8172,7 @@
6361	8172	{
6362	8173	pigmentdepth--;
6363	8174
6364		- // GraphreeD.trace("POP " + tex + "(" + pigmentdepth + ")" + " : " + pigmentstack[pigmentdepth] + " vs " + texture);
	8175	+ // GrafreeD.trace("POP " + tex + "(" + pigmentdepth + ")" + " : " + pigmentstack[pigmentdepth] + " vs " + texture);
6365	8176	if (pigmentstack[pigmentdepth] != (texture!=null?texture.texture:null))
6366	8177	{
6367	8178	// assert (pigmentstack[pigmentdepth] == texture);
..	..	@@ -6406,9 +8217,57 @@
6406	8217	}
6407	8218	}
6408	8219
6409		- /boolean/ void BindTextures(cTexture tex, int resolution)
	8220	+ /boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
6410	8221	{
6411		- if (// drawMode != 0 \|\| /tex == null \|\|/
	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
	8269	+ {
	8270	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
6412	8271	ambientOcclusion ) // \|\| !textureon)
6413	8272	{
6414	8273	return; // false;
..	..	@@ -6417,17 +8276,47 @@
6417	8276	if (tex == null)
6418	8277	{
6419	8278	BindTexture(null,false,resolution);
6420		- BindTexture(null,true,resolution);
6421	8279	return;
6422	8280	}
6423	8281
6424	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	+
6425	8315	String bump = Object3D.GetBump(tex);
6426	8316
6427		- usedtextures.put(pigment, pigment);
6428		- usedtextures.put(bump, bump);
	8317	+ usedtextures.add(tex);
6429	8318
6430		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8319	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
6431	8320	{
6432	8321	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
6433	8322	// System.out.println("; bump = " + bump);
..	..	@@ -6437,43 +8326,94 @@
6437	8326	{
6438	8327	bump = null;
6439	8328	}
6440		- if (pigment.equals(""))
6441		- {
6442		- pigment = null;
6443		- }
6444	8329
6445		- GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
6446		- BindTexture(pigment, false, resolution);
6447	8330	GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
6448		- BindTexture(bump, true, resolution);
	8331	+ BindTexture(tex, true, resolution);
6449	8332	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
6450		-
6451		- return; // true;
6452	8333	}
6453	8334
6454		- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution)
	8335	+ java.util.HashSet<String> missingTextures = new java.util.HashSet<String>();
	8336	+
	8337	+ private boolean FileExists(String tex)
6455	8338	{
6456		- 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;
6457	8358
6458	8359	if (tex != null)
6459	8360	{
6460		- String texname = tex;
	8361	+ String texname = bump ? Object3D.GetBump(tex) : Object3D.GetPigment(tex);
	8362	+ byte[] texdata = bump ? tex.bumpdata : tex.pigmentdata;
6461	8363
6462		- String[] split = tex.split("Textures");
6463		- if (split.length > 1)
6464		- texname = "/Users/nbriere/Textures" + split[split.length-1];
6465		- else
6466		- if (!texname.startsWith("/"))
6467		- texname = "/Users/nbriere/Textures/" + texname;
	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	+ }
6468	8381
6469	8382	if (CACHETEXTURE)
6470		- texture = textures.get(texname); // TEXTURE CACHE
6471		-
6472		- TextureData texturedata = null;
6473		-
6474		- if (texture == null \|\| texture.resolution < resolution)
6475	8383	{
6476		- 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(""))
6477	8417	{
6478	8418	assert(!bump);
6479	8419	// if (bump)
..	..	@@ -6484,19 +8424,23 @@
6484	8424	// }
6485	8425	// else
6486	8426	// {
6487		- texture = textures.get(tex);
6488		- if (texture == null)
	8427	+ // texturecache = textures.get(texname); // suspicious
	8428	+ if (texturecache == null)
6489	8429	{
6490		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8430	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
6491	8431	}
	8432	+ else
	8433	+ new Exception().printStackTrace();
6492	8434	// }
6493	8435	} else
6494		- if (tex.equals("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
	8436	+ if (texname.endsWith("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
6495	8437	{
6496	8438	assert(bump);
6497		- texture = textures.get(tex);
6498		- if (texture == null)
6499		- 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();
6500	8444	} else
6501	8445	{
6502	8446	//if (tex.equals("IMMORTAL"))
..	..	@@ -6504,11 +8448,22 @@
6504	8448	// texture = GetResourceTexture("default.png");
6505	8449	//} else
6506	8450	//{
6507		- if (tex.equals("WHITE_NOISE"))
	8451	+ if (texname.endsWith("WHITE_NOISE"))
6508	8452	{
6509		- texture = textures.get(tex);
6510		- if (texture == null)
6511		- 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();
6512	8467	} else
6513	8468	{
6514	8469	if (textureon)
..	..	@@ -6533,7 +8488,7 @@
6533	8488	}
6534	8489
6535	8490	cachename = texname.substring(0, texname.length()-4)+ext+".jpg";
6536		- if (!new File(cachename).exists())
	8491	+ if (!FileExists(cachename))
6537	8492	cachename = texname;
6538	8493	else
6539	8494	processbump = false; // don't process bump map again
..	..	@@ -6555,7 +8510,7 @@
6555	8510	}
6556	8511
6557	8512	cachename = texname.substring(0, texname.length()-4)+ext+".png";
6558		- if (!new File(cachename).exists())
	8513	+ if (!FileExists(cachename))
6559	8514	cachename = texname;
6560	8515	else
6561	8516	processbump = false; // don't process bump map again
..	..	@@ -6564,20 +8519,23 @@
6564	8519	texturedata = GetFileTexture(cachename, processbump, resolution);
6565	8520
6566	8521
6567		- if (texturedata != null)
6568		- 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);
6569	8526	//texture = GetTexture(tex, bump);
6570	8527	}
	8528	+ }
6571	8529	}
6572	8530	//}
6573	8531	}
6574	8532
6575		- if (/CACHETEXTURE &&/ texture != null && textureon)
	8533	+ if (texdata == null && /CACHETEXTURE &&/ texturecache != null && textureon)
6576	8534	{
6577	8535	//return false;
6578	8536
6579	8537	// System.out.println("CACHE +++++++++++++++ TEXTURE : " + texname + " (" + texture.getEstimatedMemorySize() + ")");
6580		- if (texturedata != null && (texname.endsWith(".jpg") \|\| texname.endsWith(".JPG")))
	8538	+ if (texturedata != null && texname.toLowerCase().endsWith(".jpg"))
6581	8539	{
6582	8540	// String ext = "_highres";
6583	8541	// if (REDUCETEXTURE)
..	..	@@ -6594,52 +8552,17 @@
6594	8552	File cachefile = new File(texname.substring(0, texname.length()-4)+ext+".jpg");
6595	8553	if (!cachefile.exists())
6596	8554	{
6597		- // cache to disk
6598		- Buffer buffer = texturedata.getBuffer(); // getMipmapData();
6599		- //buffers[0].
6600		-
6601		- ByteBuffer bytebuf = (ByteBuffer)buffer; // ).asIntBuffer();
6602		- int[] pixels = new int[bytebuf.capacity()/3];
6603		-
6604		- // squared size heuristic...
6605		- if ((int)Math.sqrt(pixels.length) == Math.sqrt(pixels.length))
	8555	+ //if (texturedata.getWidth() == texturedata.getHeight())
6606	8556	{
6607		- for (int i=pixels.length; --i>=0;)
6608		- {
6609		- int i3 = i*3;
6610		- pixels[i] = 0xFF;
6611		- pixels[i] <<= 8;
6612		- pixels[i] \|= bytebuf.get(i3+2) & 0xFF;
6613		- pixels[i] <<= 8;
6614		- pixels[i] \|= bytebuf.get(i3+1) & 0xFF;
6615		- pixels[i] <<= 8;
6616		- pixels[i] \|= bytebuf.get(i3) & 0xFF;
6617		- }
6618		-
6619		- /*
6620		- int r=0,g=0,b=0,a=0;
6621		- for (int i=0; i<width; i++)
6622		- for (int j=0; j<height; j++)
6623		- {
6624		- int index = j*width+i;
6625		- int p = pixels[index];
6626		- a = ((p>>24) & 0xFF);
6627		- r = ((p>>16) & 0xFF);
6628		- g = ((p>>8) & 0xFF);
6629		- b = (p & 0xFF);
6630		- pixels[index] = (a<<24) \| (b<<16) \| (g<<8) \| r;
6631		- }
6632		- /**/
6633		- int width = (int)Math.sqrt(pixels.length); // squared
6634		- int height = width;
6635		- BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
6636		- rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
	8557	+ BufferedImage rendImage = CreateBim(texturedata);
	8558	+
6637	8559	ImageWriter writer = null;
6638	8560	Iterator iter = ImageIO.getImageWritersByFormatName("jpg");
6639	8561	if (iter.hasNext()) {
6640	8562	writer = (ImageWriter)iter.next();
6641	8563	}
6642		- float compressionQuality = 0.9f;
	8564	+
	8565	+ float compressionQuality = 0.85f;
6643	8566	try
6644	8567	{
6645	8568	ImageOutputStream ios = ImageIO.createImageOutputStream(cachefile);
..	..	@@ -6656,16 +8579,20 @@
6656	8579	}
6657	8580	}
6658	8581	}
6659		-
	8582	+
	8583	+ Hashtable<cTexture, CacheTexture> textures = bump ? texturebump : texturepigment;
	8584	+
6660	8585	//System.out.println("Texture = " + tex);
6661		- if (textures.containsKey(texname))
	8586	+ if (textures.containsKey(tex))
6662	8587	{
6663		- CacheTexture thetex = textures.get(texname);
	8588	+ CacheTexture thetex = textures.get(tex);
6664	8589	thetex.texture.disable();
6665	8590	thetex.texture.dispose();
6666		- textures.remove(texname);
	8591	+ textures.remove(tex);
6667	8592	}
6668		- textures.put(texname, texture);
	8593	+
	8594	+ //texture.texturedata = texturedata;
	8595	+ textures.put(tex, texturecache);
6669	8596
6670	8597	// newtex = true;
6671	8598	}
..	..	@@ -6681,28 +8608,78 @@
6681	8608	}
6682	8609	}
6683	8610
	8611	+ return texturecache;
	8612	+ }
	8613	+
	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
	8651	+ {
	8652	+ CacheTexture texture = GetCacheTexture(tex, bump, resolution);
	8653	+
6684	8654	if (bump)
6685	8655	{
6686		- // GraphreeD.trace("PUSH BUMP " + tex + "(" + bumpdepth + ")" + " : " + texture);
	8656	+ // GrafreeD.trace("PUSH BUMP " + tex + "(" + bumpdepth + ")" + " : " + texture);
6687	8657	bumpstack[bumpdepth++] = texture!=null?texture.texture:null;
6688	8658	}
6689	8659	else
6690	8660	{
6691		- // GraphreeD.trace("PUSH PIGMENT " + tex + "(" + pigmentdepth + ")" + " : " + texture);
	8661	+ // GrafreeD.trace("PUSH PIGMENT " + tex + "(" + pigmentdepth + ")" + " : " + texture);
6692	8662	pigmentstack[pigmentdepth++] = texture!=null?texture.texture:null;
6693	8663	}
6694	8664
6695	8665	return texture!=null?texture.texture:null;
6696	8666	}
6697	8667
6698		- boolean BindTexture(String tex, boolean bump, int resolution)
	8668	+ public com.sun.opengl.util.texture.TextureData GetTextureData(cTexture tex, boolean bump, int resolution) throws Exception
	8669	+ {
	8670	+ CacheTexture texture = GetCacheTexture(tex, bump, resolution);
	8671	+
	8672	+ return texture!=null?texture.texturedata:null;
	8673	+ }
	8674	+
	8675	+ boolean BindTexture(cTexture tex, boolean bump, int resolution) throws Exception
6699	8676	{
6700	8677	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
6701	8678	{
6702	8679	return false;
6703	8680	}
6704	8681
6705		- boolean newtex = false;
	8682	+ //boolean newtex = false;
6706	8683
6707	8684	com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
6708	8685
..	..	@@ -6734,9 +8711,75 @@
6734	8711	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_S, GetGL().GL_REPEAT);
6735	8712	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_T, GetGL().GL_REPEAT);
6736	8713
6737		- return newtex;
	8714	+ return true; // Warning: not used.
6738	8715	}
6739	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	+
6740	8783	ShadowBuffer shadowPBuf;
6741	8784	AntialiasBuffer antialiasPBuf;
6742	8785	int MAXSTACK;
..	..	@@ -6753,10 +8796,12 @@
6753	8796
6754	8797	gl.glGetIntegerv(GL.GL_MAX_TEXTURE_STACK_DEPTH, temp, 0);
6755	8798	MAXSTACK = temp[0];
6756		- System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
	8799	+ if (Globals.DEBUG)
	8800	+ System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
6757	8801	gl.glGetIntegerv(GL.GL_MAX_MODELVIEW_STACK_DEPTH, temp, 0);
6758	8802	MAXSTACK = temp[0];
6759		- System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
	8803	+ if (Globals.DEBUG)
	8804	+ System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
6760	8805
6761	8806	// Use debug pipeline
6762	8807	//drawable.setGL(new DebugGL(gl)); //
..	..	@@ -6764,7 +8809,8 @@
6764	8809	gl = drawable.getGL(); //
6765	8810
6766	8811	GL gl3 = getGL();
6767		- System.out.println("INIT GL IS: " + gl.getClass().getName());
	8812	+ if (Globals.DEBUG)
	8813	+ System.out.println("INIT GL IS: " + gl.getClass().getName());
6768	8814
6769	8815
6770	8816	//float pos[] = { 100, 100, 100, 0 };
..	..	@@ -6929,7 +8975,7 @@
6929	8975
6930	8976	if (cubemap == null)
6931	8977	{
6932		- LoadEnvy(5);
	8978	+ //LoadEnvy(1);
6933	8979	}
6934	8980
6935	8981	//cubemap.enable();
..	..	@@ -7205,6 +9251,8 @@
7205	9251
7206	9252	void LoadEnvy(int which)
7207	9253	{
	9254	+ assert(false);
	9255	+
7208	9256	String name;
7209	9257	String ext;
7210	9258
..	..	@@ -7216,37 +9264,58 @@
7216	9264	cubemap = null;
7217	9265	return;
7218	9266	case 1:
7219		- name = "cubemaps/box_";
7220		- ext = "png";
	9267	+ name = "cubemaps/rgb/";
	9268	+ ext = "jpg";
7221	9269	reverseUP = false;
7222	9270	break;
7223	9271	case 2:
7224		- name = "cubemaps/uffizi_";
7225		- ext = "png";
7226		- break; // reverseUP = true; break;
	9272	+ name = "cubemaps/uffizi/";
	9273	+ ext = "jpg";
	9274	+ reverseUP = false;
	9275	+ break;
7227	9276	case 3:
7228		- name = "cubemaps/CloudyHills_";
7229		- ext = "tga";
	9277	+ name = "cubemaps/CloudyHills/";
	9278	+ ext = "jpg";
7230	9279	reverseUP = false;
7231	9280	break;
7232	9281	case 4:
7233		- name = "cubemaps/cornell_";
	9282	+ name = "cubemaps/cornell/";
7234	9283	ext = "png";
7235	9284	reverseUP = false;
7236	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;
7237	9311	default:
7238		- name = "cubemaps/rgb_";
7239		- ext = "png"; /mipmap = true;/ reverseUP = false;
	9312	+ name = "cubemaps/box/";
	9313	+ ext = "png"; /mipmap = true;/
	9314	+ reverseUP = false;
7240	9315	break;
7241	9316	}
7242		-
7243		- try
7244		- {
7245		- cubemap = LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
7246		- } catch (IOException e)
7247		- {
7248		- throw new RuntimeException(e);
7249		- }
	9317	+
	9318	+ LoadSkybox(name, ext, mipmap);
7250	9319	}
7251	9320
7252	9321	public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height)
..	..	@@ -7278,8 +9347,12 @@
7278	9347	static double[] model = new double[16];
7279	9348	double[] camera2light = new double[16];
7280	9349	double[] light2camera = new double[16];
7281		- int newenvy = -1;
7282		- boolean envyoff = true; // false;
	9350	+
	9351	+ //int newenvy = -1;
	9352	+ //boolean envyoff = false;
	9353	+
	9354	+ String loadedskyboxname;
	9355	+
7283	9356	cVector light0 = new cVector(0, 0, 0); // 1,3,2);
7284	9357	//float[] light0 = { 0,0,0 };
7285	9358	cVector dirlight = new cVector(0, 0, 1); // 1,3,2);
..	..	@@ -7292,9 +9365,9 @@
7292	9365	static boolean occlusionInitialized = false;
7293	9366	boolean selection = false;
7294	9367	boolean pointselection = false;
7295		- /static/ boolean lighttouched = true;
	9368	+ ///static/ boolean lighttouched = true;
7296	9369	boolean deselect;
7297		- boolean ambientOcclusion = false;
	9370	+ private boolean ambientOcclusion = false;
7298	9371	static boolean flash = false;
7299	9372	/static/ boolean wait = false;
7300	9373	boolean displaydone = false; // after repaint() calls
..	..	@@ -7424,6 +9497,8 @@
7424	9497	//gl.glFrustum(-0.5scale, 0.5scale, -0.5scale, 0.5scale, 1, 100);
7425	9498	//glu.gluPerspective(lightshaper_fovy, 1, lightshaper_zNear, lightshaper_zFar);
7426	9499	double scale = lightCamera.SCALE / lightCamera.Distance();
	9500	+// PATCH FILLE AUX JEANS
	9501	+ //scale *= lightCamera.shaper_fovy / 25;
7427	9502	gl.glScaled(2 * scale, 2 * scale, -scale);
7428	9503	gl.glTranslated(0, 0, lightCamera.DECAL);
7429	9504
..	..	@@ -7570,17 +9645,40 @@
7570	9645	jy8[3] = 0.5f;
7571	9646	}
7572	9647
7573		- 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
7574	9649	float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
7575		- float[] options3 = new float[]{1, 1, 1, 1}; // fog color. image intensity
	9650	+ float[] options3 = new float[]{1, 1, 1, 0}; // fog color
	9651	+ float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
7576	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	+
7577	9677	static int imagecount = 0; // movie generation
7578	9678
7579	9679	static int jitter = 0;
7580	9680
7581	9681	boolean restartframe = false;
7582		-
7583		- static int framecount = 0; // general-purpose global count
7584	9682
7585	9683	void displayAntiAliased(javax.media.opengl.GL gl)
7586	9684	{
..	..	@@ -7610,14 +9708,14 @@
7610	9708
7611	9709	//System.out.println("start frame");
7612	9710	gl.glClear(gl.GL_ACCUM_BUFFER_BIT);
7613		- for (jitter = 0; jitter < ACSIZE; jitter++) //, GraphreeD.wav.cursor += LIVE ? 735 : 0)
	9711	+ for (jitter = 0; jitter < ACSIZE; jitter++) //, GrafreeD.wav.cursor += LIVE ? 735 : 0)
7614	9712	{
7615		- framecount++;
	9713	+ Globals.framecount++;
7616	9714
7617	9715	if (CameraPane.tickcount > 0)
7618	9716	CameraPane.tickcount--;
7619	9717
7620		-// GraphreeD.wav.cursor += 735; // 44100 Hz / 120 Hz * 2 (for 16 bits)
	9718	+// GrafreeD.wav.cursor += 735; // 44100 Hz / 120 Hz * 2 (for 16 bits)
7621	9719	// restartframe = true;
7622	9720	if (options1[2] > 100 && (jitter%2==0))
7623	9721	{
..	..	@@ -7650,7 +9748,7 @@
7650	9748
7651	9749	gl.glLightfv(gl.GL_LIGHT0, gl.GL_POSITION, pos, 0);
7652	9750	*/
7653		- lighttouched = true;
	9751	+ Globals.lighttouched = true;
7654	9752	//System.err.println(" shadowbuffer: " + jitter);
7655	9753	shadowbuffer.display();
7656	9754
..	..	@@ -7671,8 +9769,8 @@
7671	9769	assert (parentcam != renderCamera);
7672	9770
7673	9771	if (renderCamera != lightCamera)
7674		- for (int count = parentcam.GetTransformCount(); --count>=0;)
7675		- LA.matConcat(parentcam.toParent, matrix, matrix);
	9772	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9773	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
7676	9774
7677	9775	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
7678	9776
..	..	@@ -7687,8 +9785,8 @@
7687	9785	LA.matCopy(renderCamera.fromScreen, matrix);
7688	9786
7689	9787	if (renderCamera != lightCamera)
7690		- for (int count = parentcam.GetTransformCount(); --count>=0;)
7691		- LA.matConcat(matrix, parentcam.fromParent, matrix);
	9788	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9789	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
7692	9790
7693	9791	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
7694	9792
..	..	@@ -7734,13 +9832,18 @@
7734	9832	rati = 1 / rati;
7735	9833	gl.glOrtho(-skyscale / rati, skyscale / rati, -skyscale, skyscale, 0.001, 1000);
7736	9834	}
7737		- assert (newenvy == -1);
	9835	+
	9836	+ //assert (newenvy == -1);
	9837	+
7738	9838	gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
7739	9839	gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
7740		- DrawSkyBox(gl);
	9840	+ DrawSkyBox(gl, (float)rati);
7741	9841	gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
7742	9842	gl.glEnable(GL.GL_VERTEX_PROGRAM_ARB);
7743		- accPerspective(gl, renderCamera.shaper_fovy / ratio,
	9843	+
	9844	+ boolean vr = capsLocked && !lightMode;
	9845	+
	9846	+ accPerspective(gl, renderCamera.shaper_fovy / ratio * (vr ? 1.2 : 1),
7744	9847	ratio,
7745	9848	//near_plane, far_plane,
7746	9849	renderCamera.shaper_zNear * renderCamera.Distance(), renderCamera.shaper_zFar * renderCamera.Distance(),
..	..	@@ -7760,7 +9863,7 @@
7760	9863	//gl.glFlush();
7761	9864	gl.glAccum(gl.GL_ACCUM, 1.0f / ACSIZE);
7762	9865
7763		- if (ANIMATION && ABORTED)
	9866	+ if (Globals.ANIMATION && ABORTED)
7764	9867	{
7765	9868	System.err.println(" ABORTED FRAME");
7766	9869	break;
..	..	@@ -7790,7 +9893,7 @@
7790	9893	setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
7791	9894
7792	9895	// save image
7793		- if (ANIMATION && !ABORTED)
	9896	+ if (Globals.ANIMATION && !ABORTED)
7794	9897	{
7795	9898	VPwidth = viewport[2];
7796	9899	VPheight = viewport[3];
..	..	@@ -7901,11 +10004,11 @@
7901	10004
7902	10005	// imagecount++;
7903	10006
7904		- 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;
7905	10008
7906	10009	if (!BOXMODE)
7907	10010	{
7908		- System.out.println("image: " + fullname + " (" + (GraphreeD.wav.cursor / 735 / 4) + ")");
	10011	+ System.out.println("image: " + fullname + " (wav cursor=" + (Grafreed.wav.cursor / 735 / 4) + ")");
7909	10012	}
7910	10013
7911	10014	if (!BOXMODE)
..	..	@@ -7933,7 +10036,7 @@
7933	10036	{
7934	10037	if (ACSIZE > 1)
7935	10038	{
7936		- // System.err.println("image #" + (GraphreeD.wav.cursor / 735 / 4));
	10039	+ // System.err.println("image #" + (GrafreeD.wav.cursor / 735 / 4));
7937	10040	}
7938	10041	}
7939	10042
..	..	@@ -7943,7 +10046,7 @@
7943	10046	ABORTED = false;
7944	10047	}
7945	10048	else
7946		- GraphreeD.wav.cursor += 735 * ACSIZE;
	10049	+ Grafreed.wav.cursor += 735 * ACSIZE;
7947	10050
7948	10051	if (false)
7949	10052	{
..	..	@@ -8597,32 +10700,34 @@
8597	10700	}
8598	10701	}
8599	10702
8600		- boolean IsFrozen()
8601		- {
8602		- boolean selectmode = drawMode == SELECTION \|\| CameraPane.DEBUG_SELECTION;
8603		-
8604		- return !selectmode && cameracount == 0; // != 0;
8605		- }
8606		-
8607	10703	boolean niceon = false;
8608	10704	javax.swing.Timer AAtimer = new javax.swing.Timer(750, this);
8609	10705	boolean currentlydrawing = false;
8610	10706	static boolean init = false;
8611	10707
8612	10708	double[][] matrix = LA.newMatrix();
	10709	+
	10710	+ // This is to refresh the UI of the material panel.
	10711	+ ObjEditor patchMaterial;
8613	10712
8614	10713	public void display(GLAutoDrawable drawable)
8615	10714	{
8616		- if (GraphreeD.savesound && GraphreeD.hassound)
	10715	+ if (patchMaterial.patchMaterial)
8617	10716	{
8618		- GraphreeD.wav.save();
8619		- GraphreeD.savesound = false;
8620		- GraphreeD.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;
8621	10726	}
8622	10727	// if (DEBUG_SELECTION)
8623	10728	// {
8624		-// if (drawMode != SELECTION)
8625		-// drawMode = SELECTION;
	10729	+// if (DrawMode() != SELECTION)
	10730	+// DrawMode() = SELECTION;
8626	10731	// }
8627	10732
8628	10733	if (!isRenderer)
..	..	@@ -8656,7 +10761,9 @@
8656	10761	}
8657	10762	/**/
8658	10763
8659		- if (selection)
	10764	+ boolean control = ((modifiers & CTRL) != 0);
	10765	+
	10766	+ if (selection && (!Globals.isLIVE() \|\| control))
8660	10767	{
8661	10768	selectbuffer.display();
8662	10769	return;
..	..	@@ -8678,9 +10785,9 @@
8678	10785
8679	10786	//ANTIALIAS = 0;
8680	10787
8681		- if (drawMode == DEFAULT) // && CURRENTANTIALIAS > 0)
	10788	+ if (DrawMode() == DEFAULT) // && CURRENTANTIALIAS > 0)
8682	10789	{
8683		- if (niceon \|\| isLIVE())
	10790	+ if (niceon \|\| Globals.isLIVE())
8684	10791	{
8685	10792	//if(active == 0)
8686	10793	// antialiaser = null;
..	..	@@ -8693,6 +10800,7 @@
8693	10800	ANTIALIAS = 0;
8694	10801	//System.out.println("RESTART");
8695	10802	AAtimer.restart();
	10803	+ Globals.TIMERRUNNING = true;
8696	10804	}
8697	10805	}
8698	10806	}
..	..	@@ -8705,8 +10813,114 @@
8705	10813	assert eyeCamera.shaper_zFar == 1E5f; // 500.0f;
8706	10814	*/
8707	10815
8708		- if (drawMode == DEFAULT)
	10816	+ if (DrawMode() == DEFAULT)
8709	10817	{
	10818	+ if (manipCamera == lightCamera)
	10819	+ {
	10820	+// switch (e.getKeyCode())
	10821	+// {
	10822	+// case DOWN_ARROW:
	10823	+// lightCamera.DECAL /= 2;
	10824	+// repaint();
	10825	+// break;
	10826	+// case UP_ARROW:
	10827	+// lightCamera.DECAL *= 2;
	10828	+// repaint();
	10829	+// break;
	10830	+// case LEFT_ARROW:
	10831	+// lightCamera.SCALE /= 2;
	10832	+// repaint();
	10833	+// break;
	10834	+// case RIGHT_ARROW:
	10835	+// lightCamera.SCALE *= 2;
	10836	+// repaint();
	10837	+// break;
	10838	+// default:
	10839	+// break;
	10840	+ if (keys[DOWN_ARROW])
	10841	+ {
	10842	+ lightCamera.DECAL /= 2;
	10843	+ }
	10844	+
	10845	+ if (keys[UP_ARROW])
	10846	+ {
	10847	+ lightCamera.DECAL *= 2;
	10848	+ }
	10849	+
	10850	+ if (keys[LEFT_ARROW])
	10851	+ {
	10852	+ lightCamera.SCALE /= 2;
	10853	+ }
	10854	+
	10855	+ if (keys[RIGHT_ARROW])
	10856	+ {
	10857	+ lightCamera.SCALE *= 2;
	10858	+ }
	10859	+ }
	10860	+ else
	10861	+ {
	10862	+ //pingthread.mute = true;
	10863	+
	10864	+ boolean keyon = false;
	10865	+
	10866	+ if (keys[DOWN_ARROW])
	10867	+ {
	10868	+ speed = ++speedkey[DOWN_ARROW];
	10869	+ if (speed > 20)
	10870	+ speed = 20;
	10871	+ GoDown(modifiers);
	10872	+ keyon = true;
	10873	+ }
	10874	+ else
	10875	+ speedkey[DOWN_ARROW] = 0;
	10876	+
	10877	+ if (keys[UP_ARROW])
	10878	+ {
	10879	+ speed = ++speedkey[UP_ARROW];
	10880	+ if (speed > 20)
	10881	+ speed = 20;
	10882	+ GoUp(modifiers);
	10883	+ keyon = true;
	10884	+ }
	10885	+ else
	10886	+ speedkey[UP_ARROW] = 0;
	10887	+
	10888	+ if (keys[LEFT_ARROW])
	10889	+ {
	10890	+ speed = ++speedkey[LEFT_ARROW];
	10891	+ if (speed > 20)
	10892	+ speed = 20;
	10893	+ GoLeft(modifiers);
	10894	+ keyon = true;
	10895	+ }
	10896	+ else
	10897	+ speedkey[LEFT_ARROW] = 0;
	10898	+
	10899	+ if (keys[RIGHT_ARROW])
	10900	+ {
	10901	+ speed = ++speedkey[RIGHT_ARROW];
	10902	+ if (speed > 20)
	10903	+ speed = 20;
	10904	+ GoRight(modifiers);
	10905	+ keyon = true;
	10906	+ }
	10907	+ else
	10908	+ speedkey[RIGHT_ARROW] = 0;
	10909	+
	10910	+ if (Globals.WALK && capsLocked)
	10911	+ {
	10912	+ Walk();
	10913	+ keyon = true;
	10914	+ }
	10915	+
	10916	+ if (keyon)
	10917	+ {
	10918	+ repaint();
	10919	+ }
	10920	+
	10921	+ //pingthread.mute = false;
	10922	+ }
	10923	+
8710	10924	currentlydrawing = true;
8711	10925	}
8712	10926
..	..	@@ -8736,18 +10950,18 @@
8736	10950
8737	10951	// if(Applet3D.clipboard != null)
8738	10952	// System.out.println("Clipboard = " + Applet3D.clipboard); //.get(0).parent);
8739		-//drawMode = SELECTION;
	10953	+//DrawMode() = SELECTION;
8740	10954	indexcount = 0;
8741	10955
8742		- if (drawMode == OCCLUSION)
	10956	+ if (DrawMode() == OCCLUSION)
8743	10957	{
8744		- drawMode = DEFAULT;
	10958	+ Globals.drawMode = DEFAULT; // WARNING
8745	10959	ambientOcclusion = true;
8746	10960	setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
8747	10961	Object3D theobject = object;
8748	10962	Object3D theparent = object.parent;
8749	10963	object.parent = null;
8750		- object = (Object3D)GraphreeD.clone(object);
	10964	+ object = (Object3D)Grafreed.clone(object);
8751	10965	object.Stripify();
8752	10966	if (theobject.selection == null \|\| theobject.selection.Size() == 0)
8753	10967	theobject.PreprocessOcclusion(this);
..	..	@@ -8760,26 +10974,27 @@
8760	10974	ambientOcclusion = false;
8761	10975	}
8762	10976
8763		- if (lighttouched && drawMode == DEFAULT && !lightMode) // && !FROZEN)
	10977	+ if (//Globals.lighttouched &&
	10978	+ DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
8764	10979	{
8765	10980	//if (RENDERSHADOW) // ?
8766	10981	if (!IsFrozen())
8767	10982	{
8768	10983	// dec 2012
8769		- if (!(!flash && !lightMode && drawMode == DEFAULT && ANTIALIAS > 0))
	10984	+ if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
8770	10985	{
8771		- framecount++;
	10986	+ Globals.framecount++;
8772	10987	shadowbuffer.display();
8773	10988	}
8774	10989	}
8775		- lighttouched = false; // ??
	10990	+ Globals.lighttouched = false; // ??
8776	10991	//drawing = true;
8777	10992	//lighttouched = true;
8778	10993	}
8779	10994
8780	10995	if (wait)
8781	10996	{
8782		- Sleep(500);
	10997	+ Sleep(200); // blocks everything
8783	10998
8784	10999	wait = false;
8785	11000	}
..	..	@@ -8793,9 +11008,9 @@
8793	11008	//eyeCamera.shaper_fovy = 1;
8794	11009	}
8795	11010
8796		- if ((RENDERPROGRAM != 0 \|\| ambientOcclusion \|\| spherical) && drawMode == DEFAULT) // SELECTION)
	11011	+ if ((RENDERPROGRAM != 0 \|\| ambientOcclusion \|\| spherical) && DrawMode() == DEFAULT) // SELECTION)
8797	11012	{
8798		- //System.out.println("drawMode = " + drawMode);
	11013	+ //System.out.println("DrawMode() = " + DrawMode());
8799	11014	vertexMode \|= VP_PASS;
8800	11015	//vertexMode \|= VP_PROJECTION;
8801	11016	if (!ambientOcclusion)
..	..	@@ -8855,7 +11070,7 @@
8855	11070	Camera cam = renderCamera; // lightMode?lightCamera:eyeCamera;
8856	11071	//Camera lightcam = new Camera(light0);
8857	11072
8858		- if (drawMode == SHADOW)
	11073	+ if (DrawMode() == SHADOW)
8859	11074	{
8860	11075	/*
8861	11076	gl.glMatrixMode(GL.GL_MODELVIEW);
..	..	@@ -8893,8 +11108,8 @@
8893	11108
8894	11109	// if (parentcam != renderCamera) // not a light
8895	11110	if (cam != lightCamera)
8896		- for (int count = parentcam.GetTransformCount(); --count>=0;)
8897		- LA.matConcat(parentcam.toParent, matrix, matrix);
	11111	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11112	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
8898	11113
8899	11114	for (int j = 0; j < 4; j++)
8900	11115	{
..	..	@@ -8908,8 +11123,8 @@
8908	11123
8909	11124	// if (parentcam != renderCamera) // not a light
8910	11125	if (cam != lightCamera)
8911		- for (int count = parentcam.GetTransformCount(); --count>=0;)
8912		- LA.matConcat(matrix, parentcam.fromParent, matrix);
	11126	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11127	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
8913	11128
8914	11129	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
8915	11130
..	..	@@ -8945,7 +11160,7 @@
8945	11160	gl.glClear(gl.GL_DEPTH_BUFFER_BIT);
8946	11161	} else
8947	11162	{
8948		- if (drawMode != DEFAULT)
	11163	+ if (DrawMode() != DEFAULT)
8949	11164	{
8950	11165	gl.glClearColor(1, 1, 1, 0);
8951	11166	} // 1);
..	..	@@ -8995,13 +11210,43 @@
8995	11210	gl.glOrtho(-skyscale / ratio, skyscale / ratio, -skyscale, skyscale, 0.001, 1000);
8996	11211	}
8997	11212
8998		- if (newenvy > -1)
	11213	+// if (newenvy > -1)
	11214	+// {
	11215	+// LoadEnvy(newenvy);
	11216	+// }
	11217	+//
	11218	+// newenvy = -1;
	11219	+
	11220	+ if (transformMode) // object.skyboxname != null && object.skyboxname.equals("cubemaps/default-skyboxes/rgb"))
8999	11221	{
9000		- LoadEnvy(newenvy);
	11222	+ if (cubemaprgb == null)
	11223	+ {
	11224	+ cubemaprgb = LoadSkybox("cubemaps/default-skyboxes/rgb2" + "/", "jpg", false);
	11225	+ }
	11226	+
	11227	+ cubemap = cubemaprgb;
9001	11228	}
9002		-
9003		- newenvy = -1;
9004		-
	11229	+ else
	11230	+ {
	11231	+ if (object.skyboxname != null)
	11232	+ {
	11233	+ if (!object.skyboxname.equals(this.loadedskyboxname))
	11234	+ {
	11235	+ if (cubemap != null && cubemap != cubemaprgb)
	11236	+ cubemap.dispose();
	11237	+ cubemapcustom = LoadSkybox(object.skyboxname + "/", object.skyboxext, false);
	11238	+ loadedskyboxname = object.skyboxname;
	11239	+ }
	11240	+ }
	11241	+ else
	11242	+ {
	11243	+ cubemapcustom = null;
	11244	+ loadedskyboxname = null;
	11245	+ }
	11246	+
	11247	+ cubemap = cubemapcustom;
	11248	+ }
	11249	+
9005	11250	ratio = ((double) getWidth()) / getHeight();
9006	11251	//System.out.println("ratio = " + ratio);
9007	11252
..	..	@@ -9010,14 +11255,14 @@
9010	11255
9011	11256	fast &= !ambientOcclusion;
9012	11257
9013		- if (drawMode == DEFAULT)
	11258	+ if (DrawMode() == DEFAULT)
9014	11259	{
9015	11260	//gl.glEnable(gl.GL_ALPHA_TEST);
9016	11261	//gl.glActiveTexture(GL.GL_TEXTURE0);
9017	11262
9018	11263	if (!IsFrozen() && !ambientOcclusion)
9019	11264	{
9020		- DrawSkyBox(gl);
	11265	+ DrawSkyBox(gl, (float)ratio);
9021	11266	}
9022	11267
9023	11268	//if (selection_view == -1)
..	..	@@ -9071,6 +11316,8 @@
9071	11316	//gl.glFrustum(-0.5scale, 0.5scale, -0.5scale, 0.5scale, 1, 100);
9072	11317	//glu.gluPerspective(lightshaper_fovy, 1, lightshaper_zNear, lightshaper_zFar);
9073	11318	double scale = lightCamera.SCALE / lightCamera.Distance();
	11319	+// PATCH FILLE AUX JEANS
	11320	+ //scale *= lightCamera.shaper_fovy / 25;
9074	11321	gl.glScaled(2 * scale, 2 * scale, -scale);
9075	11322	gl.glTranslated(0, 0, lightCamera.DECAL);
9076	11323
..	..	@@ -9166,7 +11413,16 @@
9166	11413	// Bump noise
9167	11414	gl.glActiveTexture(GL.GL_TEXTURE6);
9168	11415	//gl.glBindTexture(GL.GL_TEXTURE_2D, bump_noise);
9169		- BindTexture(NOISE_TEXTURE, false, 2);
	11416	+
	11417	+ try
	11418	+ {
	11419	+ BindTexture(NOISE_TEXTURE, false, 2);
	11420	+ }
	11421	+ catch (Exception e)
	11422	+ {
	11423	+ System.err.println("FAILED: " + NOISE_TEXTURE);
	11424	+ }
	11425	+
9170	11426
9171	11427	gl.glActiveTexture(GL.GL_TEXTURE0);
9172	11428	gl.glEnable(GL.GL_TEXTURE_2D);
..	..	@@ -9189,8 +11445,8 @@
9189	11445
9190	11446	gl.glMatrixMode(GL.GL_MODELVIEW);
9191	11447
9192		-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
9193	11448	//gl.glEnable(gl.GL_POLYGON_SMOOTH);
	11449	+//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
9194	11450	//gl.glEnable(gl.GL_MULTISAMPLE);
9195	11451	} else
9196	11452	{
..	..	@@ -9202,14 +11458,16 @@
9202	11458	//System.out.println("BLENDING ON");
9203	11459	gl.glEnable(GL.GL_BLEND);
9204	11460	gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
9205		-
	11461	+// gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
9206	11462	gl.glMatrixMode(gl.GL_PROJECTION);
9207	11463	gl.glLoadIdentity();
9208	11464
9209		- if (drawMode == SHADOW \|\| cam == lightCamera) // \|\| (vertexMode&VP_PROJECTION) != 0)
	11465	+ if (DrawMode() == SHADOW \|\| cam == lightCamera) // \|\| (vertexMode&VP_PROJECTION) != 0)
9210	11466	{
9211	11467	//glu.gluPerspective(lightshaper_fovy, 1, lightshaper_zNear, lightshaper_zFar);
9212	11468	double scale = lightCamera.SCALE / lightCamera.Distance();
	11469	+// PATCH FILLE AUX JEANS
	11470	+ //scale *= lightCamera.shaper_fovy / 25;
9213	11471	gl.glScaled(2 * scale, 2 * scale, -scale);
9214	11472	gl.glTranslated(0, 0, lightCamera.DECAL);
9215	11473	//System.out.println("DECAL = " + LIGHTDECAL + "; SCALE = " + LIGHTSCALE);
..	..	@@ -9250,7 +11508,10 @@
9250	11508	//gl.glOrtho(-BOOST, BOOST, -BOOST, BOOST, 0.001, 1000);
9251	11509	} else
9252	11510	{
9253		- glu.gluPerspective(cam.shaper_fovy / ratio, ratio, cam.shaper_zNear * cam.Distance(), cam.shaper_zFar * cam.Distance());
	11511	+ boolean vr = capsLocked && !lightMode;
	11512	+
	11513	+ glu.gluPerspective(cam.shaper_fovy / ratio * (vr ? 1.2 : 1),
	11514	+ ratio, cam.shaper_zNear * cam.Distance(), cam.shaper_zFar * cam.Distance());
9254	11515	}
9255	11516	}
9256	11517
..	..	@@ -9262,7 +11523,7 @@
9262	11523	//gl.glPushMatrix();
9263	11524	gl.glLoadIdentity();
9264	11525
9265		- if (!ambientOcclusion) // drawMode != OCCLUSION)
	11526	+ if (!ambientOcclusion) // DrawMode() != OCCLUSION)
9266	11527	{
9267	11528	//LA.xformPos(light0, lightCamera.fromScreen, light);
9268	11529	LA.xformDir(dirlight, lightCamera.fromScreen, lightposition);
..	..	@@ -9289,8 +11550,8 @@
9289	11550	System.err.println("parentcam != renderCamera");
9290	11551
9291	11552	// if (cam != lightCamera)
9292		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9293		- LA.xformDir(lightposition, parentcam.toParent, lightposition); // may 2013
	11553	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11554	+ LA.xformDir(lightposition, parentcam.GlobalTransformInv(), lightposition); // may 2013
9294	11555	}
9295	11556
9296	11557	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -9311,8 +11572,8 @@
9311	11572	if (true) // TODO
9312	11573	{
9313	11574	if (cam != lightCamera)
9314		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9315		- LA.xformDir(light0, parentcam.toParent, light0); // may 2013
	11575	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11576	+ LA.xformDir(light0, parentcam.GlobalTransform(), light0); // may 2013
9316	11577	}
9317	11578
9318	11579	LA.xformPos(light0, cam.toScreen, light0);
..	..	@@ -9349,7 +11610,7 @@
9349	11610	}
9350	11611
9351	11612	/**/
9352		- if (true) // drawMode == SELECTION) // != DEFAULT)
	11613	+ if (true) // DrawMode() == SELECTION) // != DEFAULT)
9353	11614	gl.glDisable(gl.GL_LIGHTING);
9354	11615	else
9355	11616	gl.glEnable(gl.GL_LIGHTING);
..	..	@@ -9361,12 +11622,13 @@
9361	11622
9362	11623	gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 63, options2, 0);
9363	11624	gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 62, options3, 0);
	11625	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 61, options4, 0);
9364	11626
9365	11627	options2[0] *= renderCamera.Distance();
9366	11628
9367	11629	lightslot = 64;
9368	11630
9369		- if (!frozen && !ambientOcclusion && isRenderer && drawMode == DEFAULT)
	11631	+ if (!frozen && !ambientOcclusion && isRenderer && DrawMode() == DEFAULT)
9370	11632	{
9371	11633	DrawLights(object);
9372	11634	}
..	..	@@ -9377,7 +11639,7 @@
9377	11639	fragmentMode \|= (lightslot - 64) << 2; // 1; // first bit is available for aniso
9378	11640	//System.out.println("fragmentMode = " + fragmentMode);
9379	11641
9380		- if (drawMode == DEFAULT \|\| drawMode == SELECTION \|\| DEBUG_SELECTION)
	11642	+ if (DrawMode() == DEFAULT \|\| DrawMode() == SELECTION \|\| IsDebugSelection())
9381	11643	{
9382	11644	/*
9383	11645	if (CULLFACE \|\| (ambientOcclusion && OCCLUSION_CULLING))
..	..	@@ -9410,7 +11672,7 @@
9410	11672	}
9411	11673	}
9412	11674
9413		- if (drawMode == DEFAULT)
	11675	+ if (DrawMode() == DEFAULT)
9414	11676	{
9415	11677	if (WIREFRAME && !ambientOcclusion)
9416	11678	{
..	..	@@ -9428,7 +11690,7 @@
9428	11690	gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9429	11691	gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9430	11692
9431		- if (!fast/RENDERPROGRAM != 0/ && (drawMode == DEFAULT \|\| drawMode == SHADOW)) // && !WIREFRAME) //
	11693	+ if (!fast/RENDERPROGRAM != 0/ && (DrawMode() == DEFAULT \|\| DrawMode() == SHADOW)) // && !WIREFRAME) //
9432	11694	{
9433	11695	if (vertexMode != 0) // && !fast)
9434	11696	{
..	..	@@ -9448,7 +11710,7 @@
9448	11710	}
9449	11711	}
9450	11712
9451		- if (false) // fast && !IsFreezed() && drawMode != SELECTION && !ambientOcclusion)
	11713	+ if (false) //RENDERPROGRAM > 0 && DrawMode() == DEFAULT) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
9452	11714	{
9453	11715	//gl.glDepthFunc(GL.GL_LEQUAL);
9454	11716	//gl.glClear(gl.GL_COLOR_BUFFER_BIT \| gl.GL_DEPTH_BUFFER_BIT);
..	..	@@ -9456,27 +11718,24 @@
9456	11718
9457	11719	boolean texon = textureon;
9458	11720
9459		- if (RENDERPROGRAM > 0)
9460		- {
9461		- gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9462		- textureon = false;
9463		- }
	11721	+ gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11722	+ textureon = false;
	11723	+
9464	11724	//gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9465	11725	//System.out.println("ALLO");
9466	11726	gl.glColorMask(false, false, false, false);
9467	11727	DrawObject(gl);
9468		- if (RENDERPROGRAM > 0)
9469		- {
9470		- gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
9471		- textureon = texon;
9472		- }
	11728	+
	11729	+ gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11730	+ textureon = texon;
	11731	+
9473	11732	gl.glColorMask(true, true, true, true);
9474	11733
9475	11734	gl.glDepthFunc(GL.GL_EQUAL);
9476		- //gl.glDepthMask(false);
	11735	+ gl.glDepthMask(false);
9477	11736	}
9478	11737
9479		- if (false) // drawMode == SHADOW)
	11738	+ if (false) // DrawMode() == SHADOW)
9480	11739	{
9481	11740	//SetColumnMajorData(cameraInverseTransform, view_1);
9482	11741	//System.out.println("light = " + cameraInverseTransform);
..	..	@@ -9490,16 +11749,16 @@
9490	11749	//System.out.println("object = " + object);
9491	11750	if (!frozen && !imageLocked)
9492	11751	{
9493		- if (!flash && !lightMode && drawMode == DEFAULT && ANTIALIAS > 0)
	11752	+ if (!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0)
9494	11753	{
9495	11754	displayAntiAliased(gl);
9496	11755	} else
9497	11756	{
9498	11757	programcount = 0;
9499		- int keepmode = drawMode;
	11758	+ int keepmode = DrawMode();
9500	11759	// if (DEBUG_SELECTION)
9501	11760	// {
9502		-// drawMode = SELECTION;
	11761	+// DrawMode() = SELECTION;
9503	11762	// }
9504	11763	// for point selection
9505	11764	// gl.glGetDoublev(gl.GL_MODELVIEW_MATRIX, tempmat, 0);
..	..	@@ -9509,10 +11768,10 @@
9509	11768	DrawObject(gl);
9510	11769
9511	11770	// jan 2013 System.err.println("RESET ABORT (display)");
9512		- // if (drawMode == DEFAULT)
	11771	+ // if (DrawMode() == DEFAULT)
9513	11772	// ABORTED = false;
9514	11773	fullreset = false;
9515		- drawMode = keepmode;
	11774	+ Globals.drawMode = keepmode; // WARNING
9516	11775	//System.out.println("PROGRAM SWITCH " + programcount);
9517	11776	}
9518	11777	}
..	..	@@ -9520,11 +11779,11 @@
9520	11779	gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9521	11780	gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9522	11781
9523		- if (drawMode == DEFAULT)
	11782	+ if (DrawMode() == DEFAULT)
9524	11783	{
9525	11784	ReleaseTexture(NOISE_TEXTURE, false);
9526	11785	}
9527		- //if (drawMode == DEFAULT)
	11786	+ //if (DrawMode() == DEFAULT)
9528	11787	{
9529	11788
9530	11789	gl.glActiveTexture(GL.GL_TEXTURE1);
..	..	@@ -9536,7 +11795,7 @@
9536	11795	//else
9537	11796	//gl.glDisable(gl.GL_TEXTURE_2D);
9538	11797	//gl.glPopMatrix();
9539		- if (imageCompleted && ANTIALIAS > 0 && drawMode == DEFAULT && cam != lightCamera && !ambientOcclusion)
	11798	+ if (imageCompleted && ANTIALIAS > 0 && DrawMode() == DEFAULT && cam != lightCamera && !ambientOcclusion)
9540	11799	{
9541	11800	//new Exception().printStackTrace();
9542	11801	//System.out.println("Draw image " + width + ", " + height);
..	..	@@ -9578,7 +11837,7 @@
9578	11837	//gl.glFlush();
9579	11838	}
9580	11839
9581		- if (flash && drawMode == DEFAULT)
	11840	+ if (flash && DrawMode() == DEFAULT)
9582	11841	{
9583	11842	flash = false;
9584	11843	wait = true;
..	..	@@ -9586,9 +11845,9 @@
9586	11845	}
9587	11846
9588	11847	//drawing = false;
9589		- //if(drawMode == DEFAULT)
	11848	+ //if(DrawMode() == DEFAULT)
9590	11849	// niceon = false;
9591		- if (drawMode == DEFAULT)
	11850	+ if (DrawMode() == DEFAULT)
9592	11851	{
9593	11852	currentlydrawing = false;
9594	11853	}
..	..	@@ -9608,8 +11867,11 @@
9608	11867	repaint();
9609	11868	}
9610	11869
9611		- if (isLIVE() && drawMode == DEFAULT) // may 2013
	11870	+ if (Globals.isLIVE() && DrawMode() == DEFAULT \|\| pingthread.live) // may 2013
	11871	+ {
	11872	+ renderCamera.computeTransform();
9612	11873	repaint();
	11874	+ }
9613	11875
9614	11876	displaydone = true;
9615	11877	}
..	..	@@ -9627,8 +11889,14 @@
9627	11889	{
9628	11890	renderpass++;
9629	11891	// System.out.println("Draw object... ");
	11892	+ STEP = 1;
9630	11893	if (FAST) // in case there is no script
9631		- STEP = 16;
	11894	+ STEP = 8;
	11895	+
	11896	+ if (CURRENTANTIALIAS == 0 \|\| ACSIZE == 1)
	11897	+ {
	11898	+ STEP *= 4;
	11899	+ }
9632	11900
9633	11901	//object.FullInvariants();
9634	11902
..	..	@@ -9642,24 +11910,59 @@
9642	11910	e.printStackTrace();
9643	11911	}
9644	11912
9645		- if (GraphreeD.RENDERME > 0)
9646		- GraphreeD.RENDERME--; // mechante magouille
	11913	+ if (Grafreed.RENDERME > 0)
	11914	+ Grafreed.RENDERME--; // mechante magouille
9647	11915
9648		- ONESTEP = false;
	11916	+ Globals.ONESTEP = false;
9649	11917	}
9650	11918
9651	11919	static boolean zoomonce = false;
9652	11920
	11921	+ static void CreateSelectedPoint()
	11922	+ {
	11923	+ if (selectedpoint == null)
	11924	+ {
	11925	+ debugpointG = new Sphere();
	11926	+ debugpointP = new Sphere();
	11927	+ debugpointC = new Sphere();
	11928	+ debugpointR = new Sphere();
	11929	+
	11930	+ selectedpoint = new Superellipsoid();
	11931	+
	11932	+ for (int i=0; i<8; i++)
	11933	+ {
	11934	+ debugpoints[i] = new Sphere();
	11935	+ }
	11936	+ }
	11937	+ }
	11938	+
9653	11939	void DrawObject(GL gl, boolean draw)
9654	11940	{
	11941	+ // To clear camera values
	11942	+ ResetOptions();
	11943	+
9655	11944	//System.out.println("DRAW OBJECT " + mouseDown);
9656		-// drawMode = SELECTION;
	11945	+// DrawMode() = SELECTION;
9657	11946	//GL gl = getGL();
9658	11947	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
9659	11948	{
9660		- if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && drawMode == SHADOW) // && !lightMode)
9661		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
9662		- pingthread.StepToTarget(true); // true);
	11949	+ if (TRACK)
	11950	+ {
	11951	+ if (object.selection != null &&
	11952	+ object.selection.size() > 0 &&
	11953	+ object.selection.elementAt(0) != null &&
	11954	+ !(object.selection.elementAt(0) instanceof Camera) &&
	11955	+ !(object.selection.elementAt(0) instanceof ScriptNode))
	11956	+ {
	11957	+ trackedobject = object.selection.elementAt(0);
	11958	+ //repaint();
	11959	+ }
	11960	+ else
	11961	+ trackedobject = null;
	11962	+ }
	11963	+ if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
	11964	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	11965	+ pingthread.StepToTarget(); // true);
9663	11966	// zoomonce = false;
9664	11967	}
9665	11968
..	..	@@ -9678,9 +11981,9 @@
9678	11981	callist = gl.glGenLists(1);
9679	11982	}
9680	11983
9681		- boolean selectmode = drawMode == SELECTION \|\| CameraPane.DEBUG_SELECTION;
	11984	+ boolean selectmode = DrawMode() == SELECTION \|\| IsDebugSelection();
9682	11985
9683		- boolean active = !selectmode; // drawMode != SELECTION; // mouseDown;
	11986	+ boolean active = !selectmode; // DrawMode() != SELECTION; // mouseDown;
9684	11987
9685	11988	if (!mainDL \|\| !active \|\| touched)
9686	11989	{
..	..	@@ -9707,24 +12010,32 @@
9707	12010	PushMatrix(ClickInfo.matbuffer);
9708	12011	}
9709	12012
9710		- if (drawMode == 0)
	12013	+ if (DrawMode() == 0)
9711	12014	{
9712	12015	// System.out.println("CLEAR +++++++++++++++ +++++++++++++++ +++++++++++++++ +++++++++++++++");
9713	12016
9714	12017	usedtextures.clear();
9715	12018
9716		- BindTextures(DEFAULT_TEXTURES, 2);
	12019	+ try
	12020	+ {
	12021	+ BindTextures(DEFAULT_TEXTURES, 2);
	12022	+ }
	12023	+ catch (Exception e)
	12024	+ {
	12025	+ System.err.println("FAILED: " + DEFAULT_TEXTURES);
	12026	+ }
9717	12027	}
9718	12028	//System.out.println("--> " + stackdepth);
9719		-// GraphreeD.traceon();
	12029	+// GrafreeD.traceon();
9720	12030
9721	12031	// DRAW
9722	12032	object.draw(this, /(Composite)/ object, false, false);
9723	12033
9724		- if (drawMode == DEFAULT)
	12034	+ if (DrawMode() == DEFAULT)
9725	12035	{
9726		- if (DEBUG)
	12036	+ if (Globals.DEBUG)
9727	12037	{
	12038	+ CreateSelectedPoint();
9728	12039	float radius = 0.05f;
9729	12040	if (selectedpoint.radius != radius)
9730	12041	{
..	..	@@ -9732,69 +12043,104 @@
9732	12043	selectedpoint.radius = radius;
9733	12044	selectedpoint.recalculate();
9734	12045	selectedpoint.material = new cMaterial();
9735		- selectedpoint.material.color = 0.25f;
	12046	+ selectedpoint.material.color = 0.15f; // Yellow
9736	12047	selectedpoint.material.modulation = 0.75f;
9737	12048
9738		- debugpoint.radius = radius;
9739		- debugpoint.recalculate();
9740		- debugpoint.material = new cMaterial();
9741		- debugpoint.material.color = 0.25f;
9742		- debugpoint.material.modulation = 0.75f;
	12049	+ debugpointG.radius = radius;
	12050	+ debugpointG.recalculate();
	12051	+ debugpointG.material = new cMaterial();
	12052	+ debugpointG.material.color = 0.25f; // Green
	12053	+ debugpointG.material.modulation = 0.75f;
9743	12054
9744		- debugpoint2.radius = radius;
9745		- debugpoint2.recalculate();
9746		- debugpoint2.material = new cMaterial();
9747		- debugpoint2.material.color = 0.75f;
9748		- debugpoint2.material.modulation = 0.75f;
	12055	+ debugpointP.radius = radius;
	12056	+ debugpointP.recalculate();
	12057	+ debugpointP.material = new cMaterial();
	12058	+ debugpointP.material.color = 0.75f; // Purple
	12059	+ debugpointP.material.modulation = 0.75f;
	12060	+
	12061	+ debugpointC.radius = radius;
	12062	+ debugpointC.recalculate();
	12063	+ debugpointC.material = new cMaterial();
	12064	+ debugpointC.material.color = 0.5f; // Cyan
	12065	+ debugpointC.material.modulation = 0.75f;
	12066	+
	12067	+ debugpointR.radius = radius;
	12068	+ debugpointR.recalculate();
	12069	+ debugpointR.material = new cMaterial();
	12070	+ debugpointR.material.color = 0f; // Red
	12071	+ debugpointR.material.modulation = 0.75f;
9749	12072
9750	12073	InitPoints(radius);
9751	12074	}
9752	12075	selectedpoint.draw(this, /(Composite)/ null, false, false);
9753		- //debugpoint.draw(this, /(Composite)/ null, false);
9754		- //debugpoint2.draw(this, /(Composite)/ null, false);
9755		- DrawPoints(this);
	12076	+ debugpointG.draw(this, /(Composite)/ null, false,false);
	12077	+ debugpointP.draw(this, /(Composite)/ null, false,false);
	12078	+ debugpointC.draw(this, /(Composite)/ null, false,false);
	12079	+ debugpointR.draw(this, /(Composite)/ null, false,false);
	12080	+ // DrawPoints(this);
9756	12081	}
9757	12082
9758	12083	// debugstuff.draw(this, /(Composite)/ null, false);
9759	12084	}
9760		-// GraphreeD.traceoff();
	12085	+// GrafreeD.traceoff();
9761	12086	//System.out.println(stackdepth);
9762		- if (drawMode == 0)
	12087	+ if (DrawMode() == 0)
9763	12088	{
9764	12089	ReleaseTextures(DEFAULT_TEXTURES);
9765	12090
9766	12091	if (CLEANCACHE)
9767		- for (java.util.Enumeration<String> e = textures.keys() ; e.hasMoreElements();)
	12092	+ for (java.util.Enumeration<cTexture> e = texturepigment.keys() ; e.hasMoreElements();)
9768	12093	{
9769		- String tex = e.nextElement();
	12094	+ cTexture tex = e.nextElement();
9770	12095
9771	12096	// System.out.println("Texture --------- " + tex);
9772	12097
9773		- if (tex.equals("WHITE_NOISE"))
	12098	+ if (tex.equals("WHITE_NOISE:"))
9774	12099	continue;
9775	12100
9776		- if (!usedtextures.containsKey(tex))
	12101	+ if (!usedtextures.contains(tex))
9777	12102	{
	12103	+ CacheTexture gettex = texturepigment.get(tex);
9778	12104	// System.out.println("DISPOSE +++++++++++++++ " + tex);
9779		- textures.get(tex).texture.dispose();
9780		- textures.remove(tex);
	12105	+ if (gettex != null)
	12106	+ {
	12107	+ gettex.texture.dispose();
	12108	+ texturepigment.remove(tex);
	12109	+ }
	12110	+
	12111	+ gettex = texturebump.get(tex);
	12112	+ // System.out.println("DISPOSE +++++++++++++++ " + tex);
	12113	+ if (gettex != null)
	12114	+ {
	12115	+ gettex.texture.dispose();
	12116	+ texturebump.remove(tex);
	12117	+ }
9781	12118	}
9782	12119	}
9783	12120	}
9784	12121
9785	12122	checker = null;
9786	12123
9787		- if (!ambientOcclusion && !IsFrozen() && drawMode == DEFAULT)
	12124	+ if (!ambientOcclusion && !IsFrozen() && DrawMode() == DEFAULT)
9788	12125	FindChecker(object);
9789	12126
9790		- if (checker != null && drawMode == DEFAULT)
	12127	+ if (checker != null && DrawMode() == DEFAULT)
9791	12128	{
9792		- // BindTexture(IMMORTAL_TEXTURE);
	12129	+ //BindTexture(IMMORTAL_TEXTURE);
	12130	+ try
	12131	+ {
	12132	+ BindTextures(checker.GetTextures(), checker.texres);
	12133	+ }
	12134	+ catch (Exception e)
	12135	+ {
	12136	+ System.err.println("FAILED: " + checker.GetTextures());
	12137	+ }
9793	12138	// NEAREST
9794	12139	GetGL().glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST); // GL.GL_LINEAR);
9795	12140	DrawChecker(gl);
9796	12141	//checker.Draw(this, null, false);
9797	12142	// ReleaseTexture(IMMORTAL_TEXTURE);
	12143	+ ReleaseTextures(checker.GetTextures());
9798	12144	}
9799	12145
9800	12146	if (object.parent != null)
..	..	@@ -9807,7 +12153,7 @@
9807	12153	//gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9808	12154	//gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9809	12155
9810		- if (DISPLAYTEXT && drawMode == DEFAULT)
	12156	+ if (DISPLAYTEXT && DrawMode() == DEFAULT)
9811	12157	{
9812	12158	// Draw it once, then use the raster
9813	12159	Balloon(gl, balloon.createGraphics());
..	..	@@ -9863,14 +12209,14 @@
9863	12209	int[] xs = new int[3];
9864	12210	int[] ys = new int[3];
9865	12211
9866		- void DrawString(Object3D obj) // String string)
	12212	+ public void DrawString(Object3D obj) // String string) // INTERFACE
9867	12213	{
9868		- if (!DISPLAYTEXT \|\| drawMode != DEFAULT)
	12214	+ if (!DISPLAYTEXT \|\| DrawMode() != DEFAULT)
9869	12215	{
9870	12216	return;
9871	12217	}
9872	12218
9873		- String string = obj.GetToolTip();
	12219	+ String string = obj.toString(); //.GetToolTip();
9874	12220
9875	12221	GL gl = GetGL();
9876	12222
..	..	@@ -10187,8 +12533,8 @@
10187	12533	//obj.TransformToWorld(light, light);
10188	12534	for (int i = tp.size(); --i >= 0;)
10189	12535	{
10190		- for (int count = tp.get(i).GetTransformCount(); --count>=0;)
10191		- LA.xformPos(light, tp.get(i).toParent, light);
	12536	+ //for (int count = tp.get(i).GetTransformCount(); --count>=0;)
	12537	+ LA.xformPos(light, tp.get(i).GlobalTransformInv(), light);
10192	12538	}
10193	12539
10194	12540
..	..	@@ -10205,8 +12551,8 @@
10205	12551	parentcam = cameras[0];
10206	12552	}
10207	12553
10208		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10209		- LA.xformPos(light, parentcam.toParent, light); // may 2013
	12554	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	12555	+ LA.xformPos(light, parentcam.GlobalTransform(), light); // may 2013
10210	12556
10211	12557	LA.xformPos(light, renderCamera.toScreen, light);
10212	12558
..	..	@@ -10253,7 +12599,7 @@
10253	12599	return;
10254	12600	}
10255	12601
10256		- if (obj instanceof CheckerIG)
	12602	+ if (obj instanceof Checker)
10257	12603	{
10258	12604	checker = obj;
10259	12605
..	..	@@ -10296,8 +12642,82 @@
10296	12642
10297	12643	//gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
10298	12644
10299		- String program =
	12645	+ String programmin =
	12646	+ // Min shader
10300	12647	"!!ARBfp1.0\n" +
	12648	+ "PARAM zero12t = { 0.0, 1.0, 2, 1.25 };" +
	12649	+ "PARAM pow_2 = { 0.5, 0.25, 0.125, 0.0 };" +
	12650	+ "PARAM pow2 = { 2, 4, 8, 0.0 };" +
	12651	+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
	12652	+ "PARAM eps = { 0.001, 0.001, 0.001, 1.0 };" +
	12653	+ "PARAM infinity = { 100000000, 100000000, 100000000, 1.0 };" +
	12654	+ "PARAM light2cam0 = program.env[10];" +
	12655	+ "PARAM light2cam1 = program.env[11];" +
	12656	+ "PARAM light2cam2 = program.env[12];" +
	12657	+ "TEMP temp;" +
	12658	+ "TEMP light;" +
	12659	+ "TEMP ndotl;" +
	12660	+ "TEMP normal;" +
	12661	+ "TEMP depth;" +
	12662	+ "TEMP eye;" +
	12663	+ "TEMP pos;" +
	12664	+
	12665	+ "MAD normal, fragment.color, zero12t.z, -zero12t.y;" +
	12666	+ Normalize("normal") +
	12667	+ "MOV light, state.light[0].position;" +
	12668	+ "DP3 ndotl.x, light, normal;" +
	12669	+ "MAX ndotl.x, ndotl.x, zero12t.x;" +
	12670	+
	12671	+ // shadow
	12672	+ "MOV pos, fragment.texcoord[1];" +
	12673	+ "MOV temp, pos;" +
	12674	+ ShadowTextureFetch("depth", "temp", "1") +
	12675	+ //"TEX depth, fragment.texcoord[1], texture[1], 2D;" +
	12676	+ "SLT ndotl.z, fragment.texcoord[1].z, depth.z;" +
	12677	+
	12678	+ // No shadow when out of frustum
	12679	+ //"SGE temp.y, depth.z, zero123.y;" +
	12680	+ //"LRP temp.x, temp.y, zero123.y, temp.x;" +
	12681	+
	12682	+ "MUL ndotl.x, ndotl.x, ndotl.z;" + // Shadow
	12683	+
	12684	+ // Backlit
	12685	+ "MOV pos.w, zero12t.y;" + // one
	12686	+ "DP4 eye.x, pos, light2cam0;" +
	12687	+ "DP4 eye.y, pos, light2cam1;" +
	12688	+ "DP4 eye.z, pos, light2cam2;" +
	12689	+ Normalize("eye") +
	12690	+
	12691	+ "DP3 ndotl.y, -eye, normal;" +
	12692	+ //"MUL ndotl.y, ndotl.y, pow2.x;" +
	12693	+ "POW ndotl.y, ndotl.y, pow2.x;" + // backlit
	12694	+ "SUB ndotl.y, zero12t.y, ndotl.y;" + // 1 - y
	12695	+ //"POW ndotl.y, ndotl.y, pow2.z;" + // backlit
	12696	+ //"SUB ndotl.y, zero123.y, ndotl.y;" +
	12697	+ //"MUL ndotl.y, ndotl.y, pow2.z;" +
	12698	+ "ADD ndotl.y, ndotl.y, one.x;" +
	12699	+ "MUL ndotl.y, ndotl.y, pow_2.x;" +
	12700	+
	12701	+ //"MAX ndotl.x, ndotl.x, ndotl.y;" + // Ambient
	12702	+ //"MAX ndotl.x, ndotl.x, pow2.y;" + // Ambient
	12703	+
	12704	+ // Pigment
	12705	+ "TEX temp, fragment.texcoord[0], texture[0], 2D;" +
	12706	+ "LRP temp, zero12t.w, temp, one;" + // texture proportion
	12707	+ "MUL temp, temp, zero12t.w;" + // Times x
	12708	+
	12709	+ //"MUL temp, temp, ndotl.y;" +
	12710	+ "MAD ndotl.x, pow_2.xxxx, ndotl.yyyy, ndotl.x;" +
	12711	+
	12712	+ "MUL temp, temp, ndotl.x;" + // lambert
	12713	+
	12714	+ "MOV temp.w, zero12t.y;" + // reset alpha
	12715	+ "MOV result.color, temp;" +
	12716	+ "END";
	12717	+
	12718	+ String programmax =
	12719	+ "!!ARBfp1.0\n" +
	12720	+
10301	12721	//"OPTION ARB_fragment_program_shadow;" +
10302	12722	"PARAM light2cam0 = program.env[10];" +
10303	12723	"PARAM light2cam1 = program.env[11];" +
..	..	@@ -10323,13 +12743,15 @@
10323	12743	"PARAM params4 = program.env[4];" + // anisoV, cameralight, selfshadow, shadow
10324	12744	"PARAM params5 = program.env[5];" + // texture, opacity, fakedepth, shadowbias
10325	12745	"PARAM params6 = program.env[6];" + // bump, noise, borderfade, fog punchthrough
10326		- "PARAM params7 = program.env[7];" + // noise power, opacity power
	12746	+ "PARAM params7 = program.env[7];" + // noise power, opacity power, parallax
10327	12747	"PARAM options0 = program.env[63];" + // fog density, intensity, elevation
10328		- "PARAM options1 = program.env[62];" + // fog rgb color, image intensity
	12748	+ "PARAM options1 = program.env[62];" + // fog rgb color
	12749	+ "PARAM options2 = program.env[61];" + // image intensity, subsurface, lightsheen
10329	12750	"PARAM pointlight = program.env[127];" + // ...
10330	12751	"PARAM zero = { 0.0, 0.0, 0.0, 0.0 };" +
10331	12752	"PARAM halfhalf = { 0.25, 0.25, 0.25, 1.0 };" +
10332	12753	"PARAM half = { 0.5, 0.5, 0.5, 1.0 };" +
	12754	+ "PARAM threequarter = { 0.75, 0.75, 0.75, 1.0 };" +
10333	12755	"PARAM two = { 2.0, 2.0, 2.0, 1.0 };" +
10334	12756	"PARAM ten = { 10, 10, 10, 1.0 };" +
10335	12757	"PARAM one3rd = { 0.5, 0.33333333333, 0.333333333, 1.0 };" +
..	..	@@ -10350,6 +12772,7 @@
10350	12772	"PARAM lodbias = { 10,10,10,10 };" + // 20, -2, -20, 1.0 };" +
10351	12773	"PARAM infinity = { 100000000, 100000000, 100000000, 1.0 };" +
10352	12774	"PARAM one2048th = { 0.00048828125, 0.00048828125, 0.00048828125, 1.0 };" +
	12775	+ "PARAM ninetenth = { 0.9, 0.9, 0.9, 1.0 };" +
10353	12776	"PARAM almostone = { 0.999, 0.999, 0.999, 1.0 };" +
10354	12777	"PARAM c256 = { 256, 256, 256, 1.0 };" +
10355	12778	"PARAM c256i = { 0.00390625, 0.00390625, 0.00390625, 1.0 };" +
..	..	@@ -10390,6 +12813,10 @@
10390	12813	"TEMP R1;" +
10391	12814	"TEMP R2;" +
10392	12815	"TEMP R3;" +
	12816	+ "TEMP min;" +
	12817	+ "TEMP max;" +
	12818	+ "TEMP average;" +
	12819	+ "TEMP saturation;" +
10393	12820	"TEMP keep1;" +
10394	12821	"TEMP keep2;" +
10395	12822	"TEMP keep3;" +
..	..	@@ -10405,8 +12832,7 @@
10405	12832	"TEMP shininess;" +
10406	12833	"\n" +
10407	12834	"MOV texSamp, one;" +
10408		- //"TEX texSamp, fragment.texcoord[0], texture[0], 2D;" +
10409		-
	12835	+
10410	12836	"MOV mapgrid.x, one2048th.x;" +
10411	12837	"MOV temp, fragment.texcoord[1];" +
10412	12838	/*
..	..	@@ -10427,20 +12853,20 @@
10427	12853	"MUL temp, floor, mapgrid.x;" +
10428	12854	//"TEX depth0, temp, texture[1], 2D;" +
10429	12855	(((mode & FP_SOFTSHADOW) == 0) ? "" :
10430		- TextureFetch("depth0", "temp", "1") +
	12856	+ ShadowTextureFetch("depth0", "temp", "1") +
10431	12857	"") +
10432	12858	"ADD temp.x, temp.x, mapgrid.x;" +
10433	12859	//"TEX depth1, temp, texture[1], 2D;" +
10434	12860	(((mode & FP_SOFTSHADOW) == 0) ? "" :
10435		- TextureFetch("depth1", "temp", "1") +
	12861	+ ShadowTextureFetch("depth1", "temp", "1") +
10436	12862	"") +
10437	12863	"ADD temp.y, temp.y, mapgrid.x;" +
10438	12864	//"TEX depth2, temp, texture[1], 2D;" +
10439		- TextureFetch("depth2", "temp", "1") +
	12865	+ ShadowTextureFetch("depth2", "temp", "1") +
10440	12866	"SUB temp.x, temp.x, mapgrid.x;" +
10441	12867	//"TEX depth3, temp, texture[1], 2D;" +
10442	12868	(((mode & FP_SOFTSHADOW) == 0) ? "" :
10443		- TextureFetch("depth3", "temp", "1") +
	12869	+ ShadowTextureFetch("depth3", "temp", "1") +
10444	12870	"") +
10445	12871	//"MUL texSamp0, texSamp0, state.material.front.diffuse;" +
10446	12872	//"MOV params, material;" +
..	..	@@ -10562,7 +12988,7 @@
10562	12988	"POW texSamp.a, texSamp.a, params6.w;" + // fog punch through shortcut
10563	12989	// mar 2013 ??? "KIL alpha.a;" +
10564	12990	"MOV alpha, texSamp.aaaa;" + // y;" +
10565		- "KIL alpha.a;" +
	12991	+ "KIL alpha.a;" + // not sure with parallax mapping
10566	12992	/*
10567	12993	"MUL temp.xy, temp, two;" +
10568	12994	"TXB bump, temp, texture[0], 2D;" +
..	..	@@ -10648,11 +13074,6 @@
10648	13074	"SUB bump0, bump0, half;" +
10649	13075	"ADD bump, bump, bump0;" +
10650	13076
10651		- "MOV temp.x, texSamp.a;" +
10652		- "LRP texSamp, params5.x, texSamp, one;" + // texture proportion
10653		- //"LRP texSamp0, params5.x, texSamp0, one;" +
10654		- "MOV texSamp.a, temp.x;" +
10655		-
10656	13077	// double-sided
10657	13078	/**/
10658	13079	(doublesided?"DP3 temp.z, normal, eye;" +
..	..	@@ -10662,26 +13083,73 @@
10662	13083	"ADD temp.x, temp.x, one.x;" +
10663	13084	"MUL normal, normal, temp.xxxx;":""
10664	13085	) +
10665		- /**/
10666		-//// Normalize("normal") +
10667		-//// "MAX normal.z, eps.x, normal.z;" +
10668		-// Normalize("normal") +
10669		- "MOV normald, normal;" +
10670		- "MOV normals, normal;" +
	13086	+ /**/
	13087	+
	13088	+ "MOV temp, fragment.texcoord[4];" +
10671	13089
10672	13090	// UV base
10673	13091	//"DP3 UP.x,state.matrix.modelview.row[0],Y;" +
10674	13092	//"DP3 UP.y,state.matrix.modelview.row[1],Y;" +
10675	13093	//"DP3 UP.z,state.matrix.modelview.row[2],Y;" +
10676		- "DP3 UP.x,state.matrix.texture[7].row[0],Y;" +
10677		- "DP3 UP.y,state.matrix.texture[7].row[1],Y;" +
10678		- "DP3 UP.z,state.matrix.texture[7].row[2],Y;" +
	13094	+ "DP3 UP.x,state.matrix.texture[7].row[0],temp;" +
	13095	+ "DP3 UP.y,state.matrix.texture[7].row[1],temp;" +
	13096	+ "DP3 UP.z,state.matrix.texture[7].row[2],temp;" +
	13097	+ Normalize("UP") +
	13098	+
10679	13099	"XPD V, normal, UP;" +
10680	13100	Normalize("V") +
10681	13101	"XPD U, V, normal;" +
10682	13102	Normalize("U") +
10683	13103
	13104	+ "MOV temp, fragment.texcoord[0];" +
	13105	+
	13106	+// "MAD normal, -temp.x, U, normal;" +
	13107	+// "MAD normal, -temp.y, V, normal;" +
	13108	+// Normalize("normal") +
	13109	+
	13110	+//// "MAX normal.z, eps.x, normal.z;" +
	13111	+// Normalize("normal") +
	13112	+ "MOV normald, normal;" +
	13113	+ "MOV normals, normal;" +
	13114	+
10684	13115	// parallax mapping
	13116	+
	13117	+ "DP3 temp2.x, V, eye;" +
	13118	+ "DP3 temp2.y, U, eye;" +
	13119	+ "DP3 temp2.z, normal, eye;" +
	13120	+ "RCP temp2.z, temp2.z;" +
	13121	+
	13122	+ "DP3 temp2.w, texSamp, texSamp;" + // Height
	13123	+ "RSQ temp2.w, temp2.w;" +
	13124	+ "RCP temp2.w, temp2.w;" +
	13125	+
	13126	+ "SUB temp2.w, temp2.w, half;" +
	13127	+ // "SGE temp.x, temp2.w, eps.x;" +
	13128	+ // "MUL temp2.w, temp2.w, temp.x;" +
	13129	+
	13130	+ // "MOV texSamp, U;" +
	13131	+
	13132	+ "MUL temp2.z, temp2.z, temp2.w;" +
	13133	+ "MUL temp2.z, temp2.z, params7.z;" + // parallax
	13134	+
	13135	+ "MUL temp2, temp2, temp2.z;" +
	13136	+
	13137	+ "SUB temp, temp, temp2;" +
	13138	+
	13139	+ "TEX temp, temp, texture[0], 2D;" +
	13140	+ "POW temp.a, temp.a, params6.w;" + // punch through
	13141	+
	13142	+ "ADD texSamp, temp, texSamp;" +
	13143	+ "MUL texSamp.xyz, half, texSamp;" +
	13144	+
	13145	+ "MOV alpha, texSamp.aaaa;" +
	13146	+
	13147	+// parallax mapping
	13148	+
	13149	+ "MOV temp.x, texSamp.a;" +
	13150	+ "LRP texSamp, params5.x, texSamp, one;" + // texture proportion
	13151	+ //"LRP texSamp0, params5.x, texSamp0, one;" +
	13152	+ "MOV texSamp.a, temp.x;" +
10685	13153
10686	13154	//"MOV temp, fragment.texcoord[0];" +
10687	13155	//
..	..	@@ -10811,10 +13279,10 @@
10811	13279	"MAD shadow.x, buffer.x, frac.y, shadow.x;" +
10812	13280	"") +
10813	13281
10814		- // display shadow only (bump == 0)
	13282	+ // display shadow only (fakedepth == 0)
10815	13283	"SUB temp.x, half.x, shadow.x;" +
10816		- "MOV temp.y, -params6.x;" +
10817		- "SLT temp.z, temp.y, zero.x;" +
	13284	+ "MOV temp.y, -params5.z;" + // params6.x;" +
	13285	+ "SLT temp.z, temp.y, -c256i.x;" +
10818	13286	"SUB temp.y, one.x, temp.z;" +
10819	13287	"MUL temp.x, temp.x, temp.y;" +
10820	13288	"KIL temp.x;" +
..	..	@@ -10920,10 +13388,42 @@
10920	13388
10921	13389	// skin?
10922	13390	// Saturation for skin
10923		- /**/ // c'est ici
10924		- (Skinshader? "DP3 temp.x, final,one;" +
	13391	+ /**/
	13392	+ (Skinshader?
	13393	+ "DP3 average.x, final,one;" +
	13394	+ "MUL average, one3rd.xxxx,average.xxxx;" +
	13395	+
	13396	+ "MIN min.x, final.x,final.y;" +
	13397	+ "MIN min.x, min.x,final.z;" +
	13398	+
	13399	+ "MAX max.x, final.x,final.y;" +
	13400	+ "MAX max.x, max.x,final.z;" +
	13401	+ "MOV max, max.xxxx;" +
	13402	+
	13403	+ "SUB saturation, max, final;" +
	13404	+
	13405	+ "ADD temp.x, max.x, one10th.x;" +
	13406	+ "RCP temp.x, temp.x;" +
	13407	+ "MUL temp.x, temp.x, half.x;" +
	13408	+ "MUL saturation, saturation, temp.xxxx;" +
	13409	+
	13410	+ "DP3 ndotl.x, normald, light;" +
	13411	+ "MAX ndotl.x, ndotl.x, -ndotl.x;" +
	13412	+
	13413	+ "SUB temp.x, one.x, ndotl.x;" +
	13414	+ // Tuning for default skin
	13415	+ //"ADD temp.x, temp.x, options2.z;" + // lightsheen
	13416	+ "MAD temp.x, options2.z, half.y, temp.x;" + // lightsheen
	13417	+ "ADD temp.y, one.y, options2.y;" + // subsurface
	13418	+ "MUL temp.x, temp.x, temp.y;" +
	13419	+
	13420	+ "MUL saturation, saturation, temp.xxxx;" +
	13421	+ "SUB_SAT temp, max, saturation;" +
	13422	+/**
	13423	+ "DP3 temp.x, final,one;" +
10925	13424	"MUL R2, one3rd.xxxx,temp.xxxx;" +
10926		- "SUB temp, final,R2;" +
	13425	+ "SUB temp, final, R2;" +
	13426	+
10927	13427	// using light angle
10928	13428	"DP3 ndotl.x, normald,light;" +
10929	13429	//"SLT ndotl.y, ndotl.x, zero.x;" +
..	..	@@ -10936,7 +13436,6 @@
10936	13436	// using light intensity
10937	13437	"MOV ndotl.z, R2.x;" +
10938	13438	"MUL ndotl.z, ndotl.z, ndotl.z;" + // tuning...
10939		-
10940	13439	// june 2014
10941	13440	"MAD R1.x, ndotl.z,slope.y,one.x;" +
10942	13441	// "SUB ndotl.x, one.x, ndotl.x;" +
..	..	@@ -10948,6 +13447,7 @@
10948	13447	//"MUL R2.y, shadow.x,R2.y;" + // avril 2014
10949	13448
10950	13449	"MAD temp.x, R2.y, ndotl.y, temp.x;" + // red shift (skin)
	13450	+/**/
10951	13451
10952	13452	// "ADD final, R2,temp;" +
10953	13453	"MOV final, temp;"
..	..	@@ -11037,7 +13537,7 @@
11037	13537	/**/
11038	13538	// HDR
11039	13539	"MOV temp.z, final.a;" +
11040		- "MUL final, final,options1.w;" +
	13540	+ "MUL final, final,options2.x;" +
11041	13541	"MOV final.a, temp.z;" +
11042	13542	/**/
11043	13543
..	..	@@ -11074,10 +13574,17 @@
11074	13574	"MOV final.z, zero.x;" +
11075	13575	"MOV final.a, one.w;":""
11076	13576	) +
	13577	+ /*
11077	13578	(NORMALdebug?"MOV final.x, normal.x;" +
11078	13579	"MOV final.y, normal.y;" +
11079	13580	"MOV final.z, normal.z;" +
11080	13581	"MOV final.a, one.w;":""
	13582	+ ) +
	13583	+ */
	13584	+ (NORMALdebug?"SUB final.x, one.x, final.x;" +
	13585	+ "SUB final.y, one.x, final.y;" +
	13586	+ "SUB final.z, one.x, final.z;" +
	13587	+ "MOV final.a, final.a;":""
11081	13588	) +
11082	13589	// "MOV final, bumpmap;" +
11083	13590	"MOV result.color, final;" +
..	..	@@ -11106,8 +13613,19 @@
11106	13613	//once = true;
11107	13614	}
11108	13615
11109		- System.out.print("Program #" + mode + "; length = " + program.length());
11110		- System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
	13616	+ String program = programmax;
	13617	+
	13618	+ if (Globals.MINSHADER)
	13619	+ {
	13620	+ program = programmin;
	13621	+ }
	13622	+
	13623	+ if (Globals.DEBUG)
	13624	+ {
	13625	+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
	13626	+ System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
	13627	+ }
	13628	+
11111	13629	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
11112	13630
11113	13631	//gl.glNewList(displayListID, GL.GL_COMPILE);
..	..	@@ -11154,7 +13672,8 @@
11154	13672	"\n" +
11155	13673	"END\n";
11156	13674
11157		- System.out.println("Program shadow #" + 0 + "; length = " + program.length());
	13675	+ if (Globals.DEBUG)
	13676	+ System.out.println("Program shadow #" + 0 + "; length = " + program.length());
11158	13677	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
11159	13678
11160	13679	//gl.glNewList(displayListID, GL.GL_COMPILE);
..	..	@@ -11199,30 +13718,32 @@
11199	13718	return out;
11200	13719	}
11201	13720
11202		- String TextureFetch(String dest, String src, String unit)
	13721	+ // Also does frustum culling
	13722	+ String ShadowTextureFetch(String dest, String src, String unit)
11203	13723	{
11204	13724	return "TEX " + dest + ", " + src + ", texture[" + unit + "], 2D;" +
11205	13725	"SGE " + src + ".w, " + src + ".x, eps.x;" +
11206	13726	"SGE " + src + ".z, " + src + ".y, eps.x;" +
	13727	+ "SLT " + dest + ".x, " + src + ".x, one.x;" +
	13728	+ "SLT " + dest + ".y, " + src + ".y, one.x;" +
11207	13729	"MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
11208		- "SLT " + src + ".z, " + src + ".x, one.x;" +
11209		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
11210		- "SLT " + src + ".z, " + src + ".y, one.x;" +
11211		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
	13730	+ "MUL " + src + ".w, " + dest + ".x, " + src + ".w;" +
	13731	+ "MUL " + src + ".w, " + dest + ".y, " + src + ".w;" +
11212	13732	//"SWZ buffer, temp, w,w,w,w;";
11213		- "MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
	13733	+ //"MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
11214	13734	"SUB " + src + ".z, " + "one.x, " + src + ".w;" +
11215	13735	//"MUL " + src + ".z, " + src + ".z, infinity.x;" +
11216	13736	//"ADD " + dest + ".z, " + dest + ".z, " + src + ".z;";
11217		- "MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
	13737	+ //"MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
11218	13738
11219		- //"LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
11220		- //"LRP " + dest + ".z" + ", " + src + ".w, infinity.x," + dest + ".z;";
	13739	+ //?? "LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
	13740	+ "LRP " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
11221	13741	}
11222	13742
11223	13743	String Shadow(String depth, String shadow)
11224	13744	{
11225	13745	return "MAX temp.x, ndotl.x, one64th.x;" +
	13746	+ "MIN temp.x, temp.x, ninetenth.x;" +
11226	13747	/**/
11227	13748	// Sine
11228	13749	"MUL temp.y, temp.x, temp.x;" +
..	..	@@ -11238,12 +13759,16 @@
11238	13759
11239	13760	"ADD " + depth + ".z, " + depth + ".z, temp.x;" +
11240	13761	//"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing!
	13762	+
	13763	+ // Compare fragment depth in light space with shadowmap.
11241	13764	"SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" +
11242	13765	"SGE temp.y, temp.x, zero.x;" +
11243		- "SUB " + shadow + ".y, one.x, temp.y;" +
	13766	+ "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded
	13767	+
	13768	+ // Reverse comparison
11244	13769	"SUB temp.x, one.x, temp.x;" +
11245	13770	"MUL " + shadow + ".x, temp.x, temp.y;" +
11246		- "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded
	13771	+ "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse
11247	13772	"POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth
11248	13773
11249	13774	"SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" +
..	..	@@ -11257,6 +13782,10 @@
11257	13782	// No shadow for backface
11258	13783	"DP3 temp.x, normal, lightd;" +
11259	13784	"SLT temp.x, temp.x, zero.x;" + // shadoweps
	13785	+ "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
	13786	+
	13787	+ // No shadow when out of frustum
	13788	+ "SGE temp.x, " + depth + ".z, one.z;" +
11260	13789	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
11261	13790	"";
11262	13791	}
..	..	@@ -11402,8 +13931,9 @@
11402	13931	/static/ float[] modelParams4 = new float[]{0, 0, 0, 0}; // anisoV, cameralight, selfshadow, shadow
11403	13932	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
11404	13933	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
11405		- /static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
11406		- Object3D.cVector2[] vector2buffer;
	13934	+ /static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power, parallax
	13935	+
	13936	+ //Object3D.cVector2[] vector2buffer;
11407	13937
11408	13938	// IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
11409	13939	// OUT : diff, spec
..	..	@@ -11419,9 +13949,10 @@
11419	13949	"DP3 " + dest + ".z," + "normals," + "eye;" +
11420	13950	"MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
11421	13951	//"MOV " + dest + ".w," + "normal.z;" +
11422		- "MUL " + dest + ".z," + "params2.w," + dest + ".x;" +
11423		- "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
11424		- //"MOV " + dest + ".z," + "params2.w;" +
	13952	+// "MUL " + dest + ".z," + "params2.w," + dest + ".x;" + // PRETTY HEURISTIC FOR VELVET
	13953	+// "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
	13954	+
	13955	+ "MOV " + dest + ".z," + "params2.w;" + // EXACT
11425	13956	"POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
11426	13957	"RCP " + dest + ".w," + dest + ".w;" +
11427	13958	//"RSQ " + dest + ".w," + dest + ".w;" +
..	..	@@ -11567,7 +14098,7 @@
11567	14098	"PARAM p[4] = { state.matrix.projection }; # modelview projection matrix\n" +
11568	14099	"PARAM zero = { 0.0, 0.0, 0.0, 1.0 };" +
11569	14100	"PARAM half = { 0.5, 0.5, 0.5, 1.0 };" +
11570		- "PARAM one = { 1.0, 1.0, 1.0, 0.0 };" +
	14101	+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
11571	14102	"PARAM two = { 2.0, 2.0, 2.0, 1.0 };" +
11572	14103	"PARAM third = { 0.33333333333, 0.33333333333, 0.33333333333, 1.0 };" +
11573	14104	//"PARAM v256 = { 256.0, 256.0, 256.0, 1.0 };" +
..	..	@@ -11628,7 +14159,7 @@
11628	14159	"DP4 temp.x,state.matrix.texture[0].inverse.row[0],vertex.texcoord;" +
11629	14160	"DP4 temp.y,state.matrix.texture[0].inverse.row[1],vertex.texcoord;" +
11630	14161	"DP4 temp.z,state.matrix.texture[0].inverse.row[2],vertex.texcoord;" +
11631		- //"MOV result.texcoord, vertex.texcoord;" +
	14162	+ //"MOV result.texcoord, vertex.fogcoord;" +
11632	14163	"MOV result.texcoord, temp;" +
11633	14164	// border fade
11634	14165	"MOV result.texcoord[3], vertex.texcoord;" +
..	..	@@ -11675,7 +14206,9 @@
11675	14206
11676	14207	//"ADD temp.z, temp.z, one;" +
11677	14208
11678		- "MOV result.color, temp;"
	14209	+ "MOV result.texcoord[4], vertex.attrib[4];" + // U dir
	14210	+
	14211	+ "MOV result.color, temp;" // Normal
11679	14212	: "MOV result.color, vertex.color;") +
11680	14213	((mode & VP_PROJECTION) != 0 ? "MOV result.color, zero;"
11681	14214	: "") +
..	..	@@ -11810,12 +14343,13 @@
11810	14343	public void mouseClicked(MouseEvent e)
11811	14344	{
11812	14345	System.out.println("mouseClicked: " + e);
	14346	+ System.exit(0);
11813	14347	}
11814	14348
11815	14349	public void mousePressed(MouseEvent e)
11816	14350	{
11817	14351	//System.out.println("mousePressed: " + e);
11818		- clickStart(e.getX(), e.getY(), e.getModifiersEx());
	14352	+ clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
11819	14353	}
11820	14354
11821	14355	static long prevtime = 0;
..	..	@@ -11842,14 +14376,18 @@
11842	14376
11843	14377	//System.err.println("Dtime = " + Dtime + "; units = " + e.getUnitsToScroll() + "; ratio (units/ms) = " + ratio);
11844	14378
	14379	+ if (BUTTONLESSWHEEL)
11845	14380	if (Math.abs(ratio) < 0.1 \|\| Math.abs(Dtime) == 0) // < 30)
11846	14381	{
11847	14382	return;
11848	14383	}
11849	14384
	14385	+ //boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
	14386	+
	14387	+ boolean vr = capsLocked && !lightMode;
11850	14388
11851	14389	// TIMER
11852		- if (!wheeltimer.isRunning() && e.getModifiersEx() == 0) // VR
	14390	+ if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !vr) // VR
11853	14391	{
11854	14392	keepboxmode = BOXMODE;
11855	14393	keepsupport = SUPPORT;
..	..	@@ -11889,8 +14427,8 @@
11889	14427	// mode \|= META;
11890	14428	//}
11891	14429
11892		- SetMouseMode(WHEEL \| e.getModifiersEx());
11893		- 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());
11894	14432	anchorX = ax;
11895	14433	anchorY = ay;
11896	14434	prevX = px;
..	..	@@ -11924,6 +14462,7 @@
11924	14462	else
11925	14463	if (evt.getSource() == AAtimer)
11926	14464	{
	14465	+ Globals.TIMERRUNNING = false;
11927	14466	if (mouseDown)
11928	14467	{
11929	14468	//new Exception().printStackTrace();
..	..	@@ -11949,6 +14488,10 @@
11949	14488	// LIVE = waslive;
11950	14489	// wasliveok = true;
11951	14490	// waslive = false;
	14491	+
	14492	+ // May 2019 Forget it:
	14493	+ if (true)
	14494	+ return;
11952	14495
11953	14496	// source == timer
11954	14497	if (mouseDown)
..	..	@@ -11978,22 +14521,24 @@
11978	14521	// ObjEditor.tweenManager.update(1f / 60f);
11979	14522
11980	14523	// fev 2014???
11981		- if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && drawMode == SHADOW) // && !lightMode)
11982		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11983		- pingthread.StepToTarget(true); // true);
	14524	+ if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
	14525	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	14526	+ pingthread.StepToTarget(); // true);
11984	14527	}
	14528	+
11985	14529	// if (!LIVE)
11986	14530	super.repaint();
11987	14531	}
11988	14532
11989	14533	javax.swing.Timer timer = new javax.swing.Timer(350, this);
11990	14534
11991		- void clickStart(int x, int y, int modifiers)
	14535	+ void clickStart(int x, int y, int modifiers, int modifiersex)
11992	14536	{
11993	14537	if (!wasliveok)
11994	14538	return;
11995	14539
11996	14540	AAtimer.restart(); //
	14541	+ Globals.TIMERRUNNING = true;
11997	14542
11998	14543	// waslive = LIVE;
11999	14544	// LIVE = false;
..	..	@@ -12005,7 +14550,7 @@
12005	14550	// touched = true; // main DL
12006	14551	if (isRenderer)
12007	14552	{
12008		- SetMouseMode(modifiers);
	14553	+ SetMouseMode(modifiers, modifiersex);
12009	14554	}
12010	14555
12011	14556	selectX = anchorX = x;
..	..	@@ -12018,7 +14563,7 @@
12018	14563	clicked = true;
12019	14564	hold = false;
12020	14565
12021		- if (((modifiers & ~1024) & ~0) == 0) // Single or multiple selection
	14566	+ if (((modifiersex & ~1024) & ~0) == 0) // Single or multiple selection
12022	14567	// june 2013 means CTRL_CLICK: if (((modifiers & ~1024) & ~128) == 0) // Single or multiple selection
12023	14568	{
12024	14569	// System.out.println("RESTART II " + modifiers);
..	..	@@ -12043,14 +14588,15 @@
12043	14588	drag = false;
12044	14589	//System.out.println("Mouse DOWN");
12045	14590	editObj = false;
12046		- ClickInfo info = new ClickInfo();
12047		- info.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
12048		- info.pane = this;
12049		- info.camera = renderCamera;
12050		- info.x = x;
12051		- info.y = y;
12052		- info.modifiers = modifiers;
12053		- editObj = object.doEditClick(info, 0);
	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);
12054	14600	if (!editObj)
12055	14601	{
12056	14602	hasMarquee = true;
..	..	@@ -12066,19 +14612,22 @@
12066	14612
12067	14613	public void mouseDragged(MouseEvent e)
12068	14614	{
	14615	+ Globals.MOUSEDRAGGED = true;
	14616	+
	14617	+ //System.out.println("mouseDragged: " + e);
12069	14618	if (isRenderer)
12070	14619	movingcamera = true;
	14620	+
12071	14621	//if (drawing)
12072	14622	//return;
12073		- //System.out.println("mouseDragged: " + e);
12074		- if ((e.getModifiersEx() & CTRL) != 0
12075		- \|\| (e.getModifiersEx() & COMMAND) != 0) // \|\| IsFrozen())
	14623	+ if ((e.getModifiersEx() & CTRL) != 0 \|\|
	14624	+ (e.getModifiersEx() & COMMAND) != 0) // \|\| IsFrozen())
12076	14625	{
12077	14626	//System.out.println("mouseDragged: " + e);
12078	14627	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
12079	14628	}
12080	14629	else
12081		- drag(e.getX(), e.getY(), e.getModifiersEx());
	14630	+ drag(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
12082	14631
12083	14632	//try { Thread.sleep(1); } catch (Exception ex) {}
12084	14633	}
..	..	@@ -12091,9 +14640,22 @@
12091	14640	cVector tmp2 = new cVector();
12092	14641	boolean isMoving;
12093	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	+
12094	14653	class PingThread extends Thread
12095	14654	{
12096	14655	boolean jump;
	14656	+ boolean live;
	14657	+
	14658	+ boolean mute = false;
12097	14659
12098	14660	// void JumpToTarget()
12099	14661	// {
..	..	@@ -12109,6 +14671,95 @@
12109	14671	// only one thread!? synchronized
12110	14672	void StepToTarget(boolean jump)
12111	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	+ // System.err.println("selected point = " + Trunk(selectedpoint.toParent[3][0]) + " " + Trunk(selectedpoint.toParent[3][1]) + " " + Trunk(selectedpoint.toParent[3][2]));
	14683	+ CreateSelectedPoint();
	14684	+
	14685	+ RigidBody.pos.x = (float)selectedpoint.toParent[3][0];
	14686	+ RigidBody.pos.y = (float)selectedpoint.toParent[3][1];
	14687	+ RigidBody.pos.z = (float)selectedpoint.toParent[3][2];
	14688	+
	14689	+ RigidBody.wind.set(RigidBody.pos);
	14690	+ RigidBody.wind.x -= (float)manipCamera.location.x;
	14691	+ RigidBody.wind.y -= (float)manipCamera.location.y;
	14692	+ RigidBody.wind.z -= (float)manipCamera.location.z;
	14693	+ RigidBody.wind.normalize();
	14694	+ }
	14695	+
	14696	+ if (mute)
	14697	+ return;
	14698	+
	14699	+ if (capsLocked && manipCamera.viewCode == 0)
	14700	+ {
	14701	+ eye.x = manipCamera.location.x;
	14702	+ eye.y = manipCamera.location.y + 0.25;
	14703	+ eye.z = manipCamera.location.z;
	14704	+
	14705	+ dir.y = -1;
	14706	+
	14707	+ Ray ray = new Ray(eye, dir);
	14708	+
	14709	+ IntersectResult res = new IntersectResult();
	14710	+ res.t = Double.POSITIVE_INFINITY;
	14711	+
	14712	+ tmp.set(targetLookAt);
	14713	+ tmp.sub(manipCamera.location);
	14714	+
	14715	+ double dist = tmp.length();
	14716	+
	14717	+ tmp.normalize();
	14718	+
	14719	+ eye2.x = manipCamera.location.x + tmp.x * 0.25;
	14720	+ eye2.y = manipCamera.location.y + 0.25;
	14721	+ eye2.z = manipCamera.location.z + tmp.z * 0.25;
	14722	+
	14723	+ Ray ray2 = new Ray(eye2, dir);
	14724	+
	14725	+ IntersectResult res2 = new IntersectResult();
	14726	+ res2.t = Double.POSITIVE_INFINITY;
	14727	+
	14728	+ if (object.intersect(ray, res) && object.intersect(ray2, res2) && Math.abs(res.t - res2.t) < 0.25)
	14729	+ {
	14730	+ //tmp.set(manipCamera.location);
	14731	+
	14732	+ manipCamera.location.x = ray.eyePoint.x + ray.viewDirection.x * res.t;
	14733	+ manipCamera.location.y = ray.eyePoint.y + ray.viewDirection.y * res.t + 0.5;
	14734	+ manipCamera.location.z = ray.eyePoint.z + ray.viewDirection.z * res.t;
	14735	+
	14736	+ //tmp.sub(manipCamera.location);
	14737	+
	14738	+ targetLookAt.x = ray2.eyePoint.x + ray2.viewDirection.x * res2.t;
	14739	+ targetLookAt.y = ray2.eyePoint.y + ray2.viewDirection.y * res2.t + 0.5;
	14740	+ targetLookAt.z = ray2.eyePoint.z + ray2.viewDirection.z * res2.t;
	14741	+
	14742	+ targetLookAt.sub(manipCamera.location);
	14743	+ targetLookAt.normalize();
	14744	+ targetLookAt.mul(dist);
	14745	+ targetLookAt.add(manipCamera.location);
	14746	+
	14747	+ //if (tmp.dot(tmp) > 0.000001)
	14748	+ // System.out.println("INTERSECTION " + manipCamera.location);
	14749	+
	14750	+ manipCamera.lookAt.set(targetLookAt);
	14751	+
	14752	+ tmp.x = res.n.x;
	14753	+ tmp.y = res.n.y;
	14754	+ tmp.z = res.n.z;
	14755	+ tmp.x += res2.n.x;
	14756	+ tmp.y += res2.n.y;
	14757	+ tmp.z += res2.n.z;
	14758	+ tmp.normalize();
	14759	+ manipCamera.UP.set(tmp);
	14760	+ }
	14761	+ }
	14762	+
12112	14763	tmp.set(targetLookAt);
12113	14764	tmp.sub(manipCamera.lookAt); // june 2014
12114	14765
..	..	@@ -12146,7 +14797,7 @@
12146	14797
12147	14798	if (tmp.dot(tmp) > 1) // may 2014. far away: jump to target
12148	14799	{
12149		- jump = true; // step = 1;
	14800	+ // sep 2019 jump = true; // step = 1;
12150	14801	}
12151	14802
12152	14803	if (OEILONCE && OEIL)
..	..	@@ -12181,7 +14832,10 @@
12181	14832	if (tmp.dot(tmp) < 0.00001)
12182	14833	{
12183	14834	zoomonce = false;
	14835	+ live = false;
12184	14836	}
	14837	+ else
	14838	+ live = true;
12185	14839
12186	14840	tmp.mul(step > step2 ? step : step2);
12187	14841	}
..	..	@@ -12208,7 +14862,7 @@
12208	14862	{
12209	14863	if (LOOKAT)
12210	14864	manipCamera.lookAt.add(tmp);
12211		- if (OEIL)
	14865	+ if (OEIL && !capsLocked)
12212	14866	manipCamera.location.add(tmp);
12213	14867
12214	14868	{
..	..	@@ -12223,13 +14877,16 @@
12223	14877	lightCamera.computeTransform();
12224	14878	}
12225	14879	}
12226		- manipCamera.computeTransform();
	14880	+ if (tmp.x != 0 \|\| tmp.y != 0 \|\| tmp.z != 0)
	14881	+ {
	14882	+ manipCamera.computeTransform();
	14883	+ }
12227	14884	}
12228	14885	// ?????? mouseDown = true;
12229	14886	//System.out.println("---------------- ---------- Paint " + tmp.length2());
12230	14887	if (lightMode)
12231	14888	{
12232		- lighttouched = true;
	14889	+ Globals.lighttouched = true;
12233	14890	}
12234	14891
12235	14892	if (OEILONCE && OEIL)
..	..	@@ -12246,6 +14903,7 @@
12246	14903
12247	14904	public void run()
12248	14905	{
	14906	+ new Exception().printStackTrace();
12249	14907	System.exit(0);
12250	14908	for (;;)
12251	14909	{
..	..	@@ -12287,7 +14945,7 @@
12287	14945	mouseDown = false;
12288	14946	if (lightMode)
12289	14947	{
12290		- lighttouched = true;
	14948	+ Globals.lighttouched = true;
12291	14949	}
12292	14950	repaint();
12293	14951	alreadypainted = true;
..	..	@@ -12295,7 +14953,7 @@
12295	14953	isMoving = false;
12296	14954	} //??
12297	14955
12298		- if (isLIVE() && !alreadypainted)
	14956	+ if (Globals.isLIVE() && !alreadypainted)
12299	14957	{
12300	14958	// FOR DEBUG BREAKPOINT USING PAUSE: while (true)
12301	14959	repaint();
..	..	@@ -12307,57 +14965,115 @@
12307	14965	{
12308	14966	if (lightMode)
12309	14967	{
12310		- lighttouched = true;
	14968	+ Globals.lighttouched = true;
12311	14969	}
12312		- drag(X, (mouseMode != 0) ? Y : anchorY, MODIFIERS);
	14970	+ drag(X, (mouseMode != 0) ? Y : anchorY, 0, MODIFIERS);
12313	14971	}
12314	14972	//else
12315	14973	}
12316	14974	}
12317	14975	}
	14976	+
12318	14977	PingThread pingthread = new PingThread();
12319		- int delta = 5;
12320		- int speed = 5;
	14978	+ int delta = 1;
	14979	+ int speed = 1;
	14980	+ int walk = 8;
12321	14981	boolean autorepeat = false;
12322	14982
	14983	+ void Walk()
	14984	+ {
	14985	+ manipCamera.BackForth(0, walk, 1000);
	14986	+
	14987	+ targetLookAt.set(manipCamera.lookAt);
	14988	+ }
	14989	+
	14990	+ void ViewAngle(float dy)
	14991	+ {
	14992	+ double factor = Math.exp(-dy/300.0); // (1 + dy/100);
	14993	+
	14994	+ if (manipCamera.shaper_fovy * factor > 1 &&
	14995	+ manipCamera.shaper_fovy * factor < 150)
	14996	+ {
	14997	+ manipCamera.shaper_fovy *= factor;
	14998	+ //System.out.println("fovy = " + shaper_fovy);
	14999	+ }
	15000	+ }
	15001	+
12323	15002	void GoDown(int mod)
12324	15003	{
12325	15004	MODIFIERS \|= COMMAND;
12326		- /*
	15005	+ boolean isVR = (mouseMode&VR)!=0;
	15006	+ /**/
12327	15007	if((mod&SHIFT) == SHIFT)
12328		- manipCamera.RotatePosition(0, -speed);
12329		- else
12330		- manipCamera.BackForth(0, -speed*delta, getWidth());
12331		- */
12332		- if ((mod & SHIFT) == SHIFT)
12333	15008	{
12334		- mouseMode = mouseMode; // VR??
12335		- } else
12336		- {
12337		- mouseMode \|= BACKFORTH;
	15009	+// if (isVR)
	15010	+// manipCamera.RotateInterest(0, speed);
	15011	+// else
	15012	+ if (isVR)
	15013	+ ViewAngle(-speed*delta);
	15014	+ else
	15015	+ manipCamera.Translate(0, -speed*delta, getWidth());
12338	15016	}
	15017	+ else
	15018	+ {
	15019	+ if (isVR)
	15020	+ manipCamera.BackForth(0, -speed*delta, isVR?1000:0); // getWidth());
	15021	+ else
	15022	+ manipCamera.RotatePosition(0, -speed);
	15023	+ }
	15024	+
	15025	+ /**/
	15026	+// if ((mod & SHIFT) == SHIFT)
	15027	+// {
	15028	+// mouseMode = mouseMode; // VR??
	15029	+// } else
	15030	+// {
	15031	+// mouseMode \|= BACKFORTH;
	15032	+// }
12339	15033
	15034	+ targetLookAt.set(manipCamera.lookAt);
	15035	+
12340	15036	//prevX = X = anchorX;
12341	15037	prevY = Y = anchorY - (int) (renderCamera.Distance());
12342	15038	}
12343	15039
12344	15040	void GoUp(int mod)
12345	15041	{
	15042	+ RigidBody.justclicked = true;
	15043	+
12346	15044	MODIFIERS \|= COMMAND;
12347		- /*
	15045	+ /**/
	15046	+ boolean isVR = (mouseMode&VR)!=0;
	15047	+
12348	15048	if((mod&SHIFT) == SHIFT)
12349		- manipCamera.RotatePosition(0, speed);
12350		- else
12351		- manipCamera.BackForth(0, speed*delta, getWidth());
12352		- */
12353		- if ((mod & SHIFT) == SHIFT)
12354	15049	{
12355		- mouseMode = mouseMode;
12356		- } else
12357		- {
12358		- mouseMode \|= BACKFORTH;
	15050	+// if (isVR)
	15051	+// manipCamera.RotateInterest(0, -speed);
	15052	+// else
	15053	+ if (isVR)
	15054	+ ViewAngle(speed*delta);
	15055	+ else
	15056	+ manipCamera.Translate(0, speed*delta, getWidth());
12359	15057	}
	15058	+ else
	15059	+ {
	15060	+ if (isVR)
	15061	+ manipCamera.BackForth(0, speed*delta, isVR?1000:0); // getWidth());
	15062	+ else
	15063	+ manipCamera.RotatePosition(0, speed);
	15064	+ }
	15065	+
	15066	+ /**/
	15067	+// if ((mod & SHIFT) == SHIFT)
	15068	+// {
	15069	+// mouseMode = mouseMode;
	15070	+// } else
	15071	+// {
	15072	+// mouseMode \|= BACKFORTH;
	15073	+// }
12360	15074
	15075	+ targetLookAt.set(manipCamera.lookAt);
	15076	+
12361	15077	//prevX = X = anchorX;
12362	15078	prevY = Y = anchorY + (int) (renderCamera.Distance());
12363	15079	}
..	..	@@ -12365,20 +15081,31 @@
12365	15081	void GoLeft(int mod)
12366	15082	{
12367	15083	MODIFIERS \|= COMMAND;
12368		- /*
	15084	+ /**/
12369	15085	if((mod&SHIFT) == SHIFT)
12370		- manipCamera.RotatePosition(speed, 0);
	15086	+ manipCamera.Translate(speed, 0, getWidth());
12371	15087	else
12372		- manipCamera.Translate(speed*delta, 0, getWidth());
12373		- */
12374		- if ((mod & SHIFT) == SHIFT)
12375	15088	{
12376		- mouseMode = mouseMode;
12377		- } else
12378		- {
12379		- mouseMode \|= ROTATE;
12380		- } // TRANSLATE;
	15089	+ if ((mouseMode&VR)!=0)
	15090	+ manipCamera.RotateInterest(-speed*manipCamera.shaper_fovy/90, 0);
	15091	+ else
	15092	+ manipCamera.RotatePosition(speed*manipCamera.shaper_fovy/90, 0);
	15093	+ }
	15094	+
	15095	+ /**/
	15096	+// if ((mod & SHIFT) == SHIFT)
	15097	+// {
	15098	+// mouseMode = mouseMode;
	15099	+// } else
	15100	+// {
	15101	+// mouseMode \|= ROTATE;
	15102	+// } // TRANSLATE;
12381	15103
	15104	+ //System.err.println("lookAt = " + manipCamera.lookAt);
	15105	+ //System.err.println("location = " + manipCamera.location);
	15106	+
	15107	+ targetLookAt.set(manipCamera.lookAt);
	15108	+
12382	15109	prevX = X = anchorX - 10; // (int)(10*renderCamera.Distance());
12383	15110	prevY = Y = anchorY;
12384	15111	}
..	..	@@ -12386,20 +15113,28 @@
12386	15113	void GoRight(int mod)
12387	15114	{
12388	15115	MODIFIERS \|= COMMAND;
12389		- /*
	15116	+ /**/
12390	15117	if((mod&SHIFT) == SHIFT)
12391		- manipCamera.RotatePosition(-speed, 0);
	15118	+ manipCamera.Translate(-speed, 0, getWidth());
12392	15119	else
12393		- manipCamera.Translate(-speed*delta, 0, getWidth());
12394		- */
12395		- if ((mod & SHIFT) == SHIFT)
12396	15120	{
12397		- mouseMode = mouseMode;
12398		- } else
12399		- {
12400		- mouseMode \|= ROTATE;
12401		- } // TRANSLATE;
	15121	+ if ((mouseMode&VR)!=0)
	15122	+ manipCamera.RotateInterest(speed*manipCamera.shaper_fovy/90, 0);
	15123	+ else
	15124	+ manipCamera.RotatePosition(-speed*manipCamera.shaper_fovy/90, 0);
	15125	+ }
	15126	+
	15127	+ /**/
	15128	+// if ((mod & SHIFT) == SHIFT)
	15129	+// {
	15130	+// mouseMode = mouseMode;
	15131	+// } else
	15132	+// {
	15133	+// mouseMode \|= ROTATE;
	15134	+// } // TRANSLATE;
12402	15135
	15136	+ targetLookAt.set(manipCamera.lookAt);
	15137	+
12403	15138	prevX = X = anchorX + 10; // (int)(10*renderCamera.Distance());
12404	15139	prevY = Y = anchorY;
12405	15140	}
..	..	@@ -12409,7 +15144,7 @@
12409	15144	int X, Y;
12410	15145	boolean SX, SY;
12411	15146
12412		- void drag(int x, int y, int modifiers)
	15147	+ void drag(int x, int y, int modifiers, int modifiersex)
12413	15148	{
12414	15149	if (IsFrozen())
12415	15150	{
..	..	@@ -12418,17 +15153,17 @@
12418	15153
12419	15154	drag = true; // NEW
12420	15155
12421		- boolean continuous = (modifiers & COMMAND) == COMMAND;
	15156	+ boolean continuous = (modifiersex & COMMAND) == COMMAND;
12422	15157
12423	15158	X = x;
12424	15159	Y = y;
12425	15160	// floating state for animation
12426		- MODIFIERS = modifiers;
12427		- modifiers &= ~1024;
	15161	+ MODIFIERS = modifiersex;
	15162	+ modifiersex &= ~1024;
12428	15163	if (false) // modifiers != 0)
12429	15164	{
12430	15165	//new Exception().printStackTrace();
12431		- System.out.println("mouseDragged: " + modifiers);
	15166	+ System.out.println("mouseDragged: " + modifiersex);
12432	15167	System.out.println("SHIFT = " + SHIFT);
12433	15168	System.out.println("CONTROL = " + COMMAND);
12434	15169	System.out.println("META = " + META);
..	..	@@ -12441,14 +15176,16 @@
12441	15176	if (editObj)
12442	15177	{
12443	15178	drag = true;
12444		- ClickInfo info = new ClickInfo();
12445		- info.bounds.setBounds(0, 0,
	15179	+ //ClickInfo info = new ClickInfo();
	15180	+ object.clickInfo.bounds.setBounds(0, 0,
12446	15181	(int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
12447		- info.pane = this;
12448		- info.camera = renderCamera;
12449		- info.x = x;
12450		- info.y = y;
12451		- object.editWindow.copy.doEditDrag(info);
	15182	+ object.clickInfo.pane = this;
	15183	+ object.clickInfo.camera = renderCamera;
	15184	+ object.clickInfo.x = x;
	15185	+ object.clickInfo.y = y;
	15186	+ object //.GetWindow().copy
	15187	+ .doEditDrag(//info,
	15188	+ (modifiers & MouseEvent.BUTTON3_MASK) != 0);
12452	15189	} else
12453	15190	{
12454	15191	if (x < startX)
..	..	@@ -12531,6 +15268,11 @@
12531	15268	if ((mouseMode & ZOOM) != 0)
12532	15269	{
12533	15270	//if ((mouseMode & BACKFORTH) != 0)
	15271	+ if ((modifiersex & SHIFT) == SHIFT)
	15272	+ {
	15273	+ ViewAngle(dy);
	15274	+ }
	15275	+ else
12534	15276	if ((mouseMode & VR) != 0)
12535	15277	manipCamera.BackForth(dx, dy, getWidth());
12536	15278	else
..	..	@@ -12550,6 +15292,7 @@
12550	15292	{
12551	15293	manipCamera.Translate(dx, dy, getWidth());
12552	15294	}
	15295	+ else
12553	15296	if ((mouseMode & ZOOM) == 0 && (mouseMode & VR) != 0)
12554	15297	{
12555	15298	manipCamera.RotateInterest(dx, dy);
..	..	@@ -12560,7 +15303,7 @@
12560	15303
12561	15304	if (manipCamera == lightCamera)
12562	15305	{
12563		- lighttouched = true;
	15306	+ Globals.lighttouched = true;
12564	15307	}
12565	15308	/*
12566	15309	switch (mode)
..	..	@@ -12596,23 +15339,30 @@
12596	15339	}
12597	15340	}
12598	15341
	15342	+// ClickInfo clickInfo = new ClickInfo();
	15343	+
12599	15344	public void mouseMoved(MouseEvent e)
12600	15345	{
12601		- //System.out.println("mouseMoved: " + e);
	15346	+//object.editWindow.frame.
	15347	+ setCursor(Cursor.getDefaultCursor());
12602	15348
	15349	+ //System.out.println("mouseMoved: " + e);
12603	15350	if (isRenderer)
12604	15351	return;
12605	15352
12606		- ClickInfo ci = new ClickInfo();
12607		- ci.x = e.getX();
12608		- ci.y = e.getY();
12609		- ci.modifiers = e.getModifiersEx();
12610		- ci.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
12611		- ci.pane = this;
12612		- ci.camera = renderCamera;
	15353	+ // Mouse cursor feedback
	15354	+ object.clickInfo.x = e.getX();
	15355	+ object.clickInfo.y = e.getY();
	15356	+ object.clickInfo.modifiers = e.getModifiersEx();
	15357	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	15358	+ object.clickInfo.pane = this;
	15359	+ object.clickInfo.camera = renderCamera;
12613	15360	if (!isRenderer)
12614	15361	{
12615		- if (object.editWindow.copy.doEditClick(ci, 0))
	15362	+ //ObjEditor editWindow = object.editWindow;
	15363	+ //Object3D copy = editWindow.copy;
	15364	+ if (object.doEditClick(//clickInfo,
	15365	+ 0))
12616	15366	{
12617	15367	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
12618	15368	} else
..	..	@@ -12624,7 +15374,17 @@
12624	15374
12625	15375	public void mouseReleased(MouseEvent e)
12626	15376	{
	15377	+ if (isRenderer && !movingcamera)
	15378	+ {
	15379	+ RigidBody.justclicked = true;
	15380	+ System.out.println("justclicked: " + e);
	15381	+ }
	15382	+
	15383	+ Globals.MOUSEDRAGGED = false;
	15384	+
12627	15385	movingcamera = false;
	15386	+ X = 0; // getBounds().width/2;
	15387	+ Y = 0; // getBounds().height/2;
12628	15388	//System.out.println("mouseReleased: " + e);
12629	15389	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
12630	15390	}
..	..	@@ -12647,9 +15407,9 @@
12647	15407	boolean control = ((modifiers & CTRL) != 0); // june 2013: for point selection
12648	15408	boolean command = ((modifiers & COMMAND) != 0); // june 2013: for multiple selection
12649	15409
12650		- if (control \|\| command \|\| IsFrozen())
	15410	+// No delay if (control \|\| command \|\| IsFrozen())
12651	15411	timeout = true;
12652		- else
	15412	+// ?? May 2019 else
12653	15413	// timer.setDelay((modifiers & 128) != 0?0:350);
12654	15414	mouseDown = false;
12655	15415	if (!control && !command) // june 2013
..	..	@@ -12759,7 +15519,7 @@
12759	15519	System.out.println("keyReleased: " + e);
12760	15520	}
12761	15521
12762		- void SetMouseMode(int modifiers)
	15522	+ void SetMouseMode(int modifiers, int modifiersex)
12763	15523	{
12764	15524	//System.out.println("SetMouseMode = " + modifiers);
12765	15525	//modifiers &= ~1024;
..	..	@@ -12771,24 +15531,30 @@
12771	15531	//if (modifiers == 0) // \|\| (modifiers == (1024 \| CONTROL)))
12772	15532	// return;
12773	15533	//System.out.println("SetMode = " + modifiers);
12774		- if ((modifiers & WHEEL) == WHEEL)
	15534	+ if ((modifiersex & WHEEL) == WHEEL)
12775	15535	{
12776	15536	mouseMode \|= ZOOM;
12777	15537	}
12778		- if ((modifiers & META) == META)
	15538	+
	15539	+ //boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
	15540	+ boolean vr = capsLocked && !lightMode;
	15541	+
	15542	+ if (vr) // \|\| (modifiers & META) == META)
12779	15543	{
12780	15544	mouseMode \|= VR; // BACKFORTH;
12781	15545	}
12782		- if ((modifiers & CTRLCLICK) == CTRLCLICK)
12783		- {
12784		- mouseMode \|= SELECT; // BACKFORTH;
12785		- }
12786		- if ((modifiers & COMMAND) == COMMAND)
	15546	+ if ((modifiersex & CTRLCLICK) == CTRLCLICK)
12787	15547	{
12788	15548	mouseMode \|= SELECT;
12789	15549	}
12790		- if ((modifiers & SHIFT) == SHIFT \|\| forcetranslate)
	15550	+ if ((modifiersex & COMMAND) == COMMAND)
12791	15551	{
	15552	+ mouseMode \|= SELECT;
	15553	+ }
	15554	+ if (//(modifiersex & SHIFT) == SHIFT \|\|
	15555	+ forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
	15556	+ {
	15557	+ mouseMode &= ~VR;
12792	15558	mouseMode \|= TRANSLATE;
12793	15559	}
12794	15560	// if ((modifiers & SHIFT_META) == SHIFT_META)
..	..	@@ -12815,10 +15581,10 @@
12815	15581
12816	15582	if (isRenderer) //
12817	15583	{
12818		- SetMouseMode(modifiers);
	15584	+ SetMouseMode(0, modifiers);
12819	15585	}
12820	15586
12821		- theRenderer.keyPressed(key);
	15587	+ Globals.theRenderer.keyPressed(key);
12822	15588	}
12823	15589
12824	15590	int kompactbit = 4; // power bit
..	..	@@ -12830,8 +15596,18 @@
12830	15596	float SATPOW = 1; // 2; // 0.5f;
12831	15597	float BRIPOW = 1; // 0.5f; // 0.5f;
12832	15598
12833		- void keyPressed(int key)
	15599	+static BufferedImage cursorImg = new BufferedImage(16, 16, BufferedImage.TYPE_INT_ARGB);
	15600	+
	15601	+// Create a new blank cursor.
	15602	+static Cursor blankCursor = Toolkit.getDefaultToolkit().createCustomCursor(
	15603	+ cursorImg, new Point(0, 0), "blank cursor");
	15604	+
	15605	+ public void keyPressed(int key)
12834	15606	{
	15607	+// Set the blank cursor to the JFrame.
	15608	+//object.editWindow.frame.
	15609	+ setCursor(blankCursor);
	15610	+
12835	15611	if (key >= '0' && key <= '5')
12836	15612	clampbit = (key-'0');
12837	15613
..	..	@@ -12877,7 +15653,8 @@
12877	15653	// break;
12878	15654	case 'T':
12879	15655	CACHETEXTURE ^= true;
12880		- textures.clear();
	15656	+ texturepigment.clear();
	15657	+ texturebump.clear();
12881	15658	// repaint();
12882	15659	break;
12883	15660	case 'Y':
..	..	@@ -12887,8 +15664,8 @@
12887	15664	case 'K':
12888	15665	KOMPACTTEXTURE ^= true;
12889	15666	//textures.clear();
12890		- break;
12891		- case 'P': // Texture Projection macros
	15667	+ // break;
	15668	+ //case 'P': // Texture Projection macros
12892	15669	// SAVETEXTURE ^= true;
12893	15670	macromode = true;
12894	15671	Udebug = Vdebug = NORMALdebug = false; programInitialized = false;
..	..	@@ -12945,7 +15722,7 @@
12945	15722	case 'B':
12946	15723	BRISMOOTH ^= true;
12947	15724	SHADOWCULLFACE ^= true;
12948		- lighttouched = true;
	15725	+ Globals.lighttouched = true;
12949	15726	repaint();
12950	15727	break;
12951	15728	case 'b':
..	..	@@ -12962,7 +15739,9 @@
12962	15739	case 'E' : COMPACT ^= true;
12963	15740	repaint();
12964	15741	break;
12965		- case 'W' : DEBUGHSB ^= true;
	15742	+ case 'W' : // Wide Window (fullscreen)
	15743	+ //DEBUGHSB ^= true;
	15744	+ ObjEditor.theFrame.ToggleFullScreen();
12966	15745	repaint();
12967	15746	break;
12968	15747	case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
..	..	@@ -12987,8 +15766,8 @@
12987	15766	RevertCamera();
12988	15767	repaint();
12989	15768	break;
	15769	+ //case 'l':
12990	15770	case 'L':
12991		- case 'l':
12992	15771	if (lightMode)
12993	15772	{
12994	15773	lightMode = false;
..	..	@@ -13007,7 +15786,7 @@
13007	15786	targetLookAt.set(manipCamera.lookAt);
13008	15787	repaint();
13009	15788	break;
13010		- case 'p':
	15789	+ case 'P': // p':
13011	15790	// c'est quoi ca au juste? spherical ^= true;
13012	15791	Skinshader ^= true; programInitialized = false;
13013	15792	repaint();
..	..	@@ -13018,7 +15797,8 @@
13018	15797	break;
13019	15798	case 'm':
13020	15799	{
13021		- PrintMemory();
	15800	+ //PrintMemory();
	15801	+ ToggleImageFlip();
13022	15802	break;
13023	15803	}
13024	15804	case 'M':
..	..	@@ -13045,27 +15825,31 @@
13045	15825	repaint();
13046	15826	break;
13047	15827	case 'O':
13048		- drawMode = OCCLUSION;
13049		- repaint();
13050		- break;
	15828	+ // Too dangerous. Use menu. Globals.drawMode = OCCLUSION; // WARNING
	15829	+ //repaint();
	15830	+ //break;
13051	15831	case 'o':
13052	15832	OCCLUSION_CULLING ^= true;
13053	15833	System.out.println("OCCLUSION CULLING = " + OCCLUSION_CULLING);
13054	15834	break;
13055		- case '0': envyoff ^= true; repaint(); break;
	15835	+ //case '0': envyoff ^= true; repaint(); break;
13056	15836	case '1':
13057	15837	case '2':
13058	15838	case '3':
13059	15839	case '4':
13060	15840	case '5':
13061		- newenvy = Character.getNumericValue(key);
13062		- repaint();
13063		- break;
13064	15841	case '6':
13065	15842	case '7':
13066	15843	case '8':
13067	15844	case '9':
13068		- BGcolor = (key - '6')/3.f;
	15845	+ if (true) // envyoff)
	15846	+ {
	15847	+ BGcolor = (key - '1')/8.f;
	15848	+ }
	15849	+ else
	15850	+ {
	15851	+ //newenvy = Character.getNumericValue(key);
	15852	+ }
13069	15853	repaint();
13070	15854	break;
13071	15855	case '!':
..	..	@@ -13131,28 +15915,47 @@
13131	15915	case '_':
13132	15916	kompactbit = 5;
13133	15917	break;
13134		- case '+':
13135		- kompactbit = 6;
13136		- break;
	15918	+// case '+':
	15919	+// kompactbit = 6;
	15920	+// break;
13137	15921	case ' ':
	15922	+ capsLocked ^= true;
	15923	+ repaint();
	15924	+ break;
	15925	+ case 'l':
13138	15926	lightMode ^= true;
13139		- lighttouched = true;
	15927	+ if (lightMode)
	15928	+ {
	15929	+ keepshadow = Globals.RENDERSHADOW;
	15930	+ Globals.RENDERSHADOW = false;
	15931	+ }
	15932	+ else
	15933	+ {
	15934	+ Globals.RENDERSHADOW = keepshadow;
	15935	+ }
	15936	+
	15937	+ Globals.lighttouched = true;
13140	15938	manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
13141	15939	targetLookAt.set(manipCamera.lookAt);
13142	15940	repaint();
13143	15941	break;
13144	15942	//case '`' :
13145	15943	case ESC:
	15944	+ if (FULLSCREEN)
	15945	+ object.editWindow.ToggleFullScreen();
	15946	+ break;
	15947	+ case 'p':
13146	15948	RENDERPROGRAM += 1;
13147	15949	RENDERPROGRAM %= 3;
	15950	+
13148	15951	repaint();
13149	15952	break;
13150	15953	case 'Z':
13151		- RESIZETEXTURE ^= true;
13152		- break;
	15954	+ //RESIZETEXTURE ^= true;
	15955	+ //break;
13153	15956	case 'z':
13154		- RENDERSHADOW ^= true;
13155		- lighttouched = true;
	15957	+ Globals.RENDERSHADOW ^= true;
	15958	+ Globals.lighttouched = true;
13156	15959	repaint();
13157	15960	break;
13158	15961	//case UP:
..	..	@@ -13178,13 +15981,19 @@
13178	15981	FlipTransform();
13179	15982	break;
13180	15983	case ENTER:
13181		- object.editWindow.ScreenFit(); // Edit();
	15984	+ // object.editWindow.ScreenFit(); // Edit();
	15985	+ ToggleLive();
	15986	+ if (capsLocked)
	15987	+ {
	15988	+ Globals.WALK ^= true;
	15989	+ }
13182	15990	break;
13183	15991	case DELETE:
13184	15992	ClearSelection();
13185	15993	break;
13186		- /*
13187	15994	case '+':
	15995	+
	15996	+ /*
13188	15997	//fontsize += 1;
13189	15998	bbzoom *= 2;
13190	15999	repaint();
..	..	@@ -13201,30 +16010,36 @@
13201	16010	case '=':
13202	16011	IncDepth();
13203	16012	//fontsize += 1;
13204		- object.editWindow.refreshContents(true);
	16013	+ object.GetWindow().refreshContents(true);
13205	16014	maskbit = 6;
13206	16015	break;
13207	16016	case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
13208	16017	DecDepth();
13209	16018	maskbit = 5;
13210	16019	//if(fontsize > 1) fontsize -= 1;
13211		- if (object.editWindow == null)
13212		- new Exception().printStackTrace();
13213		- else
13214		- object.editWindow.refreshContents(true);
	16020	+// if (object.editWindow == null)
	16021	+// new Exception().printStackTrace();
	16022	+// else
	16023	+ object.GetWindow().refreshContents(true);
13215	16024	break;
13216	16025	case '{':
13217		- manipCamera.shaper_fovy /= 1.1;
	16026	+ double factor = 1.1;
	16027	+ if (manipCamera.shaper_fovy / factor > 0.1)
	16028	+ manipCamera.shaper_fovy /= factor;
13218	16029	System.out.println("FOV = " + manipCamera.shaper_fovy);
13219	16030	repaint();
13220	16031	break;
13221	16032	case '}':
13222		- manipCamera.shaper_fovy *= 1.1;
	16033	+ factor = 1.1;
	16034	+ if (manipCamera.shaper_fovy * factor < 150)
	16035	+ manipCamera.shaper_fovy *= factor;
13223	16036	System.out.println("FOV = " + manipCamera.shaper_fovy);
13224	16037	repaint();
13225	16038	break;
13226	16039	case '[':
13227		- manipCamera.shaper_fovy /= 1.01;
	16040	+ factor = 1.01;
	16041	+ if (manipCamera.shaper_fovy / factor > 0.1)
	16042	+ manipCamera.shaper_fovy /= factor;
13228	16043	if (false) //manipCamera.hAspect == 0)
13229	16044	{
13230	16045	double x = Math.tan(manipCamera.shaper_fovy * Math.PI / 180 / 2);
..	..	@@ -13240,7 +16055,9 @@
13240	16055	break;
13241	16056	case ']':
13242	16057	//manipCamera.shaper_fovy += (180 - manipCamera.shaper_fovy)*0.1;
13243		- manipCamera.shaper_fovy *= 1.01;
	16058	+ factor = 1.01;
	16059	+ if (manipCamera.shaper_fovy * factor < 150)
	16060	+ manipCamera.shaper_fovy *= factor;
13244	16061	if (false) //manipCamera.hAspect == 0)
13245	16062	{
13246	16063	double x = Math.tan(manipCamera.shaper_fovy * Math.PI / 180 / 2);
..	..	@@ -13266,6 +16083,7 @@
13266	16083	}
13267	16084	//System.out.println("shaper_fovy = " + manipCamera.shaper_fovy);
13268	16085	}
	16086	+
13269	16087	static double OCCLUSIONBOOST = 1; // 0.5;
13270	16088
13271	16089	void keyReleased(int key, int modifiers)
..	..	@@ -13273,102 +16091,117 @@
13273	16091	//mode = ROTATE;
13274	16092	if ((MODIFIERS & COMMAND) == 0) // VR??
13275	16093	{
13276		- SetMouseMode(modifiers);
	16094	+ SetMouseMode(0, modifiers);
13277	16095	}
13278	16096	}
13279	16097
13280		- protected void processKeyEvent(KeyEvent e)
	16098	+ boolean keys[] = new boolean[256];
	16099	+ int speedkey[] = new int[256];
	16100	+ int modifiers = 0;
	16101	+
	16102	+ public void processKeyEvent(KeyEvent e)
13281	16103	{
13282	16104	switch (e.getID())
13283	16105	{
13284	16106	case KeyEvent.KEY_PRESSED:
13285		- if (!autorepeat)
13286		- {
13287		- //System.out.println("processKeyEvent: " + KeyEvent.getKeyText(e.getKeyCode()));
13288		- keyPressed(e.getKeyChar(), e.getModifiersEx());
13289		- }
13290		- if (manipCamera == lightCamera)
13291		- {
13292		- switch (e.getKeyCode())
13293		- {
13294		- case DOWN_ARROW:
13295		- lightCamera.DECAL /= 2;
13296		- repaint();
13297		- break;
13298		- case UP_ARROW:
13299		- lightCamera.DECAL *= 2;
13300		- repaint();
13301		- break;
13302		- case LEFT_ARROW:
13303		- lightCamera.SCALE /= 2;
13304		- repaint();
13305		- break;
13306		- case RIGHT_ARROW:
13307		- lightCamera.SCALE *= 2;
13308		- repaint();
13309		- break;
13310		- default:
13311		- break;
13312		- }
13313		-
13314		- System.out.println("DECAL = " + lightCamera.DECAL + "; SCALE = " + lightCamera.SCALE);
13315		- } else
13316		- {
13317		- if (true) // !autorepeat)
13318		- {
13319		- boolean reset = true;
13320		-
13321		- switch (e.getKeyCode())
13322		- {
13323		- case DOWN_ARROW:
13324		- GoDown(e.getModifiersEx());
13325		- repaint();
13326		- break;
13327		- case UP_ARROW:
13328		- GoUp(e.getModifiersEx());
13329		- repaint();
13330		- break;
13331		- case LEFT_ARROW:
13332		- GoLeft(e.getModifiersEx());
13333		- repaint();
13334		- break;
13335		- case RIGHT_ARROW:
13336		- GoRight(e.getModifiersEx());
13337		- repaint();
13338		- break;
13339		- default:
13340		- reset = false;
13341		- break;
13342		- }
13343		-
13344		- if (reset)
13345		- {
13346		- autorepeat = true;
13347		-
13348		- targetLookAt.set(manipCamera.lookAt);
13349		- }
13350		- }
13351		- }
	16107	+ keys[e.getKeyCode()] = true;
	16108	+ modifiers = e.getModifiersEx();
	16109	+ keyPressed(e.getKeyChar(), modifiers);
	16110	+ //Globals.theRenderer.keyPressed(e.getKeyChar());
	16111	+ repaint();
13352	16112	break;
13353		- case KeyEvent.KEY_TYPED:
13354		- break;
	16113	+// if (!autorepeat)
	16114	+// {
	16115	+// //System.out.println("processKeyEvent: " + KeyEvent.getKeyText(e.getKeyCode()));
	16116	+// keyPressed(e.getKeyChar(), e.getModifiersEx());
	16117	+// }
	16118	+// if (manipCamera == lightCamera)
	16119	+// {
	16120	+// switch (e.getKeyCode())
	16121	+// {
	16122	+// case DOWN_ARROW:
	16123	+// lightCamera.DECAL /= 2;
	16124	+// repaint();
	16125	+// break;
	16126	+// case UP_ARROW:
	16127	+// lightCamera.DECAL *= 2;
	16128	+// repaint();
	16129	+// break;
	16130	+// case LEFT_ARROW:
	16131	+// lightCamera.SCALE /= 2;
	16132	+// repaint();
	16133	+// break;
	16134	+// case RIGHT_ARROW:
	16135	+// lightCamera.SCALE *= 2;
	16136	+// repaint();
	16137	+// break;
	16138	+// default:
	16139	+// break;
	16140	+// }
	16141	+//
	16142	+// System.out.println("DECAL = " + lightCamera.DECAL + "; SCALE = " + lightCamera.SCALE);
	16143	+// } else
	16144	+// {
	16145	+// if (true) // !autorepeat)
	16146	+// {
	16147	+// boolean reset = true;
	16148	+//
	16149	+// switch (e.getKeyCode())
	16150	+// {
	16151	+// case DOWN_ARROW:
	16152	+// GoDown(e.getModifiersEx());
	16153	+// repaint();
	16154	+// break;
	16155	+// case UP_ARROW:
	16156	+// GoUp(e.getModifiersEx());
	16157	+// repaint();
	16158	+// break;
	16159	+// case LEFT_ARROW:
	16160	+// GoLeft(e.getModifiersEx());
	16161	+// repaint();
	16162	+// break;
	16163	+// case RIGHT_ARROW:
	16164	+// GoRight(e.getModifiersEx());
	16165	+// repaint();
	16166	+// break;
	16167	+// default:
	16168	+// reset = false;
	16169	+// break;
	16170	+// }
	16171	+//
	16172	+// if (reset)
	16173	+// {
	16174	+// autorepeat = true;
	16175	+//
	16176	+// targetLookAt.set(manipCamera.lookAt);
	16177	+// }
	16178	+// }
	16179	+// }
	16180	+// break;
	16181	+// case KeyEvent.KEY_TYPED:
	16182	+// break;
13355	16183	case KeyEvent.KEY_RELEASED:
13356		- {
13357		- switch (e.getKeyCode())
13358		- {
13359		- case DOWN_ARROW:
13360		- case UP_ARROW:
13361		- case LEFT_ARROW:
13362		- case RIGHT_ARROW:
13363		- MODIFIERS &= ~COMMAND;
13364		- autorepeat = false;
13365		- break;
13366		- default:
13367		- break;
13368		- }
	16184	+ keys[e.getKeyCode()] = false;
	16185	+ modifiers = e.getModifiersEx();
13369	16186	keyReleased(e.getKeyChar(), e.getModifiersEx());
	16187	+ repaint();
13370	16188	break;
13371		- }
	16189	+// {
	16190	+// switch (e.getKeyCode())
	16191	+// {
	16192	+// case DOWN_ARROW:
	16193	+// case UP_ARROW:
	16194	+// case LEFT_ARROW:
	16195	+// case RIGHT_ARROW:
	16196	+// MODIFIERS &= ~COMMAND;
	16197	+// autorepeat = false;
	16198	+// break;
	16199	+// default:
	16200	+// break;
	16201	+// }
	16202	+// keyReleased(e.getKeyChar(), e.getModifiersEx());
	16203	+// break;
	16204	+// }
13372	16205	default:
13373	16206	break;
13374	16207	}
..	..	@@ -13407,8 +16240,9 @@
13407	16240
13408	16241	protected void processMouseMotionEvent(MouseEvent e)
13409	16242	{
13410		- //System.out.println("processMouseMotionEvent: " + mouseMode);
13411		- if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
	16243	+ //System.out.println("processMouseMotionEvent: " + mouseMode + " " + e.getModifiers() + " " + e.getModifiersEx() + " " + e.getButton());
	16244	+ //if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
	16245	+ if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (e.getModifiers() & MouseEvent.BUTTON3_MASK) == 0 && (mouseMode & SELECT) == 0)
13412	16246	{
13413	16247	mouseMoved(e);
13414	16248	} else
..	..	@@ -13433,11 +16267,12 @@
13433	16267	}
13434	16268	*/
13435	16269
13436		- object.editWindow.EditSelection();
	16270	+ object.GetWindow().EditSelection(false);
13437	16271	}
13438	16272
13439	16273	void SelectParent()
13440	16274	{
	16275	+ new Exception().printStackTrace();
13441	16276	System.exit(0);
13442	16277	Composite group = (Composite) object;
13443	16278	java.util.Vector selectees = new java.util.Vector(group.selection);
..	..	@@ -13449,10 +16284,10 @@
13449	16284	{
13450	16285	//selectees.remove(i);
13451	16286	System.out.println("select parent of " + elem);
13452		- group.editWindow.Select(elem.parent.GetTreePath(), first, true);
	16287	+ group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
13453	16288	} else
13454	16289	{
13455		- group.editWindow.Select(elem.GetTreePath(), first, true);
	16290	+ group.GetWindow().Select(elem.GetTreePath(), first, true);
13456	16291	}
13457	16292
13458	16293	first = false;
..	..	@@ -13461,6 +16296,7 @@
13461	16296
13462	16297	void SelectChildren()
13463	16298	{
	16299	+ new Exception().printStackTrace();
13464	16300	System.exit(0);
13465	16301	/*
13466	16302	Composite group = (Composite) object;
..	..	@@ -13493,12 +16329,12 @@
13493	16329	for (int j = 0; j < group.children.size(); j++)
13494	16330	{
13495	16331	elem = (Object3D) group.children.elementAt(j);
13496		- object.editWindow.Select(elem.GetTreePath(), first, true);
	16332	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
13497	16333	first = false;
13498	16334	}
13499	16335	} else
13500	16336	{
13501		- object.editWindow.Select(elem.GetTreePath(), first, true);
	16337	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
13502	16338	}
13503	16339
13504	16340	first = false;
..	..	@@ -13509,21 +16345,21 @@
13509	16345	{
13510	16346	//Composite group = (Composite) object;
13511	16347	Object3D group = object;
13512		- group.editWindow.loadClipboard(true); // ClearSelection(false);
	16348	+ group.GetWindow().loadClipboard(true); // ClearSelection(false);
13513	16349	}
13514	16350
13515	16351	void ResetTransform(int mask)
13516	16352	{
13517	16353	//Composite group = (Composite) object;
13518	16354	Object3D group = object;
13519		- group.editWindow.ResetTransform(mask);
	16355	+ group.GetWindow().ResetTransform(mask);
13520	16356	}
13521	16357
13522	16358	void FlipTransform()
13523	16359	{
13524	16360	//Composite group = (Composite) object;
13525	16361	Object3D group = object;
13526		- group.editWindow.FlipTransform();
	16362	+ group.GetWindow().FlipTransform();
13527	16363	// group.editWindow.ReduceMesh(true);
13528	16364	}
13529	16365
..	..	@@ -13531,7 +16367,7 @@
13531	16367	{
13532	16368	//Composite group = (Composite) object;
13533	16369	Object3D group = object;
13534		- group.editWindow.PrintMemory();
	16370	+ group.GetWindow().PrintMemory();
13535	16371	// group.editWindow.ReduceMesh(true);
13536	16372	}
13537	16373
..	..	@@ -13539,7 +16375,7 @@
13539	16375	{
13540	16376	//Composite group = (Composite) object;
13541	16377	Object3D group = object;
13542		- group.editWindow.ResetCentroid();
	16378	+ group.GetWindow().ResetCentroid();
13543	16379	}
13544	16380
13545	16381	void IncDepth()
..	..	@@ -13621,11 +16457,11 @@
13621	16457
13622	16458	int width = getBounds().width;
13623	16459	int height = getBounds().height;
13624		- ClickInfo info = new ClickInfo();
13625		- info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
13626	16460	//Image img = CreateImage(width, height);
13627	16461	//System.out.println("width = " + width + "; height = " + height + "\n");
	16462	+
13628	16463	Graphics gr = g; // img.getGraphics();
	16464	+
13629	16465	if (!hasMarquee)
13630	16466	{
13631	16467	if (Xmin < Xmax) // !locked)
..	..	@@ -13697,44 +16533,92 @@
13697	16533	}
13698	16534	if (object != null && !hasMarquee)
13699	16535	{
	16536	+ if (object.clickInfo == null)
	16537	+ object.clickInfo = new ClickInfo();
	16538	+ ClickInfo info = object.clickInfo;
	16539	+ //ClickInfo info = new ClickInfo();
	16540	+ info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
	16541	+
13700	16542	if (isRenderer)
13701	16543	{
13702		- info.flags++;
	16544	+ object.clickInfo.flags++;
13703	16545	double frameAspect = (double) width / (double) height;
13704	16546	if (frameAspect > renderCamera.aspect)
13705	16547	{
13706	16548	int desired = (int) ((double) height * renderCamera.aspect);
13707		- info.bounds.width -= width - desired;
13708		- info.bounds.x += (width - desired) / 2;
	16549	+ object.clickInfo.bounds.width -= width - desired;
	16550	+ object.clickInfo.bounds.x += (width - desired) / 2;
13709	16551	} else
13710	16552	{
13711	16553	int desired = (int) ((double) width / renderCamera.aspect);
13712		- info.bounds.height -= height - desired;
13713		- info.bounds.y += (height - desired) / 2;
	16554	+ object.clickInfo.bounds.height -= height - desired;
	16555	+ object.clickInfo.bounds.y += (height - desired) / 2;
13714	16556	}
13715	16557	}
13716		- info.g = gr;
13717		- info.camera = renderCamera;
	16558	+
	16559	+ object.clickInfo.g = gr;
	16560	+ object.clickInfo.camera = renderCamera;
13718	16561	/*
13719	16562	// Memory intensive (brep.verticescopy)
13720	16563	if (!(object instanceof Composite))
13721	16564	object.draw(info, 0, false); // SLOW :
13722	16565	*/
13723		- if (!isRenderer)
	16566	+ if (!isRenderer) // && drag)
13724	16567	{
13725		- object.drawEditHandles(info, 0);
	16568	+ Grafreed.Assert(object != null);
	16569	+ Grafreed.Assert(object.selection != null);
	16570	+ if (object.selection.Size() > 0)
	16571	+ {
	16572	+ int hitSomething = object.selection.get(0).hitSomething;
	16573	+
	16574	+ object.clickInfo.DX = 0;
	16575	+ object.clickInfo.DY = 0;
	16576	+ object.clickInfo.W = 1;
	16577	+ if (hitSomething == Object3D.hitCenter)
	16578	+ {
	16579	+ info.DX = X;
	16580	+ if (X != 0)
	16581	+ info.DX -= info.bounds.width/2;
	16582	+
	16583	+ info.DY = Y;
	16584	+ if (Y != 0)
	16585	+ info.DY -= info.bounds.height/2;
	16586	+ }
	16587	+
	16588	+ object.drawEditHandles(//info,
	16589	+ 0);
	16590	+
	16591	+ if (drag && (X != 0 \|\| Y != 0))
	16592	+ {
	16593	+ switch (hitSomething)
	16594	+ {
	16595	+ case Object3D.hitCenter: gr.setColor(Color.white);
	16596	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16597	+ break;
	16598	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	16599	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16600	+ break;
	16601	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	16602	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16603	+ break;
	16604	+ }
	16605	+
	16606	+ }
	16607	+ }
13726	16608	}
13727	16609	}
	16610	+
13728	16611	if (isRenderer)
13729	16612	{
13730	16613	//gr.setColor(Color.black);
13731	16614	//gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
13732	16615	//gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
13733	16616	}
	16617	+
13734	16618	if (hasMarquee)
13735	16619	{
13736	16620	gr.setXORMode(Color.white);
13737		- gr.setColor(Color.red);
	16621	+ gr.setColor(Color.white);
13738	16622	if (!firstime)
13739	16623	{
13740	16624	gr.drawRect(prevmarqX, prevmarqY, prevmarqW, prevmarqH);
..	..	@@ -13753,6 +16637,7 @@
13753	16637	//if (g != gr) g.drawImage(img, 0, 0, width, height, null);
13754	16638	}
13755	16639
	16640	+ // To avoid clear.
13756	16641	public void update(Graphics g)
13757	16642	{
13758	16643	paint(g);
..	..	@@ -13842,6 +16727,7 @@
13842	16727	public boolean mouseDown(Event evt, int x, int y)
13843	16728	{
13844	16729	System.out.println("mouseDown: " + evt);
	16730	+ System.exit(0);
13845	16731	/*
13846	16732	locked = true;
13847	16733	drag = false;
..	..	@@ -13885,13 +16771,14 @@
13885	16771	{
13886	16772	keyPressed(0, modifiers);
13887	16773	}
13888		- clickStart(x, y, modifiers);
	16774	+ // clickStart(x, y, modifiers);
13889	16775	return true;
13890	16776	}
13891	16777
13892	16778	public boolean mouseDrag(Event evt, int x, int y)
13893	16779	{
13894		- //System.out.println("mouseDrag: " + evt);
	16780	+ System.out.println("mouseDrag: " + evt);
	16781	+ System.exit(0);
13895	16782	/*
13896	16783	drag = true;
13897	16784	//System.out.println("Mouse DRAG");
..	..	@@ -14003,13 +16890,14 @@
14003	16890	{
14004	16891	keyReleased(0, 0);
14005	16892	}
14006		- drag(x, y, modifiers);
	16893	+ drag(x, y, 0, modifiers);
14007	16894	return true;
14008	16895	}
14009	16896
14010	16897	public boolean mouseUp(Event evt, int x, int y)
14011	16898	{
14012	16899	System.out.println("mouseUp: " + evt);
	16900	+ System.exit(0);
14013	16901	/*
14014	16902	locked = false;
14015	16903	if (isRenderer)
..	..	@@ -14135,7 +17023,7 @@
14135	17023	Object3D object;
14136	17024	static Object3D trackedobject;
14137	17025	Camera renderCamera; // Light or Eye (or Occlusion)
14138		- /static/ Camera manipCamera; // Light or Eye
	17026	+ /static/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
14139	17027	/static/ Camera eyeCamera;
14140	17028	/static/ Camera lightCamera;
14141	17029	int cameracount;
..	..	@@ -14199,6 +17087,8 @@
14199	17087	private /static/ boolean firstime;
14200	17088	private /static/ cVector newView = new cVector();
14201	17089	private static final String[] suffixes = {"posx", "negx", "posy", "negy", "posz", "negz"};
	17090	+ private static final String[] suffixes2 = {"east", "west", "top", "bottom", "north", "south"};
	17091	+ private static final String[] suffixes3 = {"ft", "bk", "up", "dn", "rt", "lf"};
14202	17092	private static final int[] targets = {GL.GL_TEXTURE_CUBE_MAP_POSITIVE_X,
14203	17093	GL.GL_TEXTURE_CUBE_MAP_NEGATIVE_X,
14204	17094	GL.GL_TEXTURE_CUBE_MAP_POSITIVE_Y,
..	..	@@ -14211,36 +17101,74 @@
14211	17101	{
14212	17102	com.sun.opengl.util.texture.Texture cubemap = TextureIO.newTexture(GL.GL_TEXTURE_CUBE_MAP);
14213	17103
	17104	+ int usedsuf = 0;
	17105	+
14214	17106	for (int i = 0; i < suffixes.length; i++)
14215	17107	{
14216		- String resourceName = basename + suffixes[i] + "." + suffix;
14217		- TextureData data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
14218		- mipmapped,
14219		- FileUtil.getFileSuffix(resourceName));
14220		- if (data == null)
	17108	+ String[] suffixe = suffixes;
	17109	+ String[] fallback = suffixes2;
	17110	+ String[] fallfallback = suffixes3;
	17111	+
	17112	+ for (int c=usedsuf; --c>=0;)
14221	17113	{
14222		- throw new IOException("Unable to load texture " + resourceName);
	17114	+// String[] temp = suffixe;
	17115	+// suffixe = fallback;
	17116	+// fallback = fallfallback;
	17117	+// fallfallback = temp;
14223	17118	}
	17119	+
	17120	+ String resourceName = basename + suffixe[i] + "." + suffix;
	17121	+ TextureData data;
	17122	+
	17123	+ try
	17124	+ {
	17125	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	17126	+ mipmapped,
	17127	+ FileUtil.getFileSuffix(resourceName));
	17128	+ }
	17129	+ catch (Exception e)
	17130	+ {
	17131	+ try
	17132	+ {
	17133	+ resourceName = basename + fallback[i] + "." + suffix;
	17134	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	17135	+ mipmapped,
	17136	+ FileUtil.getFileSuffix(resourceName));
	17137	+ }
	17138	+ catch (Exception e2)
	17139	+ {
	17140	+ resourceName = basename + fallfallback[i] + "." + suffix;
	17141	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	17142	+ mipmapped,
	17143	+ FileUtil.getFileSuffix(resourceName));
	17144	+ }
	17145	+ }
	17146	+
14224	17147	//System.out.println("Target = " + targets[i]);
14225	17148	cubemap.updateImage(data, targets[i]);
14226	17149	}
14227	17150
14228	17151	return cubemap;
14229	17152	}
	17153	+
14230	17154	int bigsphere = -1;
14231	17155
14232	17156	float BGcolor = 0.5f;
14233	17157
14234		- private void DrawSkyBox(GL gl)
	17158	+ float ambientLight[] = {1f, 1f, 1f, 1.0f};
	17159	+
	17160	+ private void DrawSkyBox(GL gl, float ratio)
14235	17161	{
14236		- if (envyoff \|\| cubemap == null)
	17162	+ if (//envyoff \|\|
	17163	+ WIREFRAME \|\|
	17164	+ cubemap == null)
14237	17165	{
14238	17166	gl.glClearColor(BGcolor, BGcolor, BGcolor, 1);
14239	17167	gl.glClear(gl.GL_COLOR_BUFFER_BIT);
14240	17168	return;
14241	17169	}
14242	17170
14243		- if (WIREFRAME)
	17171	+ //if (WIREFRAME)
14244	17172	gl.glPolygonMode(gl.GL_FRONT_AND_BACK, gl.GL_FILL);
14245	17173
14246	17174	gl.glDisable(gl.GL_CULL_FACE);
..	..	@@ -14248,7 +17176,17 @@
14248	17176	// Compensates for ExaminerViewer's modification of modelview matrix
14249	17177	gl.glMatrixMode(GL.GL_MODELVIEW);
14250	17178	gl.glLoadIdentity();
	17179	+ gl.glScalef(1,ratio,1);
14251	17180
	17181	+// colorV[0] = 2;
	17182	+// colorV[1] = 2;
	17183	+// colorV[2] = 2;
	17184	+// colorV[3] = 1;
	17185	+// gl.glDisable(gl.GL_COLOR_MATERIAL);
	17186	+// gl.glMaterialfv(gl.GL_FRONT_AND_BACK, gl.GL_AMBIENT, colorV, 0);
	17187	+//
	17188	+// gl.glLightModelfv(gl.GL_LIGHT_MODEL_AMBIENT, ambientLight, 0);
	17189	+
14252	17190	//gl.glActiveTexture(GL.GL_TEXTURE1);
14253	17191	//gl.glDisable(GL.GL_TEXTURE_CUBE_MAP);
14254	17192
..	..	@@ -14280,6 +17218,7 @@
14280	17218	{
14281	17219	gl.glScalef(1.0f, -1.0f, 1.0f);
14282	17220	}
	17221	+ gl.glScalef(-1.0f, 1.0f, 1.0f);
14283	17222	gl.glMultMatrixd(viewrot_1, 0);
14284	17223	gl.glTranslatef(0, 0, 0.5f); // (float)lightCamera.Distance()); // 0.5f);
14285	17224	//viewer.updateInverseRotation(gl);
..	..	@@ -14320,7 +17259,8 @@
14320	17259	gl.glDisable(GL.GL_TEXTURE_GEN_R);
14321	17260
14322	17261	cubemap.disable();
14323		- ////cubemap.unbind();
	17262	+ //cubemap.dispose();
	17263	+
14324	17264	if (CULLFACE)
14325	17265	{
14326	17266	gl.glEnable(gl.GL_CULL_FACE);
..	..	@@ -14328,6 +17268,8 @@
14328	17268
14329	17269	if (WIREFRAME)
14330	17270	gl.glPolygonMode(gl.GL_FRONT_AND_BACK, gl.GL_LINE);
	17271	+ else
	17272	+ gl.glPolygonMode(gl.GL_FRONT_AND_BACK, gl.GL_FILL);
14331	17273	}
14332	17274
14333	17275	private void DrawChecker(GL gl)
..	..	@@ -14355,7 +17297,7 @@
14355	17297	gl.glPushAttrib(GL.GL_ALL_ATTRIB_BITS);
14356	17298	gl.glPushMatrix();
14357	17299	gl.glLoadIdentity();
14358		- PushMatrix(checker.toParent);
	17300	+ //PushMatrix(checker.toParent);
14359	17301
14360	17302	gl.glMatrixMode(GL.GL_TEXTURE);
14361	17303	gl.glPushMatrix();
..	..	@@ -14376,10 +17318,10 @@
14376	17318	gl.glScalef(1.0f, -1.0f, 1.0f);
14377	17319	}
14378	17320
14379		- gl.glNormal3f(0.0f, 0.0f, 1.0f);
	17321	+ SetGLNormal(gl, 0.0f, 0.0f, 1.0f);
14380	17322
14381		- float step = 0.1666f; //0.25f;
14382		- float stepv = step * 1652 / 998;
	17323	+ float step = 2; // 0.1666f; //0.25f;
	17324	+ float stepv = 2; // step * 1652 / 998;
14383	17325
14384	17326	int i0 = 0;
14385	17327	/*
..	..	@@ -14415,20 +17357,21 @@
14415	17357	/**/
14416	17358	//checker.GetMaterial().opacity = 1.1f;
14417	17359	////checker.GetMaterial().ambient = 0.99f;
14418		- Object3D.materialstack[Object3D.materialdepth] = checker.material;
14419		- Object3D.selectedstack[Object3D.materialdepth] = false;
14420		- cStatic.objectstack[Object3D.materialdepth++] = checker;
	17360	+ materialstack[materialdepth] = checker.material;
	17361	+ selectedstack[materialdepth] = false;
	17362	+ cStatic.objectstack[materialdepth++] = checker;
14421	17363	//System.out.println("material " + material);
14422	17364	//Applet3D.tracein(this, selected);
14423		- vector2buffer = checker.projectedVertices;
	17365	+ //vector2buffer = checker.projectedVertices;
14424	17366
14425		- checker.GetMaterial().Draw(this, false); // true);
	17367	+ //checker.GetMaterial().Draw(this, false); // true);
	17368	+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
14426	17369
14427		- Object3D.materialdepth -= 1;
14428		- if (Object3D.materialdepth > 0)
	17370	+ materialdepth -= 1;
	17371	+ if (materialdepth > 0)
14429	17372	{
14430		- vector2buffer = cStatic.objectstack[Object3D.materialdepth - 1].projectedVertices;
14431		- Object3D.materialstack[Object3D.materialdepth - 1].Draw(this, Object3D.selectedstack[Object3D.materialdepth - 1]);
	17373	+ //vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	17374	+ DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
14432	17375	}
14433	17376	//checker.GetMaterial().opacity = 1f;
14434	17377	////checker.GetMaterial().ambient = 1f;
..	..	@@ -14449,15 +17392,27 @@
14449	17392
14450	17393	//float u = (i+1)/2;
14451	17394	//float v = (j+1)/2;
14452		- gl.glTexCoord2f((i + 1) / 2, (j + 1) / 2); // (1,0) // (i+1+step)/2,(j+1)/2);
	17395	+ if (checker.flipV)
	17396	+ gl.glTexCoord2f((i + 1) / 2, 1 - (j + 1) / 2);
	17397	+ else
	17398	+ gl.glTexCoord2f((i + 1) / 2, (j + 1) / 2); // (1,0) // (i+1+step)/2,(j+1)/2);
14453	17399	gl.glVertex3f(i, j, -0.5f);
14454	17400
	17401	+ if (checker.flipV)
	17402	+ gl.glTexCoord2f((i + 1 + step) / 2, 1 - (j + 1) / 2); // (1,1) // (i+1+step)/2,(j+1+step)/2);
	17403	+ else
14455	17404	gl.glTexCoord2f((i + 1 + step) / 2, (j + 1) / 2); // (1,1) // (i+1+step)/2,(j+1+step)/2);
14456	17405	gl.glVertex3f(i + step, j, -0.5f);
14457	17406
	17407	+ if (checker.flipV)
	17408	+ gl.glTexCoord2f((i + 1 + step) / 2, 1 - (j + 1 + stepv) / 2); // (0,1) //(i+1)/2,(j+1+step)/2);
	17409	+ else
14458	17410	gl.glTexCoord2f((i + 1 + step) / 2, (j + 1 + stepv) / 2); // (0,1) //(i+1)/2,(j+1+step)/2);
14459	17411	gl.glVertex3f(i + step, j + stepv, -0.5f);
14460	17412
	17413	+ if (checker.flipV)
	17414	+ gl.glTexCoord2f((i + 1) / 2, 1 - (j + 1 + stepv) / 2); // (0,0) //(i+1)/2,(j+1)/2);
	17415	+ else
14461	17416	gl.glTexCoord2f((i + 1) / 2, (j + 1 + stepv) / 2); // (0,0) //(i+1)/2,(j+1)/2);
14462	17417	gl.glVertex3f(i, j + stepv, -0.5f);
14463	17418	}
..	..	@@ -14469,7 +17424,7 @@
14469	17424	gl.glMatrixMode(GL.GL_PROJECTION);
14470	17425	gl.glPopMatrix();
14471	17426	gl.glMatrixMode(GL.GL_MODELVIEW);
14472		- PopMatrix(null); // checker.toParent); // null);
	17427	+ //PopMatrix(null); // checker.toParent); // null);
14473	17428	gl.glPopMatrix();
14474	17429	PopTextureMatrix(checker.toParent);
14475	17430	gl.glMatrixMode(GL.GL_TEXTURE);
..	..	@@ -14502,6 +17457,14 @@
14502	17457	}
14503	17458	}
14504	17459
	17460	+ private Object3D GetFolder()
	17461	+ {
	17462	+ Object3D folder = object.GetWindow().copy;
	17463	+ if (object.GetWindow().copy.selection.Size() > 0)
	17464	+ folder = object.GetWindow().copy.selection.elementAt(0);
	17465	+ return folder;
	17466	+ }
	17467	+
14505	17468	class SelectBuffer implements GLEventListener
14506	17469	{
14507	17470
..	..	@@ -14517,7 +17480,7 @@
14517	17480	//new Exception().printStackTrace();
14518	17481	System.out.println("select buffer init");
14519	17482	// Use debug pipeline
14520		- drawable.setGL(new DebugGL(drawable.getGL()));
	17483	+ //drawable.setGL(new DebugGL(drawable.getGL()));
14521	17484
14522	17485	GL gl = drawable.getGL();
14523	17486
..	..	@@ -14560,6 +17523,7 @@
14560	17523	{
14561	17524	if (!selection)
14562	17525	{
	17526	+ new Exception().printStackTrace();
14563	17527	System.exit(0);
14564	17528	return;
14565	17529	}
..	..	@@ -14580,17 +17544,39 @@
14580	17544
14581	17545	//gl.glDisable(GL.GL_POLYGON_OFFSET_FILL);
14582	17546
	17547	+ if (PAINTMODE)
	17548	+ {
	17549	+ if (object.GetWindow().copy.selection.Size() > 0)
	17550	+ {
	17551	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	17552	+
	17553	+ // Make what you paint not selectable.
	17554	+ paintobj.ResetSelectable();
	17555	+ }
	17556	+ }
	17557	+
14583	17558	//int tmp = selection_view;
14584	17559	//selection_view = -1;
14585		- int temp = drawMode;
14586		- drawMode = SELECTION;
	17560	+ int temp = DrawMode();
	17561	+ Globals.drawMode = SELECTION; // WARNING
14587	17562	indexcount = 0;
14588	17563	parent.display(drawable);
14589	17564	//selection_view = tmp;
14590	17565	//if (temp == SELECTION)
14591	17566	// temp = DEFAULT; // patch for selection debug
14592		- drawMode = temp;
	17567	+ Globals.drawMode = temp; // WARNING
14593	17568
	17569	+ if (PAINTMODE)
	17570	+ {
	17571	+ if (object.GetWindow().copy.selection.Size() > 0)
	17572	+ {
	17573	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	17574	+
	17575	+ // Revert.
	17576	+ paintobj.RestoreSelectable();
	17577	+ }
	17578	+ }
	17579	+
14594	17580	//gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
14595	17581
14596	17582	// trying different ways of getting the depth info over
..	..	@@ -14621,7 +17607,7 @@
14621	17607
14622	17608	float depth = depths[y * TEX_SIZE + x];
14623	17609
14624		- if (pointselection && mouseMode == SELECT && depth != 0 && depth != 1)
	17610	+ if (pointselection && (mouseMode & SELECT) == SELECT && depth != 0 && depth != 1)
14625	17611	{
14626	17612	pointselection = false;
14627	17613
..	..	@@ -14638,6 +17624,13 @@
14638	17624	// System.err.println("view = " + view[4] + " " + view[5] + " " + view[6] + " " + view[7]);
14639	17625	// System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
14640	17626	// System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
	17627	+
	17628	+ CreateSelectedPoint();
	17629	+
	17630	+ // Will fit the mesh !!!
	17631	+ selectedpoint.toParent[0][0] = 0.0001;
	17632	+ selectedpoint.toParent[1][1] = 0.0001;
	17633	+ selectedpoint.toParent[2][2] = 0.0001;
14641	17634
14642	17635	glu.gluUnProject(x,y,depth,view,0,tempmat2,0,viewport,0,selectedpoint.toParent[3],0);
14643	17636
..	..	@@ -14682,34 +17675,36 @@
14682	17675	System.out.println("; fromto " + sel + " " + Trunk(previousselectedpoint.toParent[3][0]) + " " + Trunk(previousselectedpoint.toParent[3][2]) + " " + Trunk(selectedpoint.toParent[3][0]) + " " + Trunk(selectedpoint.toParent[3][2]));
14683	17676	}
14684	17677
14685		- previousselectedpoint = (Sphere) GraphreeD.clone(selectedpoint);
	17678	+ previousselectedpoint = (Sphere) Grafreed.clone(selectedpoint);
14686	17679	}
14687	17680	}
14688	17681
14689	17682	if (!movingcamera && !PAINTMODE)
14690		- object.editWindow.ScreenFitPoint(); // fev 2014
	17683	+ object.GetWindow().ScreenFitPoint(); // fev 2014
14691	17684
14692		- if (PAINTMODE && GraphreeD.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	17685	+ if (PAINTMODE) // && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
14693	17686	{
14694		- Object3D paintobj = GraphreeD.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
	17687	+ //Object3D paintobj; // = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
14695	17688
14696		- Object3D group = new Object3D("inst" + paintcount++);
	17689	+ if (object.GetWindow().copy.selection.Size() > 0)
	17690	+ {
	17691	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
14697	17692
14698		- group.CreateMaterial(); // use a void leaf to select instances
14699		-
14700		- group.add(paintobj); // link
14701		-
14702		- object.editWindow.SnapObject(group);
14703		-
14704		- Object3D folder = object.editWindow.copy;
14705		-
14706		- if (object.editWindow.copy.selection.Size() > 0)
14707		- folder = object.editWindow.copy.selection.elementAt(0);
14708		-
14709		- folder.add(group);
14710		-
14711		- object.editWindow.ResetModel();
14712		- object.editWindow.refreshContents();
	17693	+ Object3D inst = new Object3D("inst" + paintcount++);
	17694	+
	17695	+ inst.CreateMaterial(); // use a void leaf to select instances
	17696	+
	17697	+ inst.add(paintobj); // link
	17698	+
	17699	+ object.GetWindow().SnapObject(inst);
	17700	+
	17701	+ Object3D folder = paintFolder; // GetFolder();
	17702	+
	17703	+ folder.add(inst);
	17704	+
	17705	+ object.GetWindow().ResetModel();
	17706	+ object.GetWindow().refreshContents();
	17707	+ }
14713	17708	}
14714	17709	else
14715	17710	paintcount = 0;
..	..	@@ -14748,6 +17743,11 @@
14748	17743	//System.out.println("objects[color] = " + objects[color]);
14749	17744	//objects[color].Select();
14750	17745	indexcount = 0;
	17746	+ ObjEditor window = object.GetWindow();
	17747	+ if (window != null && deselect)
	17748	+ {
	17749	+ window.Select(null, deselect, true);
	17750	+ }
14751	17751	object.Select(color, deselect);
14752	17752	}
14753	17753
..	..	@@ -14798,6 +17798,7 @@
14798	17798
14799	17799	public void init(GLAutoDrawable drawable)
14800	17800	{
	17801	+ if (Globals.DEBUG)
14801	17802	System.out.println("shadow buffer init");
14802	17803
14803	17804	GL gl = drawable.getGL();
..	..	@@ -14847,7 +17848,7 @@
14847	17848	gl.glDisable(gl.GL_CULL_FACE);
14848	17849	}
14849	17850
14850		- if (!RENDERSHADOW)
	17851	+ if (!Globals.RENDERSHADOW)
14851	17852	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
14852	17853
14853	17854	// SB gl.glPolygonOffset(2.5f, 10);
..	..	@@ -14857,14 +17858,14 @@
14857	17858	//gl.glColorMask(false, false, false, false);
14858	17859
14859	17860	//render_scene_from_light_view(gl, drawable, 0, 0);
14860		- if (RENDERSHADOW && lighttouched && !movingcamera) // && !parent.IsFreezed())
	17861	+ if (Globals.RENDERSHADOW && Globals.lighttouched && (!movingcamera \|\| !Globals.FREEZEONMOVE)) // && !parent.IsFreezed())
14861	17862	{
14862	17863	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
14863	17864
14864		- int temp = drawMode;
14865		- drawMode = SHADOW;
	17865	+ int temp = DrawMode();
	17866	+ Globals.drawMode = SHADOW; // WARNING
14866	17867	parent.display(drawable);
14867		- drawMode = temp;
	17868	+ Globals.drawMode = temp; // WARNING
14868	17869	}
14869	17870
14870	17871	gl.glCullFace(gl.GL_BACK);
..	..	@@ -14917,7 +17918,6 @@
14917	17918
14918	17919	class AntialiasBuffer implements GLEventListener
14919	17920	{
14920		-
14921	17921	CameraPane parent = null;
14922	17922
14923	17923	AntialiasBuffer(CameraPane p)
..	..	@@ -15027,15 +18027,25 @@
15027	18027	gl.glFlush();
15028	18028
15029	18029	/**/
15030		- gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_BGRA, GL.GL_UNSIGNED_INT_8_8_8_8_REV, occlusionsizebuffer);
	18030	+ gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusiondepthbuffer);
15031	18031
15032		- int[] pixels = occlusionsizebuffer.array();
	18032	+ float[] depths = occlusiondepthbuffer.array();
15033	18033
	18034	+ gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_BGRA, GL.GL_UNSIGNED_INT_8_8_8_8_REV, occlusioncolorbuffer);
	18035	+
	18036	+ int[] pixels = selectsizebuffer.array();
	18037	+
15034	18038	double r = 0, g = 0, b = 0;
15035	18039
15036	18040	double count = 0;
	18041	+
	18042	+ gl.glGetDoublev(gl.GL_PROJECTION_MATRIX, tempmat2, 0);
	18043	+
	18044	+ float mindepth = 1;
	18045	+
	18046	+ double FACTOR = 1;
15037	18047
15038		- for (int i = 0; i < pixels.length; i++)
	18048	+ for (int i = 0; i < depths.length; i++)
15039	18049	{
15040	18050	int x = i / OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
15041	18051	int y = i % OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
..	..	@@ -15118,7 +18128,7 @@
15118	18128
15119	18129	double scale = ray.z; // 1; // cos
15120	18130
15121		- int p = pixels[newindex];
	18131	+ float depth = depths[newindex];
15122	18132
15123	18133	/*
15124	18134	int newindex2 = (x + 1) * OCCLUSION_SIZE + y;
..	..	@@ -15142,10 +18152,23 @@
15142	18152	scale = (1 - modu) * modv;
15143	18153	*/
15144	18154
15145		- r += ((p >> 16) & 0xFF) * scale / 255;
15146		- g += ((p >> 8) & 0xFF) * scale / 255;
15147		- b += (p & 0xFF) * scale / 255;
	18155	+ //r += ((p >> 16) & 0xFF) * scale / 255;
	18156	+ //g += ((p >> 8) & 0xFF) * scale / 255;
	18157	+ //b += (p & 0xFF) * scale / 255;
	18158	+
	18159	+ if (mindepth > depth)
	18160	+ {
	18161	+ mindepth = depth;
	18162	+ }
15148	18163
	18164	+ double z_eye = tempmat2[34 + 2] / (depth -2.0 + 1.0 - tempmat2[2*4 + 2]);
	18165	+
	18166	+ double factor = 1 - Math.exp(-z_eye * z_eye / FACTOR);
	18167	+
	18168	+ r += factor * scale;
	18169	+ g += factor * scale;
	18170	+ b += factor * scale;
	18171	+
15149	18172	count += scale;
15150	18173	}
15151	18174
..	..	@@ -15243,17 +18266,16 @@
15243	18266	GLUT glut = new GLUT();
15244	18267
15245	18268
15246		- static final public int DEFAULT = 0;
15247		- static final public int SELECTION = 1;
15248		- static final public int SHADOW = 2;
15249		- static final public int OCCLUSION = 3;
15250		- static
15251		- public int drawMode = DEFAULT;
15252	18269	public boolean spherical = false;
15253	18270	static boolean DEBUG_OCCLUSION = false;
15254	18271	static boolean DEBUG_SELECTION = false;
15255	18272	boolean OCCLUSION_CULLING = false; //true;
15256	18273	public boolean lightMode = false;
	18274	+
	18275	+ private boolean keepshadow;
	18276	+
	18277	+ static public boolean capsLocked = false; // VR
	18278	+
15257	18279	static public int indexcount = 0;
15258	18280	/static/ cColor vertexOcclusion = new cColor();
15259	18281	//private int selection_view = -1;
..	..	@@ -15261,21 +18283,15 @@
15261	18283	int AAbuffersize = 0;
15262	18284
15263	18285	//double[] selectedpoint = new double[3];
15264		- static Sphere selectedpoint = new Sphere();
	18286	+ static Superellipsoid selectedpoint;
15265	18287	static Sphere previousselectedpoint = null;
15266		- static Sphere debugpoint = new Sphere();
15267		- static Sphere debugpoint2 = new Sphere();
	18288	+ static Sphere debugpointG;
	18289	+ static Sphere debugpointP;
	18290	+ static Sphere debugpointC;
	18291	+ static Sphere debugpointR;
15268	18292
15269	18293	static Sphere debugpoints[] = new Sphere[8];
15270	18294
15271		- static
15272		- {
15273		- for (int i=0; i<8; i++)
15274		- {
15275		- debugpoints[i] = new Sphere();
15276		- }
15277		- }
15278		-
15279	18295	static void InitPoints(float radius)
15280	18296	{
15281	18297	for (int i=0; i<8; i++)
..	..	@@ -15295,7 +18311,7 @@
15295	18311	}
15296	18312	}
15297	18313
15298		- static void DrawPoints(CameraPane cpane)
	18314	+ static void DrawPoints(iCameraPane cpane)
15299	18315	{
15300	18316	for (int i=0; i<8; i++) // first and last are red
15301	18317	{
..	..	@@ -15314,10 +18330,14 @@
15314	18330	static IntBuffer AAbuffer; // = IntBuffer.allocate(MAX_SIZE*MAX_SIZE);
15315	18331	static IntBuffer bigAAbuffer;
15316	18332	static java.nio.FloatBuffer histogram = BufferUtil.newFloatBuffer(HISTOGRAM_SIZE * 3);
15317		- static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
	18333	+ //static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
15318	18334	static IntBuffer selectsizebuffer = IntBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
15319	18335	static java.nio.FloatBuffer pointselectsizebuffer = java.nio.FloatBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
15320		- static IntBuffer occlusionsizebuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	18336	+ //static IntBuffer occlusionsizebuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	18337	+ static java.nio.FloatBuffer occlusiondepthbuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	18338	+
	18339	+ static IntBuffer occlusioncolorbuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	18340	+
15321	18341	static BufferedImage bufimage = new BufferedImage(TEX_SIZE, TEX_SIZE, BufferedImage.TYPE_INT_RGB);
15322	18342	static BufferedImage textest = new cBufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB);
15323	18343	static java.util.Vector<BufferedImage> billboards = new java.util.Vector<BufferedImage>();
..	..	@@ -15326,10 +18346,11 @@
15326	18346	static IntBuffer textbuffer = null; // IntBuffer.allocate(TEXT_WIDTH88 * TEXT_HEIGHT);
15327	18347	// Depth buffer format
15328	18348	//private int depth_format;
15329		- static public void NextIndex(Object3D o, GL gl)
	18349	+
	18350	+ public void NextIndex()
15330	18351	{
15331	18352	indexcount+=16;
15332		- gl.glColor3d(((indexcount >>> 16) & 255) / 255.0, ((indexcount >>> 8) & 255) / 255.0, ((indexcount) & 255) / 255.0);
	18353	+ GetGL().glColor3d(((indexcount >>> 16) & 255) / 255.0, ((indexcount >>> 8) & 255) / 255.0, ((indexcount) & 255) / 255.0);
15333	18354	//objects[indexcount] = o;
15334	18355	//System.out.println("indexcount = " + indexcount);
15335	18356	}