~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -56,8 +56,6 @@
56	56	static int CURRENTANTIALIAS = 0; // 1;
57	57	/static/ boolean RENDERSHADOW = true;
58	58	/static/ int RENDERPROGRAM = 2; // 0 == none, 1 == fast, 2 == normal
59		- static boolean ANIMATION = false;
60		- static String filename;
61	59
62	60	boolean DISPLAYTEXT = false;
63	61	//boolean REDUCETEXTURE = true;
..	..	@@ -86,7 +84,7 @@
86	84	static boolean FULLSCREEN = false;
87	85	static boolean SUPPORT = true;
88	86	static boolean INERTIA = true;
89		-static boolean FAST = true; // false;
	87	+static boolean FAST = false;
90	88	static boolean SLOWPOSE = false;
91	89	static boolean FOOTCONTACT = true;
92	90
..	..	@@ -108,7 +106,7 @@
108	106	static boolean OEIL = true;
109	107	static boolean OEILONCE = false; // do oeilon then oeiloff
110	108	static boolean LOOKAT = true;
111		-static boolean RANDOM = true; // false;
	109	+static boolean SWITCH = true; // false;
112	110	static boolean HANDLES = false; // selection doesn't work!!
113	111	static boolean PAINTMODE = false;
114	112
..	..	@@ -1630,7 +1628,7 @@
1630	1628
1631	1629	cColor.HSBtoRGB(display.color, display.saturation, 1, display.modelParams0);
1632	1630
1633		- float[] colorV = GrafreeD.colorV;
	1631	+ float[] colorV = Grafreed.colorV;
1634	1632
1635	1633	/**/
1636	1634	if (display.DrawMode() == display.DEFAULT) // && display.RENDERPROGRAM == 0)
..	..	@@ -2142,7 +2140,7 @@
2142	2140	System.err.println("LIVE = " + Globals.isLIVE());
2143	2141
2144	2142	if (!Globals.isLIVE()) // save sound
2145		- GrafreeD.savesound = true; // wav.save();
	2143	+ Grafreed.savesound = true; // wav.save();
2146	2144	// else
2147	2145	repaint(); // start loop // may 2013
2148	2146	}
..	..	@@ -2267,9 +2265,9 @@
2267	2265	LOOKAT ^= true;
2268	2266	}
2269	2267
2270		- void ToggleRandom()
	2268	+ void ToggleSwitch()
2271	2269	{
2272		- RANDOM ^= true;
	2270	+ SWITCH ^= true;
2273	2271	}
2274	2272
2275	2273	void ToggleHandles()
..	..	@@ -4208,6 +4206,7 @@
4208	4206
4209	4207	com.sun.opengl.util.texture.Texture CompressTexture2(String name)
4210	4208	{
	4209	+ new Exception().printStackTrace();
4211	4210	System.exit(0);
4212	4211	com.sun.opengl.util.texture.Texture texture = null;
4213	4212
..	..	@@ -8023,7 +8022,7 @@
8023	8022	}
8024	8023	}
8025	8024
8026		- /boolean/ public void BindTextures(cTexture tex, int resolution) // INTERFACE
	8025	+ /boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
8027	8026	{
8028	8027	if (// DrawMode() != 0 \|\| /tex == null \|\|/
8029	8028	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -8068,7 +8067,7 @@
8068	8067	return; // true;
8069	8068	}
8070	8069
8071		- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution)
	8070	+ CacheTexture GetCacheTexture(String tex, boolean bump, int resolution) throws Exception
