~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -1628,7 +1628,7 @@
1628	1628
1629	1629	cColor.HSBtoRGB(display.color, display.saturation, 1, display.modelParams0);
1630	1630
1631		- float[] colorV = GrafreeD.colorV;
	1631	+ float[] colorV = Grafreed.colorV;
1632	1632
1633	1633	/**/
1634	1634	if (display.DrawMode() == display.DEFAULT) // && display.RENDERPROGRAM == 0)
..	..	@@ -2140,7 +2140,7 @@
2140	2140	System.err.println("LIVE = " + Globals.isLIVE());
2141	2141
2142	2142	if (!Globals.isLIVE()) // save sound
2143		- GrafreeD.savesound = true; // wav.save();
	2143	+ Grafreed.savesound = true; // wav.save();
2144	2144	// else
2145	2145	repaint(); // start loop // may 2013
2146	2146	}
..	..	@@ -8022,7 +8022,7 @@
8022	8022	}
8023	8023	}
8024	8024
8025		- /boolean/ public void BindTextures(cTexture tex, int resolution) // INTERFACE
	8025	+ /boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
8026	8026	{
8027	8027	if (// DrawMode() != 0 \|\| /tex == null \|\|/
8028	8028	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -8067,7 +8067,7 @@
8067	8067	return; // true;
8068	8068	}
8069	8069
8070		- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution)
	8070	+ CacheTexture GetCacheTexture(String tex, boolean bump, int resolution) throws Exception
8071	8071	{
8072	8072	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
8073	8073
..	..	@@ -8184,7 +8184,9 @@
8184	8184	texturedata = GetFileTexture(cachename, processbump, resolution);
8185	8185
8186	8186
8187		- if (texturedata != null)
	8187	+ if (texturedata == null)
	8188	+ throw new Exception();
	8189	+
8188	8190	texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
8189	8191	//texture = GetTexture(tex, bump);
8190	8192	}
..	..	@@ -8306,7 +8308,7 @@
8306	8308	return texture;
8307	8309	}
8308	8310
8309		- 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
8310	8312	{
8311	8313	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8312	8314
..	..	@@ -8324,14 +8326,14 @@
8324	8326	return texture!=null?texture.texture:null;
8325	8327	}
8326	8328
8327		- 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
8328	8330	{
8329	8331	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8330	8332
8331	8333	return texture!=null?texture.texturedata:null;
8332	8334	}
8333	8335
8334		- boolean BindTexture(String tex, boolean bump, int resolution)
	8336	+ boolean BindTexture(String tex, boolean bump, int resolution) throws Exception
8335	8337	{
8336	8338	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
8337	8339	{
..	..	@@ -9542,7 +9544,7 @@
9542	9544
9543	9545	if (!BOXMODE)
9544	9546	{
9545		- 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) + ")");
9546	9548	}
9547	9549
9548	9550	if (!BOXMODE)
..	..	@@ -9580,7 +9582,7 @@
9580	9582	ABORTED = false;
9581	9583	}
9582	9584	else
9583		- GrafreeD.wav.cursor += 735 * ACSIZE;
	9585	+ Grafreed.wav.cursor += 735 * ACSIZE;
