~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -31,9 +31,12 @@
31	31
32	32	import gleem.linalg.Mat4f;
33	33
34		-class CameraPane extends GLCanvas implements Runnable, GLEventListener, ActionListener, MouseWheelListener, MouseMotionListener, MouseListener, KeyListener
	34	+class CameraPane extends GLCanvas implements iCameraPane, Runnable, GLEventListener, ActionListener, MouseWheelListener, MouseMotionListener, MouseListener, KeyListener
35	35	{
36		- static boolean DEBUG = false;
	36	+ static cMaterial[] materialstack = new cMaterial[65536];
	37	+ static boolean[] selectedstack = new boolean[65536];
	38	+ static int materialdepth = 0;
	39	+
37	40	static boolean FRUSTUM = false; // still bogus true; // frustum culling
38	41
39	42	// camera change fix
..	..	@@ -42,25 +45,7 @@
42	45
43	46	static int STEP = 1;
44	47
45		- static boolean ONESTEP = false; // do LIVE once
46		-
47		- /**
48		- * @return the LIVE
49		- */
50		- public static boolean isLIVE()
51		- {
52		- return LIVE \|\| ONESTEP;
53		- }
54		-
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;
	48	+ /static/ private boolean CULLFACE = false; // true;
64	49	/static/ boolean NEAREST = false; // true;
65	50	/static/ boolean WIREFRAME = false; // true;
66	51
..	..	@@ -70,14 +55,12 @@
70	55	static int CURRENTANTIALIAS = 0; // 1;
71	56	/static/ boolean RENDERSHADOW = true;
72	57	/static/ int RENDERPROGRAM = 2; // 0 == none, 1 == fast, 2 == normal
73		- static boolean ANIMATION = false;
74		- static String filename;
75	58
76	59	boolean DISPLAYTEXT = false;
77	60	//boolean REDUCETEXTURE = true;
78	61	boolean CACHETEXTURE = true;
79	62	boolean CLEANCACHE = false; // true;
80		- boolean MIPMAP = false; // true;
	63	+ boolean MIPMAP = true; // false; // true;
81	64	boolean COMPRESSTEXTURE = false;
82	65	boolean KOMPACTTEXTURE = false; // true;
83	66	boolean RESIZETEXTURE = false;
..	..	@@ -97,10 +80,8 @@
97	80
98	81	static boolean textureon = true;
99	82	static boolean LOCALTRANSFORM = false;
100		-private static boolean LIVE = false;
101	83	static boolean FULLSCREEN = false;
102	84	static boolean SUPPORT = true;
103		-static boolean CROWD = false;
104	85	static boolean INERTIA = true;
105	86	static boolean FAST = false;
106	87	static boolean SLOWPOSE = false;
..	..	@@ -108,6 +89,8 @@
108	89
109	90	static int tickcount = 0; // slow pose issue
110	91
	92	+static boolean BUTTONLESSWHEEL = false;
	93	+static boolean ZOOMBOXMODE = false;
111	94	static boolean BOXMODE = false;
112	95	static boolean IMAGEFLIP = false;
113	96	static boolean SMOOTHFOCUS = false;
..	..	@@ -122,7 +105,7 @@
122	105	static boolean OEIL = true;
123	106	static boolean OEILONCE = false; // do oeilon then oeiloff
124	107	static boolean LOOKAT = true;
125		-static boolean RANDOM = true; // false;
	108	+static boolean SWITCH = true; // false;
126	109	static boolean HANDLES = false; // selection doesn't work!!
127	110	static boolean PAINTMODE = false;
128	111
..	..	@@ -165,12 +148,41 @@
165	148	defaultcaps.setAccumBlueBits(16);
166	149	defaultcaps.setAccumAlphaBits(16);
167	150	}
168		- static CameraPane theRenderer;
169		-
	151	+
	152	+ private File defaultDirectory = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory();
	153	+
170	154	void SetAsGLRenderer(boolean b)
171	155	{
172	156	isRenderer = b;
173		- theRenderer = this;
	157	+ Globals.theRenderer = this;
	158	+ }
	159	+
	160	+ CameraPane(Object3D o, Camera cam, boolean withcontext)
	161	+ {
	162	+ super(defaultcaps, null, withcontext?glcontext:null, null);
	163	+
	164	+ //System.out.println("AMERICA AREA = " + (9458886 + 9210755 + 8480395 + 2736391 + 1943018 + 1289475 + 1141569 + 1069350 + 911559 + 721229 + 395886 + 377972 + 246700 + 211156 + 173985 + 141133 + 118279 + 112079 + 108523));
	165	+ glcontext = getContext();
	166	+
	167	+ cameras = new Camera[2];
	168	+ targetLookAts = new cVector[2];
	169	+
	170	+ SetCamera(cam);
	171	+
	172	+ SetLight(new Camera(new cVector(10, 10, -20)));
	173	+
	174	+ object = o;
	175	+
	176	+ setBackground(Color.white);
	177	+
	178	+ addKeyListener(this);
	179	+ addMouseListener(this);
	180	+ addMouseMotionListener(this);
	181	+ addMouseWheelListener(this);
	182	+ //System.out.println("addGLEventListener: " + this);
	183	+ addGLEventListener(this);
	184	+
	185	+// pingthread.start(); // may 2013
174	186	}
175	187
176	188	static boolean AntialiasingEnabled()
..	..	@@ -178,12 +190,53 @@
178	190	return CURRENTANTIALIAS > 0;
179	191	}
180	192
181		- void ClearDepth()
	193	+ /// INTERFACE
	194	+
	195	+ public javax.media.opengl.GL GetGL0()
	196	+ {
	197	+ return null;
	198	+ }
	199	+
	200	+ public int GenList()
	201	+ {
	202	+ javax.media.opengl.GL gl = GetGL();
	203	+ return gl.glGenLists(1);
	204	+ }
	205	+
	206	+ public void NewList(int id)
	207	+ {
	208	+ javax.media.opengl.GL gl = GetGL();
	209	+ gl.glNewList(id, gl.GL_COMPILE); //_AND_EXECUTE);
	210	+ }
	211	+
	212	+ public void CallList(int id)
	213	+ {
	214	+ javax.media.opengl.GL gl = GetGL();
	215	+ gl.glCallList(id);
	216	+ }
	217	+
	218	+ public void EndList()
	219	+ {
	220	+ javax.media.opengl.GL gl = GetGL();
	221	+ gl.glEndList();
	222	+ }
	223	+
	224	+ public boolean IsBoxMode()
	225	+ {
	226	+ return BOXMODE;
	227	+ }
	228	+
	229	+ public boolean IsZoomBoxMode()
	230	+ {
	231	+ return ZOOMBOXMODE;
	232	+ }
	233	+
	234	+ public void ClearDepth()
182	235	{
183	236	GetGL().glClear(GetGL().GL_DEPTH_BUFFER_BIT);
184	237	}
185	238
186		- void DepthTest(boolean depthtest)
	239	+ public void DepthTest(boolean depthtest)
187	240	{
188	241	if (depthtest)
189	242	GetGL().glDepthFunc(GL.GL_LEQUAL);
..	..	@@ -191,7 +244,7 @@
191	244	GetGL().glDepthFunc(GL.GL_ALWAYS);
192	245	}
193	246
194		- void DepthWrite(boolean depthwrite)
	247	+ public void DepthWrite(boolean depthwrite)
195	248	{
196	249	if (depthwrite)
197	250	GetGL().glDepthMask(true);
..	..	@@ -199,12 +252,1616 @@
199	252	GetGL().glDepthMask(false);
200	253	}
201	254
202		- void BackFaceCull(boolean bfc)
	255	+ public void BackFaceCull(boolean bfc)
