~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	}
..	..	@@ -13943,7 +13943,7 @@
13943	13943
13944	13944	// fev 2014???
13945	13945	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
13946		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	13946	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
13947	13947	pingthread.StepToTarget(true); // true);
13948	13948	}
13949	13949	// if (!LIVE)
..	..	@@ -14604,7 +14604,8 @@
14604	14604	Globals.MOUSEDRAGGED = false;
14605	14605
14606	14606	movingcamera = false;
14607		- X = Y = 0;
	14607	+ X = 0; // getBounds().width/2;
	14608	+ Y = 0; // getBounds().height/2;
14608	14609	//System.out.println("mouseReleased: " + e);
14609	14610	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
14610	14611	}
..	..	@@ -15190,17 +15191,17 @@
15190	15191	case '=':
15191	15192	IncDepth();
15192	15193	//fontsize += 1;
15193		- object.editWindow.refreshContents(true);
	15194	+ object.GetWindow().refreshContents(true);
15194	15195	maskbit = 6;
15195	15196	break;
15196	15197	case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
15197	15198	DecDepth();
15198	15199	maskbit = 5;
15199	15200	//if(fontsize > 1) fontsize -= 1;
15200		- if (object.editWindow == null)
15201		- new Exception().printStackTrace();
15202		- else
15203		- object.editWindow.refreshContents(true);
	15201	+// if (object.editWindow == null)
	15202	+// new Exception().printStackTrace();
	15203	+// else
	15204	+ object.GetWindow().refreshContents(true);
15204	15205	break;
15205	15206	case '{':
15206	15207	manipCamera.shaper_fovy /= 1.1;
..	..	@@ -15424,7 +15425,7 @@
15424	15425	}
15425	15426	*/
15426	15427
15427		- object.editWindow.EditSelection(false);
	15428	+ object.GetWindow().EditSelection(false);
15428	15429	}
15429	15430
15430	15431	void SelectParent()
..	..	@@ -15441,10 +15442,10 @@
15441	15442	{
15442	15443	//selectees.remove(i);
15443	15444	System.out.println("select parent of " + elem);
15444		- group.editWindow.Select(elem.parent.GetTreePath(), first, true);
	15445	+ group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
15445	15446	} else
15446	15447	{
15447		- group.editWindow.Select(elem.GetTreePath(), first, true);
	15448	+ group.GetWindow().Select(elem.GetTreePath(), first, true);
15448	15449	}
15449	15450
15450	15451	first = false;
..	..	@@ -15486,12 +15487,12 @@
15486	15487	for (int j = 0; j < group.children.size(); j++)
15487	15488	{
15488	15489	elem = (Object3D) group.children.elementAt(j);
15489		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15490	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15490	15491	first = false;
15491	15492	}
15492	15493	} else
15493	15494	{
15494		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15495	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15495	15496	}
15496	15497
15497	15498	first = false;
..	..	@@ -15502,21 +15503,21 @@
15502	15503	{
15503	15504	//Composite group = (Composite) object;
15504	15505	Object3D group = object;
15505		- group.editWindow.loadClipboard(true); // ClearSelection(false);
	15506	+ group.GetWindow().loadClipboard(true); // ClearSelection(false);
15506	15507	}
15507	15508
15508	15509	void ResetTransform(int mask)
15509	15510	{
15510	15511	//Composite group = (Composite) object;
15511	15512	Object3D group = object;
15512		- group.editWindow.ResetTransform(mask);
	15513	+ group.GetWindow().ResetTransform(mask);
15513	15514	}
15514	15515
15515	15516	void FlipTransform()
15516	15517	{
15517	15518	//Composite group = (Composite) object;
15518	15519	Object3D group = object;
15519		- group.editWindow.FlipTransform();
	15520	+ group.GetWindow().FlipTransform();
15520	15521	// group.editWindow.ReduceMesh(true);
15521	15522	}
15522	15523
..	..	@@ -15524,7 +15525,7 @@
15524	15525	{
15525	15526	//Composite group = (Composite) object;
15526	15527	Object3D group = object;
15527		- group.editWindow.PrintMemory();
	15528	+ group.GetWindow().PrintMemory();
15528	15529	// group.editWindow.ReduceMesh(true);
15529	15530	}
15530	15531
..	..	@@ -15532,7 +15533,7 @@
15532	15533	{
15533	15534	//Composite group = (Composite) object;
15534	15535	Object3D group = object;
15535		- group.editWindow.ResetCentroid();
	15536	+ group.GetWindow().ResetCentroid();
15536	15537	}
15537	15538
15538	15539	void IncDepth()
..	..	@@ -15717,23 +15718,42 @@
15717	15718	*/
15718	15719	if (!isRenderer)
15719	15720	{
15720		- object.drawEditHandles(info, 0);
15721		-
15722		- if (drag && (X != 0 \|\| Y != 0) && object.selection.Size() > 0)
	15721	+ if (object.selection.Size() > 0)
15723	15722	{
15724		- 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)
15725	15729	{
15726		- case Object3D.hitCenter: gr.setColor(Color.pink);
15727		- gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15728		- break;
15729		- case Object3D.hitRotate: gr.setColor(Color.yellow);
15730		- gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15731		- break;
15732		- case Object3D.hitScale: gr.setColor(Color.cyan);
15733		- gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15734		- 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;
15735	15737	}
15736		-
	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	+ }
15737	15757	}
15738	15758	}
15739	15759	}
..	..	@@ -16724,7 +16744,7 @@
16724	16744	}
16725	16745
16726	16746	if (!movingcamera && !PAINTMODE)
16727		- object.editWindow.ScreenFitPoint(); // fev 2014
	16747	+ object.GetWindow().ScreenFitPoint(); // fev 2014
16728	16748
16729	16749	if (PAINTMODE && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
16730	16750	{
..	..	@@ -16736,17 +16756,17 @@
16736	16756
16737	16757	group.add(paintobj); // link
16738	16758
16739		- object.editWindow.SnapObject(group);
	16759	+ object.GetWindow().SnapObject(group);
16740	16760
16741		- Object3D folder = object.editWindow.copy;
	16761	+ Object3D folder = object.GetWindow().copy;
16742	16762
16743		- if (object.editWindow.copy.selection.Size() > 0)
16744		- folder = object.editWindow.copy.selection.elementAt(0);
	16763	+ if (object.GetWindow().copy.selection.Size() > 0)
	16764	+ folder = object.GetWindow().copy.selection.elementAt(0);
16745	16765
16746	16766	folder.add(group);
16747	16767
16748		- object.editWindow.ResetModel();
16749		- object.editWindow.refreshContents();
	16768	+ object.GetWindow().ResetModel();
	16769	+ object.GetWindow().refreshContents();
16750	16770	}
16751	16771	else
16752	16772	paintcount = 0;