9584	9586
9585	9587	if (false)
9586	9588	{
..	..	@@ -10243,11 +10245,11 @@
10243	10245
10244	10246	public void display(GLAutoDrawable drawable)
10245	10247	{
10246		- if (GrafreeD.savesound && GrafreeD.hassound)
	10248	+ if (Grafreed.savesound && Grafreed.hassound)
10247	10249	{
10248		- GrafreeD.wav.save();
10249		- GrafreeD.savesound = false;
10250		- GrafreeD.hassound = false;
	10250	+ Grafreed.wav.save();
	10251	+ Grafreed.savesound = false;
	10252	+ Grafreed.hassound = false;
10251	10253	}
10252	10254	// if (DEBUG_SELECTION)
10253	10255	// {
..	..	@@ -10377,7 +10379,7 @@
10377	10379	Object3D theobject = object;
10378	10380	Object3D theparent = object.parent;
10379	10381	object.parent = null;
10380		- object = (Object3D)GrafreeD.clone(object);
	10382	+ object = (Object3D)Grafreed.clone(object);
10381	10383	object.Stripify();
10382	10384	if (theobject.selection == null \|\| theobject.selection.Size() == 0)
10383	10385	theobject.PreprocessOcclusion(this);
..	..	@@ -10390,13 +10392,13 @@
10390	10392	ambientOcclusion = false;
10391	10393	}
10392	10394
10393		- if (Globals.lighttouched && DrawMode() == DEFAULT && !lightMode) // && !FROZEN)
	10395	+ if (Globals.lighttouched && DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
10394	10396	{
10395	10397	//if (RENDERSHADOW) // ?
10396	10398	if (!IsFrozen())
10397	10399	{
10398	10400	// dec 2012
10399		- if (!ambientOcclusion && !(!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0))
	10401	+ if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
10400	10402	{
10401	10403	Globals.framecount++;
10402	10404	shadowbuffer.display();
..	..	@@ -10798,7 +10800,16 @@
10798	10800	// Bump noise
10799	10801	gl.glActiveTexture(GL.GL_TEXTURE6);
10800	10802	//gl.glBindTexture(GL.GL_TEXTURE_2D, bump_noise);
10801		- 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	+
10802	10813
10803	10814	gl.glActiveTexture(GL.GL_TEXTURE0);
10804	10815	gl.glEnable(GL.GL_TEXTURE_2D);
..	..	@@ -11283,8 +11294,8 @@
11283	11294	e.printStackTrace();
11284	11295	}
11285	11296
11286		- if (GrafreeD.RENDERME > 0)
11287		- GrafreeD.RENDERME--; // mechante magouille
	11297	+ if (Grafreed.RENDERME > 0)
	11298	+ Grafreed.RENDERME--; // mechante magouille
11288	11299
11289	11300	Globals.ONESTEP = false;
11290	11301	}
..	..	@@ -11354,7 +11365,14 @@
11354	11365
11355	11366	usedtextures.clear();
11356	11367
11357		- 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	+ }
11358	11376	}
11359	11377	//System.out.println("--> " + stackdepth);
11360	11378	// GrafreeD.traceon();
..	..	@@ -11445,7 +11463,14 @@
11445	11463	if (checker != null && DrawMode() == DEFAULT)
11446	11464	{
11447	11465	//BindTexture(IMMORTAL_TEXTURE);
11448		- 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	+ }
11449	11474	// NEAREST
11450	11475	GetGL().glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST); // GL.GL_LINEAR);
11451	11476	DrawChecker(gl);
..	..	@@ -11527,7 +11552,7 @@
11527	11552	return;
11528	11553	}
11529	11554
11530		- String string = obj.GetToolTip();
	11555	+ String string = obj.toString(); //.GetToolTip();
11531	11556
11532	11557	GL gl = GetGL();
11533	11558
..	..	@@ -12477,8 +12502,8 @@
12477	12502
12478	12503	// display shadow only (bump == 0)
12479	12504	"SUB temp.x, half.x, shadow.x;" +
12480		- "MOV temp.y, -params6.x;" +
12481		- "SLT temp.z, temp.y, zero.x;" +
	12505	+ "MOV temp.y, -params5.z;" + // params6.x;" +
	12506	+ "SLT temp.z, temp.y, -one2048th.x;" +
12482	12507	"SUB temp.y, one.x, temp.z;" +
12483	12508	"MUL temp.x, temp.x, temp.y;" +
12484	12509	"KIL temp.x;" +
..	..	@@ -12758,7 +12783,7 @@
12758	12783	"MUL final.y, fragment.texcoord[0].x, c256;" +
12759	12784	"FLR final.x, final.y;" +
12760	12785	"SUB final.y, final.y, final.x;" +
12761		- //"MUL final.x, final.x, c256i;" +
	12786	+ "MUL final.x, final.x, c256i;" +
12762	12787	"MOV final.z, zero.x;" +
12763	12788	"MOV final.a, one.w;":""
12764	12789	) +
..	..	@@ -12766,7 +12791,7 @@
12766	12791	"MUL final.y, fragment.texcoord[0].y, c256;" +
12767	12792	"FLR final.x, final.y;" +
12768	12793	"SUB final.y, final.y, final.x;" +
12769		- //"MUL final.x, final.x, c256i;" +
	12794	+ "MUL final.x, final.x, c256i;" +
12770	12795	"MOV final.z, zero.x;" +
12771	12796	"MOV final.a, one.w;":""
12772	12797	) +
..	..	@@ -12809,7 +12834,7 @@
12809	12834	//once = true;
12810	12835	}
12811	12836
12812		- System.out.print("Program #" + mode + "; length = " + program.length());
	12837	+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
12813	12838	System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
12814	12839	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
12815	12840
..	..	@@ -12942,12 +12967,16 @@
12942	12967
12943	12968	"ADD " + depth + ".z, " + depth + ".z, temp.x;" +
12944	12969	//"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing!
	12970	+
	12971	+ // Compare fragment depth in light space with shadowmap.
