~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -2065,7 +2065,7 @@
2065	2065	//System.err.println("Oeil on");
2066	2066	OEIL = true;
2067	2067	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
2068		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	2068	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
2069	2069	//pingthread.StepToTarget(true);
2070	2070	}
2071	2071
..	..	@@ -11527,7 +11527,7 @@
11527	11527	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
11528	11528	{
11529	11529	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
11530		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	11530	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11531	11531	pingthread.StepToTarget(true); // true);
11532	11532	// zoomonce = false;
11533	11533	}
..	..	@@ -13375,9 +13375,10 @@
13375	13375	"DP3 " + dest + ".z," + "normals," + "eye;" +
13376	13376	"MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
13377	13377	//"MOV " + dest + ".w," + "normal.z;" +
13378		- "MUL " + dest + ".z," + "params2.w," + dest + ".x;" +
13379		- "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
13380		- //"MOV " + dest + ".z," + "params2.w;" +
	13378	+// "MUL " + dest + ".z," + "params2.w," + dest + ".x;" + // PRETTY HEURISTIC FOR VELVET
	13379	+// "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
	13380	+
	13381	+ "MOV " + dest + ".z," + "params2.w;" + // EXACT
13381	13382	"POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
13382	13383	"RCP " + dest + ".w," + dest + ".w;" +
13383	13384	//"RSQ " + dest + ".w," + dest + ".w;" +
..	..	@@ -13942,7 +13943,7 @@
13942	13943
13943	13944	// fev 2014???
13944	13945	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
13945		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	13946	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
13946	13947	pingthread.StepToTarget(true); // true);
13947	13948	}
13948	13949	// if (!LIVE)
..	..	@@ -14603,7 +14604,8 @@
14603	14604	Globals.MOUSEDRAGGED = false;
14604	14605
14605	14606	movingcamera = false;
14606		- X = Y = 0;
	14607	+ X = 0; // getBounds().width/2;
	14608	+ Y = 0; // getBounds().height/2;
14607	14609	//System.out.println("mouseReleased: " + e);
14608	14610	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
14609	14611	}
..	..	@@ -15119,9 +15121,9 @@
15119	15121	case '_':
15120	15122	kompactbit = 5;
15121	15123	break;
15122		- case '+':
15123		- kompactbit = 6;
15124		- break;
	15124	+// case '+':
	15125	+// kompactbit = 6;
	15126	+// break;
15125	15127	case ' ':
15126	15128	ObjEditor.theFrame.ToggleFullScreen();
15127	15129	repaint();
..	..	@@ -15170,8 +15172,9 @@
15170	15172	case DELETE:
15171	15173	ClearSelection();
15172	15174	break;
15173		- /*
15174	15175	case '+':
	15176	+
	15177	+ /*
15175	15178	//fontsize += 1;
15176	15179	bbzoom *= 2;
15177	15180	repaint();
..	..	@@ -15188,17 +15191,17 @@
15188	15191	case '=':
15189	15192	IncDepth();
15190	15193	//fontsize += 1;
15191		- object.editWindow.refreshContents(true);
	15194	+ object.GetWindow().refreshContents(true);
15192	15195	maskbit = 6;
15193	15196	break;
15194	15197	case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
15195	15198	DecDepth();
15196	15199	maskbit = 5;
15197	15200	//if(fontsize > 1) fontsize -= 1;
15198		- if (object.editWindow == null)
15199		- new Exception().printStackTrace();
15200		- else
15201		- object.editWindow.refreshContents(true);
	15201	+// if (object.editWindow == null)
	15202	+// new Exception().printStackTrace();
	15203	+// else
	15204	+ object.GetWindow().refreshContents(true);
15202	15205	break;
15203	15206	case '{':
15204	15207	manipCamera.shaper_fovy /= 1.1;
..	..	@@ -15422,7 +15425,7 @@
15422	15425	}
15423	15426	*/
15424	15427
15425		- object.editWindow.EditSelection(false);
	15428	+ object.GetWindow().EditSelection(false);
