~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -24,11 +24,17 @@
24	24
25	25	private UUID uuid = UUID.randomUUID();
26	26
27		- // TEMPORARY for mocap undo
28		- mocap.reader.BVHReader.BVHResult bvh;
29		- Object3D skeleton;
	27	+ // TEMPORARY for mocap undo. No need to be transient.
	28	+ mocap.reader.BVHReader.BVHResult savebvh;
	29	+ Object3D saveskeleton;
30	30	//
31	31
	32	+ String skyboxname;
	33	+ String skyboxext;
	34	+
	35	+ byte[] versions[];
	36	+ int versionindex = -1;
	37	+
32	38	ScriptNode scriptnode;
33	39
34	40	void InitOthers()
..	..	@@ -170,24 +176,35 @@
170	176
171	177	void ExtractBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
172	178	{
	179	+ Object3D o;
	180	+
173	181	if (hashtable.containsKey(GetUUID()))
174	182	{
175		- Object3D o = hashtable.get(GetUUID());
	183	+ o = hashtable.get(GetUUID());
176	184
177	185	Grafreed.Assert(this.bRep == o.bRep);
178		- if (this.bRep != null)
179		- assert(this.bRep.support == o.transientrep);
	186	+ //if (this.bRep != null)
	187	+ // assert(this.bRep.support == o.transientrep);
	188	+ if (this.support != null)
	189	+ assert(this.support.bRep == o.transientrep);
	190	+ }
	191	+ else
	192	+ {
	193	+ o = new Object3D("copy of " + this.name);
180	194
181		- return;
	195	+ hashtable.put(GetUUID(), o);
182	196	}
183	197
184		- Object3D o = new Object3D();
185		-
186		- hashtable.put(GetUUID(), o);
187		-
188		- for (int i=0; i<Size(); i++)
	198	+ if (!blockloop)
189	199	{
190		- get(i).ExtractBigData(hashtable);
	200	+ blockloop = true;
	201	+
	202	+ for (int i=0; i<Size(); i++)
	203	+ {
	204	+ get(i).ExtractBigData(hashtable);
	205	+ }
	206	+
	207	+ blockloop = false;
191	208	}
192	209
193	210	ExtractBigData(o);
..	..	@@ -195,11 +212,26 @@
195	212
196	213	void ExtractBigData(Object3D o)
197	214	{
	215	+ if (o.bRep != null)
	216	+ Grafreed.Assert(o.bRep == this.bRep);
	217	+
198	218	o.bRep = this.bRep;
199		- if (this.bRep != null)
	219	+// July 2019 if (this.bRep != null)
	220	+// {
	221	+// o.transientrep = this.bRep.support;
	222	+// o.bRep.support = null;
	223	+// }
	224	+ o.selection = this.selection;
	225	+ o.versions = this.versions;
	226	+ o.versionindex = this.versionindex;
	227	+
	228	+ if (this.support != null)
200	229	{
201		- o.transientrep = this.bRep.support;
202		- o.bRep.support = null;
	230	+ if (o.transientrep != null)
	231	+ Grafreed.Assert(o.transientrep == this.support.bRep);
	232	+
	233	+ o.transientrep = this.support.bRep;
	234	+ this.support.bRep = null;
203	235	}
204	236
205	237	// o.support = this.support;
..	..	@@ -223,19 +255,35 @@
223	255
224	256	RestoreBigData(o);
225	257
226		- hashtable.remove(GetUUID());
	258	+ if (blockloop)
	259	+ return;
	260	+
	261	+ blockloop = true;
	262	+
	263	+ //hashtable.remove(GetUUID());
227	264
228	265	for (int i=0; i<Size(); i++)
229	266	{
230	267	get(i).RestoreBigData(hashtable);
231	268	}
	269	+
	270	+ blockloop = false;
232	271	}
233	272
234	273	void RestoreBigData(Object3D o)
235	274	{
236	275	this.bRep = o.bRep;
237		- if (this.bRep != null)
238		- this.bRep.support = o.transientrep;
	276	+ if (this.support != null && o.transientrep != null)
	277	+ {
	278	+ this.support.bRep = o.transientrep;
	279	+ }
	280	+
	281	+ this.selection = o.selection;
	282	+
	283	+ this.versions = o.versions;
	284	+ this.versionindex = o.versionindex;
	285	+// July 2019 if (this.bRep != null)
	286	+// this.bRep.support = o.transientrep;
239	287	// this.support = o.support;
240	288	// this.fileparent = o.fileparent;
241	289	}
..	..	@@ -381,6 +429,7 @@
381	429	}
382	430
383	431	boolean live = false;
	432	+ transient boolean keepdontselect;