203	256	{
204	257	if (bfc)
205	258	GetGL().glEnable(GetGL().GL_CULL_FACE);
206	259	else
207	260	GetGL().glDisable(GetGL().GL_CULL_FACE);
	261	+ }
	262	+
	263	+ public boolean BackFaceCullMode()
	264	+ {
	265	+ return this.CULLFACE;
	266	+ }
	267	+
	268	+ public boolean IsAmbientOcclusionOn()
	269	+ {
	270	+ return this.ambientOcclusion;
	271	+ }
	272	+
	273	+ public boolean IsDebugSelection()
	274	+ {
	275	+ return DEBUG_SELECTION;
	276	+ }
	277	+
	278	+ public boolean IsFrozen()
	279	+ {
	280	+ boolean selectmode = this.DrawMode() == SELECTION \|\| this.IsDebugSelection();
	281	+
	282	+ return !selectmode && cameracount == 0; // != 0;
	283	+ }
	284	+
	285	+ // Currently in Globals
	286	+ public int DrawMode()
	287	+ {
	288	+ return Globals.DrawMode();
	289	+ }
	290	+
	291	+ public Camera EyeCamera()
	292	+ {
	293	+ return eyeCamera;
	294	+ }
	295	+
	296	+ public Camera LightCamera()
	297	+ {
	298	+ return lightCamera;
	299	+ }
	300	+
	301	+ public Camera ManipCamera()
	302	+ {
	303	+ return manipCamera;
	304	+ }
	305	+
	306	+ public Camera RenderCamera()
	307	+ {
	308	+ return renderCamera;
	309	+ }
	310	+
	311	+ public Camera[] Cameras()
	312	+ {
	313	+ return cameras;
	314	+ }
	315	+
	316	+ public void PushMaterial(Object3D obj, boolean selected)
	317	+ {
	318	+ CameraPane display = this;
	319	+ javax.media.opengl.GL gl = display.GetGL();
	320	+ cMaterial material = obj.material;
	321	+
	322	+ if (material != null)
	323	+ {
	324	+ materialstack[materialdepth] = material;
	325	+ selectedstack[materialdepth] = selected;
	326	+ cStatic.objectstack[materialdepth++] = obj;
	327	+ //System.out.println("material " + material);
	328	+ //Applet3D.tracein(this, selected);
	329	+ //display.vector2buffer = obj.projectedVertices;
	330	+ if (obj instanceof Camera)
	331	+ {
	332	+ display.options1[0] = material.shift;
	333	+ //System.out.println("shift " + material.shift);
	334	+ display.options1[1] = material.lightarea;
	335	+ display.options1[2] = material.shadowbias;
	336	+ display.options1[3] = material.aniso;
	337	+ display.options1[4] = material.anisoV;
	338	+// System.out.println("display.options1[0] " + display.options1[0]);
	339	+// System.out.println("display.options1[1] " + display.options1[1]);
	340	+// System.out.println("display.options1[2] " + display.options1[2]);
	341	+// System.out.println("display.options1[3] " + display.options1[3]);
	342	+// System.out.println("display.options1[4] " + display.options1[4]);
	343	+ display.options2[0] = material.opacity;
	344	+ display.options2[1] = material.diffuse;
	345	+ display.options2[2] = material.factor;
	346	+// System.out.println("display.options2[0] " + display.options2[0]);
	347	+// System.out.println("display.options2[1] " + display.options2[1]);
	348	+// System.out.println("display.options2[2] " + display.options2[2]);
	349	+
	350	+ cColor.HSBtoRGB(material.color, material.modulation, 1, display.options3);
	351	+// System.out.println("display.options3[0] " + display.options3[0]);
	352	+// System.out.println("display.options3[1] " + display.options3[1]);
	353	+// System.out.println("display.options3[2] " + display.options3[2]);
	354	+ display.options4[0] = material.cameralight/0.2f;
	355	+ display.options4[1] = material.subsurface;
	356	+ display.options4[2] = material.sheen;
	357	+// System.out.println("display.options4[0] " + display.options4[0]);
	358	+// System.out.println("display.options4[1] " + display.options4[1]);
	359	+// System.out.println("display.options4[2] " + display.options4[2]);
	360	+
	361	+ // if (display.CURRENTANTIALIAS > 0)
	362	+ // display.options3[3] /= 4;
	363	+
	364	+ /*
	365	+ System.out.println("Focus = " + display.options1[0]);
	366	+ System.out.println("Aperture = " + display.options1[1]);
	367	+ System.out.println("ShadowBlur = " + display.options1[2]);
	368	+ System.out.println("Antialiasing = " + display.options1[3]);
	369	+ System.out.println("Fog = " + display.options2[0]);
	370	+ System.out.println("Intensity = " + display.options2[1]);
	371	+ System.out.println("Elevation = " + display.options2[2]);
	372	+ /**/
	373	+ } else
	374	+ {
	375	+ DrawMaterial(material, selected, obj.projectedVertices);
	376	+ }
	377	+ } else
	378	+ {
	379	+ if (selected && CameraPane.flash)
	380	+ {
	381	+ display.modelParams4[1] = 100;
	382	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 4, display.modelParams4, 0);
	383	+ }
	384	+ }
	385	+ }
	386	+
	387	+ public void PushMaterial2(Object3D obj, boolean selected)
	388	+ {
	389	+ CameraPane display = this;
	390	+ cMaterial material = obj.material;
	391	+
	392	+ if (material != null)
	393	+ {
	394	+ materialstack[materialdepth] = material;
	395	+ selectedstack[materialdepth] = selected;
	396	+ cStatic.objectstack[materialdepth++] = obj;
	397	+ //System.out.println("material " + material);
	398	+ //Applet3D.tracein("selected ", selected);
	399	+ //display.vector2buffer = obj.projectedVertices;
	400	+ display.DrawMaterial(material, selected, obj.projectedVertices);
	401	+ }
	402	+ }
	403	+
	404	+ public void PopMaterial(Object3D obj, boolean selected)
	405	+ {
	406	+ CameraPane display = this;
	407	+ javax.media.opengl.GL gl = display.GetGL();
	408	+ cMaterial material = obj.material;
	409	+
	410	+ //if (parent != null && parent.GetMaterial() != null)
	411	+ // parent.GetMaterial().Draw(display, parent.IsSelected(this));
	412	+ if (material != null)
	413	+ {
	414	+ materialdepth -= 1;
	415	+ if (materialdepth > 0)
	416	+ {
	417	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	418	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
	419	+ }
	420	+ //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
	421	+ } else if (selected && CameraPane.flash && obj.GetMaterial() != null)
	422	+ {
	423	+ display.modelParams4[1] = obj.GetMaterial().cameralight;
	424	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 4, display.modelParams4, 0);
	425	+ }
	426	+ }
	427	+
	428	+ public void PopMaterial2(Object3D obj)
	429	+ {
	430	+ CameraPane display = this;
	431	+ cMaterial material = obj.material;
	432	+
	433	+ if (material != null)
	434	+ {
	435	+ materialdepth -= 1;
	436	+ if (materialdepth > 0)
	437	+ {
	438	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	439	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
	440	+ }
	441	+ //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
	442	+ //else
	443	+ //material.Draw(display, false);
	444	+ }
	445	+ }
	446	+
	447	+ public void DrawFace(Object3D obj, Vertex pv, Vertex qv, Vertex rv, Face face)
	448	+ {
	449	+ CameraPane display = this;
	450	+
	451	+ if (pv.y == -10000 \|\|
	452	+ qv.y == -10000 \|\|
	453	+ rv.y == -10000)
	454	+ return;
	455	+
	456	+// float b = f.nbiterations & 1;
	457	+// float g = (f.nbiterations>>1) & 1;
	458	+// float r = (f.nbiterations>>2) & 1;
	459	+//
	460	+// //if (f.weight == 10000)
	461	+// //{
	462	+// // r = 1; g = b = 0;
	463	+// //}
	464	+// //else
	465	+// //{
	466	+// // assert(f.weight < 10000);
	467	+// r = g = b = (float)bRep.FaceWeight(f)*100;
	468	+// if (r<0)
	469	+// assert(r>=0);
	470	+// //}
	471	+
	472	+ javax.media.opengl.GL gl = display.GetGL();
	473	+
	474	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
	475	+
	476	+ //System.out.println("p = " + pv + "; q = " + qv + "; r = " + rv);
	477	+ if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
	478	+ {
	479	+ //gl.glBegin(gl.GL_TRIANGLES);
	480	+ boolean hasnorm = pv.norm != null && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0)
	481	+ // TEST LIVE NORMALS && !obj.dontselect
	482	+ ;
	483	+ if (!hasnorm)
	484	+ {
	485	+ // System.out.println("Mesh normal");
	486	+ LA.vecSub(pv/.pos/, qv/.pos/, obj.v0);
	487	+ LA.vecSub(pv/.pos/, rv/.pos/, obj.v1);
	488	+ LA.vecCross(obj.v0, obj.v1, obj.v2);
	489	+ LA.vecNormalize(obj.v2);
	490	+ gl.glNormal3f((float) obj.v2.x, (float) obj.v2.y, (float) obj.v2.z);
	491	+ }
	492	+
	493	+ // P
	494	+ float x = (float)pv.x;
	495	+ float y = (float)pv.y;
	496	+ float z = (float)pv.z;
	497	+
	498	+ if (hasnorm)
	499	+ {
	500	+// if (!pv.norm.normalized())
	501	+// assert(pv.norm.normalized());
	502	+
	503	+ //System.out.println("normalp = " + pv.norm.x + ", " + pv.norm.y + ", " + pv.norm.z);
	504	+ float nx = (float)pv.norm.x;
	505	+ float ny = (float)pv.norm.y;
	506	+ float nz = (float)pv.norm.z;
	507	+
	508	+ x += nx * obj.NORMALPUSH;
	509	+ y += ny * obj.NORMALPUSH;
	510	+ z += nz * obj.NORMALPUSH;
	511	+
	512	+ gl.glNormal3f(nx, ny, nz);
	513	+ }
	514	+ gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
	515	+ SetColor(obj, pv);
	516	+ //gl.glColor4f(r, g, b, 1);
	517	+ //gl.glColor4f(pv.boundary, pv.boundary, pv.boundary, 1);
	518	+ if (obj.flipV)
	519	+ gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
	520	+ else
	521	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	522	+ //System.out.println("vertexp = " + pv.x + ", " + pv.y + ", " + pv.z);
	523	+
	524	+ gl.glVertex3f(x, y, z);
	525	+
	526	+ // Q
	527	+ x = (float)qv.x;
	528	+ y = (float)qv.y;
	529	+ z = (float)qv.z;
	530	+
	531	+// Print(pv);
	532	+ if (hasnorm)
	533	+ {
	534	+// assert(qv.norm.normalized());
	535	+ //System.out.println("normalq = " + qv.norm.x + ", " + qv.norm.y + ", " + qv.norm.z);
	536	+ float nx = (float)qv.norm.x;
	537	+ float ny = (float)qv.norm.y;
	538	+ float nz = (float)qv.norm.z;
	539	+
	540	+ x += nx * obj.NORMALPUSH;
	541	+ y += ny * obj.NORMALPUSH;
	542	+ z += nz * obj.NORMALPUSH;
	543	+
	544	+ gl.glNormal3f(nx, ny, nz);
	545	+ }
	546	+ //System.out.println("vertexq = " + qv.s + ", " + qv.t);
	547	+ // boolean locked = false;
	548	+ // float eps = 0.1f;
	549	+ // boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
	550	+
	551	+ // int dot = 0; //*/ (int)f.dot;
	552	+
	553	+ // if ((dot&1) == 0)
	554	+ // dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
	555	+
	556	+ // if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
	557	+ if (obj.flipV)
	558	+ gl.glTexCoord2f((float) qv.s, 1-(float) qv.t);
	559	+ else
	560	+ gl.glTexCoord2f((float) qv.s, (float) qv.t);
	561	+ // else
	562	+ // {
	563	+ // locked = true;
	564	+ // gl.glTexCoord2f((float) pv.s, (float) pv.t);
	565	+ // }
	566	+ gl.glColor4f(qv.AO, qv.AO, qv.AO, 1);
	567	+ SetColor(obj, qv);
	568	+
	569	+ gl.glVertex3f(x, y, z);
	570	+ //gl.glColor4f(r, g, b, 1);
	571	+ //gl.glColor4f(qv.boundary, qv.boundary, qv.boundary, 1);
	572	+ //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
	573	+// Print(qv);
	574	+
	575	+ // R
	576	+ x = (float)rv.x;
	577	+ y = (float)rv.y;
	578	+ z = (float)rv.z;
	579	+
	580	+ if (hasnorm)
	581	+ {
	582	+// assert(rv.norm.normalized());
	583	+ //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
	584	+ float nx = (float)rv.norm.x;
	585	+ float ny = (float)rv.norm.y;
	586	+ float nz = (float)rv.norm.z;
	587	+
	588	+ x += nx * obj.NORMALPUSH;
	589	+ y += ny * obj.NORMALPUSH;
	590	+ z += nz * obj.NORMALPUSH;
	591	+
	592	+ gl.glNormal3f(nx, ny, nz);
	593	+ }
	594	+
	595	+ // if ((dot&4) == 0)
	596	+ // dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
	597	+
	598	+ // if (wrap \|\| !locked && (dot&8) != 0)
	599	+ if (obj.flipV)
	600	+ gl.glTexCoord2f((float) rv.s, 1-(float) rv.t);
	601	+ else
	602	+ gl.glTexCoord2f((float) rv.s, (float) rv.t);
	603	+ // else
	604	+ // gl.glTexCoord2f((float) pv.s, (float) pv.t);
	605	+
	606	+ // f.dot = dot;
	607	+
	608	+ gl.glColor4f(rv.AO, rv.AO, rv.AO, 1);
	609	+ SetColor(obj, rv);
	610	+ //gl.glColor4f(r, g, b, 1);
	611	+ //gl.glColor4f(rv.boundary, rv.boundary, rv.boundary, 1);
	612	+ //System.out.println("vertexr = " + rv.x + ", " + rv.y + ", " + rv.z);
	613	+ gl.glVertex3f(x, y, z);
	614	+// Print(rv);
	615	+ //gl.glEnd();
	616	+ }
	617	+ else
	618	+ {
	619	+ gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
	620	+ gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
	621	+ gl.glVertex3f((float) rv.x, (float) rv.y, (float) rv.z);
	622	+
	623	+ }
	624	+
	625	+ if (false) // (attributes & WIREFRAME) != 0)
	626	+ {
	627	+ gl.glDisable(gl.GL_LIGHTING);
	628	+
	629	+ gl.glBegin(gl.GL_LINE_LOOP);
	630	+ gl.glVertex3d(pv./pos./x, pv./pos./y, pv./pos./z);
	631	+ gl.glVertex3d(qv./pos./x, qv./pos./y, qv./pos./z);
	632	+ gl.glVertex3d(rv./pos./x, rv./pos./y, rv./pos./z);
	633	+ gl.glEnd();
	634	+
	635	+ gl.glEnable(gl.GL_LIGHTING);
	636	+ }
	637	+ }
	638	+
	639	+ /**
	640	+ * <code>draw</code> renders a <code>TriMesh</code> object including
	641	+ * it's normals, colors, textures and vertices.
	642	+ *
	643	+ * @see Renderer#draw(TriMesh)
	644	+ * @param tris
	645	+ * the mesh to render.
	646	+ */
	647	+ public void DrawParticles(TriMesh geo, Object3D shape, boolean selected, boolean rotate) // TriMesh tris)
	648	+ {
	649	+ CameraPane display = this;
	650	+
	651	+ float r = display.modelParams0[0];
	652	+ float g = display.modelParams0[1];
	653	+ float b = display.modelParams0[2];
	654	+ float opacity = display.modelParams5[1];
	655	+
	656	+ //final GL gl = GLU.getCurrentGL();
	657	+ GL gl = display.GetGL(); // getGL();
	658	+
	659	+ FloatBuffer vertBuf = geo.vertBuf;
	660	+
	661	+ int v = vertBuf.capacity();
	662	+
	663	+ int count = 0;
	664	+
	665	+ boolean cf = gl.glIsEnabled(gl.GL_CULL_FACE);
	666	+ gl.glEnable(gl.GL_CULL_FACE);
	667	+ // gl.glScalef(1.0f/1024,1.0f/1024,1.0f/1024);
	668	+ for (int i=0; i<v/3; i++)
	669	+ {
	670	+ int index3 = i*3;
	671	+
	672	+ if (geo.sizeBuf.get(index3+1) == 0)
	673	+ continue;
	674	+
	675	+ count++;
	676	+
	677	+ int index4 = i*4;
	678	+
	679	+ float tx = vertBuf.get(index3);
	680	+ float ty = vertBuf.get(index3+1);
	681	+ float tz = vertBuf.get(index3+2);
	682	+
	683	+ // if (tx == 0 && ty == 0 && tz == 0)
	684	+ // continue;
	685	+
	686	+ gl.glMatrixMode(gl.GL_TEXTURE);
	687	+ gl.glPushMatrix();
	688	+
	689	+ float[] texmat = geo.texmat;
	690	+ texmat[12] = texmat[13] = texmat[14] = i;
	691	+
	692	+ gl.glMultMatrixf(texmat, 0);
	693	+
	694	+ gl.glMatrixMode(gl.GL_MODELVIEW);
	695	+ gl.glPushMatrix();
	696	+
	697	+ gl.glTranslatef(tx,ty,tz);
	698	+
	699	+ if (rotate)
	700	+ gl.glRotatef(i, 0, 1, 0);
	701	+
	702	+ float size = geo.sizeBuf.get(index3) / 100;
	703	+ gl.glScalef(size,size,size);
	704	+
	705	+ float cr = geo.colorBuf.get(index4);
	706	+ float cg = geo.colorBuf.get(index4+1);
	707	+ float cb = geo.colorBuf.get(index4+2);
	708	+ float ca = geo.colorBuf.get(index4+3);
	709	+
	710	+ display.modelParams0[0] = r * cr;
	711	+ display.modelParams0[1] = g * cg;
	712	+ display.modelParams0[2] = b * cb;
	713	+
	714	+ display.modelParams5[1] = opacity * ca;
	715	+
	716	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 0, display.modelParams0, 0);
	717	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 5, display.modelParams5, 0);
	718	+
	719	+ RandomNode.globalseed = (int)geo.sizeBuf.get(index3+2); // i;
	720	+ RandomNode.globalseed2 = RandomNode.globalseed;
	721	+
	722	+// gl.glColor4f(cr,cg,cb,ca);
	723	+ // gl.glScalef(1024/16,1024/16,1024/16);
	724	+ shape.Draw/Node/(display,null,selected,false); // blocked
	725	+ // gl.glScalef(16.0f/1024,16.0f/1024,16.0f/1024);
	726	+ //gl.glTranslatef(-tx,-ty,-tz);
	727	+ gl.glPopMatrix();
	728	+
	729	+ gl.glMatrixMode(gl.GL_TEXTURE);
	730	+ gl.glPopMatrix();
	731	+ }
	732	+ // gl.glScalef(1024,1024,1024);
	733	+ if (!cf)
	734	+ gl.glDisable(gl.GL_CULL_FACE);
	735	+
	736	+ display.modelParams0[0] = r;
	737	+ display.modelParams0[1] = g;
	738	+ display.modelParams0[2] = b;
	739	+
	740	+ display.modelParams5[1] = opacity;
	741	+
	742	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 0, display.modelParams0, 0);
	743	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 5, display.modelParams5, 0);
	744	+
	745	+ gl.glMatrixMode(gl.GL_MODELVIEW);
	746	+
	747	+// System.err.println("total = " + v/3 + "; displayed = " + count);
	748	+ if (true)
	749	+ return;
	750	+
	751	+//// if (!tris.predraw(this))
	752	+//// {
	753	+//// return;
	754	+//// }
	755	+//// if (Debug.stats)
	756	+//// {
	757	+//// StatCollector.addStat(StatType.STAT_TRIANGLE_COUNT, tris.getTriangleCount());
	758	+//// StatCollector.addStat(StatType.STAT_VERTEX_COUNT, tris.getVertexCount());
	759	+//// StatCollector.addStat(StatType.STAT_GEOM_COUNT, 1);
	760	+//// }
	761	+////
	762	+//// if (tris.getDisplayListID() != -1)
	763	+//// {
	764	+//// renderDisplayList(tris);
	765	+//// return;
	766	+//// }
	767	+////
	768	+//// if (!generatingDisplayList)
	769	+//// {
	770	+//// applyStates(tris.states, tris);
	771	+//// }
	772	+//// if (Debug.stats)
	773	+//// {
	774	+//// StatCollector.startStat(StatType.STAT_RENDER_TIMER);
	775	+//// }
	776	+//// boolean transformed = doTransforms(tris);
	777	+//
	778	+// int glMode = GL.GL_TRIANGLES;
	779	+// switch (getMode())
	780	+// {
	781	+// case Triangles:
	782	+// glMode = GL.GL_TRIANGLES;
	783	+// break;
	784	+// case Strip:
	785	+// glMode = GL.GL_TRIANGLE_STRIP;
	786	+// break;
	787	+// case Fan:
	788	+// glMode = GL.GL_TRIANGLE_FAN;
	789	+// break;
	790	+// }
	791	+//
	792	+// if (!predrawGeometry(gl))
	793	+// {
	794	+// // make sure only the necessary indices are sent through on old
	795	+// // cards.
	796	+// IntBuffer indices = this.getIndexBuffer();
	797	+// if (indices == null)
	798	+// {
	799	+// logger.severe("missing indices on geometry object: " + this.toString());
	800	+// } else
	801	+// {
	802	+// indices.rewind();
	803	+// indices.limit(this.getMaxIndex());
	804	+//
	805	+// gl.glDrawElements(glMode, indices.limit(), GL.GL_UNSIGNED_INT, indices); // TODO Check <count> and assumed <type> of GL_UNSIGNED_INT
	806	+//
	807	+// indices.clear();
	808	+// }
	809	+// } else
	810	+// {
	811	+// gl.glDrawElements(glMode, this.getIndexBuffer().limit(),
	812	+// GL.GL_UNSIGNED_INT, 0);
	813	+// }
	814	+//
	815	+//// postdrawGeometry(tris);
	816	+//// if (transformed)
	817	+//// {
	818	+//// undoTransforms(tris);
	819	+//// }
	820	+////
	821	+//// if (Debug.stats)
	822	+//// {
	823	+//// StatCollector.endStat(StatType.STAT_RENDER_TIMER);
	824	+//// }
	825	+//// tris.postdraw(this);
	826	+ }
	827	+
	828	+ static Camera localcamera = new Camera();
	829	+ static cVector from = new cVector();
	830	+ static cVector to = new cVector();
	831	+
	832	+ public void PrepOcclusion(BoundaryRep br, double[][] transform)
	833	+ {
	834	+ CameraPane cp = this;
	835	+
	836	+ Camera keep = cp.RenderCamera();
	837	+ cp.renderCamera = localcamera;
	838	+
	839	+ if (br.trimmed)
	840	+ {
	841	+ float[] colors = new float[br.positions.length / 3];
	842	+
	843	+ int i3 = 0;
	844	+ for (int i = 0; i < br.positions.length / 3; i++, i3 += 3)
	845	+ {
	846	+ if (br.normals[i3] == 0 && br.normals[i3+1] == 0 && br.normals[i3+2] == 0)
	847	+ continue;
	848	+
	849	+ from.set(br.positions[i3], br.positions[i3 + 1], br.positions[i3 + 2]);
	850	+ to.set(br.positions[i3] + br.normals[i3],
	851	+ br.positions[i3 + 1] + br.normals[i3 + 1],
	852	+ br.positions[i3 + 2] + br.normals[i3 + 2]);
	853	+ LA.xformPos(from, transform, from);
	854	+ LA.xformPos(to, transform, to); // RIGID ONLY
	855	+ localcamera.setAim(from, to);
	856	+
	857	+ CameraPane.occlusionbuffer.display();
	858	+
	859	+ if (CameraPane.DEBUG_OCCLUSION)
	860	+ cp.display(); // debug
	861	+
	862	+ colors[i] = cp.vertexOcclusion.r;
	863	+ //colors[i3 + 1] = cp.vertexOcclusion.g;
	864	+ //colors[i3 + 2] = cp.vertexOcclusion.b;
	865	+
	866	+ if ((i % 100) == 0 && i != 0)
	867	+ {
	868	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	869	+ //System.out.println("Color = " + cp.vertexOcclusion.r + ", " + cp.vertexOcclusion.g + ", " + cp.vertexOcclusion.b + "; " + (int)(100.0*i/(positions.length/3)) + "% done");
	870	+ System.out.println((int) (100.0 * i / (br.positions.length / 3)) + "% (" + i + " of " + (br.positions.length / 3) + ")");
	871	+ }
	872	+ }
	873	+
	874	+ br.colors = colors;
	875	+ }
	876	+ else
	877	+ {
	878	+ for (int i = 0; i < br.VertexCount(); i++)
	879	+ {
	880	+ Vertex v = br.GetVertex(i);
	881	+
	882	+ if (v.norm == null \|\| v.norm.x == 0 && v.norm.y == 0 && v.norm.z == 0)
	883	+ continue;
	884	+
	885	+ from.set(v.x, v.y, v.z);
	886	+ to.set(v.x+v.norm.x, v.y+v.norm.y, v.z+v.norm.z);
	887	+ LA.xformPos(from, transform, from);
	888	+ LA.xformPos(to, transform, to); // RIGID ONLY
	889	+ localcamera.setAim(from, to);
	890	+
	891	+ CameraPane.occlusionbuffer.display();
	892	+
	893	+ if (CameraPane.DEBUG_OCCLUSION)
	894	+ cp.display(); // debug
	895	+
	896	+ v.AO = cp.vertexOcclusion.r;
	897	+
	898	+ if ((i % 100) == 0 && i != 0)
	899	+ {
	900	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	901	+ //System.out.println("Color = " + cp.vertexOcclusion.r + ", " + cp.vertexOcclusion.g + ", " + cp.vertexOcclusion.b + "; " + (int)(100.0*i/(positions.length/3)) + "% done");
	902	+ System.out.println((int) (100.0 * i / br.VertexCount()) + "% (" + i + " of " + br.VertexCount() + ")");
	903	+ }
	904	+ }
	905	+ }
	906	+
	907	+ //System.out.println("done.");
	908	+
	909	+ cp.renderCamera = keep;
	910	+ }
	911	+
	912	+ void DrawPointFLow(PointFlow pointFlow, Object3D /Composite/ root, boolean selected, boolean blocked)
	913	+ {
	914	+ CameraPane display = this;
	915	+ pointFlow.CreateHT();
	916	+
	917	+ float r = display.modelParams0[0];
	918	+ float g = display.modelParams0[1];
	919	+ float b = display.modelParams0[2];
	920	+ float opacity = display.modelParams5[1];
	921	+
	922	+ //final GL gl = GLU.getCurrentGL();
	923	+ GL gl = display.GetGL(); // getGL();
	924	+
	925	+ int s = pointFlow.points.size();
	926	+
	927	+ boolean cf = gl.glIsEnabled(gl.GL_CULL_FACE);
	928	+ gl.glEnable(gl.GL_CULL_FACE);
	929	+
	930	+ for (int i=s; --i>=0;)
	931	+ //for (int i=0; i<s; i++)
	932	+ {
	933	+ cVector v = pointFlow.points.get(i);
	934	+
	935	+ double mindist = Double.MAX_VALUE;
	936	+
	937	+ double size = pointFlow.minimumSize;
	938	+
	939	+ double distancenext = 0;
	940	+
	941	+ if (i > 0)
	942	+ {
	943	+ cVector w = pointFlow.points.get(i-1);
	944	+
	945	+ double dist = w.distance(v);
	946	+
	947	+ distancenext = dist;
	948	+
	949	+ if (mindist > dist)
	950	+ {
	951	+ mindist = dist;
	952	+ size = mindist*pointFlow.resizefactor;
	953	+ }
	954	+ }
	955	+
	956	+ if (i < s-1)
	957	+ {
	958	+ cVector w = pointFlow.points.get(i+1);
	959	+
	960	+ double dist = w.distance(v);
	961	+
	962	+ if (mindist > dist)
	963	+ {
	964	+ mindist = dist;
	965	+ size = mindist*pointFlow.resizefactor;
	966	+ }
	967	+ }
	968	+
	969	+ if (size < pointFlow.minimumSize)
	970	+ size = pointFlow.minimumSize;
	971	+ if (size > pointFlow.maximumSize)
	972	+ size = pointFlow.maximumSize;
	973	+
	974	+ double tx = v.x;
	975	+ double ty = v.y;
	976	+ double tz = v.z;
	977	+
	978	+ // if (tx == 0 && ty == 0 && tz == 0)
	979	+ // continue;
	980	+
	981	+ gl.glMatrixMode(gl.GL_TEXTURE);
	982	+ gl.glPushMatrix();
	983	+ pointFlow.texmat[12] = pointFlow.texmat[13] = pointFlow.texmat[14] = i;
	984	+
	985	+ gl.glMultMatrixf(pointFlow.texmat, 0);
	986	+
	987	+ gl.glMatrixMode(gl.GL_MODELVIEW);
	988	+ gl.glPushMatrix();
	989	+
	990	+ gl.glTranslated(tx,ty,tz);
	991	+
	992	+ gl.glScaled(size,size,size);
	993	+
	994	+// float cr = colorBuf.get(index4);
	995	+// float cg = colorBuf.get(index4+1);
	996	+// float cb = colorBuf.get(index4+2);
	997	+// float ca = colorBuf.get(index4+3);
	998	+//
	999	+// display.modelParams0[0] = r * cr;
	1000	+// display.modelParams0[1] = g * cg;
	1001	+// display.modelParams0[2] = b * cb;
	1002	+//
	1003	+// display.modelParams5[1] = opacity * ca;
	1004	+//
	1005	+// gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 0, display.modelParams0, 0);
	1006	+// gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 5, display.modelParams5, 0);
	1007	+//
	1008	+// RandomNode.globalseed = (int)sizeBuf.get(index3+2); // i;
	1009	+// RandomNode.globalseed2 = RandomNode.globalseed;
	1010	+//
	1011	+//// gl.glColor4f(cr,cg,cb,ca);
	1012	+// // gl.glScalef(1024/16,1024/16,1024/16);
	1013	+ pointFlow.geo.Draw/Node/(display,null,selected, blocked);
	1014	+
	1015	+ gl.glPopMatrix();
	1016	+
	1017	+ double step = size/4; //
	1018	+
	1019	+ if (i == 0 \|\| size == 0 \|\| distancenext > 8*size \|\| distancenext < step)
	1020	+ continue;
	1021	+
	1022	+ int nbsteps = (int)(distancenext/step);
	1023	+
	1024	+ step = distancenext/nbsteps;
	1025	+
	1026	+ cVector next = pointFlow.points.get(i-1);
	1027	+
	1028	+ tmp.set(next);
	1029	+ tmp.sub(v);
	1030	+ tmp.normalize();
	1031	+ tmp.mul(step);
	1032	+
	1033	+ // calculate next size
	1034	+ mindist = Double.MAX_VALUE;
	1035	+
	1036	+ double nextsize = pointFlow.minimumSize;
	1037	+
	1038	+ if (i > 1)
	1039	+ {
	1040	+ cVector w = pointFlow.points.get(i-2);
	1041	+
	1042	+ double dist = w.distance(next);
	1043	+
	1044	+ if (mindist > dist)
	1045	+ {
	1046	+ mindist = dist;
	1047	+ nextsize = mindist*pointFlow.resizefactor;
	1048	+ }
	1049	+ }
	1050	+
	1051	+ double dist = v.distance(next);
	1052	+
	1053	+ if (mindist > dist)
	1054	+ {
	1055	+ mindist = dist;
	1056	+ nextsize = mindist*pointFlow.resizefactor;
	1057	+ }
	1058	+
	1059	+ if (nextsize < pointFlow.minimumSize)
	1060	+ nextsize = pointFlow.minimumSize;
	1061	+ if (nextsize > pointFlow.maximumSize)
	1062	+ nextsize = pointFlow.maximumSize;
	1063	+ //
	1064	+
	1065	+ double count = 0;
	1066	+
	1067	+ while (distancenext > 0.000000001) // step
	1068	+ {
	1069	+ gl.glPushMatrix();
	1070	+
	1071	+ gl.glTranslated(tx + tmp.xcount, ty + tmp.ycount, tz + tmp.z*count);
	1072	+
	1073	+ double K = count/nbsteps;
	1074	+
	1075	+ double intersize = Knextsize + (1-K)size;
	1076	+
	1077	+ gl.glScaled(intersize,intersize,intersize);
	1078	+
	1079	+ pointFlow.geo.Draw/Node/(display,null,selected,blocked);
	1080	+
	1081	+ count++;
	1082	+
	1083	+ distancenext -= step;
	1084	+
	1085	+ gl.glPopMatrix();
	1086	+ }
	1087	+
	1088	+ if (count != nbsteps)
	1089	+ assert(count == nbsteps);
	1090	+
	1091	+ // gl.glScalef(16.0f/1024,16.0f/1024,16.0f/1024);
	1092	+ //gl.glTranslatef(-tx,-ty,-tz);
	1093	+
	1094	+ gl.glMatrixMode(gl.GL_TEXTURE);
	1095	+ gl.glPopMatrix();
	1096	+ }
	1097	+
	1098	+ if (!cf)
	1099	+ gl.glDisable(gl.GL_CULL_FACE);
	1100	+
	1101	+// display.modelParams0[0] = r;
	1102	+// display.modelParams0[1] = g;
	1103	+// display.modelParams0[2] = b;
	1104	+//
	1105	+// display.modelParams5[1] = opacity;
	1106	+//
	1107	+// gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 0, display.modelParams0, 0);
	1108	+// gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 5, display.modelParams5, 0);
	1109	+
	1110	+ gl.glMatrixMode(gl.GL_MODELVIEW);
	1111	+ }
	1112	+
	1113	+ public void DrawBox(cVector min, cVector max)
	1114	+ {
	1115	+ javax.media.opengl.GL gl = GetGL();
	1116	+ gl.glBegin(gl.GL_LINES);
	1117	+
	1118	+ gl.glVertex3d(min.x, min.y, min.z);
	1119	+ gl.glVertex3d(min.x, min.y, max.z);
	1120	+ gl.glVertex3d(min.x, min.y, min.z);
	1121	+ gl.glVertex3d(min.x, max.y, min.z);
	1122	+ gl.glVertex3d(min.x, min.y, min.z);
	1123	+ gl.glVertex3d(max.x, min.y, min.z);
	1124	+
	1125	+ gl.glVertex3d(max.x, max.y, max.z);
	1126	+ gl.glVertex3d(min.x, max.y, max.z);
	1127	+ gl.glVertex3d(max.x, max.y, max.z);
	1128	+ gl.glVertex3d(max.x, min.y, max.z);
	1129	+ gl.glVertex3d(max.x, max.y, max.z);
	1130	+ gl.glVertex3d(max.x, max.y, min.z);
	1131	+
	1132	+ gl.glEnd();
	1133	+ }
	1134	+
	1135	+ public void DrawGeometry(BoundaryRep bRep, boolean flipV, boolean selectmode)
	1136	+ {
	1137	+ int[] strips = bRep.getRawIndices();
	1138	+
	1139	+ javax.media.opengl.GL gl = GetGL();
	1140	+
	1141	+ // TRIANGLE STRIP ARRAY
	1142	+ if (bRep.trimmed)
	1143	+ {
	1144	+ float[] v = bRep.getRawVertices();
	1145	+ float[] n = bRep.getRawNormals();
	1146	+ float[] c = bRep.getRawColors();
	1147	+ float[] uv = bRep.getRawUVMap();
	1148	+
	1149	+ int count2 = 0;
	1150	+ int count3 = 0;
	1151	+
	1152	+ if (n.length > 0)
	1153	+ {
	1154	+ for (int i = 0; i < strips.length; i++)
	1155	+ {
	1156	+ gl.glBegin(gl.GL_TRIANGLE_STRIP);
	1157	+
	1158	+ /*
	1159	+ boolean locked = false;
	1160	+ float eps = 0.1f;
	1161	+ boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
	1162	+
	1163	+ int dot = 0;
	1164	+
	1165	+ if ((dot&1) == 0)
	1166	+ dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
	1167	+
	1168	+ if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
	1169	+ gl.glTexCoord2f((float) qv.s, (float) qv.t);
	1170	+ else
	1171	+ {
	1172	+ locked = true;
	1173	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	1174	+ }
	1175	+ //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
	1176	+ gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
	1177	+ if (hasnorm)
	1178	+ {
	1179	+ //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
	1180	+ gl.glNormal3f((float) rv.norm.x, (float) rv.norm.y, (float) rv.norm.z);
	1181	+ }
	1182	+
	1183	+ if ((dot&4) == 0)
	1184	+ dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
	1185	+
	1186	+ if (wrap \|\| !locked && (dot&8) != 0)
	1187	+ gl.glTexCoord2f((float) rv.s, (float) rv.t);
	1188	+ else
	1189	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	1190	+
	1191	+ f.dot = dot;
	1192	+ */
	1193	+
	1194	+ if (!selectmode)
	1195	+ {
	1196	+ if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
	1197	+ {
	1198	+ gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1199	+ } else
	1200	+ {
	1201	+ gl.glNormal3f(0, 0, 1);
	1202	+ }
	1203	+
	1204	+ if (c != null)
	1205	+ //System.out.println("glcolor = " + c[count3] + ", " + c[count3+1] + ", " + c[count3+2]);
	1206	+ {
	1207	+ gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
	1208	+ }
	1209	+ }
	1210	+
	1211	+ if (flipV)
	1212	+ gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
	1213	+ else
	1214	+ gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1215	+
	1216	+ //System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
	1217	+ gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1218	+
	1219	+ count2 += 2;
	1220	+ count3 += 3;
	1221	+ if (!selectmode)
	1222	+ {
	1223	+ if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
	1224	+ {
	1225	+ gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1226	+ } else
	1227	+ {
	1228	+ gl.glNormal3f(0, 0, 1);
	1229	+ }
	1230	+ if (c != null)
	1231	+ {
	1232	+ gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
	1233	+ }
	1234	+ }
	1235	+
	1236	+ if (flipV)
	1237	+ gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
	1238	+ else
	1239	+ gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1240	+
	1241	+ //System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
	1242	+ gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1243	+
	1244	+ count2 += 2;
	1245	+ count3 += 3;
	1246	+ for (int j = 0; j < strips[i] - 2; j++)
	1247	+ {
	1248	+ //gl.glTexCoord2d(...);
	1249	+ if (!selectmode)
	1250	+ {
	1251	+ if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
	1252	+ {
	1253	+ gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1254	+ } else
	1255	+ {
	1256	+ gl.glNormal3f(0, 0, 1);
	1257	+ }
	1258	+ if (c != null)
	1259	+ {
	1260	+ gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
	1261	+ }
	1262	+ }
	1263	+
	1264	+ if (flipV)
	1265	+ gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
	1266	+ else
	1267	+ gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1268	+
	1269	+ //System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
	1270	+ gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1271	+
	1272	+ count2 += 2;
	1273	+ count3 += 3;
	1274	+ }
	1275	+
	1276	+ gl.glEnd();
	1277	+ }
	1278	+ }
	1279	+
	1280	+ assert count3 == v.length;
	1281	+ }
	1282	+ else // !trimmed
	1283	+ {
	1284	+ int count = 0;
	1285	+ for (int i = 0; i < strips.length; i++)
	1286	+ {
	1287	+ gl.glBegin(gl.GL_TRIANGLE_STRIP);
	1288	+
	1289	+ Vertex p = bRep.GetVertex(bRep.indices[count++]);
	1290	+ Vertex q = bRep.GetVertex(bRep.indices[count++]);
	1291	+
	1292	+ drawVertex(gl, p, flipV, selectmode);
	1293	+ drawVertex(gl, q, flipV, selectmode);
	1294	+
	1295	+ for (int j = 0; j < strips[i] - 2; j++)
	1296	+ {
	1297	+ Vertex r = bRep.GetVertex(bRep.indices[count++]);
	1298	+
	1299	+ // if (j%2 == 0)
	1300	+ // drawFace(p, q, r, display, null);
	1301	+ // else
	1302	+ // drawFace(p, r, q, display, null);
	1303	+
	1304	+ // p = q;
	1305	+ // q = r;
	1306	+ drawVertex(gl, r, flipV, selectmode);
	1307	+ }
	1308	+
	1309	+ gl.glEnd();
	1310	+ }
	1311	+ }
	1312	+ }
	1313	+
	1314	+ static cSpring.Point3D temp = new cSpring.Point3D();
	1315	+ static cSpring.Point3D temp2 = new cSpring.Point3D();
	1316	+ static cSpring.Point3D temp3 = new cSpring.Point3D();
	1317	+
	1318	+ public void DrawDynamicMesh(cMesh mesh)
	1319	+ {
	1320	+ GL gl = GetGL(); // getGL();
	1321	+
	1322	+ cSpring.PhysicsController3D Phys = mesh.Phys;
	1323	+
	1324	+ gl.glDisable(gl.GL_LIGHTING);
	1325	+
	1326	+ gl.glLineWidth(1);
	1327	+ gl.glColor3f(1,1,1);
	1328	+ gl.glBegin(gl.GL_LINES);
	1329	+ double scale = 0;
	1330	+ int count = 0;
	1331	+ for (int s=0; s<Phys.allSprings.size(); s++)
	1332	+ {
	1333	+ cSpring.Spring spring = Phys.allSprings.get(s);
	1334	+ if(s == 0)
	1335	+ {
	1336	+ //System.out.println(" spring : " + spring.a.position + "; " + spring.b.position);
	1337	+ }
	1338	+ if (mesh.showsprings)
	1339	+ {
	1340	+ temp.set(spring.a.position);
	1341	+ temp.add(spring.b.position);
	1342	+ temp.mul(0.5);
	1343	+ temp2.set(spring.a.position);
	1344	+ temp2.sub(spring.b.position);
	1345	+ temp2.mul(spring.restLength/2);
	1346	+ temp.sub(temp2);
	1347	+ gl.glVertex3f((float)temp.x, (float)temp.y, (float)temp.z);
	1348	+ temp.add(temp2);
	1349	+ temp.add(temp2);
	1350	+ gl.glVertex3f((float)temp.x, (float)temp.y, (float)temp.z);
	1351	+ }
	1352	+
	1353	+ if (spring.isHandle)
	1354	+ continue;
	1355	+
	1356	+ //if (scale < spring.restLength)
	1357	+ scale += spring.restLength;
	1358	+ count++;
	1359	+ }
	1360	+ gl.glEnd();
	1361	+
	1362	+ if (count == 0)
	1363	+ scale = 0.01;
	1364	+ else
	1365	+ scale /= count * 3;
	1366	+
	1367	+ //scale = 0.25;
	1368	+
	1369	+ if (mesh.ShowInfo())
	1370	+ {
	1371	+ gl.glLineWidth(4);
	1372	+ for (int s=0; s<Phys.allNodes.size(); s++)
	1373	+ {
	1374	+ cSpring.DynamicNode node = Phys.allNodes.get(s);
	1375	+ if (node.mass == 0)
	1376	+ continue;
	1377	+
	1378	+ int i = node.springs==null?-1:node.springs.size();
	1379	+ gl.glColor3f((i>>2)&1,(i>>1)&1,i&1);
	1380	+ //temp.set(node.springForce.x, node.springForce.y, node.springForce.z);
	1381	+ //temp.normalize();
	1382	+ //gl.glColor3d((temp.x+1)/2, (temp.y+1)/2, (temp.z+1)/2);
	1383	+ gl.glBegin(gl.GL_LINES);
	1384	+ gl.glVertex3d(node.position.x, node.position.y, node.position.z);
	1385	+ //gl.glVertex3d(node.position.x + node.normal.xscale, node.position.y + node.normal.yscale, node.position.z + node.normal.z*scale);
	1386	+ gl.glVertex3d(node.position.x + mesh.bRep.GetVertex(s).norm.x*scale,
	1387	+ node.position.y + mesh.bRep.GetVertex(s).norm.y*scale,
	1388	+ node.position.z + mesh.bRep.GetVertex(s).norm.z*scale);
	1389	+ gl.glEnd();
	1390	+ }
	1391	+
	1392	+ gl.glLineWidth(8);
	1393	+ for (int s=0; s<Phys.allNodes.size(); s++)
	1394	+ {
	1395	+ cSpring.DynamicNode node = Phys.allNodes.get(s);
	1396	+
	1397	+ if (node.springs != null)
	1398	+ {
	1399	+ for (int i=0; i<node.springs.size(); i+=1)
	1400	+ {
	1401	+ cSpring.DynamicNode f = node.springs.get(i).GetOther(node);
	1402	+
	1403	+ int c = i+1;
	1404	+ // c = node.springs.get(i).nbcopies;
	1405	+
	1406	+ gl.glColor3f((c>>2)&1,(c>>1)&1,c&1);
	1407	+ gl.glBegin(gl.GL_LINES);
	1408	+ gl.glVertex3d(node.position.x, node.position.y, node.position.z);
	1409	+ 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);
	1410	+ gl.glEnd();
	1411	+ }
	1412	+ }
	1413	+ }
	1414	+
	1415	+ gl.glLineWidth(1);
	1416	+ }
	1417	+
	1418	+ gl.glEnable(gl.GL_LIGHTING);
	1419	+ }
	1420	+
	1421	+ /// INTERFACE
	1422	+
	1423	+ public void StartTriangles()
	1424	+ {
	1425	+ javax.media.opengl.GL gl = GetGL();
	1426	+ gl.glBegin(gl.GL_TRIANGLES);
	1427	+ }
	1428	+
	1429	+ public void EndTriangles()
	1430	+ {
	1431	+ GetGL().glEnd();
	1432	+ }
	1433	+
	1434	+ void drawVertex(javax.media.opengl.GL gl, Vertex pv, boolean flipV, boolean selectmode)
	1435	+ {
	1436	+ if (!selectmode)
	1437	+ {
	1438	+ gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
	1439	+ gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
	1440	+
	1441	+ if (flipV)
	1442	+ gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
	1443	+ else
	1444	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	1445	+ }
	1446	+
	1447	+ gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
	1448	+ }
	1449	+
	1450	+ void SetColor(Object3D obj, Vertex p0)
	1451	+ {
	1452	+ CameraPane display = this;
	1453	+ BoundaryRep bRep = obj.bRep;
	1454	+
	1455	+ if (RENDERPROGRAM == 0)
	1456	+ {
	1457	+ float r = 0;
	1458	+ if (bRep != null)
	1459	+ {
	1460	+ if (bRep.stripified)
	1461	+ {
	1462	+ r = 1;
	1463	+ }
	1464	+ }
	1465	+ float g = 0;
	1466	+ if (bRep != null)
	1467	+ {
	1468	+ if (bRep.trimmed)
	1469	+ {
	1470	+ g = 1;
	1471	+ }
	1472	+ }
	1473	+ float b = 0;
	1474	+ if (obj.support != null && obj.link2master)
	1475	+ {
	1476	+ b = 1;
	1477	+ }
	1478	+ display.GetGL().glColor3f(rp0.AO, gp0.AO, b*p0.AO);
	1479	+ return;
	1480	+ }
	1481	+
	1482	+ if (display.DrawMode() != CameraPane.SHADOW)
	1483	+ return;
	1484	+
	1485	+ javax.media.opengl.GL gl = display.GetGL();
	1486	+// if (true) return;
	1487	+// float ao = p.AO;
	1488	+//
	1489	+// // if (ao == 0 && !bRep.AOdone) // transient problem!
	1490	+// // ao = 1;
	1491	+//
	1492	+// gl.glColor4f(ao, ao, ao, 1);
	1493	+
	1494	+// CameraPane.selectedpoint.
	1495	+// getAverage(cStatic.point1, true);
	1496	+ if (CameraPane.pointflow == null) // !random) // live)
	1497	+ {
	1498	+ return;
	1499	+ }
	1500	+
	1501	+ cStatic.point1.set(0,0,0);
	1502	+ LA.xformPos(cStatic.point1, CameraPane.selectedpoint.toParent, cStatic.point1);
	1503	+
	1504	+ cStatic.point1.sub(p0);
	1505	+
	1506	+
	1507	+// if (marked && (p0.vertexlinks == null \|\| support == null \|\| support.bRep == null)) // no position delta?
	1508	+// {
	1509	+// return;
	1510	+// }
	1511	+
	1512	+ //if (true)
	1513	+ if (cStatic.point1.dot(cStatic.point1) > 0.000001)
	1514	+ {
	1515	+ return;
	1516	+ }
	1517	+
	1518	+ float[] colorV = new float[3];
	1519	+
	1520	+ if (false) // marked)
	1521	+ {
	1522	+ // debug rigging weights
	1523	+ for (int object = 0; object < p0.vertexlinks.length; object++)
	1524	+ {
	1525	+ float weight = p0.weights[object] / p0.totalweight;
	1526	+
	1527	+ // if (weight < 0.1)
	1528	+ // {
	1529	+ // assert(weight == 0);
	1530	+ // continue;
	1531	+ // }
	1532	+
	1533	+ if (p0.vertexlinks[object] == -1)
	1534	+ continue;
	1535	+
	1536	+ Vertex q = obj.support.bRep.GetVertex(p0.vertexlinks[object]);
	1537	+
	1538	+ int color = //1 << object; //
	1539	+ //p.vertexlinks.length;
	1540	+ obj.support.bRep.supports[p0.closestsupport].links[object];
	1541	+ colorV[2] += (color & 1) * weight;
	1542	+ colorV[1] += ((color & 2) >> 1) * weight;
	1543	+ colorV[0] += ((color & 4) >> 2) * weight;
	1544	+ }
	1545	+ }
	1546	+ else
	1547	+ {
	1548	+ if (obj.drawingstarted)
	1549	+ {
	1550	+ // find next point
	1551	+ if (bRep.GetVertex(0).faceindices == null)
	1552	+ {
	1553	+ bRep.InitFaceIndices();
	1554	+ }
	1555	+
	1556	+ double ymin = p0.y;
	1557	+
	1558	+ Vertex newp = p0;
	1559	+
	1560	+ for (int fii = 0; fii < p0.faceindices.length; fii++)
	1561	+ {
	1562	+ int fi = p0.faceindices[fii];
	1563	+
	1564	+ if (fi == -1)
	1565	+ break;
	1566	+
	1567	+ Face f = bRep.GetFace(fi);
	1568	+
	1569	+ Vertex p = bRep.GetVertex(f.p);
	1570	+ Vertex q = bRep.GetVertex(f.q);
	1571	+ Vertex r = bRep.GetVertex(f.r);
	1572	+
	1573	+ int swap = (int)(Math.random()*3);
	1574	+
	1575	+// for (int s=swap; --s>=0;)
	1576	+// {
	1577	+// Vertex t = p;
	1578	+// p = q;
	1579	+// q = r;
	1580	+// r = t;
	1581	+// }
	1582	+ if (ymin > p.y)
	1583	+ {
	1584	+ ymin = p.y;
	1585	+ newp = p;
	1586	+// break;
	1587	+ }
	1588	+ if (ymin > q.y)
	1589	+ {
	1590	+ ymin = q.y;
	1591	+ newp = q;
	1592	+// break;
	1593	+ }
	1594	+ if (ymin > r.y)
	1595	+ {
	1596	+ ymin = r.y;
	1597	+ newp = r;
	1598	+// break;
	1599	+ }
	1600	+ }
	1601	+
	1602	+ CameraPane.selectedpoint.toParent[3][0] = newp.x;
	1603	+ CameraPane.selectedpoint.toParent[3][1] = newp.y;
	1604	+ CameraPane.selectedpoint.toParent[3][2] = newp.z;
	1605	+
	1606	+ obj.drawingstarted = false;
	1607	+
	1608	+ // return;
	1609	+ }
	1610	+
	1611	+ if (false) // CameraPane.DRAW
	1612	+ {
	1613	+ p0.AO = colorV[0] = 2;
	1614	+ colorV[1] = 2;
	1615	+ colorV[2] = 2;
	1616	+ }
	1617	+
	1618	+ CameraPane.pointflow.add(p0);
	1619	+ CameraPane.pointflow.Touch();
	1620	+ }
	1621	+
	1622	+// gl.glColor3f(colorV[0], colorV[1], colorV[2]);
	1623	+// gl.glMaterialfv(gl.GL_FRONT, gl.GL_DIFFUSE, colorV, 0);
	1624	+// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
	1625	+ }
	1626	+
	1627	+ void DrawMaterial(cMaterial material, boolean selected, Object3D.cVector2[] others)
	1628	+ {
	1629	+ CameraPane display = this;
	1630	+ //new Exception().printStackTrace();
	1631	+
	1632	+ if (display.IsFrozen() && !selected \|\| display.IsAmbientOcclusionOn()) // \|\| display.drawMode == display.SHADOW)
	1633	+ {
	1634	+ return;
	1635	+ }
	1636	+
	1637	+ javax.media.opengl.GL gl = display.GetGL();
	1638	+
	1639	+ //Color col = Color.getHSBColor(color,modulation,1);
	1640	+ //col.getColorComponents(ColorSpace.getInstance(ColorSpace.CS_LINEAR_RGB), CameraPane.modelParams0);
	1641	+ if (!material.multiply)
	1642	+ {
	1643	+ display.color = material.color;
	1644	+ display.saturation = material.modulation;
	1645	+ }
	1646	+ else
	1647	+ {
	1648	+ display.color = material.color2;
	1649	+ display.saturation = material.modulation2;
	1650	+ }
	1651	+
	1652	+ cColor.HSBtoRGB(display.color, display.saturation, 1, display.modelParams0);
	1653	+
	1654	+ float[] colorV = Grafreed.colorV;
	1655	+
	1656	+ /**/
	1657	+ if (display.DrawMode() == display.DEFAULT) // && display.RENDERPROGRAM == 0)
	1658	+ {
	1659	+ colorV[0] = display.modelParams0[0] * material.diffuse;
	1660	+ colorV[1] = display.modelParams0[1] * material.diffuse;
	1661	+ colorV[2] = display.modelParams0[2] * material.diffuse;
	1662	+ colorV[3] = 1; // material.opacity;
	1663	+
	1664	+ gl.glColor4f(colorV[0], colorV[1], colorV[2], material.opacity);
	1665	+ //System.out.println("Opacity = " + opacity);
	1666	+
	1667	+ gl.glMaterialfv(gl.GL_FRONT, gl.GL_DIFFUSE, colorV, 0);
	1668	+ //color[0] /= 2; color[1] /= 2; color[2] /= 2;
	1669	+ gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
	1670	+
	1671	+ float amb = material.ambient;
	1672	+ if (amb < material.cameralight)
	1673	+ {
	1674	+ amb = material.cameralight;
	1675	+ }
	1676	+ colorV[0] = display.modelParams0[0] * material.diffuse * amb;
	1677	+ colorV[1] = display.modelParams0[1] * material.diffuse * amb;
	1678	+ colorV[2] = display.modelParams0[2] * material.diffuse * amb;
	1679	+ gl.glMaterialfv(gl.GL_FRONT, gl.GL_AMBIENT, colorV, 0);
	1680	+ //color[0] /= 2; color[1] /= 2; color[2] /= 2;
	1681	+ gl.glMaterialfv(gl.GL_BACK, gl.GL_AMBIENT, colorV, 0);
	1682	+
	1683	+ /**/
	1684	+ colorV[0] = ((1 - material.metalness) + display.modelParams0[0] * material.metalness) * material.specular;
	1685	+ colorV[1] = ((1 - material.metalness) + display.modelParams0[1] * material.metalness) * material.specular;
	1686	+ colorV[2] = ((1 - material.metalness) + display.modelParams0[2] * material.metalness) * material.specular;
	1687	+ gl.glMaterialfv(gl.GL_FRONT, gl.GL_SPECULAR, colorV, 0);
	1688	+ //color[0] /= 2; color[1] /= 2; color[2] /= 2;
	1689	+ gl.glMaterialfv(gl.GL_BACK, gl.GL_SPECULAR, colorV, 0);
	1690	+ colorV[0] = 10 / material.shininess; // 1/0.005f;
	1691	+ //System.out.println("shininess = " + colorV[0]);
	1692	+ if (colorV[0] > 128)
	1693	+ {
	1694	+ colorV[0] = 128;
	1695	+ }
	1696	+ gl.glMaterialfv(gl.GL_FRONT, gl.GL_SHININESS, colorV, 0);
	1697	+ gl.glMaterialfv(gl.GL_BACK, gl.GL_SHININESS, colorV, 0);
	1698	+ /**/
	1699	+ }
	1700	+ /**/
	1701	+
	1702	+ //selected = false;
	1703	+ selected = selected && display.flash;
	1704	+
	1705	+ //display.modelParams0[0] = 0; // pigment.r;
	1706	+ //display.modelParams0[1] = 0; // pigment.g;
	1707	+ //display.modelParams0[2] = 0; // pigment.b;
	1708	+ if (!material.multiply)
	1709	+ {
	1710	+ display.modelParams0[3] = material.metalness;
	1711	+ display.modelParams1[0] = material.diffuse;
	1712	+ display.modelParams1[1] = material.specular;
	1713	+ display.modelParams1[2] = 1 / material.shininess;
	1714	+ display.modelParams1[3] = material.shift;
	1715	+ display.modelParams2[0] = material.ambient;
	1716	+ display.modelParams2[1] = material.lightarea;
	1717	+ //System.out.println("light area = " + lightarea);
	1718	+ display.modelParams2[2] = 1 / material.factor; // diffuseness
	1719	+ display.modelParams2[3] = material.velvet;
	1720	+ display.modelParams3[0] = material.sheen;
	1721	+ display.modelParams3[1] = material.subsurface;
	1722	+ display.modelParams3[2] = material.bump; // backlit
	1723	+ display.modelParams3[3] = material.aniso;
	1724	+ display.modelParams4[0] = material.anisoV;
	1725	+ display.modelParams4[1] = selected ? 100 : material.cameralight;
	1726	+ //System.out.println("selected = " + selected);
	1727	+ display.modelParams4[2] = material.diffuseness;
	1728	+ display.modelParams4[3] = material.shadow;
	1729	+ display.modelParams5[0] = material.texture;
	1730	+ display.modelParams5[1] = material.opacity;
	1731	+ display.modelParams5[2] = material.fakedepth;
	1732	+ display.modelParams5[3] = CameraPane.SHADOWCULLFACE ? 0f : (material.shadowbias - 0.005f) / 10;
	1733	+ }
	1734	+ else
	1735	+ {
	1736	+ display.modelParams0[3] = material.metalness2;
	1737	+ display.modelParams1[0] = material.diffuse2;
	1738	+ display.modelParams1[1] = material.specular2;
	1739	+ display.modelParams1[2] = material.shininess2;
	1740	+ display.modelParams1[3] = material.shift2;
	1741	+ display.modelParams2[0] = material.ambient2;
	1742	+ display.modelParams2[1] = material.lightarea2;
	1743	+ display.modelParams2[2] = material.factor2;
	1744	+ display.modelParams2[3] = material.velvet2;
	1745	+ display.modelParams3[0] = material.sheen2;
	1746	+ display.modelParams3[1] = material.subsurface2;
	1747	+ display.modelParams3[2] = material.bump2;
	1748	+ display.modelParams3[3] = material.aniso2;
	1749	+ display.modelParams4[0] = material.anisoV2;
	1750	+ display.modelParams4[1] = material.cameralight2;
	1751	+ //System.out.println("selected = " + selected);
	1752	+ display.modelParams4[2] = material.diffuseness2;
	1753	+ display.modelParams4[3] = material.shadow2;
	1754	+ display.modelParams5[0] = material.texture2;
	1755	+ display.modelParams5[1] = material.opacity2;
	1756	+ display.modelParams5[2] = material.fakedepth2;
	1757	+ display.modelParams5[3] = material.shadowbias2;
	1758	+ }
	1759	+
	1760	+ display.modelParams6[0] = 0;
	1761	+ display.modelParams6[1] = 0;
	1762	+ display.modelParams6[2] = 0;
	1763	+ display.modelParams6[3] = 0;
	1764	+
	1765	+ display.modelParams7[0] = 0;
	1766	+ display.modelParams7[1] = 1000;
	1767	+ display.modelParams7[2] = 0;
	1768	+ display.modelParams7[3] = 0;
	1769	+
	1770	+ //display.modelParams6[0] = 100; // criss de bug de bump
	1771	+
	1772	+ Object3D.cVector2[] extparams = others; // display.vector2buffer;
	1773	+ if (extparams != null && extparams.length > 0 && extparams[0] != null)
	1774	+ {
	1775	+ display.modelParams6[0] = extparams[0].x / 1000.0f; // bump
	1776	+ display.modelParams6[1] = extparams[0].y / 1000.0f; // noise
	1777	+ if (extparams.length > 1)
	1778	+ {
	1779	+ display.modelParams6[2] = extparams[1].x / 1000.0f; // borderfade
	1780	+ display.modelParams6[3] = extparams[1].y / 1000.0f; // (float)Math.exp(-extparams[1].y / 1000.0f); // fog punchthrough
	1781	+ if (extparams.length > 2)
	1782	+ {
	1783	+ display.modelParams7[0] = extparams[2].x / 1000.0f; // noise power
	1784	+ float x = extparams[2].y / 1000.0f;
	1785	+ //if (x == 0)
	1786	+ // x = 1f;
	1787	+ 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
	1788	+ if (extparams[2].y > 0)
	1789	+ {
	1790	+ //System.out.println("extparams[1].y = " + extparams[1].y);
	1791	+ //System.out.println("extparams[2].y = " + extparams[2].y);
	1792	+ //System.out.println("opacity power = " + display.modelParams7[1]);
	1793	+ }
	1794	+ }
	1795	+ }
	1796	+ }
	1797	+
	1798	+ //if (display.modelParams6[2] != 0)
	1799	+ /*
	1800	+ System.out.println("modelParams0[0] = " + display.modelParams0[0]);
	1801	+ System.out.println("modelParams0[1] = " + display.modelParams0[1]);
	1802	+ System.out.println("modelParams0[2] = " + display.modelParams0[2]);
	1803	+ System.out.println("modelParams0[3] = " + display.modelParams0[3]);
	1804	+ System.out.println("modelParams1[0] = " + display.modelParams1[0]);
	1805	+ System.out.println("modelParams1[1] = " + display.modelParams1[1]);
	1806	+ System.out.println("modelParams1[2] = " + display.modelParams1[2]);
	1807	+ System.out.println("modelParams1[3] = " + display.modelParams1[3]);
	1808	+ System.out.println("modelParams2[0] = " + display.modelParams2[0]);
	1809	+ System.out.println("modelParams2[1] = " + display.modelParams2[1]);
	1810	+ System.out.println("modelParams2[2] = " + display.modelParams2[2]);
	1811	+ System.out.println("modelParams2[3] = " + display.modelParams2[3]);
	1812	+ System.out.println("modelParams3[0] = " + display.modelParams3[0]);
	1813	+ System.out.println("modelParams3[1] = " + display.modelParams3[1]);
	1814	+ System.out.println("modelParams3[2] = " + display.modelParams3[2]);
	1815	+ System.out.println("modelParams3[3] = " + display.modelParams3[3]);
	1816	+ System.out.println("modelParams4[0] = " + display.modelParams4[0]);
	1817	+ System.out.println("modelParams4[1] = " + display.modelParams4[1]);
	1818	+ System.out.println("modelParams4[2] = " + display.modelParams4[2]);
	1819	+ System.out.println("modelParams4[3] = " + display.modelParams4[3]);
	1820	+ System.out.println("modelParams5[0] = " + display.modelParams5[0]);
	1821	+ System.out.println("modelParams5[1] = " + display.modelParams5[1]);
	1822	+ System.out.println("modelParams5[2] = " + display.modelParams5[2]);
	1823	+ System.out.println("modelParams5[3] = " + display.modelParams5[3]);
	1824	+ System.out.println("modelParams6[0] = " + display.modelParams6[0]);
	1825	+ System.out.println("modelParams6[1] = " + display.modelParams6[1]);
	1826	+ System.out.println("modelParams6[2] = " + display.modelParams6[2]);
	1827	+ System.out.println("modelParams6[3] = " + display.modelParams6[3]);
	1828	+ System.out.println("modelParams7[0] = " + display.modelParams7[0]);
	1829	+ System.out.println("modelParams7[1] = " + display.modelParams7[1]);
	1830	+ System.out.println("modelParams7[2] = " + display.modelParams7[2]);
	1831	+ System.out.println("modelParams7[3] = " + display.modelParams7[3]);
	1832	+ /**/
	1833	+ //assert (display.modelParams6[2] == 0);
	1834	+
	1835	+ //System.out.println("noise power = " + display.modelParams7[0]);
	1836	+ //System.out.println("shadowbias = " + shadowbias);
	1837	+
	1838	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 0, display.modelParams0, 0);
	1839	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 1, display.modelParams1, 0);
	1840	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 2, display.modelParams2, 0);
	1841	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 3, display.modelParams3, 0);
	1842	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 4, display.modelParams4, 0);
	1843	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 5, display.modelParams5, 0);
	1844	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 6, display.modelParams6, 0);
	1845	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 7, display.modelParams7, 0);
	1846	+
	1847	+ int mode = display.FP_SHADER;
	1848	+
	1849	+ if (material.aniso != material.anisoV \|\| material.aniso > 0.002)
	1850	+ {
	1851	+ mode \|= display.FP_ANISO;
	1852	+ }
	1853	+
	1854	+ display.EnableProgram(mode);
	1855	+
	1856	+ //System.out.println("opacity power = " + display.modelParams7[1]);
	1857	+
	1858	+ if (!material.multiply)
	1859	+ {
	1860	+ if (Globals.drawMode == CameraPane.SHADOW)
	1861	+ gl.glDepthMask(material.opacity >= 0.9 && display.modelParams7[1] > 0.1);
	1862	+ else
	1863	+ gl.glDepthMask(material.opacity >= 0.99);
	1864	+ }