15426	15429	}
15427	15430
15428	15431	void SelectParent()
..	..	@@ -15439,10 +15442,10 @@
15439	15442	{
15440	15443	//selectees.remove(i);
15441	15444	System.out.println("select parent of " + elem);
15442		- group.editWindow.Select(elem.parent.GetTreePath(), first, true);
	15445	+ group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
15443	15446	} else
15444	15447	{
15445		- group.editWindow.Select(elem.GetTreePath(), first, true);
	15448	+ group.GetWindow().Select(elem.GetTreePath(), first, true);
15446	15449	}
15447	15450
15448	15451	first = false;
..	..	@@ -15484,12 +15487,12 @@
15484	15487	for (int j = 0; j < group.children.size(); j++)
15485	15488	{
15486	15489	elem = (Object3D) group.children.elementAt(j);
15487		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15490	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15488	15491	first = false;
15489	15492	}
15490	15493	} else
15491	15494	{
15492		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15495	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15493	15496	}
15494	15497
15495	15498	first = false;
..	..	@@ -15500,21 +15503,21 @@
15500	15503	{
15501	15504	//Composite group = (Composite) object;
15502	15505	Object3D group = object;
15503		- group.editWindow.loadClipboard(true); // ClearSelection(false);
	15506	+ group.GetWindow().loadClipboard(true); // ClearSelection(false);
15504	15507	}
15505	15508
15506	15509	void ResetTransform(int mask)
15507	15510	{
15508	15511	//Composite group = (Composite) object;
15509	15512	Object3D group = object;
15510		- group.editWindow.ResetTransform(mask);
	15513	+ group.GetWindow().ResetTransform(mask);
15511	15514	}
15512	15515
15513	15516	void FlipTransform()
15514	15517	{
15515	15518	//Composite group = (Composite) object;
15516	15519	Object3D group = object;
15517		- group.editWindow.FlipTransform();
	15520	+ group.GetWindow().FlipTransform();
15518	15521	// group.editWindow.ReduceMesh(true);
15519	15522	}
15520	15523
..	..	@@ -15522,7 +15525,7 @@
15522	15525	{
15523	15526	//Composite group = (Composite) object;
15524	15527	Object3D group = object;
15525		- group.editWindow.PrintMemory();
	15528	+ group.GetWindow().PrintMemory();
15526	15529	// group.editWindow.ReduceMesh(true);
15527	15530	}
15528	15531
..	..	@@ -15530,7 +15533,7 @@
15530	15533	{
15531	15534	//Composite group = (Composite) object;
15532	15535	Object3D group = object;
15533		- group.editWindow.ResetCentroid();
	15536	+ group.GetWindow().ResetCentroid();
15534	15537	}
15535	15538
15536	15539	void IncDepth()
..	..	@@ -15715,23 +15718,42 @@
15715	15718	*/
15716	15719	if (!isRenderer)
15717	15720	{
15718		- object.drawEditHandles(info, 0);
15719		-
15720		- if (drag && (X != 0 \|\| Y != 0) && object.selection.Size() > 0)
	15721	+ if (object.selection.Size() > 0)
15721	15722	{
15722		- switch (object.selection.get(0).hitSomething)
	15723	+ int hitSomething = object.selection.get(0).hitSomething;
	15724	+
	15725	+ info.DX = 0;
	15726	+ info.DY = 0;
	15727	+ info.W = 1;
	15728	+ if (hitSomething == Object3D.hitCenter)
15723	15729	{
15724		- case Object3D.hitCenter: gr.setColor(Color.pink);
15725		- gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15726		- break;
15727		- case Object3D.hitRotate: gr.setColor(Color.yellow);
15728		- gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15729		- break;
15730		- case Object3D.hitScale: gr.setColor(Color.cyan);
15731		- gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15732		- break;
	15730	+ info.DX = X;
	15731	+ if (X != 0)
	15732	+ info.DX -= info.bounds.width/2;
	15733	+
	15734	+ info.DY = Y;
	15735	+ if (Y != 0)
	15736	+ info.DY -= info.bounds.height/2;
15733	15737	}
15734		-
	15738	+
	15739	+ object.drawEditHandles(info, 0);
	15740	+
	15741	+ if (drag && (X != 0 \|\| Y != 0))
	15742	+ {
	15743	+ switch (hitSomething)
	15744	+ {
	15745	+ case Object3D.hitCenter: gr.setColor(Color.pink);
	15746	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15747	+ break;
	15748	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	15749	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15750	+ break;
	15751	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	15752	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15753	+ break;
	15754	+ }
	15755	+
	15756	+ }
15735	15757	}
15736	15758	}
15737	15759	}
..	..	@@ -16722,7 +16744,7 @@
16722	16744	}
16723	16745
16724	16746	if (!movingcamera && !PAINTMODE)
16725		- object.editWindow.ScreenFitPoint(); // fev 2014
	16747	+ object.GetWindow().ScreenFitPoint(); // fev 2014
16726	16748
16727	16749	if (PAINTMODE && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
16728	16750	{
..	..	@@ -16734,17 +16756,17 @@
16734	16756
16735	16757	group.add(paintobj); // link
16736	16758
16737		- object.editWindow.SnapObject(group);
	16759	+ object.GetWindow().SnapObject(group);
16738	16760
16739		- Object3D folder = object.editWindow.copy;
	16761	+ Object3D folder = object.GetWindow().copy;
16740	16762
16741		- if (object.editWindow.copy.selection.Size() > 0)
16742		- folder = object.editWindow.copy.selection.elementAt(0);
	16763	+ if (object.GetWindow().copy.selection.Size() > 0)
	16764	+ folder = object.GetWindow().copy.selection.elementAt(0);
16743	16765
16744	16766	folder.add(group);
16745	16767
16746		- object.editWindow.ResetModel();
16747		- object.editWindow.refreshContents();
	16768	+ object.GetWindow().ResetModel();
	16769	+ object.GetWindow().refreshContents();
16748	16770	}
16749	16771	else
16750	16772	paintcount = 0;
..	..	@@ -16783,6 +16805,11 @@
16783	16805	//System.out.println("objects[color] = " + objects[color]);
16784	16806	//objects[color].Select();
16785	16807	indexcount = 0;
	16808	+ ObjEditor window = object.GetWindow();
	16809	+ if (window != null && deselect)
	16810	+ {
	16811	+ window.Select(null, deselect, true);
	16812	+ }
16786	16813	object.Select(color, deselect);
16787	16814	}
16788	16815