12945	12972	"SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" +
12946	12973	"SGE temp.y, temp.x, zero.x;" +
12947		- "SUB " + shadow + ".y, one.x, temp.y;" +
	12974	+ "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded
	12975	+
	12976	+ // Reverse comparison
12948	12977	"SUB temp.x, one.x, temp.x;" +
12949	12978	"MUL " + shadow + ".x, temp.x, temp.y;" +
12950		- "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded
	12979	+ "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse
12951	12980	"POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth
12952	12981
12953	12982	"SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" +
..	..	@@ -12961,6 +12990,10 @@
12961	12990	// No shadow for backface
12962	12991	"DP3 temp.x, normal, lightd;" +
12963	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;" +
12964	12997	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
12965	12998	"";
12966	12999	}
..	..	@@ -13519,7 +13552,7 @@
13519	13552	public void mousePressed(MouseEvent e)
13520	13553	{
13521	13554	//System.out.println("mousePressed: " + e);
13522		- clickStart(e.getX(), e.getY(), e.getModifiersEx());
	13555	+ clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13523	13556	}
13524	13557
13525	13558	static long prevtime = 0;
..	..	@@ -13595,8 +13628,8 @@
13595	13628	// mode \|= META;
13596	13629	//}
13597	13630
13598		- SetMouseMode(WHEEL \| e.getModifiersEx());
13599		- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0);
	13631	+ SetMouseMode(e.getModifiers(), WHEEL \| e.getModifiersEx());
	13632	+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
13600	13633	anchorX = ax;
13601	13634	anchorY = ay;
13602	13635	prevX = px;
..	..	@@ -13656,6 +13689,10 @@
13656	13689	// wasliveok = true;
13657	13690	// waslive = false;
13658	13691
	13692	+ // May 2019 Forget it:
	13693	+ if (true)
	13694	+ return;
	13695	+