208	1865	}
209	1866
210	1867	int matrixdepth = 0; // 10000; // CONFLICT WITH cMESH... WARNING WARNING WARNING WARNING WARNING WARNING !!!!!!!!!!!! 0;
..	..	@@ -225,7 +1882,7 @@
225	1882	currentGL.glMultMatrixd(model, 0);
226	1883	}
227	1884
228		- void PushMatrix(double[][] matrix, int count)
	1885	+ public void PushMatrix(double[][] matrix, int count) // INTERFACE
229	1886	{
230	1887	matrixdepth++;
231	1888	// GrafreeD.tracein(matrix);
..	..	@@ -254,7 +1911,7 @@
254	1911	void PushMatrix(double[][] matrix)
255	1912	{
256	1913	// GrafreeD.tracein(matrix);
257		- PushMatrix(matrix,1);
	1914	+ PushMatrix(matrix, 1);
258	1915	}
259	1916
260	1917	void PushMatrix()
..	..	@@ -270,7 +1927,7 @@
270	1927
271	1928	double[][] tmpmat = new double[4][4];
272	1929
273		- void PopMatrix(double[][] inverse)
	1930	+ public void PopMatrix(double[][] inverse) // INTERFACE
274	1931	{
275	1932	--matrixdepth;
276	1933
..	..	@@ -310,7 +1967,7 @@
310	1967	PushTextureMatrix(matrix, 1);
311	1968	}
312	1969
313		- void PushTextureMatrix(double[][] matrix, int count)
	1970	+ public void PushTextureMatrix(double[][] matrix, int count) // INTERFACE
314	1971	{
315	1972	currentGL.glActiveTexture(GetGL().GL_TEXTURE0);
316	1973
..	..	@@ -324,7 +1981,7 @@
324	1981	currentGL.glMatrixMode(GetGL().GL_MODELVIEW);
325	1982	}
326	1983
327		- void PopTextureMatrix(double[][] inverse)
	1984	+ public void PopTextureMatrix(double[][] inverse) // INTERFACE
328	1985	{
329	1986	currentGL.glActiveTexture(GetGL().GL_TEXTURE0);
330	1987	currentGL.glMatrixMode(GetGL().GL_TEXTURE);
..	..	@@ -351,15 +2008,15 @@
351	2008
352	2009	static int camerachangeframe;
353	2010
354		- boolean SetCamera(Camera cam)
	2011	+ public boolean SetCamera(Camera cam)
355	2012	{
356	2013	// may 2014 if (cam == cameras[0] \|\| cam == cameras[1])
357	2014	// return false;
358	2015
359		- if (REFUSEMODE && isLIVE() && camerachangeframe != 0 && camerachangeframe != framecount)
	2016	+ if (REFUSEMODE && Globals.isLIVE() && camerachangeframe != 0 && camerachangeframe != Globals.framecount)
360	2017	{
361	2018	// check for last change
362		- if (framecount < camerachangeframe + 400) // 120 == 1 second
	2019	+ if (Globals.framecount < camerachangeframe + 400) // 120 == 1 second
363	2020	{
364	2021	// refuse the camera change
365	2022	System.err.println("Camera " + cam + " REFUSED");
..	..	@@ -367,7 +2024,7 @@
367	2024	}
368	2025	}
369	2026
370		- camerachangeframe = framecount;
	2027	+ camerachangeframe = Globals.framecount;
371	2028
372	2029	cam.hAspect = -1; // Read only
373	2030
..	..	@@ -398,7 +2055,7 @@
398	2055	{
399	2056	//System.err.println("Oeil on");
400	2057	TRACK = true;
401		-// JUNE 2014 if (TRACK && trackedobject != null && drawMode == SHADOW) // && !lightMode)
	2058	+// JUNE 2014 if (TRACK && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
402	2059	// object.editWindow.ScreenFit(trackedobject);
403	2060	//pingthread.StepToTarget(true);
404	2061	}
..	..	@@ -407,8 +2064,8 @@
407	2064	{
408	2065	//System.err.println("Oeil on");
409	2066	OEIL = true;
410		- if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && drawMode == SHADOW) // && !lightMode)
411		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	2067	+ if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
	2068	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
412	2069	//pingthread.StepToTarget(true);
413	2070	}
414	2071
..	..	@@ -471,39 +2128,12 @@
471	2128	{
472	2129	frozen ^= true;
473	2130	// Weird...
474		- lighttouched = true;
	2131	+ Globals.lighttouched = true;
475	2132	}
476	2133
477	2134	void ToggleDL()
478	2135	{
479	2136	mainDL ^= true;
480		- }
481		-
482		- void ToggleTexture()
483		- {
484		- textureon ^= true;
485		- }
486		-
487		- void ToggleLive()
488		- {
489		- setLIVE(isLIVE() ^ true);
490		-
491		- System.err.println("LIVE = " + isLIVE());
492		-
493		- if (!isLIVE()) // save sound
494		- GrafreeD.savesound = true; // wav.save();
495		- // else
496		- repaint(); // start loop // may 2013
497		- }
498		-
499		- void ToggleSupport()
500		- {
501		- SUPPORT ^= true;
502		- }
503		-
504		- void ToggleAbort()
505		- {
506		- ABORTMODE ^= true;
507	2137	}
508	2138
509	2139	void ToggleFullScreen()
..	..	@@ -513,12 +2143,7 @@
513	2143
514	2144	void ToggleCrowd()
515	2145	{
516		- CROWD ^= true;
517		- }
518		-
519		- void ToggleInertia()
520		- {
521		- INERTIA ^= true;
	2146	+ Globals.CROWD ^= true;
522	2147	}
523	2148
524	2149	void ToggleLocal()
..	..	@@ -526,62 +2151,89 @@
526	2151	LOCALTRANSFORM ^= true;
527	2152	}
528	2153
529		- void ToggleFast()
	2154	+ public void ToggleTexture()
	2155	+ {
	2156	+ textureon ^= true;
	2157	+ }
	2158	+
	2159	+ public void ToggleLive()
	2160	+ {
	2161	+ Globals.setLIVE(Globals.isLIVE() ^ true);
	2162	+
	2163	+ System.err.println("LIVE = " + Globals.isLIVE());
	2164	+
	2165	+ if (!Globals.isLIVE()) // save sound
	2166	+ Grafreed.savesound = true; // wav.save();
	2167	+ // else
	2168	+ repaint(); // start loop // may 2013
	2169	+ }
	2170	+
	2171	+ public void ToggleSupport()
	2172	+ {
	2173	+ SUPPORT ^= true;
	2174	+ }
	2175	+
	2176	+ public void ToggleAbort()
	2177	+ {
	2178	+ ABORTMODE ^= true;
	2179	+ }
	2180	+
	2181	+ public void ToggleInertia()
	2182	+ {
	2183	+ INERTIA ^= true;
	2184	+ }
	2185	+
	2186	+ public void ToggleFast()
530	2187	{
531	2188	FAST ^= true;
532	2189	}
533	2190
534		- void ToggleSlowPose()
	2191	+ public void ToggleSlowPose()
535	2192	{
536	2193	SLOWPOSE ^= true;
537	2194	}
538	2195
539		- void ToggleFootContact()
540		- {
541		- FOOTCONTACT ^= true;
542		- }
543		-
544		- void ToggleBoxMode()
	2196	+ public void ToggleBoxMode()
545	2197	{
546	2198	BOXMODE ^= true;
547	2199	}
548	2200
549		- void ToggleSmoothFocus()
	2201	+ public void ToggleZoomBoxMode()
	2202	+ {
	2203	+ ZOOMBOXMODE ^= true;
	2204	+ }
	2205	+
	2206	+ public void ToggleSmoothFocus()
550	2207	{
551	2208	SMOOTHFOCUS ^= true;
552	2209	}
553	2210
554		- void ToggleImageFlip()
	2211	+ public void ToggleImageFlip()
555	2212	{
556	2213	IMAGEFLIP ^= true;
557	2214	}
558	2215
559		- void ToggleSpeakerMocap()
	2216	+ public void ToggleSpeakerMocap()
560	2217	{
561	2218	SPEAKERMOCAP ^= true;
562	2219	}
563	2220
564		- void ToggleSpeakerCamera()
	2221	+ public void ToggleSpeakerCamera()
565	2222	{
566	2223	SPEAKERCAMERA ^= true;
567	2224	}
568	2225
569		- void ToggleSpeakerFocus()
	2226	+ public void ToggleSpeakerFocus()
570	2227	{
571	2228	SPEAKERFOCUS ^= true;
572	2229	}
573	2230
574		- void ToggleDebug()
575		- {
576		- DEBUG ^= true;
577		- }
578		-
579		- void ToggleFrustum()
	2231	+ public void ToggleFrustum()
580	2232	{
581	2233	FRUSTUM ^= true;
582	2234	}
583	2235
584		- void ToggleTrack()
	2236	+ public void ToggleTrack()
585	2237	{
586	2238	TRACK ^= true;
587	2239	if (TRACK)
..	..	@@ -600,25 +2252,35 @@
600	2252	repaint();
601	2253	}
602	2254
603		- void ToggleTrackOnce()
	2255	+ public void ToggleTrackOnce()
604	2256	{
605	2257	TRACKONCE ^= true;
606	2258	}
607	2259
608		- void ToggleShadowTrack()
	2260	+ public void ToggleShadowTrack()
609	2261	{
610	2262	SHADOWTRACK ^= true;
611	2263	repaint();
612	2264	}
613	2265
614		- void ToggleOeil()
	2266	+ public void ToggleOeil()
615	2267	{
616	2268	OEIL ^= true;
617	2269	}
618	2270
619		- void ToggleOeilOnce()
	2271	+ public void ToggleOeilOnce()
620	2272	{
621	2273	OEILONCE ^= true;
	2274	+ }
	2275	+
	2276	+ void ToggleFootContact()
	2277	+ {
	2278	+ FOOTCONTACT ^= true;
	2279	+ }
	2280	+
	2281	+ void ToggleDebug()
	2282	+ {
	2283	+ Globals.DEBUG ^= true;
622	2284	}
623	2285
624	2286	void ToggleLookAt()
..	..	@@ -626,9 +2288,9 @@
626	2288	LOOKAT ^= true;
627	2289	}
628	2290
629		- void ToggleRandom()
	2291	+ void ToggleSwitch()