384	433	boolean dontselect = false;
385	434	boolean hide = false;
386	435	boolean link2master = false; // performs reset support/master at each frame
..	..	@@ -881,7 +930,7 @@
881	930
882	931	if (marked && Globals.isLIVE() && live &&
883	932	//TEMP21aug2018
884		- (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW) &&
	933	+ (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| !Globals.COMPUTESHADOWWHENLIVE) &&
885	934	currentframe != Globals.framecount)
886	935	{
887	936	currentframe = Globals.framecount;
..	..	@@ -966,6 +1015,7 @@
966	1015	if (material == null \|\| material.multiply)
967	1016	return true;
968	1017
	1018	+ // Transparent objects are dynamic because we have to sort the triangles.
969	1019	return material.opacity > 0.99;
970	1020	}
971	1021
..	..	@@ -1366,6 +1416,7 @@
1366	1416	toParent = LA.newMatrix();
1367	1417	fromParent = LA.newMatrix();
1368	1418	}
	1419	+
1369	1420	LA.matCopy(other.toParent, toParent);
1370	1421	LA.matCopy(other.fromParent, fromParent);
1371	1422
..	..	@@ -2387,6 +2438,10 @@
2387	2438	}
2388	2439	*/
2389	2440	}
	2441	+ else
	2442	+ {
	2443	+ //((ObjEditor)editWindow).SetupUI2(null);
	2444	+ }
2390	2445	}
2391	2446
2392	2447	void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
..	..	@@ -2428,6 +2483,14 @@
2428	2483	{
2429	2484	editWindow.refreshContents();
2430	2485	}
	2486	+ else
	2487	+ {
	2488	+ if (manipWindow != null)
	2489	+ {
	2490	+ manipWindow.refreshContents();
	2491	+ }
	2492	+ }
	2493	+
2431	2494	//if (parent != null)
2432	2495	//parent.refreshEditWindow();
2433	2496	}
..	..	@@ -2507,7 +2570,8 @@
2507	2570	private static final int editSelf = 1;
2508	2571	private static final int editChild = 2;
2509	2572
2510		- void drawEditHandles(ClickInfo info, int level)
	2573	+ void drawEditHandles(//ClickInfo info,
	2574	+ int level)
2511	2575	{
2512	2576	if (level == 0)
2513	2577	{
..	..	@@ -2515,7 +2579,8 @@
2515	2579	return;
2516	2580
2517	2581	Object3D selectee;
2518		- for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(info, level + 1))
	2582	+ for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(//info,
	2583	+ level + 1))
2519	2584	{
2520	2585	selectee = (Object3D) e.nextElement();
2521	2586	}
..	..	@@ -2523,19 +2588,22 @@
2523	2588	} else
2524	2589	{
2525	2590	//super.
2526		- drawEditHandles0(info, level + 1);
	2591	+ drawEditHandles0(//info,
	2592	+ level + 1);
2527	2593	}
2528	2594	}
2529	2595
2530		- boolean doEditClick(ClickInfo info, int level)
	2596	+ boolean doEditClick(//ClickInfo info,
	2597	+ int level)
2531	2598	{
2532	2599	doSomething = 0;
2533	2600	if (level == 0)
2534	2601	{
2535		- return doParentClick(info);
	2602	+ return doParentClick(); //info);
2536	2603	}
2537	2604	if (//super.
2538		- doEditClick0(info, level))
	2605	+ doEditClick0(//info,
	2606	+ level))