8072	8071	{
8073	8072	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
8074	8073
..	..	@@ -8076,12 +8075,16 @@
8076	8075	{
8077	8076	String texname = tex;
8078	8077
8079		- String[] split = tex.split("Textures");
8080		- if (split.length > 1)
8081		- texname = "/Users/nbriere/Textures" + split[split.length-1];
8082		- else
8083		- if (!texname.startsWith("/"))
8084		- texname = "/Users/nbriere/Textures/" + texname;
	8078	+// String[] split = tex.split("Textures");
	8079	+// if (split.length > 1)
	8080	+// texname = "/Users/nbriere/Textures" + split[split.length-1];
	8081	+// else
	8082	+// if (!texname.startsWith("/"))
	8083	+// texname = "/Users/nbriere/Textures/" + texname;
	8084	+ if (!new File(tex).exists())
	8085	+ {
	8086	+ texname = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory() + "/Textures/" + texname;
	8087	+ }
8085	8088
8086	8089	if (CACHETEXTURE)
8087	8090	texture = textures.get(texname); // TEXTURE CACHE
..	..	@@ -8181,7 +8184,9 @@
8181	8184	texturedata = GetFileTexture(cachename, processbump, resolution);
8182	8185
8183	8186
8184		- if (texturedata != null)
	8187	+ if (texturedata == null)
	8188	+ throw new Exception();
	8189	+
8185	8190	texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
8186	8191	//texture = GetTexture(tex, bump);
8187	8192	}
..	..	@@ -8303,7 +8308,7 @@
8303	8308	return texture;
8304	8309	}
8305	8310
8306		- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution)
	8311	+ com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution) throws Exception
8307	8312	{
8308	8313	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8309	8314
..	..	@@ -8321,14 +8326,14 @@
8321	8326	return texture!=null?texture.texture:null;
8322	8327	}
8323	8328
8324		- public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution)
	8329	+ public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution) throws Exception
8325	8330	{
8326	8331	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8327	8332
8328	8333	return texture!=null?texture.texturedata:null;
8329	8334	}
8330	8335
8331		- boolean BindTexture(String tex, boolean bump, int resolution)
	8336	+ boolean BindTexture(String tex, boolean bump, int resolution) throws Exception