630	2292	{
631		- RANDOM ^= true;
	2293	+ SWITCH ^= true;
632	2294	}
633	2295
634	2296	void ToggleHandles()
..	..	@@ -636,10 +2298,17 @@
636	2298	HANDLES ^= true;
637	2299	}
638	2300
	2301	+ Object3D paintFolder;
	2302	+
639	2303	void TogglePaint()
640	2304	{
641	2305	PAINTMODE ^= true;
642	2306	paintcount = 0;
	2307	+
	2308	+ if (PAINTMODE)
	2309	+ {
	2310	+ paintFolder = GetFolder();
	2311	+ }
643	2312	}
644	2313
645	2314	void SwapCamera(int a, int b)
..	..	@@ -672,34 +2341,6 @@
672	2341	//assert (cam.hAspect == 0);
673	2342	cam.hAspect = 0;
674	2343	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	2344	}
704	2345
705	2346	private static void ApplyTransform(GL gl, Mat4f xform)
..	..	@@ -759,11 +2400,11 @@
759	2400
760	2401	GL currentGL;
761	2402
762		- GL GetGL()
	2403	+ public GL GetGL() // INTERFACE
763	2404	{
764	2405	return currentGL;
765	2406	}
766		-
	2407	+
767	2408	/**/
768	2409	class CacheTexture
769	2410	{
..	..	@@ -781,9 +2422,10 @@
781	2422	/**/
782	2423
783	2424	// TEXTURE static Texture texture;
784		- static public java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/> textures
785		- = new java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/>();
786		- static public java.util.Hashtable<String, String> usedtextures = new java.util.Hashtable<String, String>();
	2425	+ static public java.util.Hashtable<String, CacheTexture> textures = new java.util.Hashtable<String, CacheTexture>();
	2426	+ static public java.util.Hashtable<BufferedImage, CacheTexture> bimtextures = new java.util.Hashtable<BufferedImage, CacheTexture>();
	2427	+ static public java.util.HashSet<String> usedtextures = new java.util.HashSet<String>();
	2428	+
787	2429	int pigmentdepth = 0;
788	2430	public com.sun.opengl.util.texture.Texture[] pigmentstack = new com.sun.opengl.util.texture.Texture[65536];
789	2431	int bumpdepth = 0;
..	..	@@ -805,6 +2447,33 @@
805	2447	true,
806	2448	com.sun.opengl.util.texture.TextureIO.PNG);
807	2449	} catch (java.io.IOException e)
	2450	+ {
	2451	+ throw new javax.media.opengl.GLException(e);
	2452	+ }
	2453	+
	2454	+ if (bump)
	2455	+ texturedata = ConvertBump(texturedata, false);
	2456	+
	2457	+ com.sun.opengl.util.texture.Texture texture =
	2458	+ com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
	2459	+
	2460	+ texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
	2461	+ texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
	2462	+
	2463	+ return texture;
	2464	+ }
	2465	+
	2466	+ com.sun.opengl.util.texture.Texture GetBimTexture(BufferedImage name, boolean bump)
	2467	+ {
	2468	+ TextureData texturedata = null;
	2469	+
	2470	+ try
	2471	+ {
	2472	+ texturedata =
	2473	+ com.sun.opengl.util.texture.TextureIO.newTextureData(
	2474	+ name,
	2475	+ true);
	2476	+ } catch (Exception e)
808	2477	{
809	2478	throw new javax.media.opengl.GLException(e);
810	2479	}
..	..	@@ -1891,6 +3560,8 @@
1891	3560
1892	3561	System.out.println("LOADING TEXTURE : " + name);
1893	3562
	3563	+ Object x = texturedata.getMipmapData(); // .getBuffer();
	3564	+
1894	3565	//
1895	3566	if (false) // compressbit > 0)
1896	3567	{
..	..	@@ -2595,6 +4266,7 @@
2595	4266
2596	4267	com.sun.opengl.util.texture.Texture CompressTexture2(String name)
2597	4268	{
	4269	+ new Exception().printStackTrace();
2598	4270	System.exit(0);
2599	4271	com.sun.opengl.util.texture.Texture texture = null;
2600	4272
..	..	@@ -6271,7 +7943,7 @@
6271	7943	return null;
6272	7944	}
6273	7945
6274		- void ReleaseTextures(cTexture tex)
	7946	+ public void ReleaseTextures(cTexture tex) // INTERFACE
6275	7947	{
6276	7948	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
6277	7949	{
..	..	@@ -6288,7 +7960,7 @@
6288	7960	String pigment = Object3D.GetPigment(tex);
6289	7961	String bump = Object3D.GetBump(tex);
6290	7962
6291		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	7963	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
6292	7964	{
6293	7965	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
6294	7966	// System.out.println("; bump = " + bump);
..	..	@@ -6307,9 +7979,67 @@
6307	7979	ReleaseTexture(pigment, false);
6308	7980	}
6309	7981
	7982	+ public void ReleasePigmentTexture(cTexture tex) // INTERFACE
	7983	+ {
	7984	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	7985	+ {
	7986	+ return;
	7987	+ }
	7988	+
	7989	+ if (tex == null)
	7990	+ {
	7991	+ ReleaseTexture(null, false);
	7992	+ return;
	7993	+ }
	7994	+
	7995	+ String pigment = Object3D.GetPigment(tex);
	7996	+
	7997	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	7998	+ {
	7999	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	8000	+ // System.out.println("; bump = " + bump);
	8001	+ }
	8002	+
	8003	+ if (pigment.equals(""))
	8004	+ {
	8005	+ pigment = null;
	8006	+ }
	8007	+
	8008	+ ReleaseTexture(pigment, false);
	8009	+ }
	8010	+
	8011	+ public void ReleaseBumpTexture(cTexture tex) // INTERFACE
	8012	+ {
	8013	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	8014	+ {
	8015	+ return;
	8016	+ }
	8017	+
	8018	+ if (tex == null)
	8019	+ {
	8020	+ ReleaseTexture(null, true);
	8021	+ return;
	8022	+ }
	8023	+
	8024	+ String bump = Object3D.GetBump(tex);
	8025	+
	8026	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8027	+ {
	8028	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	8029	+ // System.out.println("; bump = " + bump);
	8030	+ }
	8031	+
	8032	+ if (bump.equals(""))
	8033	+ {
	8034	+ bump = null;
	8035	+ }
	8036	+
	8037	+ ReleaseTexture(bump, true);
	8038	+ }
	8039	+
6310	8040	void ReleaseTexture(String tex, boolean bump)
6311	8041	{
6312		- if (// drawMode != 0 \|\| /tex == null \|\|/
	8042	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
6313	8043	ambientOcclusion ) // \|\| !textureon)
6314	8044	{
6315	8045	return;
..	..	@@ -6410,9 +8140,57 @@
6410	8140	}
6411	8141	}
6412	8142
6413		- /boolean/ void BindTextures(cTexture tex, int resolution)
	8143	+ /boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
6414	8144	{
6415		- if (// drawMode != 0 \|\| /tex == null \|\|/
	8145	+// if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8146	+// ambientOcclusion ) // \|\| !textureon)
	8147	+// {
	8148	+// return; // false;
	8149	+// }
	8150	+//
	8151	+// if (tex == null)
	8152	+// {
	8153	+// BindTexture(null,false,resolution);
	8154	+// BindTexture(null,true,resolution);
	8155	+// return;
	8156	+// }
	8157	+//
	8158	+// String pigment = Object3D.GetPigment(tex);
	8159	+// String bump = Object3D.GetBump(tex);
	8160	+//
	8161	+// usedtextures.add(pigment);
	8162	+// usedtextures.add(bump);
	8163	+//
	8164	+// //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8165	+// {
	8166	+// // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8167	+// // System.out.println("; bump = " + bump);
	8168	+// }
	8169	+//
	8170	+// if (bump.equals(""))
	8171	+// {
	8172	+// bump = null;
	8173	+// }
	8174	+// if (pigment.equals(""))
	8175	+// {
	8176	+// pigment = null;
	8177	+// }
	8178	+//
	8179	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8180	+// BindTexture(pigment, false, resolution);
	8181	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
	8182	+// BindTexture(bump, true, resolution);
	8183	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8184	+//
	8185	+// return; // true;
	8186	+
	8187	+ BindPigmentTexture(tex, resolution);
	8188	+ BindBumpTexture(tex, resolution);
	8189	+ }
	8190	+
	8191	+ /boolean/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8192	+ {
	8193	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
6416	8194	ambientOcclusion ) // \|\| !textureon)
6417	8195	{
6418	8196	return; // false;
..	..	@@ -6420,18 +8198,48 @@
6420	8198
6421	8199	if (tex == null)
6422	8200	{
6423		- BindTexture(null,false,resolution);
6424		- BindTexture(null,true,resolution);
	8201	+ BindTexture(null, null,false,resolution);
6425	8202	return;
6426	8203	}
6427	8204
6428	8205	String pigment = Object3D.GetPigment(tex);
	8206	+
	8207	+ usedtextures.add(pigment);
	8208	+
	8209	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8210	+ {
	8211	+ // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8212	+ // System.out.println("; bump = " + bump);
	8213	+ }
	8214	+
	8215	+ if (pigment.equals(""))
	8216	+ {
	8217	+ pigment = null;
	8218	+ }
	8219	+
	8220	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8221	+ BindTexture(tex.pigmenttexture, pigment, false, resolution);
	8222	+ }
	8223	+
	8224	+ /boolean/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8225	+ {
	8226	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8227	+ ambientOcclusion ) // \|\| !textureon)
	8228	+ {
	8229	+ return; // false;
	8230	+ }
	8231	+
	8232	+ if (tex == null)
	8233	+ {
	8234	+ BindTexture(null, null,true,resolution);
	8235	+ return;
	8236	+ }
	8237	+
6429	8238	String bump = Object3D.GetBump(tex);
6430	8239
6431		- usedtextures.put(pigment, pigment);
6432		- usedtextures.put(bump, bump);
	8240	+ usedtextures.add(bump);
6433	8241
6434		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8242	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
6435	8243	{
6436	8244	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
6437	8245	// System.out.println("; bump = " + bump);
..	..	@@ -6441,42 +8249,70 @@
6441	8249	{
6442	8250	bump = null;
6443	8251	}
6444		- if (pigment.equals(""))
6445		- {
6446		- pigment = null;
6447		- }
6448	8252
6449		- GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
6450		- BindTexture(pigment, false, resolution);
6451	8253	GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
6452		- BindTexture(bump, true, resolution);
	8254	+ BindTexture(tex.bumptexture, bump, true, resolution);
6453	8255	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
6454		-
6455		- return; // true;
6456	8256	}
6457	8257
6458		- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution)
	8258	+ java.util.HashSet<String> missingTextures = new java.util.HashSet<String>();
	8259	+
	8260	+ private boolean FileExists(String tex)
6459	8261	{
6460		- CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
	8262	+ if (missingTextures.contains(tex))
	8263	+ {
	8264	+ return false;
	8265	+ }
	8266	+
	8267	+ boolean fileExists = new File(tex).exists();
	8268	+
	8269	+ if (!fileExists)
	8270	+ {
	8271	+ // If file exists, the "new File()" is not executed sgain
	8272	+ missingTextures.add(tex);
	8273	+ }
	8274	+
	8275	+ return fileExists;
	8276	+ }
	8277	+
	8278	+ CacheTexture GetCacheTexture(java.awt.image.BufferedImage bim, String tex, boolean bump, int resolution) throws Exception
	8279	+ {
	8280	+ CacheTexture texturecache = null;
6461	8281
6462	8282	if (tex != null)
6463	8283	{
6464	8284	String texname = tex;
6465	8285
6466		- String[] split = tex.split("Textures");
6467		- if (split.length > 1)
6468		- texname = "/Users/nbriere/Textures" + split[split.length-1];
6469		- else
6470		- if (!texname.startsWith("/"))
6471		- texname = "/Users/nbriere/Textures/" + texname;
	8286	+ String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
	8287	+
	8288	+// String[] split = tex.split("Textures");
	8289	+// if (split.length > 1)
	8290	+// texname = "/Users/nbriere/Textures" + split[split.length-1];
	8291	+// else
	8292	+// if (!texname.startsWith("/"))
	8293	+// texname = "/Users/nbriere/Textures/" + texname;
	8294	+ if (!FileExists(tex))
	8295	+ {
	8296	+ texname = fallbackTextureName;
	8297	+ }
6472	8298
6473	8299	if (CACHETEXTURE)
6474		- texture = textures.get(texname); // TEXTURE CACHE
6475		-
6476		- TextureData texturedata = null;
6477		-
6478		- if (texture == null \|\| texture.resolution < resolution)
6479	8300	{
	8301	+ if (bim == null)
	8302	+ texturecache = textures.get(texname); // TEXTURE CACHE
	8303	+ else
	8304	+ texturecache = bimtextures.get(bim); // TEXTURE CACHE
	8305	+ }
	8306	+
	8307	+ if (texturecache == null \|\| texturecache.resolution < resolution)
	8308	+ {
	8309	+ TextureData texturedata = null;
	8310	+
	8311	+ if (bim == null)
	8312	+ {
	8313	+
	8314	+ }
	8315	+ else
6480	8316	if (tex.equals("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
6481	8317	{
6482	8318	assert(!bump);
..	..	@@ -6488,19 +8324,19 @@
6488	8324	// }
6489	8325	// else
6490	8326	// {
6491		- texture = textures.get(tex);
6492		- if (texture == null)
	8327	+ texturecache = textures.get(tex);
	8328	+ if (texturecache == null)
6493	8329	{
6494		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8330	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
6495	8331	}
6496	8332	// }
6497	8333	} else
6498	8334	if (tex.equals("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
6499	8335	{
6500	8336	assert(bump);
6501		- texture = textures.get(tex);
6502		- if (texture == null)
6503		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8337	+ texturecache = textures.get(tex);
	8338	+ if (texturecache == null)
	8339	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
6504	8340	} else
6505	8341	{
6506	8342	//if (tex.equals("IMMORTAL"))
..	..	@@ -6510,9 +8346,9 @@
6510	8346	//{
6511	8347	if (tex.equals("WHITE_NOISE"))
6512	8348	{
6513		- texture = textures.get(tex);
6514		- if (texture == null)
6515		- texture = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8349	+ texturecache = textures.get(tex);
	8350	+ if (texturecache == null)
	8351	+ texturecache = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
6516	8352	} else
6517	8353	{
6518	8354	if (textureon)
..	..	@@ -6537,7 +8373,7 @@
6537	8373	}
6538	8374
6539	8375	cachename = texname.substring(0, texname.length()-4)+ext+".jpg";
6540		- if (!new File(cachename).exists())
	8376	+ if (!FileExists(cachename))
6541	8377	cachename = texname;
6542	8378	else
6543	8379	processbump = false; // don't process bump map again
..	..	@@ -6559,7 +8395,7 @@
6559	8395	}
6560	8396
6561	8397	cachename = texname.substring(0, texname.length()-4)+ext+".png";
6562		- if (!new File(cachename).exists())
	8398	+ if (!FileExists(cachename))
6563	8399	cachename = texname;
6564	8400	else
6565	8401	processbump = false; // don't process bump map again
..	..	@@ -6568,20 +8404,22 @@
6568	8404	texturedata = GetFileTexture(cachename, processbump, resolution);
6569	8405
6570	8406
6571		- if (texturedata != null)
6572		- texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
	8407	+ if (texturedata == null)
	8408	+ throw new Exception();
	8409	+
	8410	+ texturecache = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
6573	8411	//texture = GetTexture(tex, bump);
6574	8412	}
6575	8413	}
6576	8414	//}
6577	8415	}
6578	8416
6579		- if (/CACHETEXTURE &&/ texture != null && textureon)
	8417	+ if (/CACHETEXTURE &&/ texturecache != null && textureon)
6580	8418	{
6581	8419	//return false;
6582	8420
6583	8421	// System.out.println("CACHE +++++++++++++++ TEXTURE : " + texname + " (" + texture.getEstimatedMemorySize() + ")");
6584		- if (texturedata != null && (texname.endsWith(".jpg") \|\| texname.endsWith(".JPG")))
	8422	+ if (texturedata != null && texname.toLowerCase().endsWith(".jpg"))
6585	8423	{
6586	8424	// String ext = "_highres";
6587	8425	// if (REDUCETEXTURE)
..	..	@@ -6670,8 +8508,8 @@
6670	8508	textures.remove(texname);
6671	8509	}
6672	8510
6673		- texture.texturedata = texturedata;
6674		- textures.put(texname, texture);
	8511	+ //texture.texturedata = texturedata;
	8512	+ textures.put(texname, texturecache);
6675	8513
6676	8514	// newtex = true;
6677	8515	}
..	..	@@ -6687,12 +8525,12 @@
6687	8525	}
6688	8526	}
6689	8527
6690		- return texture;
	8528	+ return texturecache;
6691	8529	}
6692	8530
6693		- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution)
	8531	+ com.sun.opengl.util.texture.Texture GetTexture(java.awt.image.BufferedImage stream, String tex, boolean bump, int resolution) throws Exception
6694	8532	{
6695		- CacheTexture texture = GetCacheTexture(tex, bump, resolution);
	8533	+ CacheTexture texture = GetCacheTexture(stream, tex, bump, resolution);
6696	8534
6697	8535	if (bump)
6698	8536	{
..	..	@@ -6708,23 +8546,23 @@
6708	8546	return texture!=null?texture.texture:null;
6709	8547	}
6710	8548
6711		- com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution)
	8549	+ public com.sun.opengl.util.texture.TextureData GetTextureData(java.awt.image.BufferedImage stream, String tex, boolean bump, int resolution) throws Exception
6712	8550	{
6713		- CacheTexture texture = GetCacheTexture(tex, bump, resolution);
	8551	+ CacheTexture texture = GetCacheTexture(stream, tex, bump, resolution);
6714	8552
6715	8553	return texture!=null?texture.texturedata:null;
6716	8554	}
6717	8555
6718		- boolean BindTexture(String tex, boolean bump, int resolution)
	8556	+ boolean BindTexture(java.awt.image.BufferedImage stream, String tex, boolean bump, int resolution) throws Exception
6719	8557	{
6720	8558	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
6721	8559	{
6722	8560	return false;
6723	8561	}
6724	8562
6725		- boolean newtex = false;
	8563	+ //boolean newtex = false;
6726	8564
6727		- com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
	8565	+ com.sun.opengl.util.texture.Texture texture = GetTexture(stream, tex, bump, resolution);
6728	8566
6729	8567	if (texture == null)
6730	8568	return false;
..	..	@@ -6754,7 +8592,7 @@
6754	8592	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_S, GetGL().GL_REPEAT);
6755	8593	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_T, GetGL().GL_REPEAT);
6756	8594
6757		- return newtex;
	8595	+ return true; // Warning: not used.
6758	8596	}
6759	8597
6760	8598	ShadowBuffer shadowPBuf;
..	..	@@ -7312,9 +9150,9 @@
7312	9150	static boolean occlusionInitialized = false;
7313	9151	boolean selection = false;
7314	9152	boolean pointselection = false;
7315		- /static/ boolean lighttouched = true;
	9153	+ ///static/ boolean lighttouched = true;
7316	9154	boolean deselect;
7317		- boolean ambientOcclusion = false;
	9155	+ private boolean ambientOcclusion = false;
7318	9156	static boolean flash = false;
7319	9157	/static/ boolean wait = false;
7320	9158	boolean displaydone = false; // after repaint() calls
..	..	@@ -7444,6 +9282,8 @@
7444	9282	//gl.glFrustum(-0.5scale, 0.5scale, -0.5scale, 0.5scale, 1, 100);
7445	9283	//glu.gluPerspective(lightshaper_fovy, 1, lightshaper_zNear, lightshaper_zFar);
7446	9284	double scale = lightCamera.SCALE / lightCamera.Distance();
	9285	+// PATCH FILLE AUX JEANS
	9286	+ //scale *= lightCamera.shaper_fovy / 25;
7447	9287	gl.glScaled(2 * scale, 2 * scale, -scale);
7448	9288	gl.glTranslated(0, 0, lightCamera.DECAL);
7449	9289
..	..	@@ -7590,18 +9430,40 @@
7590	9430	jy8[3] = 0.5f;
7591	9431	}
7592	9432
7593		- float[] options1 = new float[]{1000, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
	9433	+ float[] options1 = new float[]{100, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
7594	9434	float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
7595	9435	float[] options3 = new float[]{1, 1, 1, 0}; // fog color
7596	9436	float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
7597	9437
	9438	+ void ResetOptions()
	9439	+ {
	9440	+ options1[0] = 100;
	9441	+ options1[1] = 0.025f;
	9442	+ options1[2] = 0.01f;
	9443	+ options1[3] = 0;
	9444	+ options1[4] = 0;
	9445	+
	9446	+ options2[0] = 0;
	9447	+ options2[1] = 0.75f;
	9448	+ options2[2] = 0;
	9449	+ options2[3] = 0;
	9450	+
	9451	+ options3[0] = 1;
	9452	+ options3[1] = 1;
	9453	+ options3[2] = 1;
	9454	+ options3[3] = 0;
	9455	+
	9456	+ options4[0] = 1;
	9457	+ options4[1] = 0;
	9458	+ options4[2] = 1;
	9459	+ options4[3] = 0;
	9460	+ }
	9461	+
7598	9462	static int imagecount = 0; // movie generation
7599	9463
7600	9464	static int jitter = 0;
7601	9465
7602	9466	boolean restartframe = false;
7603		-
7604		- static int framecount = 0; // general-purpose global count
7605	9467
7606	9468	void displayAntiAliased(javax.media.opengl.GL gl)
7607	9469	{
..	..	@@ -7633,7 +9495,7 @@
7633	9495	gl.glClear(gl.GL_ACCUM_BUFFER_BIT);
7634	9496	for (jitter = 0; jitter < ACSIZE; jitter++) //, GrafreeD.wav.cursor += LIVE ? 735 : 0)
7635	9497	{
7636		- framecount++;
	9498	+ Globals.framecount++;
7637	9499
7638	9500	if (CameraPane.tickcount > 0)
7639	9501	CameraPane.tickcount--;
..	..	@@ -7671,7 +9533,7 @@
7671	9533
7672	9534	gl.glLightfv(gl.GL_LIGHT0, gl.GL_POSITION, pos, 0);
7673	9535	*/
7674		- lighttouched = true;
	9536	+ Globals.lighttouched = true;
7675	9537	//System.err.println(" shadowbuffer: " + jitter);
7676	9538	shadowbuffer.display();
7677	9539
..	..	@@ -7692,8 +9554,8 @@
7692	9554	assert (parentcam != renderCamera);
7693	9555
7694	9556	if (renderCamera != lightCamera)
7695		- for (int count = parentcam.GetTransformCount(); --count>=0;)
7696		- LA.matConcat(parentcam.toParent, matrix, matrix);
	9557	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9558	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
7697	9559
7698	9560	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
7699	9561
..	..	@@ -7708,8 +9570,8 @@
7708	9570	LA.matCopy(renderCamera.fromScreen, matrix);
7709	9571
7710	9572	if (renderCamera != lightCamera)
7711		- for (int count = parentcam.GetTransformCount(); --count>=0;)
7712		- LA.matConcat(matrix, parentcam.fromParent, matrix);
	9573	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9574	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
7713	9575
7714	9576	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
7715	9577
..	..	@@ -7781,7 +9643,7 @@
7781	9643	//gl.glFlush();
7782	9644	gl.glAccum(gl.GL_ACCUM, 1.0f / ACSIZE);
7783	9645
7784		- if (ANIMATION && ABORTED)
	9646	+ if (Globals.ANIMATION && ABORTED)
7785	9647	{
7786	9648	System.err.println(" ABORTED FRAME");
7787	9649	break;
..	..	@@ -7811,7 +9673,7 @@
7811	9673	setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
7812	9674
7813	9675	// save image
7814		- if (ANIMATION && !ABORTED)
	9676	+ if (Globals.ANIMATION && !ABORTED)
7815	9677	{
7816	9678	VPwidth = viewport[2];
7817	9679	VPheight = viewport[3];
..	..	@@ -7922,11 +9784,11 @@
7922	9784
7923	9785	// imagecount++;
7924	9786
7925		- String fullname = filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
	9787	+ String fullname = Globals.filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
7926	9788
7927	9789	if (!BOXMODE)
7928	9790	{
7929		- System.out.println("image: " + fullname + " (wav cursor=" + (GrafreeD.wav.cursor / 735 / 4) + ")");
	9791	+ System.out.println("image: " + fullname + " (wav cursor=" + (Grafreed.wav.cursor / 735 / 4) + ")");
7930	9792	}
7931	9793
7932	9794	if (!BOXMODE)
..	..	@@ -7964,7 +9826,7 @@
7964	9826	ABORTED = false;
7965	9827	}
7966	9828	else
7967		- GrafreeD.wav.cursor += 735 * ACSIZE;
	9829	+ Grafreed.wav.cursor += 735 * ACSIZE;
7968	9830
7969	9831	if (false)
7970	9832	{
..	..	@@ -8618,13 +10480,6 @@
8618	10480	}
8619	10481	}
8620	10482
8621		- boolean IsFrozen()
8622		- {
8623		- boolean selectmode = drawMode == SELECTION \|\| CameraPane.DEBUG_SELECTION;
8624		-
8625		- return !selectmode && cameracount == 0; // != 0;
8626		- }
8627		-
8628	10483	boolean niceon = false;
8629	10484	javax.swing.Timer AAtimer = new javax.swing.Timer(750, this);
8630	10485	boolean currentlydrawing = false;
..	..	@@ -8634,16 +10489,16 @@
8634	10489
8635	10490	public void display(GLAutoDrawable drawable)
8636	10491	{
8637		- if (GrafreeD.savesound && GrafreeD.hassound)
	10492	+ if (Grafreed.savesound && Grafreed.hassound)
8638	10493	{
8639		- GrafreeD.wav.save();
8640		- GrafreeD.savesound = false;
8641		- GrafreeD.hassound = false;
	10494	+ Grafreed.wav.save();
	10495	+ Grafreed.savesound = false;
	10496	+ Grafreed.hassound = false;
8642	10497	}
8643	10498	// if (DEBUG_SELECTION)
8644	10499	// {
8645		-// if (drawMode != SELECTION)
8646		-// drawMode = SELECTION;
	10500	+// if (DrawMode() != SELECTION)
	10501	+// DrawMode() = SELECTION;
8647	10502	// }
8648	10503
8649	10504	if (!isRenderer)
..	..	@@ -8699,9 +10554,9 @@
8699	10554
8700	10555	//ANTIALIAS = 0;
8701	10556
8702		- if (drawMode == DEFAULT) // && CURRENTANTIALIAS > 0)
	10557	+ if (DrawMode() == DEFAULT) // && CURRENTANTIALIAS > 0)
8703	10558	{
8704		- if (niceon \|\| isLIVE())
	10559	+ if (niceon \|\| Globals.isLIVE())
8705	10560	{
8706	10561	//if(active == 0)
8707	10562	// antialiaser = null;
..	..	@@ -8714,6 +10569,7 @@
8714	10569	ANTIALIAS = 0;
8715	10570	//System.out.println("RESTART");
8716	10571	AAtimer.restart();
	10572	+ Globals.TIMERRUNNING = true;
8717	10573	}
8718	10574	}
8719	10575	}
..	..	@@ -8726,7 +10582,7 @@
8726	10582	assert eyeCamera.shaper_zFar == 1E5f; // 500.0f;
8727	10583	*/
8728	10584
8729		- if (drawMode == DEFAULT)
	10585	+ if (DrawMode() == DEFAULT)
8730	10586	{
8731	10587	currentlydrawing = true;
8732	10588	}
..	..	@@ -8757,18 +10613,18 @@
8757	10613
8758	10614	// if(Applet3D.clipboard != null)
8759	10615	// System.out.println("Clipboard = " + Applet3D.clipboard); //.get(0).parent);
8760		-//drawMode = SELECTION;
	10616	+//DrawMode() = SELECTION;
8761	10617	indexcount = 0;
8762	10618
8763		- if (drawMode == OCCLUSION)
	10619	+ if (DrawMode() == OCCLUSION)
8764	10620	{
8765		- drawMode = DEFAULT;
	10621	+ Globals.drawMode = DEFAULT; // WARNING
8766	10622	ambientOcclusion = true;
8767	10623	setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
8768	10624	Object3D theobject = object;
8769	10625	Object3D theparent = object.parent;
8770	10626	object.parent = null;
8771		- object = (Object3D)GrafreeD.clone(object);
	10627	+ object = (Object3D)Grafreed.clone(object);
8772	10628	object.Stripify();
8773	10629	if (theobject.selection == null \|\| theobject.selection.Size() == 0)
8774	10630	theobject.PreprocessOcclusion(this);
..	..	@@ -8781,19 +10637,20 @@
8781	10637	ambientOcclusion = false;
8782	10638	}
8783	10639
8784		- if (lighttouched && drawMode == DEFAULT && !lightMode) // && !FROZEN)
	10640	+ if (//Globals.lighttouched &&
	10641	+ DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
8785	10642	{
8786	10643	//if (RENDERSHADOW) // ?
8787	10644	if (!IsFrozen())
8788	10645	{
8789	10646	// dec 2012
8790		- if (!ambientOcclusion && !(!flash && !lightMode && drawMode == DEFAULT && ANTIALIAS > 0))
	10647	+ if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
8791	10648	{
8792		- framecount++;
	10649	+ Globals.framecount++;
8793	10650	shadowbuffer.display();
8794	10651	}
8795	10652	}
8796		- lighttouched = false; // ??
	10653	+ Globals.lighttouched = false; // ??
8797	10654	//drawing = true;
8798	10655	//lighttouched = true;
8799	10656	}
..	..	@@ -8814,9 +10671,9 @@
8814	10671	//eyeCamera.shaper_fovy = 1;
8815	10672	}
8816	10673
8817		- if ((RENDERPROGRAM != 0 \|\| ambientOcclusion \|\| spherical) && drawMode == DEFAULT) // SELECTION)
	10674	+ if ((RENDERPROGRAM != 0 \|\| ambientOcclusion \|\| spherical) && DrawMode() == DEFAULT) // SELECTION)
8818	10675	{
8819		- //System.out.println("drawMode = " + drawMode);
	10676	+ //System.out.println("DrawMode() = " + DrawMode());
8820	10677	vertexMode \|= VP_PASS;
8821	10678	//vertexMode \|= VP_PROJECTION;
8822	10679	if (!ambientOcclusion)
..	..	@@ -8876,7 +10733,7 @@
8876	10733	Camera cam = renderCamera; // lightMode?lightCamera:eyeCamera;
8877	10734	//Camera lightcam = new Camera(light0);
8878	10735
8879		- if (drawMode == SHADOW)
	10736	+ if (DrawMode() == SHADOW)
8880	10737	{
8881	10738	/*
8882	10739	gl.glMatrixMode(GL.GL_MODELVIEW);
..	..	@@ -8914,8 +10771,8 @@
8914	10771
8915	10772	// if (parentcam != renderCamera) // not a light
8916	10773	if (cam != lightCamera)
8917		- for (int count = parentcam.GetTransformCount(); --count>=0;)
8918		- LA.matConcat(parentcam.toParent, matrix, matrix);
	10774	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10775	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
8919	10776
8920	10777	for (int j = 0; j < 4; j++)
8921	10778	{
..	..	@@ -8929,8 +10786,8 @@
8929	10786
8930	10787	// if (parentcam != renderCamera) // not a light
8931	10788	if (cam != lightCamera)
8932		- for (int count = parentcam.GetTransformCount(); --count>=0;)
8933		- LA.matConcat(matrix, parentcam.fromParent, matrix);
	10789	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10790	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
8934	10791
8935	10792	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
8936	10793
..	..	@@ -8966,7 +10823,7 @@
8966	10823	gl.glClear(gl.GL_DEPTH_BUFFER_BIT);
8967	10824	} else
8968	10825	{
8969		- if (drawMode != DEFAULT)
	10826	+ if (DrawMode() != DEFAULT)
8970	10827	{
8971	10828	gl.glClearColor(1, 1, 1, 0);
8972	10829	} // 1);
..	..	@@ -9031,7 +10888,7 @@
9031	10888
9032	10889	fast &= !ambientOcclusion;
9033	10890
9034		- if (drawMode == DEFAULT)
	10891	+ if (DrawMode() == DEFAULT)
9035	10892	{
9036	10893	//gl.glEnable(gl.GL_ALPHA_TEST);
9037	10894	//gl.glActiveTexture(GL.GL_TEXTURE0);
..	..	@@ -9092,6 +10949,8 @@
9092	10949	//gl.glFrustum(-0.5scale, 0.5scale, -0.5scale, 0.5scale, 1, 100);
9093	10950	//glu.gluPerspective(lightshaper_fovy, 1, lightshaper_zNear, lightshaper_zFar);
9094	10951	double scale = lightCamera.SCALE / lightCamera.Distance();
	10952	+// PATCH FILLE AUX JEANS
	10953	+ //scale *= lightCamera.shaper_fovy / 25;
9095	10954	gl.glScaled(2 * scale, 2 * scale, -scale);
9096	10955	gl.glTranslated(0, 0, lightCamera.DECAL);
9097	10956
..	..	@@ -9187,7 +11046,16 @@
9187	11046	// Bump noise
9188	11047	gl.glActiveTexture(GL.GL_TEXTURE6);
9189	11048	//gl.glBindTexture(GL.GL_TEXTURE_2D, bump_noise);
9190		- BindTexture(NOISE_TEXTURE, false, 2);
	11049	+
	11050	+ try
	11051	+ {
	11052	+ BindTexture(null, NOISE_TEXTURE, false, 2);
	11053	+ }
	11054	+ catch (Exception e)
	11055	+ {
	11056	+ System.err.println("FAILED: " + NOISE_TEXTURE);
	11057	+ }
	11058	+
9191	11059
9192	11060	gl.glActiveTexture(GL.GL_TEXTURE0);
9193	11061	gl.glEnable(GL.GL_TEXTURE_2D);
..	..	@@ -9210,9 +11078,9 @@
9210	11078
9211	11079	gl.glMatrixMode(GL.GL_MODELVIEW);
9212	11080
9213		-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
9214		-//gl.glEnable(gl.GL_POLYGON_SMOOTH);
9215		-//gl.glEnable(gl.GL_MULTISAMPLE);
	11081	+gl.glEnable(gl.GL_POLYGON_SMOOTH);
	11082	+gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
	11083	+gl.glEnable(gl.GL_MULTISAMPLE);
9216	11084	} else
9217	11085	{
9218	11086	//gl.glDisable(GL.GL_TEXTURE_2D);
..	..	@@ -9223,14 +11091,16 @@
9223	11091	//System.out.println("BLENDING ON");
9224	11092	gl.glEnable(GL.GL_BLEND);
9225	11093	gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
9226		-
	11094	+// gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
9227	11095	gl.glMatrixMode(gl.GL_PROJECTION);
9228	11096	gl.glLoadIdentity();
9229	11097
9230		- if (drawMode == SHADOW \|\| cam == lightCamera) // \|\| (vertexMode&VP_PROJECTION) != 0)
	11098	+ if (DrawMode() == SHADOW \|\| cam == lightCamera) // \|\| (vertexMode&VP_PROJECTION) != 0)
9231	11099	{
9232	11100	//glu.gluPerspective(lightshaper_fovy, 1, lightshaper_zNear, lightshaper_zFar);
9233	11101	double scale = lightCamera.SCALE / lightCamera.Distance();
	11102	+// PATCH FILLE AUX JEANS
	11103	+ //scale *= lightCamera.shaper_fovy / 25;
9234	11104	gl.glScaled(2 * scale, 2 * scale, -scale);
9235	11105	gl.glTranslated(0, 0, lightCamera.DECAL);
9236	11106	//System.out.println("DECAL = " + LIGHTDECAL + "; SCALE = " + LIGHTSCALE);
..	..	@@ -9283,7 +11153,7 @@
9283	11153	//gl.glPushMatrix();
9284	11154	gl.glLoadIdentity();
9285	11155
9286		- if (!ambientOcclusion) // drawMode != OCCLUSION)
	11156	+ if (!ambientOcclusion) // DrawMode() != OCCLUSION)
9287	11157	{
9288	11158	//LA.xformPos(light0, lightCamera.fromScreen, light);
9289	11159	LA.xformDir(dirlight, lightCamera.fromScreen, lightposition);
..	..	@@ -9310,8 +11180,8 @@
9310	11180	System.err.println("parentcam != renderCamera");
9311	11181
9312	11182	// if (cam != lightCamera)
9313		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9314		- LA.xformDir(lightposition, parentcam.toParent, lightposition); // may 2013
	11183	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11184	+ LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
9315	11185	}
9316	11186
9317	11187	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -9332,8 +11202,8 @@
9332	11202	if (true) // TODO
9333	11203	{
9334	11204	if (cam != lightCamera)
9335		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9336		- LA.xformDir(light0, parentcam.toParent, light0); // may 2013
	11205	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11206	+ LA.xformDir(light0, parentcam.GlobalTransform(), light0); // may 2013
9337	11207	}
9338	11208
9339	11209	LA.xformPos(light0, cam.toScreen, light0);
..	..	@@ -9370,7 +11240,7 @@
9370	11240	}
9371	11241
9372	11242	/**/
9373		- if (true) // drawMode == SELECTION) // != DEFAULT)
	11243	+ if (true) // DrawMode() == SELECTION) // != DEFAULT)
9374	11244	gl.glDisable(gl.GL_LIGHTING);
9375	11245	else
9376	11246	gl.glEnable(gl.GL_LIGHTING);
..	..	@@ -9388,7 +11258,7 @@
9388	11258
9389	11259	lightslot = 64;
9390	11260
9391		- if (!frozen && !ambientOcclusion && isRenderer && drawMode == DEFAULT)
	11261	+ if (!frozen && !ambientOcclusion && isRenderer && DrawMode() == DEFAULT)
9392	11262	{
9393	11263	DrawLights(object);
9394	11264	}
..	..	@@ -9399,7 +11269,7 @@
9399	11269	fragmentMode \|= (lightslot - 64) << 2; // 1; // first bit is available for aniso
9400	11270	//System.out.println("fragmentMode = " + fragmentMode);
9401	11271
9402		- if (drawMode == DEFAULT \|\| drawMode == SELECTION \|\| DEBUG_SELECTION)
	11272	+ if (DrawMode() == DEFAULT \|\| DrawMode() == SELECTION \|\| IsDebugSelection())
9403	11273	{
9404	11274	/*
9405	11275	if (CULLFACE \|\| (ambientOcclusion && OCCLUSION_CULLING))
..	..	@@ -9432,7 +11302,7 @@
9432	11302	}
9433	11303	}
9434	11304
9435		- if (drawMode == DEFAULT)
	11305	+ if (DrawMode() == DEFAULT)
9436	11306	{
9437	11307	if (WIREFRAME && !ambientOcclusion)
9438	11308	{
..	..	@@ -9450,7 +11320,7 @@
9450	11320	gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9451	11321	gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9452	11322
9453		- if (!fast/RENDERPROGRAM != 0/ && (drawMode == DEFAULT \|\| drawMode == SHADOW)) // && !WIREFRAME) //
	11323	+ if (!fast/RENDERPROGRAM != 0/ && (DrawMode() == DEFAULT \|\| DrawMode() == SHADOW)) // && !WIREFRAME) //
9454	11324	{
9455	11325	if (vertexMode != 0) // && !fast)
9456	11326	{
..	..	@@ -9470,7 +11340,7 @@
9470	11340	}
9471	11341	}
9472	11342
9473		- if (false) // fast && !IsFreezed() && drawMode != SELECTION && !ambientOcclusion)
	11343	+ if (false) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
9474	11344	{
9475	11345	//gl.glDepthFunc(GL.GL_LEQUAL);
9476	11346	//gl.glClear(gl.GL_COLOR_BUFFER_BIT \| gl.GL_DEPTH_BUFFER_BIT);
..	..	@@ -9498,7 +11368,7 @@
9498	11368	//gl.glDepthMask(false);
9499	11369	}
9500	11370
9501		- if (false) // drawMode == SHADOW)
	11371	+ if (false) // DrawMode() == SHADOW)
9502	11372	{
9503	11373	//SetColumnMajorData(cameraInverseTransform, view_1);
9504	11374	//System.out.println("light = " + cameraInverseTransform);
..	..	@@ -9512,16 +11382,16 @@
9512	11382	//System.out.println("object = " + object);
9513	11383	if (!frozen && !imageLocked)
9514	11384	{
9515		- if (!flash && !lightMode && drawMode == DEFAULT && ANTIALIAS > 0)
	11385	+ if (!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0)
9516	11386	{
9517	11387	displayAntiAliased(gl);
9518	11388	} else
9519	11389	{
9520	11390	programcount = 0;
9521		- int keepmode = drawMode;
	11391	+ int keepmode = DrawMode();
9522	11392	// if (DEBUG_SELECTION)
9523	11393	// {
9524		-// drawMode = SELECTION;
	11394	+// DrawMode() = SELECTION;
9525	11395	// }
9526	11396	// for point selection
9527	11397	// gl.glGetDoublev(gl.GL_MODELVIEW_MATRIX, tempmat, 0);
..	..	@@ -9531,10 +11401,10 @@
9531	11401	DrawObject(gl);
9532	11402
9533	11403	// jan 2013 System.err.println("RESET ABORT (display)");
9534		- // if (drawMode == DEFAULT)
	11404	+ // if (DrawMode() == DEFAULT)
9535	11405	// ABORTED = false;
9536	11406	fullreset = false;
9537		- drawMode = keepmode;
	11407	+ Globals.drawMode = keepmode; // WARNING
9538	11408	//System.out.println("PROGRAM SWITCH " + programcount);
9539	11409	}
9540	11410	}
..	..	@@ -9542,11 +11412,11 @@
9542	11412	gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9543	11413	gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9544	11414
9545		- if (drawMode == DEFAULT)
	11415	+ if (DrawMode() == DEFAULT)
9546	11416	{
9547	11417	ReleaseTexture(NOISE_TEXTURE, false);
9548	11418	}
9549		- //if (drawMode == DEFAULT)
	11419	+ //if (DrawMode() == DEFAULT)
9550	11420	{
9551	11421
9552	11422	gl.glActiveTexture(GL.GL_TEXTURE1);
..	..	@@ -9558,7 +11428,7 @@
9558	11428	//else
9559	11429	//gl.glDisable(gl.GL_TEXTURE_2D);
9560	11430	//gl.glPopMatrix();
9561		- if (imageCompleted && ANTIALIAS > 0 && drawMode == DEFAULT && cam != lightCamera && !ambientOcclusion)
	11431	+ if (imageCompleted && ANTIALIAS > 0 && DrawMode() == DEFAULT && cam != lightCamera && !ambientOcclusion)
9562	11432	{
9563	11433	//new Exception().printStackTrace();
9564	11434	//System.out.println("Draw image " + width + ", " + height);
..	..	@@ -9600,7 +11470,7 @@
9600	11470	//gl.glFlush();
9601	11471	}
9602	11472
9603		- if (flash && drawMode == DEFAULT)
	11473	+ if (flash && DrawMode() == DEFAULT)
9604	11474	{
9605	11475	flash = false;
9606	11476	wait = true;
..	..	@@ -9608,9 +11478,9 @@
9608	11478	}
9609	11479
9610	11480	//drawing = false;
9611		- //if(drawMode == DEFAULT)
	11481	+ //if(DrawMode() == DEFAULT)
9612	11482	// niceon = false;
9613		- if (drawMode == DEFAULT)
	11483	+ if (DrawMode() == DEFAULT)
9614	11484	{
9615	11485	currentlydrawing = false;
9616	11486	}
..	..	@@ -9630,7 +11500,7 @@
9630	11500	repaint();
9631	11501	}
9632	11502
9633		- if (isLIVE() && drawMode == DEFAULT) // may 2013
	11503	+ if (Globals.isLIVE() && DrawMode() == DEFAULT) // may 2013
9634	11504	repaint();
9635	11505
9636	11506	displaydone = true;
..	..	@@ -9649,8 +11519,14 @@
9649	11519	{
9650	11520	renderpass++;
9651	11521	// System.out.println("Draw object... ");
	11522	+ STEP = 1;
9652	11523	if (FAST) // in case there is no script
9653		- STEP = 16;
	11524	+ STEP = 8;
	11525	+
	11526	+ if (CURRENTANTIALIAS == 0 \|\| ACSIZE == 1)
	11527	+ {
	11528	+ STEP *= 4;
	11529	+ }
9654	11530
9655	11531	//object.FullInvariants();
9656	11532
..	..	@@ -9664,23 +11540,44 @@
9664	11540	e.printStackTrace();
9665	11541	}
9666	11542
9667		- if (GrafreeD.RENDERME > 0)
9668		- GrafreeD.RENDERME--; // mechante magouille
	11543	+ if (Grafreed.RENDERME > 0)
	11544	+ Grafreed.RENDERME--; // mechante magouille
9669	11545
9670		- ONESTEP = false;
	11546	+ Globals.ONESTEP = false;
9671	11547	}
9672	11548
9673	11549	static boolean zoomonce = false;
9674	11550
	11551	+ static void CreateSelectedPoint()
	11552	+ {
	11553	+ if (selectedpoint == null)
	11554	+ {
	11555	+ debugpointG = new Sphere();
	11556	+ debugpointP = new Sphere();
	11557	+ debugpointC = new Sphere();
	11558	+ debugpointR = new Sphere();
	11559	+
	11560	+ selectedpoint = new Superellipsoid();
	11561	+
	11562	+ for (int i=0; i<8; i++)
	11563	+ {
	11564	+ debugpoints[i] = new Sphere();
	11565	+ }
	11566	+ }
	11567	+ }
	11568	+
9675	11569	void DrawObject(GL gl, boolean draw)
9676	11570	{
	11571	+ // To clear camera values
	11572	+ ResetOptions();
	11573	+
9677	11574	//System.out.println("DRAW OBJECT " + mouseDown);
9678		-// drawMode = SELECTION;
	11575	+// DrawMode() = SELECTION;
9679	11576	//GL gl = getGL();
9680	11577	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
9681	11578	{
9682		- if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && drawMode == SHADOW) // && !lightMode)
9683		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	11579	+ if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
	11580	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
9684	11581	pingthread.StepToTarget(true); // true);
9685	11582	// zoomonce = false;
9686	11583	}
..	..	@@ -9700,9 +11597,9 @@
9700	11597	callist = gl.glGenLists(1);
9701	11598	}
9702	11599
9703		- boolean selectmode = drawMode == SELECTION \|\| CameraPane.DEBUG_SELECTION;
	11600	+ boolean selectmode = DrawMode() == SELECTION \|\| IsDebugSelection();
9704	11601
9705		- boolean active = !selectmode; // drawMode != SELECTION; // mouseDown;
	11602	+ boolean active = !selectmode; // DrawMode() != SELECTION; // mouseDown;
9706	11603
9707	11604	if (!mainDL \|\| !active \|\| touched)
9708	11605	{
..	..	@@ -9729,13 +11626,20 @@
9729	11626	PushMatrix(ClickInfo.matbuffer);
9730	11627	}
9731	11628
9732		- if (drawMode == 0)
	11629	+ if (DrawMode() == 0)
9733	11630	{
9734	11631	// System.out.println("CLEAR +++++++++++++++ +++++++++++++++ +++++++++++++++ +++++++++++++++");
9735	11632
9736	11633	usedtextures.clear();
9737	11634
9738		- BindTextures(DEFAULT_TEXTURES, 2);
	11635	+ try
	11636	+ {
	11637	+ BindTextures(DEFAULT_TEXTURES, 2);
	11638	+ }
	11639	+ catch (Exception e)
	11640	+ {
	11641	+ System.err.println("FAILED: " + DEFAULT_TEXTURES);
	11642	+ }
9739	11643	}
9740	11644	//System.out.println("--> " + stackdepth);
9741	11645	// GrafreeD.traceon();
..	..	@@ -9743,10 +11647,11 @@
9743	11647	// DRAW
9744	11648	object.draw(this, /(Composite)/ object, false, false);
9745	11649
9746		- if (drawMode == DEFAULT)
	11650	+ if (DrawMode() == DEFAULT)
9747	11651	{
9748		- if (DEBUG)
	11652	+ if (Globals.DEBUG)
9749	11653	{
	11654	+ CreateSelectedPoint();
9750	11655	float radius = 0.05f;
9751	11656	if (selectedpoint.radius != radius)
9752	11657	{
..	..	@@ -9754,40 +11659,40 @@
9754	11659	selectedpoint.radius = radius;
9755	11660	selectedpoint.recalculate();
9756	11661	selectedpoint.material = new cMaterial();
9757		- selectedpoint.material.color = 0.15f;
	11662	+ selectedpoint.material.color = 0.15f; // Yellow
9758	11663	selectedpoint.material.modulation = 0.75f;
9759	11664
9760		- debugpoint.radius = radius;
9761		- debugpoint.recalculate();
9762		- debugpoint.material = new cMaterial();
9763		- debugpoint.material.color = 0.25f;
9764		- debugpoint.material.modulation = 0.75f;
	11665	+ debugpointG.radius = radius;
	11666	+ debugpointG.recalculate();
	11667	+ debugpointG.material = new cMaterial();
	11668	+ debugpointG.material.color = 0.25f; // Green
	11669	+ debugpointG.material.modulation = 0.75f;
9765	11670
9766		- debugpoint2.radius = radius;
9767		- debugpoint2.recalculate();
9768		- debugpoint2.material = new cMaterial();
9769		- debugpoint2.material.color = 0.75f;
9770		- debugpoint2.material.modulation = 0.75f;
	11671	+ debugpointP.radius = radius;
	11672	+ debugpointP.recalculate();
	11673	+ debugpointP.material = new cMaterial();
	11674	+ debugpointP.material.color = 0.75f; // Purple
	11675	+ debugpointP.material.modulation = 0.75f;
9771	11676
9772		- debugpoint3.radius = radius;
9773		- debugpoint3.recalculate();
9774		- debugpoint3.material = new cMaterial();
9775		- debugpoint3.material.color = 0.5f;
9776		- debugpoint3.material.modulation = 0.75f;
	11677	+ debugpointC.radius = radius;
	11678	+ debugpointC.recalculate();
	11679	+ debugpointC.material = new cMaterial();
	11680	+ debugpointC.material.color = 0.5f; // Cyan
	11681	+ debugpointC.material.modulation = 0.75f;
9777	11682
9778		- debugpoint4.radius = radius;
9779		- debugpoint4.recalculate();
9780		- debugpoint4.material = new cMaterial();
9781		- debugpoint4.material.color = 0f;
9782		- debugpoint4.material.modulation = 0.75f;
	11683	+ debugpointR.radius = radius;
	11684	+ debugpointR.recalculate();
	11685	+ debugpointR.material = new cMaterial();
	11686	+ debugpointR.material.color = 0f; // Red
	11687	+ debugpointR.material.modulation = 0.75f;
9783	11688
9784	11689	InitPoints(radius);
9785	11690	}
9786	11691	selectedpoint.draw(this, /(Composite)/ null, false, false);
9787		- debugpoint.draw(this, /(Composite)/ null, false,false);
9788		- debugpoint2.draw(this, /(Composite)/ null, false,false);
9789		- debugpoint3.draw(this, /(Composite)/ null, false,false);
9790		- debugpoint4.draw(this, /(Composite)/ null, false,false);
	11692	+ debugpointG.draw(this, /(Composite)/ null, false,false);
	11693	+ debugpointP.draw(this, /(Composite)/ null, false,false);
	11694	+ debugpointC.draw(this, /(Composite)/ null, false,false);
	11695	+ debugpointR.draw(this, /(Composite)/ null, false,false);
9791	11696	// DrawPoints(this);
9792	11697	}
9793	11698
..	..	@@ -9795,7 +11700,7 @@
9795	11700	}
9796	11701	// GrafreeD.traceoff();
9797	11702	//System.out.println(stackdepth);
9798		- if (drawMode == 0)
	11703	+ if (DrawMode() == 0)
9799	11704	{
9800	11705	ReleaseTextures(DEFAULT_TEXTURES);
9801	11706
..	..	@@ -9809,7 +11714,7 @@
9809	11714	if (tex.equals("WHITE_NOISE"))
9810	11715	continue;
9811	11716
9812		- if (!usedtextures.containsKey(tex))
	11717	+ if (!usedtextures.contains(tex))
9813	11718	{
9814	11719	// System.out.println("DISPOSE +++++++++++++++ " + tex);
9815	11720	textures.get(tex).texture.dispose();
..	..	@@ -9820,17 +11725,26 @@
9820	11725
9821	11726	checker = null;
9822	11727
9823		- if (!ambientOcclusion && !IsFrozen() && drawMode == DEFAULT)
	11728	+ if (!ambientOcclusion && !IsFrozen() && DrawMode() == DEFAULT)
9824	11729	FindChecker(object);
9825	11730
9826		- if (checker != null && drawMode == DEFAULT)
	11731	+ if (checker != null && DrawMode() == DEFAULT)
9827	11732	{
9828		- // BindTexture(IMMORTAL_TEXTURE);
	11733	+ //BindTexture(IMMORTAL_TEXTURE);
	11734	+ try
	11735	+ {
	11736	+ BindTextures(checker.GetTextures(), checker.texres);
	11737	+ }
	11738	+ catch (Exception e)
	11739	+ {
	11740	+ System.err.println("FAILED: " + checker.GetTextures());
	11741	+ }
9829	11742	// NEAREST
9830	11743	GetGL().glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST); // GL.GL_LINEAR);
9831	11744	DrawChecker(gl);
9832	11745	//checker.Draw(this, null, false);
9833	11746	// ReleaseTexture(IMMORTAL_TEXTURE);
	11747	+ ReleaseTextures(checker.GetTextures());
9834	11748	}
9835	11749
9836	11750	if (object.parent != null)
..	..	@@ -9843,7 +11757,7 @@
9843	11757	//gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9844	11758	//gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9845	11759
9846		- if (DISPLAYTEXT && drawMode == DEFAULT)
	11760	+ if (DISPLAYTEXT && DrawMode() == DEFAULT)
9847	11761	{
9848	11762	// Draw it once, then use the raster
9849	11763	Balloon(gl, balloon.createGraphics());
..	..	@@ -9899,14 +11813,14 @@
9899	11813	int[] xs = new int[3];
9900	11814	int[] ys = new int[3];
9901	11815
9902		- void DrawString(Object3D obj) // String string)
	11816	+ public void DrawString(Object3D obj) // String string) // INTERFACE
9903	11817	{
9904		- if (!DISPLAYTEXT \|\| drawMode != DEFAULT)
	11818	+ if (!DISPLAYTEXT \|\| DrawMode() != DEFAULT)
9905	11819	{
9906	11820	return;
9907	11821	}
9908	11822
9909		- String string = obj.GetToolTip();
	11823	+ String string = obj.toString(); //.GetToolTip();
9910	11824
9911	11825	GL gl = GetGL();
9912	11826
..	..	@@ -10223,8 +12137,8 @@
10223	12137	//obj.TransformToWorld(light, light);
10224	12138	for (int i = tp.size(); --i >= 0;)
10225	12139	{
10226		- for (int count = tp.get(i).GetTransformCount(); --count>=0;)
10227		- LA.xformPos(light, tp.get(i).toParent, light);
	12140	+ //for (int count = tp.get(i).GetTransformCount(); --count>=0;)
	12141	+ LA.xformPos(light, tp.get(i).GlobalTransformInv(), light);
10228	12142	}
10229	12143
10230	12144
..	..	@@ -10241,8 +12155,8 @@
10241	12155	parentcam = cameras[0];
10242	12156	}
10243	12157
10244		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10245		- LA.xformPos(light, parentcam.toParent, light); // may 2013
	12158	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	12159	+ LA.xformPos(light, parentcam.GlobalTransform(), light); // may 2013
10246	12160
10247	12161	LA.xformPos(light, renderCamera.toScreen, light);
10248	12162
..	..	@@ -10388,6 +12302,7 @@
10388	12302	"PARAM lodbias = { 10,10,10,10 };" + // 20, -2, -20, 1.0 };" +
10389	12303	"PARAM infinity = { 100000000, 100000000, 100000000, 1.0 };" +
10390	12304	"PARAM one2048th = { 0.00048828125, 0.00048828125, 0.00048828125, 1.0 };" +
	12305	+ "PARAM ninetenth = { 0.9, 0.9, 0.9, 1.0 };" +
10391	12306	"PARAM almostone = { 0.999, 0.999, 0.999, 1.0 };" +
10392	12307	"PARAM c256 = { 256, 256, 256, 1.0 };" +
10393	12308	"PARAM c256i = { 0.00390625, 0.00390625, 0.00390625, 1.0 };" +
..	..	@@ -10855,8 +12770,8 @@
10855	12770
10856	12771	// display shadow only (bump == 0)
10857	12772	"SUB temp.x, half.x, shadow.x;" +
10858		- "MOV temp.y, -params6.x;" +
10859		- "SLT temp.z, temp.y, zero.x;" +
	12773	+ "MOV temp.y, -params5.z;" + // params6.x;" +
	12774	+ "SLT temp.z, temp.y, -one2048th.x;" +
10860	12775	"SUB temp.y, one.x, temp.z;" +
10861	12776	"MUL temp.x, temp.x, temp.y;" +
10862	12777	"KIL temp.x;" +
..	..	@@ -10985,8 +12900,10 @@
10985	12900	"MAX ndotl.x, ndotl.x, -ndotl.x;" +
10986	12901
10987	12902	"SUB temp.x, one.x, ndotl.x;" +
10988		- "ADD temp.x, temp.x, options2.z;" + // lightsheen
10989		- "ADD temp.y, one.y, options2.y;" + // sursurface
	12903	+ // Tuning for default skin
	12904	+ //"ADD temp.x, temp.x, options2.z;" + // lightsheen
	12905	+ "MAD temp.x, options2.z, half.y, temp.x;" + // lightsheen
	12906	+ "ADD temp.y, one.y, options2.y;" + // subsurface
10990	12907	"MUL temp.x, temp.x, temp.y;" +
10991	12908
10992	12909	"MUL saturation, saturation, temp.xxxx;" +
..	..	@@ -11185,7 +13102,7 @@
11185	13102	//once = true;
11186	13103	}
11187	13104
11188		- System.out.print("Program #" + mode + "; length = " + program.length());
	13105	+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
11189	13106	System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
11190	13107	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
11191	13108
..	..	@@ -11302,6 +13219,7 @@
11302	13219	String Shadow(String depth, String shadow)
11303	13220	{
11304	13221	return "MAX temp.x, ndotl.x, one64th.x;" +
	13222	+ "MIN temp.x, temp.x, ninetenth.x;" +
11305	13223	/**/
11306	13224	// Sine
11307	13225	"MUL temp.y, temp.x, temp.x;" +
..	..	@@ -11317,12 +13235,16 @@
11317	13235
11318	13236	"ADD " + depth + ".z, " + depth + ".z, temp.x;" +
11319	13237	//"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing!
	13238	+
	13239	+ // Compare fragment depth in light space with shadowmap.
11320	13240	"SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" +
11321	13241	"SGE temp.y, temp.x, zero.x;" +
11322		- "SUB " + shadow + ".y, one.x, temp.y;" +
	13242	+ "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded
	13243	+
	13244	+ // Reverse comparison
11323	13245	"SUB temp.x, one.x, temp.x;" +
11324	13246	"MUL " + shadow + ".x, temp.x, temp.y;" +
11325		- "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded
	13247	+ "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse
11326	13248	"POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth
11327	13249
11328	13250	"SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" +
..	..	@@ -11336,6 +13258,10 @@
11336	13258	// No shadow for backface
11337	13259	"DP3 temp.x, normal, lightd;" +
11338	13260	"SLT temp.x, temp.x, zero.x;" + // shadoweps
	13261	+ "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
	13262	+
	13263	+ // No shadow when out of frustrum
	13264	+ "SGE temp.x, " + depth + ".z, one.z;" +
11339	13265	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
11340	13266	"";
11341	13267	}
..	..	@@ -11482,7 +13408,8 @@
11482	13408	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
11483	13409	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
11484	13410	/static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
11485		- Object3D.cVector2[] vector2buffer;
	13411	+
	13412	+ //Object3D.cVector2[] vector2buffer;
11486	13413
11487	13414	// IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
11488	13415	// OUT : diff, spec
..	..	@@ -11498,9 +13425,10 @@
11498	13425	"DP3 " + dest + ".z," + "normals," + "eye;" +
11499	13426	"MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
11500	13427	//"MOV " + dest + ".w," + "normal.z;" +
11501		- "MUL " + dest + ".z," + "params2.w," + dest + ".x;" +
11502		- "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
11503		- //"MOV " + dest + ".z," + "params2.w;" +
	13428	+// "MUL " + dest + ".z," + "params2.w," + dest + ".x;" + // PRETTY HEURISTIC FOR VELVET
	13429	+// "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
	13430	+
	13431	+ "MOV " + dest + ".z," + "params2.w;" + // EXACT
11504	13432	"POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
11505	13433	"RCP " + dest + ".w," + dest + ".w;" +
11506	13434	//"RSQ " + dest + ".w," + dest + ".w;" +
..	..	@@ -11894,7 +13822,7 @@
11894	13822	public void mousePressed(MouseEvent e)
11895	13823	{
11896	13824	//System.out.println("mousePressed: " + e);
11897		- clickStart(e.getX(), e.getY(), e.getModifiersEx());
	13825	+ clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
11898	13826	}
11899	13827
11900	13828	static long prevtime = 0;
..	..	@@ -11921,14 +13849,16 @@
11921	13849
11922	13850	//System.err.println("Dtime = " + Dtime + "; units = " + e.getUnitsToScroll() + "; ratio (units/ms) = " + ratio);
11923	13851
	13852	+ if (BUTTONLESSWHEEL)
11924	13853	if (Math.abs(ratio) < 0.1 \|\| Math.abs(Dtime) == 0) // < 30)
11925	13854	{
11926	13855	return;
11927	13856	}
11928	13857
	13858	+ boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
11929	13859
11930	13860	// TIMER
11931		- if (!wheeltimer.isRunning() && e.getModifiersEx() == 0) // VR
	13861	+ if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
11932	13862	{
11933	13863	keepboxmode = BOXMODE;
11934	13864	keepsupport = SUPPORT;
..	..	@@ -11968,8 +13898,8 @@
11968	13898	// mode \|= META;
11969	13899	//}
11970	13900
11971		- SetMouseMode(WHEEL \| e.getModifiersEx());
11972		- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0);
	13901	+ SetMouseMode(e.getModifiers(), WHEEL \| e.getModifiersEx());
	13902	+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
11973	13903	anchorX = ax;
11974	13904	anchorY = ay;
11975	13905	prevX = px;
..	..	@@ -12003,6 +13933,7 @@
12003	13933	else
12004	13934	if (evt.getSource() == AAtimer)
12005	13935	{
	13936	+ Globals.TIMERRUNNING = false;
12006	13937	if (mouseDown)
12007	13938	{
12008	13939	//new Exception().printStackTrace();
..	..	@@ -12028,6 +13959,10 @@
12028	13959	// LIVE = waslive;
12029	13960	// wasliveok = true;
12030	13961	// waslive = false;
	13962	+
	13963	+ // May 2019 Forget it:
	13964	+ if (true)
	13965	+ return;
12031	13966
12032	13967	// source == timer
12033	13968	if (mouseDown)
..	..	@@ -12057,8 +13992,8 @@
12057	13992	// ObjEditor.tweenManager.update(1f / 60f);
12058	13993
12059	13994	// fev 2014???
12060		- if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && drawMode == SHADOW) // && !lightMode)
12061		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	13995	+ if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
	13996	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
12062	13997	pingthread.StepToTarget(true); // true);
12063	13998	}
12064	13999	// if (!LIVE)
..	..	@@ -12067,12 +14002,13 @@
12067	14002
12068	14003	javax.swing.Timer timer = new javax.swing.Timer(350, this);
12069	14004
12070		- void clickStart(int x, int y, int modifiers)
	14005	+ void clickStart(int x, int y, int modifiers, int modifiersex)
12071	14006	{
12072	14007	if (!wasliveok)
12073	14008	return;
12074	14009
12075	14010	AAtimer.restart(); //
	14011	+ Globals.TIMERRUNNING = true;
12076	14012
12077	14013	// waslive = LIVE;
12078	14014	// LIVE = false;
..	..	@@ -12084,7 +14020,7 @@
12084	14020	// touched = true; // main DL
12085	14021	if (isRenderer)
12086	14022	{
12087		- SetMouseMode(modifiers);
	14023	+ SetMouseMode(modifiers, modifiersex);
12088	14024	}
12089	14025
12090	14026	selectX = anchorX = x;
..	..	@@ -12097,7 +14033,7 @@
12097	14033	clicked = true;
12098	14034	hold = false;
12099	14035
12100		- if (((modifiers & ~1024) & ~0) == 0) // Single or multiple selection
	14036	+ if (((modifiersex & ~1024) & ~0) == 0) // Single or multiple selection
12101	14037	// june 2013 means CTRL_CLICK: if (((modifiers & ~1024) & ~128) == 0) // Single or multiple selection
12102	14038	{
12103	14039	// System.out.println("RESTART II " + modifiers);
..	..	@@ -12128,7 +14064,7 @@
12128	14064	info.camera = renderCamera;
12129	14065	info.x = x;
12130	14066	info.y = y;
12131		- info.modifiers = modifiers;
	14067	+ info.modifiers = modifiersex;
12132	14068	editObj = object.doEditClick(info, 0);
12133	14069	if (!editObj)
12134	14070	{
..	..	@@ -12145,11 +14081,14 @@
12145	14081
12146	14082	public void mouseDragged(MouseEvent e)
12147	14083	{
	14084	+ Globals.MOUSEDRAGGED = true;
	14085	+
	14086	+ //System.out.println("mouseDragged: " + e);
12148	14087	if (isRenderer)
12149	14088	movingcamera = true;
	14089	+
12150	14090	//if (drawing)
12151	14091	//return;
12152		- //System.out.println("mouseDragged: " + e);
12153	14092	if ((e.getModifiersEx() & CTRL) != 0
12154	14093	\|\| (e.getModifiersEx() & COMMAND) != 0) // \|\| IsFrozen())
12155	14094	{
..	..	@@ -12157,7 +14096,7 @@
12157	14096	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
12158	14097	}
12159	14098	else
12160		- drag(e.getX(), e.getY(), e.getModifiersEx());
	14099	+ drag(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
12161	14100
12162	14101	//try { Thread.sleep(1); } catch (Exception ex) {}
12163	14102	}
..	..	@@ -12169,6 +14108,11 @@
12169	14108	cVector tmp = new cVector();
12170	14109	cVector tmp2 = new cVector();
12171	14110	boolean isMoving;
	14111	+
	14112	+ public cVector TargetLookAt()
	14113	+ {
	14114	+ return targetLookAt;
	14115	+ }
12172	14116
12173	14117	class PingThread extends Thread
12174	14118	{
..	..	@@ -12308,7 +14252,7 @@
12308	14252	//System.out.println("---------------- ---------- Paint " + tmp.length2());
12309	14253	if (lightMode)
12310	14254	{
12311		- lighttouched = true;
	14255	+ Globals.lighttouched = true;
12312	14256	}
12313	14257
12314	14258	if (OEILONCE && OEIL)
..	..	@@ -12325,6 +14269,7 @@
12325	14269
12326	14270	public void run()
12327	14271	{
	14272	+ new Exception().printStackTrace();
12328	14273	System.exit(0);
12329	14274	for (;;)
12330	14275	{
..	..	@@ -12366,7 +14311,7 @@
12366	14311	mouseDown = false;
12367	14312	if (lightMode)
12368	14313	{
12369		- lighttouched = true;
	14314	+ Globals.lighttouched = true;
12370	14315	}
12371	14316	repaint();
12372	14317	alreadypainted = true;
..	..	@@ -12374,7 +14319,7 @@
12374	14319	isMoving = false;
12375	14320	} //??
12376	14321
12377		- if (isLIVE() && !alreadypainted)
	14322	+ if (Globals.isLIVE() && !alreadypainted)
12378	14323	{
12379	14324	// FOR DEBUG BREAKPOINT USING PAUSE: while (true)
12380	14325	repaint();
..	..	@@ -12386,9 +14331,9 @@
12386	14331	{
12387	14332	if (lightMode)
12388	14333	{
12389		- lighttouched = true;
	14334	+ Globals.lighttouched = true;
12390	14335	}
12391		- drag(X, (mouseMode != 0) ? Y : anchorY, MODIFIERS);
	14336	+ drag(X, (mouseMode != 0) ? Y : anchorY, 0, MODIFIERS);
12392	14337	}
12393	14338	//else
12394	14339	}
..	..	@@ -12402,12 +14347,12 @@
12402	14347	void GoDown(int mod)
12403	14348	{
12404	14349	MODIFIERS \|= COMMAND;
12405		- /*
	14350	+ /**/
12406	14351	if((mod&SHIFT) == SHIFT)
12407	14352	manipCamera.RotatePosition(0, -speed);
12408	14353	else
12409		- manipCamera.BackForth(0, -speed*delta, getWidth());
12410		- */
	14354	+ manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
	14355	+ /**/
12411	14356	if ((mod & SHIFT) == SHIFT)
12412	14357	{
12413	14358	mouseMode = mouseMode; // VR??
..	..	@@ -12423,12 +14368,12 @@
12423	14368	void GoUp(int mod)
12424	14369	{
12425	14370	MODIFIERS \|= COMMAND;
12426		- /*
	14371	+ /**/
12427	14372	if((mod&SHIFT) == SHIFT)
12428	14373	manipCamera.RotatePosition(0, speed);
12429	14374	else
12430		- manipCamera.BackForth(0, speed*delta, getWidth());
12431		- */
	14375	+ manipCamera.BackForth(0, speed*delta, 0); // getWidth());
	14376	+ /**/
12432	14377	if ((mod & SHIFT) == SHIFT)
12433	14378	{
12434	14379	mouseMode = mouseMode;
..	..	@@ -12444,12 +14389,12 @@
12444	14389	void GoLeft(int mod)
12445	14390	{
12446	14391	MODIFIERS \|= COMMAND;
12447		- /*
	14392	+ /**/
12448	14393	if((mod&SHIFT) == SHIFT)
12449		- manipCamera.RotatePosition(speed, 0);
12450		- else
12451	14394	manipCamera.Translate(speed*delta, 0, getWidth());
12452		- */
	14395	+ else
	14396	+ manipCamera.RotatePosition(speed, 0);
	14397	+ /**/
12453	14398	if ((mod & SHIFT) == SHIFT)
12454	14399	{
12455	14400	mouseMode = mouseMode;
..	..	@@ -12465,12 +14410,12 @@
12465	14410	void GoRight(int mod)
12466	14411	{
12467	14412	MODIFIERS \|= COMMAND;
12468		- /*
	14413	+ /**/
12469	14414	if((mod&SHIFT) == SHIFT)
12470		- manipCamera.RotatePosition(-speed, 0);
12471		- else
12472	14415	manipCamera.Translate(-speed*delta, 0, getWidth());
12473		- */
	14416	+ else
	14417	+ manipCamera.RotatePosition(-speed, 0);
	14418	+ /**/
12474	14419	if ((mod & SHIFT) == SHIFT)
12475	14420	{
12476	14421	mouseMode = mouseMode;
..	..	@@ -12488,7 +14433,7 @@
12488	14433	int X, Y;
12489	14434	boolean SX, SY;
12490	14435
12491		- void drag(int x, int y, int modifiers)
	14436	+ void drag(int x, int y, int modifiers, int modifiersex)
12492	14437	{
12493	14438	if (IsFrozen())
12494	14439	{
..	..	@@ -12497,17 +14442,17 @@
12497	14442
12498	14443	drag = true; // NEW
12499	14444
12500		- boolean continuous = (modifiers & COMMAND) == COMMAND;
	14445	+ boolean continuous = (modifiersex & COMMAND) == COMMAND;
12501	14446
12502	14447	X = x;
12503	14448	Y = y;
12504	14449	// floating state for animation
12505		- MODIFIERS = modifiers;
12506		- modifiers &= ~1024;
	14450	+ MODIFIERS = modifiersex;
	14451	+ modifiersex &= ~1024;
12507	14452	if (false) // modifiers != 0)
12508	14453	{
12509	14454	//new Exception().printStackTrace();
12510		- System.out.println("mouseDragged: " + modifiers);
	14455	+ System.out.println("mouseDragged: " + modifiersex);
12511	14456	System.out.println("SHIFT = " + SHIFT);
12512	14457	System.out.println("CONTROL = " + COMMAND);
12513	14458	System.out.println("META = " + META);
..	..	@@ -12527,7 +14472,8 @@
12527	14472	info.camera = renderCamera;
12528	14473	info.x = x;
12529	14474	info.y = y;
12530		- object.editWindow.copy.doEditDrag(info);
	14475	+ object.GetWindow().copy
	14476	+ .doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
12531	14477	} else
12532	14478	{
12533	14479	if (x < startX)
..	..	@@ -12629,6 +14575,7 @@
12629	14575	{
12630	14576	manipCamera.Translate(dx, dy, getWidth());
12631	14577	}
	14578	+ else
12632	14579	if ((mouseMode & ZOOM) == 0 && (mouseMode & VR) != 0)
12633	14580	{
12634	14581	manipCamera.RotateInterest(dx, dy);
..	..	@@ -12639,7 +14586,7 @@
12639	14586
12640	14587	if (manipCamera == lightCamera)
12641	14588	{
12642		- lighttouched = true;
	14589	+ Globals.lighttouched = true;
12643	14590	}
12644	14591	/*
12645	14592	switch (mode)
..	..	@@ -12678,7 +14625,6 @@
12678	14625	public void mouseMoved(MouseEvent e)
12679	14626	{
12680	14627	//System.out.println("mouseMoved: " + e);
12681		-
12682	14628	if (isRenderer)
12683	14629	return;
12684	14630
..	..	@@ -12691,7 +14637,9 @@
12691	14637	ci.camera = renderCamera;
12692	14638	if (!isRenderer)
12693	14639	{
12694		- if (object.editWindow.copy.doEditClick(ci, 0))
	14640	+ //ObjEditor editWindow = object.editWindow;
	14641	+ //Object3D copy = editWindow.copy;
	14642	+ if (object.doEditClick(ci, 0))
12695	14643	{
12696	14644	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
12697	14645	} else
..	..	@@ -12703,7 +14651,11 @@
12703	14651
12704	14652	public void mouseReleased(MouseEvent e)
12705	14653	{
	14654	+ Globals.MOUSEDRAGGED = false;
	14655	+
12706	14656	movingcamera = false;
	14657	+ X = 0; // getBounds().width/2;
	14658	+ Y = 0; // getBounds().height/2;
12707	14659	//System.out.println("mouseReleased: " + e);
12708	14660	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
12709	14661	}
..	..	@@ -12726,9 +14678,9 @@
12726	14678	boolean control = ((modifiers & CTRL) != 0); // june 2013: for point selection
12727	14679	boolean command = ((modifiers & COMMAND) != 0); // june 2013: for multiple selection
12728	14680
12729		- if (control \|\| command \|\| IsFrozen())
	14681	+// No delay if (control \|\| command \|\| IsFrozen())
12730	14682	timeout = true;
12731		- else
	14683	+// ?? May 2019 else
12732	14684	// timer.setDelay((modifiers & 128) != 0?0:350);
12733	14685	mouseDown = false;
12734	14686	if (!control && !command) // june 2013
..	..	@@ -12838,7 +14790,7 @@
12838	14790	System.out.println("keyReleased: " + e);
12839	14791	}
12840	14792
12841		- void SetMouseMode(int modifiers)
	14793	+ void SetMouseMode(int modifiers, int modifiersex)
12842	14794	{
12843	14795	//System.out.println("SetMouseMode = " + modifiers);
12844	14796	//modifiers &= ~1024;
..	..	@@ -12850,25 +14802,25 @@
12850	14802	//if (modifiers == 0) // \|\| (modifiers == (1024 \| CONTROL)))
12851	14803	// return;
12852	14804	//System.out.println("SetMode = " + modifiers);
12853		- if ((modifiers & WHEEL) == WHEEL)
	14805	+ if ((modifiersex & WHEEL) == WHEEL)
12854	14806	{
12855	14807	mouseMode \|= ZOOM;
12856	14808	}
12857	14809
12858	14810	boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
12859		- if (capsLocked \|\| (modifiers & META) == META)
	14811	+ if (capsLocked) // \|\| (modifiers & META) == META)
12860	14812	{
12861	14813	mouseMode \|= VR; // BACKFORTH;
12862	14814	}
12863		- if ((modifiers & CTRLCLICK) == CTRLCLICK)
12864		- {
12865		- mouseMode \|= SELECT; // BACKFORTH;
12866		- }
12867		- if ((modifiers & COMMAND) == COMMAND)
	14815	+ if ((modifiersex & CTRLCLICK) == CTRLCLICK)
12868	14816	{
12869	14817	mouseMode \|= SELECT;
12870	14818	}
12871		- if ((modifiers & SHIFT) == SHIFT \|\| forcetranslate)
	14819	+ if ((modifiersex & COMMAND) == COMMAND)
	14820	+ {
	14821	+ mouseMode \|= SELECT;
	14822	+ }
	14823	+ if ((modifiersex & SHIFT) == SHIFT \|\| forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
12872	14824	{
12873	14825	mouseMode &= ~VR;
12874	14826	mouseMode \|= TRANSLATE;
..	..	@@ -12897,10 +14849,10 @@
12897	14849
12898	14850	if (isRenderer) //
12899	14851	{
12900		- SetMouseMode(modifiers);
	14852	+ SetMouseMode(0, modifiers);
12901	14853	}
12902	14854
12903		- theRenderer.keyPressed(key);
	14855	+ Globals.theRenderer.keyPressed(key);
12904	14856	}
12905	14857
12906	14858	int kompactbit = 4; // power bit
..	..	@@ -12912,7 +14864,7 @@
12912	14864	float SATPOW = 1; // 2; // 0.5f;
12913	14865	float BRIPOW = 1; // 0.5f; // 0.5f;
12914	14866
12915		- void keyPressed(int key)
	14867	+ public void keyPressed(int key)
12916	14868	{
12917	14869	if (key >= '0' && key <= '5')
12918	14870	clampbit = (key-'0');
..	..	@@ -13027,7 +14979,7 @@
13027	14979	case 'B':
13028	14980	BRISMOOTH ^= true;
13029	14981	SHADOWCULLFACE ^= true;
13030		- lighttouched = true;
	14982	+ Globals.lighttouched = true;
13031	14983	repaint();
13032	14984	break;
13033	14985	case 'b':
..	..	@@ -13044,7 +14996,9 @@
13044	14996	case 'E' : COMPACT ^= true;
13045	14997	repaint();
13046	14998	break;
13047		- case 'W' : DEBUGHSB ^= true;
	14999	+ case 'W' : // Wide Window (fullscreen)
	15000	+ //DEBUGHSB ^= true;
	15001	+ ObjEditor.theFrame.ToggleFullScreen();
13048	15002	repaint();
13049	15003	break;
13050	15004	case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
..	..	@@ -13069,8 +15023,8 @@
13069	15023	RevertCamera();
13070	15024	repaint();
13071	15025	break;
13072		- case 'L':
13073	15026	case 'l':
	15027	+ //case 'L':
13074	15028	if (lightMode)
13075	15029	{
13076	15030	lightMode = false;
..	..	@@ -13127,7 +15081,7 @@
13127	15081	repaint();
13128	15082	break;
13129	15083	case 'O':
13130		- drawMode = OCCLUSION;
	15084	+ Globals.drawMode = OCCLUSION; // WARNING
13131	15085	repaint();
13132	15086	break;
13133	15087	case 'o':
..	..	@@ -13213,12 +15167,12 @@
13213	15167	case '_':
13214	15168	kompactbit = 5;
13215	15169	break;
13216		- case '+':
13217		- kompactbit = 6;
13218		- break;
	15170	+// case '+':
	15171	+// kompactbit = 6;
	15172	+// break;
13219	15173	case ' ':
13220	15174	lightMode ^= true;
13221		- lighttouched = true;
	15175	+ Globals.lighttouched = true;
13222	15176	manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
13223	15177	targetLookAt.set(manipCamera.lookAt);
13224	15178	repaint();
..	..	@@ -13227,14 +15181,15 @@
13227	15181	case ESC:
13228	15182	RENDERPROGRAM += 1;
13229	15183	RENDERPROGRAM %= 3;
	15184	+
13230	15185	repaint();
13231	15186	break;
13232	15187	case 'Z':
13233		- RESIZETEXTURE ^= true;
13234		- break;
	15188	+ //RESIZETEXTURE ^= true;
	15189	+ //break;
13235	15190	case 'z':
13236		- RENDERSHADOW ^= true;
13237		- lighttouched = true;
	15191	+ Globals.RENDERSHADOW ^= true;
	15192	+ Globals.lighttouched = true;
13238	15193	repaint();
13239	15194	break;
13240	15195	//case UP:
..	..	@@ -13266,8 +15221,9 @@
13266	15221	case DELETE:
13267	15222	ClearSelection();
13268	15223	break;
13269		- /*
13270	15224	case '+':
	15225	+
	15226	+ /*
13271	15227	//fontsize += 1;
13272	15228	bbzoom *= 2;
13273	15229	repaint();
..	..	@@ -13284,17 +15240,17 @@
13284	15240	case '=':
13285	15241	IncDepth();
13286	15242	//fontsize += 1;
13287		- object.editWindow.refreshContents(true);
	15243	+ object.GetWindow().refreshContents(true);
13288	15244	maskbit = 6;
13289	15245	break;
13290	15246	case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
13291	15247	DecDepth();
13292	15248	maskbit = 5;
13293	15249	//if(fontsize > 1) fontsize -= 1;
13294		- if (object.editWindow == null)
13295		- new Exception().printStackTrace();
13296		- else
13297		- object.editWindow.refreshContents(true);
	15250	+// if (object.editWindow == null)
	15251	+// new Exception().printStackTrace();
	15252	+// else
	15253	+ object.GetWindow().refreshContents(true);
13298	15254	break;
13299	15255	case '{':
13300	15256	manipCamera.shaper_fovy /= 1.1;
..	..	@@ -13349,6 +15305,7 @@
13349	15305	}
13350	15306	//System.out.println("shaper_fovy = " + manipCamera.shaper_fovy);
13351	15307	}
	15308	+
13352	15309	static double OCCLUSIONBOOST = 1; // 0.5;
13353	15310
13354	15311	void keyReleased(int key, int modifiers)
..	..	@@ -13356,11 +15313,11 @@
13356	15313	//mode = ROTATE;
13357	15314	if ((MODIFIERS & COMMAND) == 0) // VR??
13358	15315	{
13359		- SetMouseMode(modifiers);
	15316	+ SetMouseMode(0, modifiers);
13360	15317	}
13361	15318	}
13362	15319
13363		- protected void processKeyEvent(KeyEvent e)
	15320	+ public void processKeyEvent(KeyEvent e)
13364	15321	{
13365	15322	switch (e.getID())
13366	15323	{
..	..	@@ -13490,8 +15447,9 @@
13490	15447
13491	15448	protected void processMouseMotionEvent(MouseEvent e)
13492	15449	{
13493		- //System.out.println("processMouseMotionEvent: " + mouseMode);
13494		- if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
	15450	+ //System.out.println("processMouseMotionEvent: " + mouseMode + " " + e.getModifiers() + " " + e.getModifiersEx() + " " + e.getButton());
	15451	+ //if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
	15452	+ if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (e.getModifiers() & MouseEvent.BUTTON3_MASK) == 0 && (mouseMode & SELECT) == 0)
13495	15453	{
13496	15454	mouseMoved(e);
13497	15455	} else
..	..	@@ -13516,11 +15474,12 @@
13516	15474	}
13517	15475	*/
13518	15476
13519		- object.editWindow.EditSelection();
	15477	+ object.GetWindow().EditSelection(false);
13520	15478	}
13521	15479
13522	15480	void SelectParent()
13523	15481	{
	15482	+ new Exception().printStackTrace();
13524	15483	System.exit(0);
13525	15484	Composite group = (Composite) object;
13526	15485	java.util.Vector selectees = new java.util.Vector(group.selection);
..	..	@@ -13532,10 +15491,10 @@
13532	15491	{
13533	15492	//selectees.remove(i);
13534	15493	System.out.println("select parent of " + elem);
13535		- group.editWindow.Select(elem.parent.GetTreePath(), first, true);
	15494	+ group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
13536	15495	} else
13537	15496	{
13538		- group.editWindow.Select(elem.GetTreePath(), first, true);
	15497	+ group.GetWindow().Select(elem.GetTreePath(), first, true);
13539	15498	}
13540	15499
13541	15500	first = false;
..	..	@@ -13544,6 +15503,7 @@
13544	15503
13545	15504	void SelectChildren()
13546	15505	{
	15506	+ new Exception().printStackTrace();
13547	15507	System.exit(0);
13548	15508	/*
13549	15509	Composite group = (Composite) object;
..	..	@@ -13576,12 +15536,12 @@
13576	15536	for (int j = 0; j < group.children.size(); j++)
13577	15537	{
13578	15538	elem = (Object3D) group.children.elementAt(j);
13579		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15539	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
13580	15540	first = false;
13581	15541	}
13582	15542	} else
13583	15543	{
13584		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15544	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
13585	15545	}
13586	15546
13587	15547	first = false;
..	..	@@ -13592,21 +15552,21 @@
13592	15552	{
13593	15553	//Composite group = (Composite) object;
13594	15554	Object3D group = object;
13595		- group.editWindow.loadClipboard(true); // ClearSelection(false);
	15555	+ group.GetWindow().loadClipboard(true); // ClearSelection(false);
13596	15556	}
13597	15557
13598	15558	void ResetTransform(int mask)
13599	15559	{
13600	15560	//Composite group = (Composite) object;
13601	15561	Object3D group = object;
13602		- group.editWindow.ResetTransform(mask);
	15562	+ group.GetWindow().ResetTransform(mask);
13603	15563	}
13604	15564
13605	15565	void FlipTransform()
13606	15566	{
13607	15567	//Composite group = (Composite) object;
13608	15568	Object3D group = object;
13609		- group.editWindow.FlipTransform();
	15569	+ group.GetWindow().FlipTransform();
13610	15570	// group.editWindow.ReduceMesh(true);
13611	15571	}
13612	15572
..	..	@@ -13614,7 +15574,7 @@
13614	15574	{
13615	15575	//Composite group = (Composite) object;
13616	15576	Object3D group = object;
13617		- group.editWindow.PrintMemory();
	15577	+ group.GetWindow().PrintMemory();
13618	15578	// group.editWindow.ReduceMesh(true);
13619	15579	}
13620	15580
..	..	@@ -13622,7 +15582,7 @@
13622	15582	{
13623	15583	//Composite group = (Composite) object;
13624	15584	Object3D group = object;
13625		- group.editWindow.ResetCentroid();
	15585	+ group.GetWindow().ResetCentroid();
13626	15586	}
13627	15587
13628	15588	void IncDepth()
..	..	@@ -13708,7 +15668,9 @@
13708	15668	info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
13709	15669	//Image img = CreateImage(width, height);
13710	15670	//System.out.println("width = " + width + "; height = " + height + "\n");
	15671	+
13711	15672	Graphics gr = g; // img.getGraphics();
	15673	+
13712	15674	if (!hasMarquee)
13713	15675	{
13714	15676	if (Xmin < Xmax) // !locked)
..	..	@@ -13796,6 +15758,7 @@
13796	15758	info.bounds.y += (height - desired) / 2;
13797	15759	}
13798	15760	}
	15761	+
13799	15762	info.g = gr;
13800	15763	info.camera = renderCamera;
13801	15764	/*
..	..	@@ -13805,15 +15768,55 @@
13805	15768	*/
13806	15769	if (!isRenderer)
13807	15770	{
13808		- object.drawEditHandles(info, 0);
	15771	+ Grafreed.Assert(object != null);
	15772	+ Grafreed.Assert(object.selection != null);
	15773	+ if (object.selection.Size() > 0)
	15774	+ {
	15775	+ int hitSomething = object.selection.get(0).hitSomething;
	15776	+
	15777	+ info.DX = 0;
	15778	+ info.DY = 0;
	15779	+ info.W = 1;
	15780	+ if (hitSomething == Object3D.hitCenter)
	15781	+ {
	15782	+ info.DX = X;
	15783	+ if (X != 0)
	15784	+ info.DX -= info.bounds.width/2;
	15785	+
	15786	+ info.DY = Y;
	15787	+ if (Y != 0)
	15788	+ info.DY -= info.bounds.height/2;
	15789	+ }
	15790	+
	15791	+ object.drawEditHandles(info, 0);
	15792	+
	15793	+ if (drag && (X != 0 \|\| Y != 0))
	15794	+ {
	15795	+ switch (hitSomething)
	15796	+ {
	15797	+ case Object3D.hitCenter: gr.setColor(Color.pink);
	15798	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15799	+ break;
	15800	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	15801	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15802	+ break;
	15803	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	15804	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15805	+ break;
	15806	+ }
	15807	+
	15808	+ }
	15809	+ }
13809	15810	}
13810	15811	}
	15812	+
13811	15813	if (isRenderer)
13812	15814	{
13813	15815	//gr.setColor(Color.black);
13814	15816	//gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
13815	15817	//gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
13816	15818	}
	15819	+
13817	15820	if (hasMarquee)
13818	15821	{
13819	15822	gr.setXORMode(Color.white);
..	..	@@ -13836,6 +15839,7 @@
13836	15839	//if (g != gr) g.drawImage(img, 0, 0, width, height, null);
13837	15840	}
13838	15841
	15842	+ // To avoid clear.
13839	15843	public void update(Graphics g)
13840	15844	{
13841	15845	paint(g);
..	..	@@ -13925,6 +15929,7 @@
13925	15929	public boolean mouseDown(Event evt, int x, int y)
13926	15930	{
13927	15931	System.out.println("mouseDown: " + evt);
	15932	+ System.exit(0);
13928	15933	/*
13929	15934	locked = true;
13930	15935	drag = false;
..	..	@@ -13968,7 +15973,7 @@
13968	15973	{
13969	15974	keyPressed(0, modifiers);
13970	15975	}
13971		- clickStart(x, y, modifiers);
	15976	+ // clickStart(x, y, modifiers);
13972	15977	return true;
13973	15978	}
13974	15979
..	..	@@ -14086,7 +16091,7 @@
14086	16091	{
14087	16092	keyReleased(0, 0);
14088	16093	}
14089		- drag(x, y, modifiers);
	16094	+ drag(x, y, 0, modifiers);
14090	16095	return true;
14091	16096	}
14092	16097
..	..	@@ -14218,7 +16223,7 @@
14218	16223	Object3D object;
14219	16224	static Object3D trackedobject;
14220	16225	Camera renderCamera; // Light or Eye (or Occlusion)
14221		- /static/ Camera manipCamera; // Light or Eye
	16226	+ /static/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
14222	16227	/static/ Camera eyeCamera;
14223	16228	/static/ Camera lightCamera;
14224	16229	int cameracount;
..	..	@@ -14438,7 +16443,7 @@
14438	16443	gl.glPushAttrib(GL.GL_ALL_ATTRIB_BITS);
14439	16444	gl.glPushMatrix();
14440	16445	gl.glLoadIdentity();
14441		- PushMatrix(checker.toParent);
	16446	+ //PushMatrix(checker.toParent);
14442	16447
14443	16448	gl.glMatrixMode(GL.GL_TEXTURE);
14444	16449	gl.glPushMatrix();
..	..	@@ -14461,8 +16466,8 @@
14461	16466
14462	16467	gl.glNormal3f(0.0f, 0.0f, 1.0f);
14463	16468
14464		- float step = 0.1666f; //0.25f;
14465		- float stepv = step * 1652 / 998;
	16469	+ float step = 2; // 0.1666f; //0.25f;
	16470	+ float stepv = 2; // step * 1652 / 998;
14466	16471
14467	16472	int i0 = 0;
14468	16473	/*
..	..	@@ -14498,20 +16503,21 @@
14498	16503	/**/
14499	16504	//checker.GetMaterial().opacity = 1.1f;
14500	16505	////checker.GetMaterial().ambient = 0.99f;
14501		- Object3D.materialstack[Object3D.materialdepth] = checker.material;
14502		- Object3D.selectedstack[Object3D.materialdepth] = false;
14503		- cStatic.objectstack[Object3D.materialdepth++] = checker;
	16506	+ materialstack[materialdepth] = checker.material;
	16507	+ selectedstack[materialdepth] = false;
	16508	+ cStatic.objectstack[materialdepth++] = checker;
14504	16509	//System.out.println("material " + material);
14505	16510	//Applet3D.tracein(this, selected);
14506		- vector2buffer = checker.projectedVertices;
	16511	+ //vector2buffer = checker.projectedVertices;
14507	16512
14508		- checker.GetMaterial().Draw(this, false); // true);
	16513	+ //checker.GetMaterial().Draw(this, false); // true);
	16514	+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
14509	16515
14510		- Object3D.materialdepth -= 1;
14511		- if (Object3D.materialdepth > 0)
	16516	+ materialdepth -= 1;
	16517	+ if (materialdepth > 0)
14512	16518	{
14513		- vector2buffer = cStatic.objectstack[Object3D.materialdepth - 1].projectedVertices;
14514		- Object3D.materialstack[Object3D.materialdepth - 1].Draw(this, Object3D.selectedstack[Object3D.materialdepth - 1]);
	16519	+ //vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	16520	+ DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
14515	16521	}
14516	16522	//checker.GetMaterial().opacity = 1f;
14517	16523	////checker.GetMaterial().ambient = 1f;
..	..	@@ -14532,15 +16538,27 @@
14532	16538
14533	16539	//float u = (i+1)/2;
14534	16540	//float v = (j+1)/2;
14535		- gl.glTexCoord2f((i + 1) / 2, (j + 1) / 2); // (1,0) // (i+1+step)/2,(j+1)/2);
	16541	+ if (checker.flipV)
	16542	+ gl.glTexCoord2f((i + 1) / 2, 1 - (j + 1) / 2);
	16543	+ else
	16544	+ gl.glTexCoord2f((i + 1) / 2, (j + 1) / 2); // (1,0) // (i+1+step)/2,(j+1)/2);
14536	16545	gl.glVertex3f(i, j, -0.5f);
14537	16546
	16547	+ if (checker.flipV)
	16548	+ gl.glTexCoord2f((i + 1 + step) / 2, 1 - (j + 1) / 2); // (1,1) // (i+1+step)/2,(j+1+step)/2);
	16549	+ else
14538	16550	gl.glTexCoord2f((i + 1 + step) / 2, (j + 1) / 2); // (1,1) // (i+1+step)/2,(j+1+step)/2);
14539	16551	gl.glVertex3f(i + step, j, -0.5f);
14540	16552
	16553	+ if (checker.flipV)
	16554	+ gl.glTexCoord2f((i + 1 + step) / 2, 1 - (j + 1 + stepv) / 2); // (0,1) //(i+1)/2,(j+1+step)/2);
	16555	+ else
14541	16556	gl.glTexCoord2f((i + 1 + step) / 2, (j + 1 + stepv) / 2); // (0,1) //(i+1)/2,(j+1+step)/2);
14542	16557	gl.glVertex3f(i + step, j + stepv, -0.5f);
14543	16558
	16559	+ if (checker.flipV)
	16560	+ gl.glTexCoord2f((i + 1) / 2, 1 - (j + 1 + stepv) / 2); // (0,0) //(i+1)/2,(j+1)/2);
	16561	+ else
14544	16562	gl.glTexCoord2f((i + 1) / 2, (j + 1 + stepv) / 2); // (0,0) //(i+1)/2,(j+1)/2);
14545	16563	gl.glVertex3f(i, j + stepv, -0.5f);
14546	16564	}
..	..	@@ -14552,7 +16570,7 @@
14552	16570	gl.glMatrixMode(GL.GL_PROJECTION);
14553	16571	gl.glPopMatrix();
14554	16572	gl.glMatrixMode(GL.GL_MODELVIEW);
14555		- PopMatrix(null); // checker.toParent); // null);
	16573	+ //PopMatrix(null); // checker.toParent); // null);
14556	16574	gl.glPopMatrix();
14557	16575	PopTextureMatrix(checker.toParent);
14558	16576	gl.glMatrixMode(GL.GL_TEXTURE);
..	..	@@ -14585,6 +16603,14 @@
14585	16603	}
14586	16604	}
14587	16605
	16606	+ private Object3D GetFolder()
	16607	+ {
	16608	+ Object3D folder = object.GetWindow().copy;
	16609	+ if (object.GetWindow().copy.selection.Size() > 0)
	16610	+ folder = object.GetWindow().copy.selection.elementAt(0);
	16611	+ return folder;
	16612	+ }
	16613	+
14588	16614	class SelectBuffer implements GLEventListener
14589	16615	{
14590	16616
..	..	@@ -14643,6 +16669,7 @@
14643	16669	{
14644	16670	if (!selection)
14645	16671	{
	16672	+ new Exception().printStackTrace();
14646	16673	System.exit(0);
14647	16674	return;
14648	16675	}
..	..	@@ -14663,17 +16690,39 @@
14663	16690
14664	16691	//gl.glDisable(GL.GL_POLYGON_OFFSET_FILL);
14665	16692
	16693	+ if (PAINTMODE)
	16694	+ {
	16695	+ if (object.GetWindow().copy.selection.Size() > 0)
	16696	+ {
	16697	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	16698	+
	16699	+ // Make what you paint not selectable.
	16700	+ paintobj.ResetSelectable();
	16701	+ }
	16702	+ }
	16703	+
14666	16704	//int tmp = selection_view;
14667	16705	//selection_view = -1;
14668		- int temp = drawMode;
14669		- drawMode = SELECTION;
	16706	+ int temp = DrawMode();
	16707	+ Globals.drawMode = SELECTION; // WARNING
14670	16708	indexcount = 0;
14671	16709	parent.display(drawable);
14672	16710	//selection_view = tmp;
14673	16711	//if (temp == SELECTION)
14674	16712	// temp = DEFAULT; // patch for selection debug
14675		- drawMode = temp;
	16713	+ Globals.drawMode = temp; // WARNING
14676	16714
	16715	+ if (PAINTMODE)
	16716	+ {
	16717	+ if (object.GetWindow().copy.selection.Size() > 0)
	16718	+ {
	16719	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	16720	+
	16721	+ // Revert.
	16722	+ paintobj.RestoreSelectable();
	16723	+ }
	16724	+ }
	16725	+
14677	16726	//gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
14678	16727
14679	16728	// trying different ways of getting the depth info over
..	..	@@ -14721,6 +16770,8 @@
14721	16770	// System.err.println("view = " + view[4] + " " + view[5] + " " + view[6] + " " + view[7]);
14722	16771	// System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
14723	16772	// System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
	16773	+
	16774	+ CreateSelectedPoint();
14724	16775
14725	16776	// Will fit the mesh !!!
14726	16777	selectedpoint.toParent[0][0] = 0.0001;
..	..	@@ -14770,34 +16821,36 @@
14770	16821	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]));
14771	16822	}
14772	16823
14773		- previousselectedpoint = (Sphere) GrafreeD.clone(selectedpoint);
	16824	+ previousselectedpoint = (Sphere) Grafreed.clone(selectedpoint);
14774	16825	}
14775	16826	}
14776	16827
14777	16828	if (!movingcamera && !PAINTMODE)
14778		- object.editWindow.ScreenFitPoint(); // fev 2014
	16829	+ object.GetWindow().ScreenFitPoint(); // fev 2014
14779	16830
14780		- if (PAINTMODE && GrafreeD.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	16831	+ if (PAINTMODE) // && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
14781	16832	{
14782		- Object3D paintobj = GrafreeD.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
	16833	+ //Object3D paintobj; // = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
14783	16834
14784		- Object3D group = new Object3D("inst" + paintcount++);
	16835	+ if (object.GetWindow().copy.selection.Size() > 0)
	16836	+ {
	16837	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
14785	16838
14786		- group.CreateMaterial(); // use a void leaf to select instances
14787		-
14788		- group.add(paintobj); // link
14789		-
14790		- object.editWindow.SnapObject(group);
14791		-
14792		- Object3D folder = object.editWindow.copy;
14793		-
14794		- if (object.editWindow.copy.selection.Size() > 0)
14795		- folder = object.editWindow.copy.selection.elementAt(0);
14796		-
14797		- folder.add(group);
14798		-
14799		- object.editWindow.ResetModel();
14800		- object.editWindow.refreshContents();
	16839	+ Object3D inst = new Object3D("inst" + paintcount++);
	16840	+
	16841	+ inst.CreateMaterial(); // use a void leaf to select instances
	16842	+
	16843	+ inst.add(paintobj); // link
	16844	+
	16845	+ object.GetWindow().SnapObject(inst);
	16846	+
	16847	+ Object3D folder = paintFolder; // GetFolder();
	16848	+
	16849	+ folder.add(inst);
	16850	+
	16851	+ object.GetWindow().ResetModel();
	16852	+ object.GetWindow().refreshContents();
	16853	+ }
14801	16854	}
14802	16855	else
14803	16856	paintcount = 0;
..	..	@@ -14836,6 +16889,11 @@
14836	16889	//System.out.println("objects[color] = " + objects[color]);
14837	16890	//objects[color].Select();
14838	16891	indexcount = 0;
	16892	+ ObjEditor window = object.GetWindow();
	16893	+ if (window != null && deselect)
	16894	+ {
	16895	+ window.Select(null, deselect, true);
	16896	+ }
14839	16897	object.Select(color, deselect);
14840	16898	}
14841	16899
..	..	@@ -14935,7 +16993,7 @@
14935	16993	gl.glDisable(gl.GL_CULL_FACE);
14936	16994	}
14937	16995
14938		- if (!RENDERSHADOW)
	16996	+ if (!Globals.RENDERSHADOW)
14939	16997	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
14940	16998
14941	16999	// SB gl.glPolygonOffset(2.5f, 10);
..	..	@@ -14945,14 +17003,14 @@
14945	17003	//gl.glColorMask(false, false, false, false);
14946	17004
14947	17005	//render_scene_from_light_view(gl, drawable, 0, 0);
14948		- if (RENDERSHADOW && lighttouched && !movingcamera) // && !parent.IsFreezed())
	17006	+ if (Globals.RENDERSHADOW && Globals.lighttouched && (!movingcamera \|\| !Globals.FREEZEONMOVE)) // && !parent.IsFreezed())
14949	17007	{
14950	17008	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
14951	17009
14952		- int temp = drawMode;
14953		- drawMode = SHADOW;
	17010	+ int temp = DrawMode();
	17011	+ Globals.drawMode = SHADOW; // WARNING
14954	17012	parent.display(drawable);
14955		- drawMode = temp;
	17013	+ Globals.drawMode = temp; // WARNING
14956	17014	}
14957	17015
14958	17016	gl.glCullFace(gl.GL_BACK);
..	..	@@ -15005,7 +17063,6 @@
15005	17063
15006	17064	class AntialiasBuffer implements GLEventListener
15007	17065	{
15008		-
15009	17066	CameraPane parent = null;
15010	17067
15011	17068	AntialiasBuffer(CameraPane p)
..	..	@@ -15115,13 +17172,19 @@
15115	17172	gl.glFlush();
15116	17173
15117	17174	/**/
15118		- gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_BGRA, GL.GL_UNSIGNED_INT_8_8_8_8_REV, occlusionsizebuffer);
	17175	+ gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusionsizebuffer);
15119	17176
15120		- int[] pixels = occlusionsizebuffer.array();
	17177	+ float[] pixels = occlusionsizebuffer.array();
15121	17178
15122	17179	double r = 0, g = 0, b = 0;
15123	17180
15124	17181	double count = 0;
	17182	+
	17183	+ gl.glGetDoublev(gl.GL_PROJECTION_MATRIX, tempmat2, 0);
	17184	+
	17185	+ float mindepth = 1;
	17186	+
	17187	+ double FACTOR = 1;
15125	17188
15126	17189	for (int i = 0; i < pixels.length; i++)
15127	17190	{
..	..	@@ -15206,7 +17269,7 @@
15206	17269
15207	17270	double scale = ray.z; // 1; // cos
15208	17271
15209		- int p = pixels[newindex];
	17272	+ float depth = pixels[newindex];
15210	17273
15211	17274	/*
15212	17275	int newindex2 = (x + 1) * OCCLUSION_SIZE + y;
..	..	@@ -15230,10 +17293,23 @@
15230	17293	scale = (1 - modu) * modv;
15231	17294	*/
15232	17295
15233		- r += ((p >> 16) & 0xFF) * scale / 255;
15234		- g += ((p >> 8) & 0xFF) * scale / 255;
15235		- b += (p & 0xFF) * scale / 255;
	17296	+ //r += ((p >> 16) & 0xFF) * scale / 255;
	17297	+ //g += ((p >> 8) & 0xFF) * scale / 255;
	17298	+ //b += (p & 0xFF) * scale / 255;
	17299	+
	17300	+ if (mindepth > depth)
	17301	+ {
	17302	+ mindepth = depth;
	17303	+ }
15236	17304
	17305	+ double z_eye = tempmat2[34 + 2] / (depth -2.0 + 1.0 - tempmat2[2*4 + 2]);
	17306	+
	17307	+ double factor = 1 - Math.exp(-z_eye * z_eye / FACTOR);
	17308	+
	17309	+ r += factor * scale;
	17310	+ g += factor * scale;
	17311	+ b += factor * scale;
	17312	+
15237	17313	count += scale;
15238	17314	}
15239	17315
..	..	@@ -15331,12 +17407,6 @@
15331	17407	GLUT glut = new GLUT();
15332	17408
15333	17409
15334		- static final public int DEFAULT = 0;
15335		- static final public int SELECTION = 1;
15336		- static final public int SHADOW = 2;
15337		- static final public int OCCLUSION = 3;
15338		- static
15339		- public int drawMode = DEFAULT;
15340	17410	public boolean spherical = false;
15341	17411	static boolean DEBUG_OCCLUSION = false;
15342	17412	static boolean DEBUG_SELECTION = false;
..	..	@@ -15349,23 +17419,15 @@
15349	17419	int AAbuffersize = 0;
15350	17420
15351	17421	//double[] selectedpoint = new double[3];
15352		- static Superellipsoid selectedpoint = new Superellipsoid();
	17422	+ static Superellipsoid selectedpoint;
15353	17423	static Sphere previousselectedpoint = null;
15354		- static Sphere debugpoint = new Sphere();
15355		- static Sphere debugpoint2 = new Sphere();
15356		- static Sphere debugpoint3 = new Sphere();
15357		- static Sphere debugpoint4 = new Sphere();
	17424	+ static Sphere debugpointG;
	17425	+ static Sphere debugpointP;
	17426	+ static Sphere debugpointC;
	17427	+ static Sphere debugpointR;
15358	17428
15359	17429	static Sphere debugpoints[] = new Sphere[8];
15360	17430
15361		- static
15362		- {
15363		- for (int i=0; i<8; i++)
15364		- {
15365		- debugpoints[i] = new Sphere();
15366		- }
15367		- }
15368		-
15369	17431	static void InitPoints(float radius)
15370	17432	{
15371	17433	for (int i=0; i<8; i++)
..	..	@@ -15385,7 +17447,7 @@
15385	17447	}
15386	17448	}
15387	17449
15388		- static void DrawPoints(CameraPane cpane)
	17450	+ static void DrawPoints(iCameraPane cpane)
15389	17451	{
15390	17452	for (int i=0; i<8; i++) // first and last are red
15391	17453	{
..	..	@@ -15407,7 +17469,8 @@
15407	17469	static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
15408	17470	static IntBuffer selectsizebuffer = IntBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
15409	17471	static java.nio.FloatBuffer pointselectsizebuffer = java.nio.FloatBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
15410		- static IntBuffer occlusionsizebuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17472	+ //static IntBuffer occlusionsizebuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17473	+ static java.nio.FloatBuffer occlusionsizebuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
15411	17474	static BufferedImage bufimage = new BufferedImage(TEX_SIZE, TEX_SIZE, BufferedImage.TYPE_INT_RGB);
15412	17475	static BufferedImage textest = new cBufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB);
15413	17476	static java.util.Vector<BufferedImage> billboards = new java.util.Vector<BufferedImage>();
..	..	@@ -15416,10 +17479,11 @@
15416	17479	static IntBuffer textbuffer = null; // IntBuffer.allocate(TEXT_WIDTH88 * TEXT_HEIGHT);
15417	17480	// Depth buffer format
15418	17481	//private int depth_format;
15419		- static public void NextIndex(Object3D o, GL gl)
	17482	+
	17483	+ public void NextIndex()
15420	17484	{
15421	17485	indexcount+=16;
15422		- gl.glColor3d(((indexcount >>> 16) & 255) / 255.0, ((indexcount >>> 8) & 255) / 255.0, ((indexcount) & 255) / 255.0);
	17486	+ GetGL().glColor3d(((indexcount >>> 16) & 255) / 255.0, ((indexcount >>> 8) & 255) / 255.0, ((indexcount) & 255) / 255.0);
15423	17487	//objects[indexcount] = o;
15424	17488	//System.out.println("indexcount = " + indexcount);
15425	17489	}