2539	2607	{
2540	2608	doSomething = 1;
2541	2609	return true;
..	..	@@ -2545,7 +2613,7 @@
2545	2613	}
2546	2614	}
2547	2615
2548		- boolean doParentClick(ClickInfo info)
	2616	+ boolean doParentClick() //ClickInfo info)
2549	2617	{
2550	2618	if (selection == null)
2551	2619	{
..	..	@@ -2558,7 +2626,8 @@
2558	2626	for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
2559	2627	{
2560	2628	Object3D selectee = (Object3D) e.nextElement();
2561		- if (selectee.doEditClick(info, 1))
	2629	+ if (selectee.doEditClick(//info,
	2630	+ 1))
2562	2631	{
2563	2632	childToDrag = selectee;
2564	2633	doSomething = 2;
..	..	@@ -2570,13 +2639,15 @@
2570	2639	return retval;
2571	2640	}
2572	2641
2573		- void doEditDrag(ClickInfo info, boolean opposite)
	2642	+ void doEditDrag(//ClickInfo clickInfo,
	2643	+ boolean opposite)
2574	2644	{
2575	2645	switch (doSomething)
2576	2646	{
2577	2647	case 1: // '\001'
2578	2648	//super.
2579		- doEditDrag0(info, opposite);
	2649	+ doEditDrag0(//clickInfo,
	2650	+ opposite);
2580	2651	break;
2581	2652
2582	2653	case 2: // '\002'
..	..	@@ -2589,11 +2660,13 @@
2589	2660	{
2590	2661	//sel.hitSomething = childToDrag.hitSomething;
2591	2662	//childToDrag.doEditDrag(info);
2592		- sel.doEditDrag(info, opposite);
	2663	+ sel.doEditDrag(//clickInfo,
	2664	+ opposite);
2593	2665	} else
2594	2666	{
2595	2667	//super.
2596		- doEditDrag0(info, opposite);
	2668	+ doEditDrag0(//clickInfo,
	2669	+ opposite);
2597	2670	}
2598	2671	}
2599	2672	break;
..	..	@@ -2611,6 +2684,9 @@
2611	2684	{
2612	2685	deselectAll();
2613	2686	}
	2687	+
	2688	+ new Exception().printStackTrace();
	2689	+
2614	2690	ClickInfo newInfo = new ClickInfo();
2615	2691	newInfo.flags = info.flags;
2616	2692	newInfo.bounds = info.bounds;
..	..	@@ -3058,7 +3134,7 @@
3058	3134	{
3059	3135	if (bRep != null)
3060	3136	{
3061		- bRep.GenerateNormalsMINE();
	3137	+ bRep.MergeNormals(); //.GenerateNormalsMINE();
3062	3138	Touch();
3063	3139	}
3064	3140	}
..	..	@@ -4958,6 +5034,14 @@
4958	5034	}
4959	5035	}
4960	5036
	5037	+ ObjEditor GetWindow()
	5038	+ {
	5039	+ if (editWindow != null)
	5040	+ return editWindow;
	5041	+
	5042	+ return manipWindow;
	5043	+ }
	5044	+
4961	5045	cTreePath Select(int indexcount, boolean deselect)
4962	5046	{
4963	5047	if (hide \|\| dontselect)
..	..	@@ -4994,10 +5078,11 @@
4994	5078	if (leaf != null)
4995	5079	{
4996	5080	cTreePath tp = new cTreePath(this, leaf);
4997		- if (editWindow != null)
	5081	+ ObjEditor window = GetWindow();
	5082	+ if (window != null)
4998	5083	{
4999	5084	//System.out.println("editWindow = " + editWindow + " vs " + this);
5000		- editWindow.Select(tp, deselect, true);
	5085	+ window.Select(tp, deselect, true);
5001	5086	}
5002	5087
5003	5088	return tp;
..	..	@@ -5014,6 +5099,7 @@
5014	5099
5015	5100	if (child == null)
5016	5101	continue;
	5102	+
5017	5103	if (child.HasTransparency() && child.size() != 0)
5018	5104	{
5019	5105	cTreePath leaf = child.Select(indexcount, deselect);
..	..	@@ -5023,9 +5109,10 @@
5023	5109	if (leaf != null)
5024	5110	{
5025	5111	cTreePath tp = new cTreePath(this, leaf);
5026		- if (editWindow != null)
	5112	+ ObjEditor window = GetWindow();
	5113	+ if (window != null)
5027	5114	{
5028		- editWindow.Select(tp, deselect, true);
	5115	+ window.Select(tp, deselect, true);
5029	5116	}
5030	5117
5031	5118	return tp;
..	..	@@ -5350,6 +5437,51 @@
5350	5437	blockloop = false;
5351	5438	}
5352	5439
	5440	+ void ResetSelectable()
	5441	+ {
	5442	+ if (blockloop)
	5443	+ return;
	5444	+
	5445	+ blockloop = true;
	5446	+
	5447	+ keepdontselect = dontselect;
	5448	+ dontselect = true;
	5449	+
	5450	+ Object3D child;
	5451	+ int nb = Size();
	5452	+ for (int i = 0; i < nb; i++)
	5453	+ {
	5454	+ child = (Object3D) get(i);
	5455	+ if (child == null)
	5456	+ continue;
	5457	+ child.ResetSelectable();
	5458	+ }
	5459	+
	5460	+ blockloop = false;
	5461	+ }
	5462	+
	5463	+ void RestoreSelectable()
	5464	+ {
	5465	+ if (blockloop)
	5466	+ return;
	5467	+
	5468	+ blockloop = true;
	5469	+
	5470	+ dontselect = keepdontselect;
	5471	+
	5472	+ Object3D child;
	5473	+ int nb = Size();
	5474	+ for (int i = 0; i < nb; i++)
	5475	+ {
	5476	+ child = (Object3D) get(i);
	5477	+ if (child == null)
	5478	+ continue;
	5479	+ child.RestoreSelectable();
	5480	+ }
	5481	+
	5482	+ blockloop = false;
	5483	+ }
	5484	+
5353	5485	boolean IsSelected()
5354	5486	{
5355	5487	if (parent == null)
..	..	@@ -5659,6 +5791,38 @@
5659	5791	}
5660	5792	}
5661	5793
	5794	+ void EmbedTextures(boolean embed)
	5795	+ {
	5796	+ if (blockloop)
	5797	+ return;
	5798	+
	5799	+ //if (GetTextures() != null)
	5800	+ if (embed)
	5801	+ CameraPane.EmbedTextures(GetTextures());
	5802	+ else
	5803	+ {
	5804	+ GetTextures().pigmentdata = null;
	5805	+ GetTextures().bumpdata = null;
	5806	+ GetTextures().pw = 0;
	5807	+ GetTextures().ph = 0;
	5808	+ GetTextures().bw = 0;
	5809	+ GetTextures().bh = 0;
	5810	+ }
	5811	+
	5812	+ int nb = Size();
	5813	+ for (int i = 0; i < nb; i++)
	5814	+ {
	5815	+ Object3D child = (Object3D) get(i);
	5816	+
	5817	+ if (child == null)
	5818	+ continue;
	5819	+
	5820	+ blockloop = true;
	5821	+ child.EmbedTextures(embed);
	5822	+ blockloop = false;
	5823	+ }
	5824	+ }
	5825	+
5662	5826	void draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5663	5827	{
5664	5828	Draw(display, root, selected, blocked);
..	..	@@ -5746,7 +5910,7 @@
5746	5910	support = support;
5747	5911
5748	5912	//boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5749		- boolean usecalllists = IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5913	+ boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5750	5914
5751	5915	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5752	5916	{
..	..	@@ -5767,7 +5931,7 @@
5767	5931
5768	5932	if (!selectmode && //display.DrawMode() != display.SELECTION &&
5769	5933	//(touched \|\| (bRep != null && bRep.displaylist <= 0)))
5770		- (Globals.isLIVE() \|\| touched && (bRep != null && bRep.displaylist <= 0)))
	5934	+ (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && Globals.COMPUTESHADOWWHENLIVE)) // \|\| (bRep != null && bRep.displaylist <= 0)))
5771	5935	{
5772	5936	Globals.lighttouched = true;
5773	5937	} // all panes...
..	..	@@ -5899,6 +6063,7 @@
5899	6063	if (GetBRep() != null)
5900	6064	{
5901	6065	display.NextIndex();
	6066	+
5902	6067	// vertex color conflict : gl.glCallList(list);
5903	6068	DrawNode(display, root, selected);
5904	6069	if (this instanceof BezierPatch)
..	..	@@ -6359,6 +6524,11 @@
6359	6524	// dec 2012
6360	6525	new Exception().printStackTrace();
6361	6526	return;
	6527	+ }
	6528	+
	6529	+ if (dontselect)
	6530	+ {
	6531	+ //bRep.GenerateNormalsMINE();
6362	6532	}
6363	6533
6364	6534	display.DrawGeometry(bRep, flipV, selectmode);
..	..	@@ -7144,20 +7314,23 @@
7144	7314	}
7145	7315	}
7146	7316
7147		- protected void calcHotSpot(cVector in, ClickInfo info, Point outPt, Rectangle outRec)
	7317	+ static ClickInfo clickInfo = new ClickInfo();
	7318	+
	7319	+ protected void calcHotSpot(cVector in, //ClickInfo clickInfo,
	7320	+ Point outPt, Rectangle outRec)
7148	7321	{
7149		- int hc = info.bounds.x + info.bounds.width / 2;
7150		- int vc = info.bounds.y + info.bounds.height / 2;
7151		- double[][] toscreen = info.toScreen;
	7322	+ int hc = clickInfo.bounds.x + clickInfo.bounds.width / 2;
	7323	+ int vc = clickInfo.bounds.y + clickInfo.bounds.height / 2;
	7324	+ double[][] toscreen = clickInfo.toScreen;
7152	7325	if (toscreen == null)
7153	7326	{
7154		- toscreen = new Camera(info.camera.viewCode).toScreen;
	7327	+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
7155	7328	}
7156	7329	cVector vec = in;
7157	7330	LA.xformPos(in, toscreen, in);
7158	7331	//System.out.println("Distance = " + info.camera.Distance());
7159		- vec.x = 100 info.camera.SCALE / info.camera.Distance();
7160		- vec.y = 100 info.camera.SCALE / info.camera.Distance();
	7332	+ vec.x = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
	7333	+ vec.y = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
7161	7334	outPt.x = hc + (int) vec.x;
7162	7335	outPt.y = vc - (int) vec.y;
7163	7336	outRec.x = outPt.x - 3;
..	..	@@ -7165,15 +7338,18 @@
7165	7338	outRec.width = outRec.height = 6;
7166	7339	}
7167	7340
7168		- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
	7341	+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
	7342	+ )
7169	7343	{
7170	7344	Point pt = new Point(0, 0);
7171	7345	Rectangle rec = new Rectangle();
7172		- calcHotSpot(in, info, pt, rec);
	7346	+ calcHotSpot(in, //clickInfo,
	7347	+ pt, rec);
7173	7348	return rec;
7174	7349	}
7175	7350
7176		- void drawEditHandles0(ClickInfo info, int level)
	7351	+ void drawEditHandles0(//ClickInfo clickInfo,
	7352	+ int level)
7177	7353	{
7178	7354	if (level == 0)
7179	7355	{
..	..	@@ -7182,16 +7358,19 @@
7182	7358	{
7183	7359	cVector origin = new cVector();
7184	7360	//LA.xformPos(origin, toParent, origin);
7185		- Rectangle spot = calcHotSpot(origin, info);
	7361	+ if (this.clickInfo == null)
	7362	+ this.clickInfo = new ClickInfo();
	7363	+
	7364	+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
7186	7365	Rectangle boundary = new Rectangle();
7187	7366	boundary.x = spot.x - 30;
7188	7367	boundary.y = spot.y - 30;
7189	7368	boundary.width = spot.width + 60;
7190	7369	boundary.height = spot.height + 60;
7191		- info.g.setColor(Color.red);
	7370	+ clickInfo.g.setColor(Color.red);
7192	7371	int spotw = spot.x + spot.width;
7193	7372	int spoth = spot.y + spot.height;
7194		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7373	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7195	7374	// if (CameraPane.Xmin > spot.x)
7196	7375	// {
7197	7376	// CameraPane.Xmin = spot.x;
..	..	@@ -7211,8 +7390,8 @@
7211	7390	spot.translate(32, 32);
7212	7391	spotw = spot.x + spot.width;
7213	7392	spoth = spot.y + spot.height;
7214		- info.g.setColor(Color.cyan);
7215		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7393	+ clickInfo.g.setColor(Color.cyan);
	7394	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7216	7395	// if (CameraPane.Xmin > spot.x)
7217	7396	// {
7218	7397	// CameraPane.Xmin = spot.x;
..	..	@@ -7232,9 +7411,9 @@
7232	7411	// bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
7233	7412	//info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
7234	7413	spot.translate(0, -32);
7235		- info.g.setColor(Color.yellow);
7236		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7237		- info.g.setColor(Color.green);
	7414	+ clickInfo.g.setColor(Color.yellow);
	7415	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7416	+ clickInfo.g.setColor(Color.green);
7238	7417	// if (CameraPane.Xmin > spot.x)
7239	7418	// {
7240	7419	// CameraPane.Xmin = spot.x;
..	..	@@ -7251,8 +7430,8 @@
7251	7430	// {
7252	7431	// CameraPane.Ymax = spoth;
7253	7432	// }
7254		- info.g.drawArc(boundary.x, boundary.y,
7255		- boundary.width, boundary.height, 0, 360);
	7433	+ clickInfo.g.drawArc(boundary.x + clickInfo.DX, boundary.y + clickInfo.DY,
	7434	+ (int)(boundary.width * clickInfo.W), (int)(boundary.height * clickInfo.W), 0, 360);
7256	7435	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7257	7436	// if (CameraPane.Xmin > boundary.x)
7258	7437	// {
..	..	@@ -7274,7 +7453,8 @@
7274	7453	}
7275	7454	}
7276	7455
7277		- boolean doEditClick0(ClickInfo info, int level)
	7456	+ boolean doEditClick0(//ClickInfo clickInfo,
	7457	+ int level)
7278	7458	{
7279	7459	if (level == 0)
7280	7460	{
..	..	@@ -7283,8 +7463,8 @@
7283	7463
7284	7464	boolean retval = false;
7285	7465
7286		- startX = info.x;
7287		- startY = info.y;
	7466	+ startX = clickInfo.x;
	7467	+ startY = clickInfo.y;
7288	7468
7289	7469	hitSomething = -1;
7290	7470	cVector origin = new cVector();
..	..	@@ -7294,22 +7474,51 @@
7294	7474	{
7295	7475	centerPt = new Point(0, 0);
7296	7476	}
7297		- calcHotSpot(origin, info, centerPt, spot);
7298		- if (spot.contains(info.x, info.y))
	7477	+ calcHotSpot(origin, //info,
	7478	+ centerPt, spot);
	7479	+ if (spot.contains(clickInfo.x, clickInfo.y))
7299	7480	{
7300	7481	hitSomething = hitCenter;
7301	7482	retval = true;
7302	7483	}
7303	7484	spot.translate(32, 0);
7304		- if (spot.contains(info.x, info.y))
	7485	+ if (spot.contains(clickInfo.x, clickInfo.y))
7305	7486	{
7306	7487	hitSomething = hitRotate;
7307	7488	retval = true;
7308	7489	}
7309	7490	spot.translate(0, 32);
7310		- if (spot.contains(info.x, info.y))
	7491	+ if (spot.contains(clickInfo.x, clickInfo.y))
7311	7492	{
7312	7493	hitSomething = hitScale;
	7494	+
	7495	+ double scale = 0.005f * clickInfo.camera.Distance();
	7496	+ double hScale = (double) (clickInfo.x /- centerPt.x/) / 32;
	7497	+ double sign = 1;
	7498	+ if (hScale < 0)
	7499	+ {
	7500	+ sign = -1;
	7501	+ }
	7502	+ hScale = signMath.pow(signhScale, scale * 50);
	7503	+ if (hScale < 0.01)
	7504	+ {
	7505	+ //hScale = 0.01;
	7506	+ }
	7507	+
	7508	+ double vScale = (double) (clickInfo.y /- centerPt.y/) / 32;
	7509	+ sign = 1;
	7510	+ if (vScale < 0)
	7511	+ {
	7512	+ sign = -1;
	7513	+ }
	7514	+ vScale = signMath.pow(signvScale, scale * 50);
	7515	+ if (vScale < 0.01)
	7516	+ {
	7517	+ //vScale = 0.01;
	7518	+ }
	7519	+
	7520	+ clickInfo.scale = Math.sqrt(hScalehScale + vScalevScale);
	7521	+
7313	7522	retval = true;
7314	7523	}
7315	7524
..	..	@@ -7319,7 +7528,7 @@
7319	7528	}
7320	7529
7321	7530	//System.out.println("info.modifiers = " + info.modifiers);
7322		- modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
	7531	+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
7323	7532	//System.out.println("modified = " + modified);
7324	7533	//new Exception().printStackTrace();
7325	7534	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7347,7 +7556,8 @@
7347	7556	return true;
7348	7557	}
7349	7558
7350		- void doEditDrag0(ClickInfo info, boolean opposite)
	7559	+ void doEditDrag0(//ClickInfo info,
	7560	+ boolean opposite)
7351	7561	{
7352	7562	if (hitSomething == 0)
7353	7563	{
..	..	@@ -7361,7 +7571,7 @@
7361	7571
7362	7572	//System.out.println("hitSomething = " + hitSomething);
7363	7573
7364		- double scale = 0.005f * info.camera.Distance();
	7574	+ double scale = 0.005f * clickInfo.camera.Distance();
7365	7575
7366	7576	cVector xlate = new cVector();
7367	7577	//cVector xlate2 = new cVector();
..	..	@@ -7395,8 +7605,8 @@
7395	7605	toParent[3][i] = xlate.get(i);
7396	7606	LA.matInvert(toParent, fromParent);
7397	7607	*/
7398		- cVector delta = LA.newVector(0, 0, startY - info.y);
7399		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7608	+ cVector delta = LA.newVector(0, 0, startY - clickInfo.y);
	7609	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7400	7610
7401	7611	LA.matCopy(startMat, toParent);
7402	7612	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7405,7 +7615,7 @@
7405	7615	} else
7406	7616	{
7407	7617	//LA.xformDir(delta, info.camera.fromScreen, delta);
7408		- cVector up = new cVector(info.camera.up);
	7618	+ cVector up = new cVector(clickInfo.camera.up);
7409	7619	cVector away = new cVector();
7410	7620	//cVector right2 = new cVector();
7411	7621	//LA.vecCross(up, cVector.Z, right);
..	..	@@ -7422,19 +7632,19 @@
7422	7632	LA.xformDir(up, ClickInfo.matbuffer, up);
7423	7633	// if (!CameraPane.LOCALTRANSFORM)
7424	7634	LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7425		- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
	7635	+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
7426	7636	// if (!CameraPane.LOCALTRANSFORM)
7427	7637	LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7428	7638	//LA.vecCross(up, cVector.Z, right2);
7429	7639
7430		- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
	7640	+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
7431	7641
7432	7642	//System.out.println("DELTA0 = " + delta);
7433	7643	//System.out.println("AWAY = " + info.camera.away);
7434	7644	//System.out.println("UP = " + info.camera.up);
7435	7645	if (away.z > 0)
7436	7646	{
7437		- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
	7647	+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7438	7648	{
7439	7649	delta.x = -delta.x;
7440	7650	} else
..	..	@@ -7449,7 +7659,7 @@
7449	7659	//System.out.println("DELTA1 = " + delta);
7450	7660	LA.xformDir(delta, ClickInfo.matbuffer, delta);
7451	7661	//System.out.println("DELTA2 = " + delta);
7452		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7662	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7453	7663	LA.matCopy(startMat, toParent);
7454	7664	//System.out.println("DELTA3 = " + delta);
7455	7665	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7459,8 +7669,8 @@
7459	7669	break;
7460	7670
7461	7671	case hitRotate: // rotate
7462		- int dx = info.x - centerPt.x;
7463		- int dy = -(info.y - centerPt.y);
	7672	+ int dx = clickInfo.x - centerPt.x;
	7673	+ int dy = -(clickInfo.y - centerPt.y);
7464	7674	double angle = (double) Math.atan2(dx, dy);
7465	7675	angle = -(1.570796 - angle);
7466	7676
..	..	@@ -7483,7 +7693,7 @@
7483	7693	}
7484	7694	/**/
7485	7695
7486		- switch (info.pane.RenderCamera().viewCode)
	7696	+ switch (clickInfo.pane.RenderCamera().viewCode)
7487	7697	{
7488	7698	case 1: // '\001'
7489	7699	LA.matZRotate(toParent, angle);
..	..	@@ -7510,7 +7720,7 @@
7510	7720	break;
7511	7721
7512	7722	case hitScale: // scale
7513		- double hScale = (double) (info.x - centerPt.x) / 32;
	7723	+ double hScale = (double) (clickInfo.x /- centerPt.x/) / 32;
7514	7724	double sign = 1;
7515	7725	if (hScale < 0)
7516	7726	{
..	..	@@ -7522,7 +7732,7 @@
7522	7732	//hScale = 0.01;
7523	7733	}
7524	7734
7525		- double vScale = (double) (info.y - centerPt.y) / 32;
	7735	+ double vScale = (double) (clickInfo.y /- centerPt.y/) / 32;
7526	7736	sign = 1;
7527	7737	if (vScale < 0)
7528	7738	{
..	..	@@ -7533,6 +7743,7 @@
7533	7743	{
7534	7744	//vScale = 0.01;
7535	7745	}
	7746	+
7536	7747	LA.matCopy(startMat, toParent);
7537	7748	/**/
7538	7749	for (int i = 0; i < 3; i++)
..	..	@@ -7542,14 +7753,14 @@
7542	7753	}
7543	7754	/**/
7544	7755
7545		- double totalScale = Math.sqrt(hScalehScale + vScalevScale) / Math.sqrt(2);
	7756	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / clickInfo.scale;
7546	7757
7547	7758	if (totalScale < 0.01)
7548	7759	{
7549	7760	totalScale = 0.01;
7550	7761	}
7551	7762
7552		- switch (info.pane.RenderCamera().viewCode)
	7763	+ switch (clickInfo.pane.RenderCamera().viewCode)
7553	7764	{
7554	7765	case 3: // '\001'
7555	7766	if (modified \|\| opposite)
..	..	@@ -7616,7 +7827,7 @@
7616	7827	} // NEW ...
7617	7828
7618	7829
7619		- info.pane.repaint();
	7830	+ clickInfo.pane.repaint();
7620	7831	}
7621	7832
7622	7833	boolean overflow = false;
..	..	@@ -7796,6 +8007,10 @@
7796	8007	editWindow = null;
7797	8008	} // ?
7798	8009	}
	8010	+ else
	8011	+ {
	8012	+ //editWindow.closeUI();
	8013	+ }
7799	8014	}
7800	8015
7801	8016	boolean root; // patch for edit windows
..	..	@@ -7953,6 +8168,10 @@
7953	8168	}
7954	8169
7955	8170	transient ObjEditor editWindow;
	8171	+ transient ObjEditor manipWindow;
	8172	+
	8173	+ transient boolean pinned;
	8174	+
7956	8175	transient ObjectUI objectUI;
7957	8176	public static int povDepth = 0;
7958	8177	private static cVector tbMin = new cVector();