8332	8337	{
8333	8338	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
8334	8339	{
..	..	@@ -9394,7 +9399,7 @@
9394	9399	//gl.glFlush();
9395	9400	gl.glAccum(gl.GL_ACCUM, 1.0f / ACSIZE);
9396	9401
9397		- if (ANIMATION && ABORTED)
	9402	+ if (Globals.ANIMATION && ABORTED)
9398	9403	{
9399	9404	System.err.println(" ABORTED FRAME");
9400	9405	break;
..	..	@@ -9424,7 +9429,7 @@
9424	9429	setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
9425	9430
9426	9431	// save image
9427		- if (ANIMATION && !ABORTED)
	9432	+ if (Globals.ANIMATION && !ABORTED)
9428	9433	{
9429	9434	VPwidth = viewport[2];
9430	9435	VPheight = viewport[3];
..	..	@@ -9535,11 +9540,11 @@
9535	9540
9536	9541	// imagecount++;
9537	9542
9538		- String fullname = filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
	9543	+ String fullname = Globals.filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
9539	9544
9540	9545	if (!BOXMODE)
9541	9546	{
9542		- System.out.println("image: " + fullname + " (wav cursor=" + (GrafreeD.wav.cursor / 735 / 4) + ")");
	9547	+ System.out.println("image: " + fullname + " (wav cursor=" + (Grafreed.wav.cursor / 735 / 4) + ")");
9543	9548	}
9544	9549
9545	9550	if (!BOXMODE)
..	..	@@ -9577,7 +9582,7 @@
9577	9582	ABORTED = false;
9578	9583	}
9579	9584	else
9580		- GrafreeD.wav.cursor += 735 * ACSIZE;
	9585	+ Grafreed.wav.cursor += 735 * ACSIZE;
9581	9586
9582	9587	if (false)
9583	9588	{
..	..	@@ -10240,11 +10245,11 @@
10240	10245
10241	10246	public void display(GLAutoDrawable drawable)
10242	10247	{
10243		- if (GrafreeD.savesound && GrafreeD.hassound)
	10248	+ if (Grafreed.savesound && Grafreed.hassound)
10244	10249	{
10245		- GrafreeD.wav.save();
10246		- GrafreeD.savesound = false;
10247		- GrafreeD.hassound = false;
	10250	+ Grafreed.wav.save();
	10251	+ Grafreed.savesound = false;
	10252	+ Grafreed.hassound = false;
10248	10253	}
10249	10254	// if (DEBUG_SELECTION)
10250	10255	// {
..	..	@@ -10374,7 +10379,7 @@
10374	10379	Object3D theobject = object;
10375	10380	Object3D theparent = object.parent;
10376	10381	object.parent = null;
10377		- object = (Object3D)GrafreeD.clone(object);
	10382	+ object = (Object3D)Grafreed.clone(object);
10378	10383	object.Stripify();
10379	10384	if (theobject.selection == null \|\| theobject.selection.Size() == 0)
10380	10385	theobject.PreprocessOcclusion(this);
..	..	@@ -10387,13 +10392,13 @@
10387	10392	ambientOcclusion = false;
10388	10393	}
10389	10394
10390		- if (Globals.lighttouched && DrawMode() == DEFAULT && !lightMode) // && !FROZEN)
	10395	+ if (Globals.lighttouched && DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
10391	10396	{
10392	10397	//if (RENDERSHADOW) // ?
10393	10398	if (!IsFrozen())
10394	10399	{
10395	10400	// dec 2012
10396		- if (!ambientOcclusion && !(!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0))
	10401	+ if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
10397	10402	{
10398	10403	Globals.framecount++;
10399	10404	shadowbuffer.display();
..	..	@@ -10795,7 +10800,16 @@
10795	10800	// Bump noise
10796	10801	gl.glActiveTexture(GL.GL_TEXTURE6);
10797	10802	//gl.glBindTexture(GL.GL_TEXTURE_2D, bump_noise);
10798		- BindTexture(NOISE_TEXTURE, false, 2);
	10803	+
	10804	+ try
	10805	+ {
	10806	+ BindTexture(NOISE_TEXTURE, false, 2);
	10807	+ }
	10808	+ catch (Exception e)
	10809	+ {
	10810	+ System.err.println("FAILED: " + NOISE_TEXTURE);
	10811	+ }
	10812	+
10799	10813
10800	10814	gl.glActiveTexture(GL.GL_TEXTURE0);
10801	10815	gl.glEnable(GL.GL_TEXTURE_2D);
..	..	@@ -11259,8 +11273,14 @@
11259	11273	{
11260	11274	renderpass++;
11261	11275	// System.out.println("Draw object... ");
	11276	+ STEP = 1;
11262	11277	if (FAST) // in case there is no script
11263		- STEP = 16;
	11278	+ STEP = 8;
	11279	+
	11280	+ if (CURRENTANTIALIAS == 0 \|\| ACSIZE == 1)
	11281	+ {
	11282	+ STEP *= 4;
	11283	+ }
11264	11284
11265	11285	//object.FullInvariants();
11266	11286
..	..	@@ -11274,8 +11294,8 @@
11274	11294	e.printStackTrace();
11275	11295	}
11276	11296
11277		- if (GrafreeD.RENDERME > 0)
11278		- GrafreeD.RENDERME--; // mechante magouille
	11297	+ if (Grafreed.RENDERME > 0)
	11298	+ Grafreed.RENDERME--; // mechante magouille
11279	11299
11280	11300	Globals.ONESTEP = false;
11281	11301	}
..	..	@@ -11345,7 +11365,14 @@
11345	11365
11346	11366	usedtextures.clear();
11347	11367
11348		- BindTextures(DEFAULT_TEXTURES, 2);
	11368	+ try
	11369	+ {
	11370	+ BindTextures(DEFAULT_TEXTURES, 2);
	11371	+ }
	11372	+ catch (Exception e)
	11373	+ {
	11374	+ System.err.println("FAILED: " + DEFAULT_TEXTURES);
	11375	+ }
11349	11376	}
11350	11377	//System.out.println("--> " + stackdepth);
11351	11378	// GrafreeD.traceon();
..	..	@@ -11436,7 +11463,14 @@
11436	11463	if (checker != null && DrawMode() == DEFAULT)
11437	11464	{
11438	11465	//BindTexture(IMMORTAL_TEXTURE);
11439		- BindTextures(checker.GetTextures(), checker.texres);
	11466	+ try
	11467	+ {
	11468	+ BindTextures(checker.GetTextures(), checker.texres);
	11469	+ }
	11470	+ catch (Exception e)
	11471	+ {
	11472	+ System.err.println("FAILED: " + checker.GetTextures());
	11473	+ }
11440	11474	// NEAREST
11441	11475	GetGL().glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST); // GL.GL_LINEAR);
11442	11476	DrawChecker(gl);
..	..	@@ -11518,7 +11552,7 @@
11518	11552	return;
11519	11553	}
11520	11554
11521		- String string = obj.GetToolTip();
	11555	+ String string = obj.toString(); //.GetToolTip();
11522	11556
11523	11557	GL gl = GetGL();
11524	11558
..	..	@@ -12468,8 +12502,8 @@
12468	12502
12469	12503	// display shadow only (bump == 0)
12470	12504	"SUB temp.x, half.x, shadow.x;" +
12471		- "MOV temp.y, -params6.x;" +
12472		- "SLT temp.z, temp.y, zero.x;" +
	12505	+ "MOV temp.y, -params5.z;" + // params6.x;" +
	12506	+ "SLT temp.z, temp.y, -one2048th.x;" +
12473	12507	"SUB temp.y, one.x, temp.z;" +
12474	12508	"MUL temp.x, temp.x, temp.y;" +
12475	12509	"KIL temp.x;" +
..	..	@@ -12598,8 +12632,10 @@
12598	12632	"MAX ndotl.x, ndotl.x, -ndotl.x;" +
12599	12633
12600	12634	"SUB temp.x, one.x, ndotl.x;" +
12601		- "ADD temp.x, temp.x, options2.z;" + // lightsheen
12602		- "ADD temp.y, one.y, options2.y;" + // sursurface
	12635	+ // Tuning for default skin
	12636	+ //"ADD temp.x, temp.x, options2.z;" + // lightsheen
	12637	+ "MAD temp.x, options2.z, half.y, temp.x;" + // lightsheen
	12638	+ "ADD temp.y, one.y, options2.y;" + // subsurface
12603	12639	"MUL temp.x, temp.x, temp.y;" +
12604	12640
12605	12641	"MUL saturation, saturation, temp.xxxx;" +
..	..	@@ -12747,7 +12783,7 @@
12747	12783	"MUL final.y, fragment.texcoord[0].x, c256;" +
12748	12784	"FLR final.x, final.y;" +
12749	12785	"SUB final.y, final.y, final.x;" +
12750		- //"MUL final.x, final.x, c256i;" +
	12786	+ "MUL final.x, final.x, c256i;" +
12751	12787	"MOV final.z, zero.x;" +
12752	12788	"MOV final.a, one.w;":""
12753	12789	) +
..	..	@@ -12755,7 +12791,7 @@
12755	12791	"MUL final.y, fragment.texcoord[0].y, c256;" +
12756	12792	"FLR final.x, final.y;" +
12757	12793	"SUB final.y, final.y, final.x;" +
12758		- //"MUL final.x, final.x, c256i;" +
	12794	+ "MUL final.x, final.x, c256i;" +
12759	12795	"MOV final.z, zero.x;" +
12760	12796	"MOV final.a, one.w;":""
12761	12797	) +
..	..	@@ -12798,7 +12834,7 @@
12798	12834	//once = true;
12799	12835	}
12800	12836
12801		- System.out.print("Program #" + mode + "; length = " + program.length());
	12837	+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
12802	12838	System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
12803	12839	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
12804	12840
..	..	@@ -12931,12 +12967,16 @@
12931	12967
12932	12968	"ADD " + depth + ".z, " + depth + ".z, temp.x;" +
12933	12969	//"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing!
	12970	+
	12971	+ // Compare fragment depth in light space with shadowmap.
12934	12972	"SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" +
12935	12973	"SGE temp.y, temp.x, zero.x;" +
12936		- "SUB " + shadow + ".y, one.x, temp.y;" +
	12974	+ "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded
	12975	+
	12976	+ // Reverse comparison
12937	12977	"SUB temp.x, one.x, temp.x;" +
12938	12978	"MUL " + shadow + ".x, temp.x, temp.y;" +
12939		- "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded
	12979	+ "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse
12940	12980	"POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth
12941	12981
12942	12982	"SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" +
..	..	@@ -12950,6 +12990,10 @@
12950	12990	// No shadow for backface
12951	12991	"DP3 temp.x, normal, lightd;" +
12952	12992	"SLT temp.x, temp.x, zero.x;" + // shadoweps
	12993	+ "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
	12994	+
	12995	+ // No shadow when out of frustrum
	12996	+ "SGE temp.x, " + depth + ".z, one.z;" +
12953	12997	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
12954	12998	"";
12955	12999	}
..	..	@@ -13508,7 +13552,7 @@
13508	13552	public void mousePressed(MouseEvent e)
13509	13553	{
13510	13554	//System.out.println("mousePressed: " + e);
13511		- clickStart(e.getX(), e.getY(), e.getModifiersEx());
	13555	+ clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13512	13556	}
13513	13557
13514	13558	static long prevtime = 0;
..	..	@@ -13584,8 +13628,8 @@
13584	13628	// mode \|= META;
13585	13629	//}
13586	13630
13587		- SetMouseMode(WHEEL \| e.getModifiersEx());
13588		- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0);
	13631	+ SetMouseMode(e.getModifiers(), WHEEL \| e.getModifiersEx());
	13632	+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