13659	13696	// source == timer
13660	13697	if (mouseDown)
13661	13698	{
..	..	@@ -13694,7 +13731,7 @@
13694	13731
13695	13732	javax.swing.Timer timer = new javax.swing.Timer(350, this);
13696	13733
13697		- void clickStart(int x, int y, int modifiers)
	13734	+ void clickStart(int x, int y, int modifiers, int modifiersex)
13698	13735	{
13699	13736	if (!wasliveok)
13700	13737	return;
..	..	@@ -13711,7 +13748,7 @@
13711	13748	// touched = true; // main DL
13712	13749	if (isRenderer)
13713	13750	{
13714		- SetMouseMode(modifiers);
	13751	+ SetMouseMode(modifiers, modifiersex);
13715	13752	}
13716	13753
13717	13754	selectX = anchorX = x;
..	..	@@ -13724,7 +13761,7 @@
13724	13761	clicked = true;
13725	13762	hold = false;
13726	13763
13727		- if (((modifiers & ~1024) & ~0) == 0) // Single or multiple selection
	13764	+ if (((modifiersex & ~1024) & ~0) == 0) // Single or multiple selection
13728	13765	// june 2013 means CTRL_CLICK: if (((modifiers & ~1024) & ~128) == 0) // Single or multiple selection
13729	13766	{
13730	13767	// System.out.println("RESTART II " + modifiers);
..	..	@@ -13755,7 +13792,7 @@
13755	13792	info.camera = renderCamera;
13756	13793	info.x = x;
13757	13794	info.y = y;
13758		- info.modifiers = modifiers;
	13795	+ info.modifiers = modifiersex;
13759	13796	editObj = object.doEditClick(info, 0);
13760	13797	if (!editObj)
13761	13798	{
..	..	@@ -13784,7 +13821,7 @@
13784	13821	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
13785	13822	}
13786	13823	else
13787		- drag(e.getX(), e.getY(), e.getModifiersEx());
	13824	+ drag(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13788	13825
13789	13826	//try { Thread.sleep(1); } catch (Exception ex) {}
13790	13827	}
..	..	@@ -14021,7 +14058,7 @@
14021	14058	{
14022	14059	Globals.lighttouched = true;
14023	14060	}
14024		- drag(X, (mouseMode != 0) ? Y : anchorY, MODIFIERS);
	14061	+ drag(X, (mouseMode != 0) ? Y : anchorY, 0, MODIFIERS);
14025	14062	}
14026	14063	//else
14027	14064	}
..	..	@@ -14121,7 +14158,7 @@
14121	14158	int X, Y;
14122	14159	boolean SX, SY;
14123	14160
14124		- void drag(int x, int y, int modifiers)
	14161	+ void drag(int x, int y, int modifiers, int modifiersex)
14125	14162	{
14126	14163	if (IsFrozen())
14127	14164	{
..	..	@@ -14130,17 +14167,17 @@
14130	14167
14131	14168	drag = true; // NEW
14132	14169
14133		- boolean continuous = (modifiers & COMMAND) == COMMAND;
	14170	+ boolean continuous = (modifiersex & COMMAND) == COMMAND;
14134	14171
14135	14172	X = x;
14136	14173	Y = y;
14137	14174	// floating state for animation
14138		- MODIFIERS = modifiers;
14139		- modifiers &= ~1024;
	14175	+ MODIFIERS = modifiersex;
	14176	+ modifiersex &= ~1024;
14140	14177	if (false) // modifiers != 0)
14141	14178	{
14142	14179	//new Exception().printStackTrace();
14143		- System.out.println("mouseDragged: " + modifiers);
	14180	+ System.out.println("mouseDragged: " + modifiersex);
14144	14181	System.out.println("SHIFT = " + SHIFT);
14145	14182	System.out.println("CONTROL = " + COMMAND);
14146	14183	System.out.println("META = " + META);
..	..	@@ -14160,7 +14197,7 @@
14160	14197	info.camera = renderCamera;
14161	14198	info.x = x;
14162	14199	info.y = y;
14163		- object.editWindow.copy.doEditDrag(info);
	14200	+ object.editWindow.copy.doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
14164	14201	} else
14165	14202	{
14166	14203	if (x < startX)
..	..	@@ -14337,6 +14374,7 @@
14337	14374	public void mouseReleased(MouseEvent e)
14338	14375	{
14339	14376	movingcamera = false;
	14377	+ X = Y = 0;
14340	14378	//System.out.println("mouseReleased: " + e);
14341	14379	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
14342	14380	}
..	..	@@ -14359,9 +14397,9 @@
14359	14397	boolean control = ((modifiers & CTRL) != 0); // june 2013: for point selection
14360	14398	boolean command = ((modifiers & COMMAND) != 0); // june 2013: for multiple selection
14361	14399
14362		- if (control \|\| command \|\| IsFrozen())
	14400	+// No delay if (control \|\| command \|\| IsFrozen())
14363	14401	timeout = true;
14364		- else
	14402	+// ?? May 2019 else
14365	14403	// timer.setDelay((modifiers & 128) != 0?0:350);
14366	14404	mouseDown = false;
14367	14405	if (!control && !command) // june 2013
..	..	@@ -14471,7 +14509,7 @@
14471	14509	System.out.println("keyReleased: " + e);
14472	14510	}
14473	14511
14474		- void SetMouseMode(int modifiers)
	14512	+ void SetMouseMode(int modifiers, int modifiersex)
14475	14513	{
14476	14514	//System.out.println("SetMouseMode = " + modifiers);
14477	14515	//modifiers &= ~1024;
..	..	@@ -14483,25 +14521,25 @@
14483	14521	//if (modifiers == 0) // \|\| (modifiers == (1024 \| CONTROL)))
14484	14522	// return;
14485	14523	//System.out.println("SetMode = " + modifiers);
14486		- if ((modifiers & WHEEL) == WHEEL)
	14524	+ if ((modifiersex & WHEEL) == WHEEL)
14487	14525	{
14488	14526	mouseMode \|= ZOOM;
14489	14527	}
14490	14528
14491	14529	boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
14492		- if (capsLocked \|\| (modifiers & META) == META)
	14530	+ if (capsLocked) // \|\| (modifiers & META) == META)
14493	14531	{
14494	14532	mouseMode \|= VR; // BACKFORTH;
14495	14533	}
14496		- if ((modifiers & CTRLCLICK) == CTRLCLICK)
	14534	+ if ((modifiersex & CTRLCLICK) == CTRLCLICK)
14497	14535	{
14498	14536	mouseMode \|= SELECT;
14499	14537	}
14500		- if ((modifiers & COMMAND) == COMMAND)
	14538	+ if ((modifiersex & COMMAND) == COMMAND)
14501	14539	{
14502	14540	mouseMode \|= SELECT;
14503	14541	}
14504		- if ((modifiers & SHIFT) == SHIFT \|\| forcetranslate)
	14542	+ if ((modifiersex & SHIFT) == SHIFT \|\| forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
14505	14543	{
14506	14544	mouseMode &= ~VR;
14507	14545	mouseMode \|= TRANSLATE;
..	..	@@ -14530,7 +14568,7 @@
14530	14568
14531	14569	if (isRenderer) //
14532	14570	{
14533		- SetMouseMode(modifiers);
	14571	+ SetMouseMode(0, modifiers);
14534	14572	}
14535	14573
14536	14574	Globals.theRenderer.keyPressed(key);
..	..	@@ -14866,7 +14904,7 @@
14866	14904	//RESIZETEXTURE ^= true;
14867	14905	//break;
14868	14906	case 'z':
14869		- RENDERSHADOW ^= true;
	14907	+ Globals.RENDERSHADOW ^= true;
14870	14908	Globals.lighttouched = true;
14871	14909	repaint();
14872	14910	break;
..	..	@@ -14990,7 +15028,7 @@
14990	15028	//mode = ROTATE;
14991	15029	if ((MODIFIERS & COMMAND) == 0) // VR??
14992	15030	{
14993		- SetMouseMode(modifiers);
	15031	+ SetMouseMode(0, modifiers);
14994	15032	}
14995	15033	}
14996	15034
..	..	@@ -15126,7 +15164,7 @@
15126	15164	{
15127	15165	//System.out.println("processMouseMotionEvent: " + mouseMode + " " + e.getModifiers() + " " + e.getModifiersEx() + " " + e.getButton());
15128	15166	//if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
15129		- 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)
15130	15168	{
15131	15169	mouseMoved(e);
15132	15170	} else
..	..	@@ -15345,7 +15383,9 @@
15345	15383	info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
15346	15384	//Image img = CreateImage(width, height);
15347	15385	//System.out.println("width = " + width + "; height = " + height + "\n");
	15386	+
15348	15387	Graphics gr = g; // img.getGraphics();
	15388	+
15349	15389	if (!hasMarquee)
15350	15390	{
15351	15391	if (Xmin < Xmax) // !locked)
..	..	@@ -15443,14 +15483,28 @@
15443	15483	if (!isRenderer)
15444	15484	{
15445	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	+ }
15446	15498	}
15447	15499	}
	15500	+
15448	15501	if (isRenderer)
15449	15502	{
15450	15503	//gr.setColor(Color.black);
15451	15504	//gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
15452	15505	//gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
15453	15506	}
	15507	+
15454	15508	if (hasMarquee)
15455	15509	{
15456	15510	gr.setXORMode(Color.white);
..	..	@@ -15563,6 +15617,7 @@
15563	15617	public boolean mouseDown(Event evt, int x, int y)
15564	15618	{
15565	15619	System.out.println("mouseDown: " + evt);
	15620	+ System.exit(0);
15566	15621	/*
15567	15622	locked = true;
15568	15623	drag = false;
..	..	@@ -15606,7 +15661,7 @@
15606	15661	{
15607	15662	keyPressed(0, modifiers);
15608	15663	}
15609		- clickStart(x, y, modifiers);
	15664	+ // clickStart(x, y, modifiers);
15610	15665	return true;
15611	15666	}
15612	15667
..	..	@@ -15724,7 +15779,7 @@
15724	15779	{
15725	15780	keyReleased(0, 0);
15726	15781	}
15727		- drag(x, y, modifiers);
	15782	+ drag(x, y, 0, modifiers);
15728	15783	return true;
15729	15784	}
15730	15785
..	..	@@ -16422,16 +16477,16 @@
16422	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]));
16423	16478	}
16424	16479
16425		- previousselectedpoint = (Sphere) GrafreeD.clone(selectedpoint);
	16480	+ previousselectedpoint = (Sphere) Grafreed.clone(selectedpoint);
16426	16481	}
16427	16482	}
16428	16483
16429	16484	if (!movingcamera && !PAINTMODE)
16430	16485	object.editWindow.ScreenFitPoint(); // fev 2014
16431	16486
16432		- 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)
16433	16488	{
16434		- 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);
16435	16490
16436	16491	Object3D group = new Object3D("inst" + paintcount++);
16437	16492
..	..	@@ -16587,7 +16642,7 @@
16587	16642	gl.glDisable(gl.GL_CULL_FACE);
16588	16643	}
16589	16644
16590		- if (!RENDERSHADOW)
	16645	+ if (!Globals.RENDERSHADOW)
16591	16646	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16592	16647
16593	16648	// SB gl.glPolygonOffset(2.5f, 10);
..	..	@@ -16597,7 +16652,7 @@
16597	16652	//gl.glColorMask(false, false, false, false);
16598	16653
16599	16654	//render_scene_from_light_view(gl, drawable, 0, 0);
16600		- if (RENDERSHADOW && Globals.lighttouched && !movingcamera) // && !parent.IsFreezed())
	16655	+ if (Globals.RENDERSHADOW && Globals.lighttouched && (!movingcamera \|\| !Globals.FREEZEONMOVE)) // && !parent.IsFreezed())
16601	16656	{
16602	16657	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16603	16658