13589	13633	anchorX = ax;
13590	13634	anchorY = ay;
13591	13635	prevX = px;
..	..	@@ -13645,6 +13689,10 @@
13645	13689	// wasliveok = true;
13646	13690	// waslive = false;
13647	13691
	13692	+ // May 2019 Forget it:
	13693	+ if (true)
	13694	+ return;
	13695	+
13648	13696	// source == timer
13649	13697	if (mouseDown)
13650	13698	{
..	..	@@ -13683,7 +13731,7 @@
13683	13731
13684	13732	javax.swing.Timer timer = new javax.swing.Timer(350, this);
13685	13733
13686		- void clickStart(int x, int y, int modifiers)
	13734	+ void clickStart(int x, int y, int modifiers, int modifiersex)
13687	13735	{
13688	13736	if (!wasliveok)
13689	13737	return;
..	..	@@ -13700,7 +13748,7 @@
13700	13748	// touched = true; // main DL
13701	13749	if (isRenderer)
13702	13750	{
13703		- SetMouseMode(modifiers);
	13751	+ SetMouseMode(modifiers, modifiersex);
13704	13752	}
13705	13753
13706	13754	selectX = anchorX = x;
..	..	@@ -13713,7 +13761,7 @@
13713	13761	clicked = true;
13714	13762	hold = false;
13715	13763
13716		- if (((modifiers & ~1024) & ~0) == 0) // Single or multiple selection
	13764	+ if (((modifiersex & ~1024) & ~0) == 0) // Single or multiple selection
13717	13765	// june 2013 means CTRL_CLICK: if (((modifiers & ~1024) & ~128) == 0) // Single or multiple selection
13718	13766	{
13719	13767	// System.out.println("RESTART II " + modifiers);
..	..	@@ -13744,7 +13792,7 @@
13744	13792	info.camera = renderCamera;
13745	13793	info.x = x;
13746	13794	info.y = y;
13747		- info.modifiers = modifiers;
	13795	+ info.modifiers = modifiersex;
13748	13796	editObj = object.doEditClick(info, 0);
13749	13797	if (!editObj)
13750	13798	{
..	..	@@ -13773,7 +13821,7 @@
13773	13821	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
13774	13822	}
13775	13823	else
13776		- drag(e.getX(), e.getY(), e.getModifiersEx());
	13824	+ drag(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13777	13825
13778	13826	//try { Thread.sleep(1); } catch (Exception ex) {}
13779	13827	}
..	..	@@ -13946,6 +13994,7 @@
13946	13994
13947	13995	public void run()
13948	13996	{
	13997	+ new Exception().printStackTrace();
13949	13998	System.exit(0);
13950	13999	for (;;)
13951	14000	{
..	..	@@ -14009,7 +14058,7 @@
14009	14058	{
14010	14059	Globals.lighttouched = true;
14011	14060	}
14012		- drag(X, (mouseMode != 0) ? Y : anchorY, MODIFIERS);
	14061	+ drag(X, (mouseMode != 0) ? Y : anchorY, 0, MODIFIERS);
14013	14062	}
14014	14063	//else
14015	14064	}
..	..	@@ -14109,7 +14158,7 @@
14109	14158	int X, Y;
14110	14159	boolean SX, SY;
14111	14160
14112		- void drag(int x, int y, int modifiers)
	14161	+ void drag(int x, int y, int modifiers, int modifiersex)
14113	14162	{
14114	14163	if (IsFrozen())
14115	14164	{
..	..	@@ -14118,17 +14167,17 @@
14118	14167
14119	14168	drag = true; // NEW
14120	14169
14121		- boolean continuous = (modifiers & COMMAND) == COMMAND;
	14170	+ boolean continuous = (modifiersex & COMMAND) == COMMAND;
14122	14171
14123	14172	X = x;
14124	14173	Y = y;
14125	14174	// floating state for animation
14126		- MODIFIERS = modifiers;
14127		- modifiers &= ~1024;
	14175	+ MODIFIERS = modifiersex;
	14176	+ modifiersex &= ~1024;
14128	14177	if (false) // modifiers != 0)
14129	14178	{
14130	14179	//new Exception().printStackTrace();
14131		- System.out.println("mouseDragged: " + modifiers);
	14180	+ System.out.println("mouseDragged: " + modifiersex);
14132	14181	System.out.println("SHIFT = " + SHIFT);
14133	14182	System.out.println("CONTROL = " + COMMAND);
14134	14183	System.out.println("META = " + META);
..	..	@@ -14148,7 +14197,7 @@
14148	14197	info.camera = renderCamera;
14149	14198	info.x = x;
14150	14199	info.y = y;
14151		- object.editWindow.copy.doEditDrag(info);
	14200	+ object.editWindow.copy.doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
14152	14201	} else
14153	14202	{
14154	14203	if (x < startX)
..	..	@@ -14325,6 +14374,7 @@
14325	14374	public void mouseReleased(MouseEvent e)
14326	14375	{
14327	14376	movingcamera = false;
	14377	+ X = Y = 0;
14328	14378	//System.out.println("mouseReleased: " + e);
14329	14379	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
14330	14380	}
..	..	@@ -14347,9 +14397,9 @@
14347	14397	boolean control = ((modifiers & CTRL) != 0); // june 2013: for point selection
14348	14398	boolean command = ((modifiers & COMMAND) != 0); // june 2013: for multiple selection
14349	14399
14350		- if (control \|\| command \|\| IsFrozen())
	14400	+// No delay if (control \|\| command \|\| IsFrozen())
14351	14401	timeout = true;
14352		- else
	14402	+// ?? May 2019 else
14353	14403	// timer.setDelay((modifiers & 128) != 0?0:350);
14354	14404	mouseDown = false;
14355	14405	if (!control && !command) // june 2013
..	..	@@ -14459,7 +14509,7 @@
14459	14509	System.out.println("keyReleased: " + e);
14460	14510	}
14461	14511
14462		- void SetMouseMode(int modifiers)
	14512	+ void SetMouseMode(int modifiers, int modifiersex)
14463	14513	{
14464	14514	//System.out.println("SetMouseMode = " + modifiers);
14465	14515	//modifiers &= ~1024;
..	..	@@ -14471,25 +14521,25 @@
14471	14521	//if (modifiers == 0) // \|\| (modifiers == (1024 \| CONTROL)))
14472	14522	// return;
14473	14523	//System.out.println("SetMode = " + modifiers);
14474		- if ((modifiers & WHEEL) == WHEEL)
	14524	+ if ((modifiersex & WHEEL) == WHEEL)
14475	14525	{
14476	14526	mouseMode \|= ZOOM;
14477	14527	}
14478	14528
14479	14529	boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
14480		- if (capsLocked \|\| (modifiers & META) == META)
	14530	+ if (capsLocked) // \|\| (modifiers & META) == META)
14481	14531	{
14482	14532	mouseMode \|= VR; // BACKFORTH;
14483	14533	}
14484		- if ((modifiers & CTRLCLICK) == CTRLCLICK)
	14534	+ if ((modifiersex & CTRLCLICK) == CTRLCLICK)
14485	14535	{
14486	14536	mouseMode \|= SELECT;
14487	14537	}
14488		- if ((modifiers & COMMAND) == COMMAND)
	14538	+ if ((modifiersex & COMMAND) == COMMAND)
14489	14539	{
14490	14540	mouseMode \|= SELECT;
14491	14541	}
14492		- if ((modifiers & SHIFT) == SHIFT \|\| forcetranslate)
	14542	+ if ((modifiersex & SHIFT) == SHIFT \|\| forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
14493	14543	{
14494	14544	mouseMode &= ~VR;
14495	14545	mouseMode \|= TRANSLATE;
..	..	@@ -14518,7 +14568,7 @@
14518	14568
14519	14569	if (isRenderer) //
14520	14570	{
14521		- SetMouseMode(modifiers);
	14571	+ SetMouseMode(0, modifiers);
14522	14572	}
14523	14573
14524	14574	Globals.theRenderer.keyPressed(key);
..	..	@@ -14854,7 +14904,7 @@
14854	14904	//RESIZETEXTURE ^= true;
14855	14905	//break;
14856	14906	case 'z':
14857		- RENDERSHADOW ^= true;
	14907	+ Globals.RENDERSHADOW ^= true;
14858	14908	Globals.lighttouched = true;
14859	14909	repaint();
14860	14910	break;
..	..	@@ -14978,7 +15028,7 @@
14978	15028	//mode = ROTATE;
14979	15029	if ((MODIFIERS & COMMAND) == 0) // VR??
14980	15030	{
14981		- SetMouseMode(modifiers);
	15031	+ SetMouseMode(0, modifiers);
14982	15032	}
14983	15033	}
14984	15034
..	..	@@ -15114,7 +15164,7 @@
15114	15164	{
15115	15165	//System.out.println("processMouseMotionEvent: " + mouseMode + " " + e.getModifiers() + " " + e.getModifiersEx() + " " + e.getButton());
15116	15166	//if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
15117		- if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (mouseMode & SELECT) == 0)
	15167	+ if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (e.getModifiers() & MouseEvent.BUTTON3_MASK) == 0 && (mouseMode & SELECT) == 0)
15118	15168	{
15119	15169	mouseMoved(e);
15120	15170	} else
..	..	@@ -15144,6 +15194,7 @@
15144	15194
15145	15195	void SelectParent()
15146	15196	{
	15197	+ new Exception().printStackTrace();
15147	15198	System.exit(0);
15148	15199	Composite group = (Composite) object;
15149	15200	java.util.Vector selectees = new java.util.Vector(group.selection);
..	..	@@ -15167,6 +15218,7 @@
15167	15218
15168	15219	void SelectChildren()
15169	15220	{
	15221	+ new Exception().printStackTrace();
15170	15222	System.exit(0);
15171	15223	/*
15172	15224	Composite group = (Composite) object;
..	..	@@ -15331,7 +15383,9 @@
15331	15383	info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
15332	15384	//Image img = CreateImage(width, height);
15333	15385	//System.out.println("width = " + width + "; height = " + height + "\n");
	15386	+
15334	15387	Graphics gr = g; // img.getGraphics();
	15388	+
15335	15389	if (!hasMarquee)
15336	15390	{
15337	15391	if (Xmin < Xmax) // !locked)
..	..	@@ -15429,14 +15483,28 @@
15429	15483	if (!isRenderer)
15430	15484	{
15431	15485	object.drawEditHandles(info, 0);
	15486	+
	15487	+ if (drag && (X != 0 \|\| Y != 0) && object.selection.Size() > 0)
	15488	+ {
	15489	+ switch (object.selection.get(0).hitSomething)
	15490	+ {
	15491	+ case Object3D.hitCenter: gr.setColor(Color.pink); break;
	15492	+ case Object3D.hitRotate: gr.setColor(Color.green); break;
	15493	+ case Object3D.hitScale: gr.setColor(Color.cyan); break;
	15494	+ }
	15495	+
	15496	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15497	+ }
15432	15498	}
15433	15499	}
	15500	+
15434	15501	if (isRenderer)
15435	15502	{
15436	15503	//gr.setColor(Color.black);
15437	15504	//gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
15438	15505	//gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
15439	15506	}
	15507	+
15440	15508	if (hasMarquee)
15441	15509	{
15442	15510	gr.setXORMode(Color.white);
..	..	@@ -15549,6 +15617,7 @@
15549	15617	public boolean mouseDown(Event evt, int x, int y)
15550	15618	{
15551	15619	System.out.println("mouseDown: " + evt);
	15620	+ System.exit(0);
15552	15621	/*
15553	15622	locked = true;
15554	15623	drag = false;
..	..	@@ -15592,7 +15661,7 @@
15592	15661	{
15593	15662	keyPressed(0, modifiers);
15594	15663	}
15595		- clickStart(x, y, modifiers);
	15664	+ // clickStart(x, y, modifiers);
15596	15665	return true;
15597	15666	}
15598	15667
..	..	@@ -15710,7 +15779,7 @@
15710	15779	{
15711	15780	keyReleased(0, 0);
15712	15781	}
15713		- drag(x, y, modifiers);
	15782	+ drag(x, y, 0, modifiers);
15714	15783	return true;
15715	15784	}
15716	15785
..	..	@@ -16280,6 +16349,7 @@
16280	16349	{
16281	16350	if (!selection)
16282	16351	{
	16352	+ new Exception().printStackTrace();
16283	16353	System.exit(0);
16284	16354	return;
16285	16355	}
..	..	@@ -16407,16 +16477,16 @@
16407	16477	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]));
16408	16478	}
16409	16479
16410		- previousselectedpoint = (Sphere) GrafreeD.clone(selectedpoint);
	16480	+ previousselectedpoint = (Sphere) Grafreed.clone(selectedpoint);
16411	16481	}
16412	16482	}
16413	16483
16414	16484	if (!movingcamera && !PAINTMODE)
16415	16485	object.editWindow.ScreenFitPoint(); // fev 2014
16416	16486
16417		- if (PAINTMODE && GrafreeD.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	16487	+ if (PAINTMODE && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
16418	16488	{
16419		- Object3D paintobj = GrafreeD.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
	16489	+ Object3D paintobj = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
16420	16490
16421	16491	Object3D group = new Object3D("inst" + paintcount++);
16422	16492
..	..	@@ -16572,7 +16642,7 @@
16572	16642	gl.glDisable(gl.GL_CULL_FACE);
16573	16643	}
16574	16644
16575		- if (!RENDERSHADOW)
	16645	+ if (!Globals.RENDERSHADOW)
16576	16646	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16577	16647
16578	16648	// SB gl.glPolygonOffset(2.5f, 10);
..	..	@@ -16582,7 +16652,7 @@
16582	16652	//gl.glColorMask(false, false, false, false);
16583	16653
16584	16654	//render_scene_from_light_view(gl, drawable, 0, 0);
16585		- if (RENDERSHADOW && Globals.lighttouched && !movingcamera) // && !parent.IsFreezed())
	16655	+ if (Globals.RENDERSHADOW && Globals.lighttouched && (!movingcamera \|\| !Globals.FREEZEONMOVE)) // && !parent.IsFreezed())
16586	16656	{
16587	16657	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16588	16658