~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -24,11 +24,14 @@
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	+ byte[] versions[];
	33	+ int versionindex = -1;
	34	+
32	35	ScriptNode scriptnode;
33	36
34	37	void InitOthers()
..	..	@@ -170,24 +173,35 @@
170	173
171	174	void ExtractBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
172	175	{
	176	+ Object3D o;
	177	+
173	178	if (hashtable.containsKey(GetUUID()))
174	179	{
175		- Object3D o = hashtable.get(GetUUID());
	180	+ o = hashtable.get(GetUUID());
176	181
177	182	Grafreed.Assert(this.bRep == o.bRep);
178		- if (this.bRep != null)
179		- assert(this.bRep.support == o.transientrep);
	183	+ //if (this.bRep != null)
	184	+ // assert(this.bRep.support == o.transientrep);
	185	+ if (this.support != null)
	186	+ assert(this.support.bRep == o.transientrep);
	187	+ }
	188	+ else
	189	+ {
	190	+ o = new Object3D("copy of " + this.name);
180	191
181		- return;
	192	+ hashtable.put(GetUUID(), o);
182	193	}
183	194
184		- Object3D o = new Object3D("copy of " + this.name);
185		-
186		- hashtable.put(GetUUID(), o);
187		-
188		- for (int i=0; i<Size(); i++)
	195	+ if (!blockloop)
189	196	{
190		- get(i).ExtractBigData(hashtable);
	197	+ blockloop = true;
	198	+
	199	+ for (int i=0; i<Size(); i++)
	200	+ {
	201	+ get(i).ExtractBigData(hashtable);
	202	+ }
	203	+
	204	+ blockloop = false;
191	205	}
192	206
193	207	ExtractBigData(o);
..	..	@@ -195,11 +209,26 @@
195	209
196	210	void ExtractBigData(Object3D o)
197	211	{
	212	+ if (o.bRep != null)
	213	+ Grafreed.Assert(o.bRep == this.bRep);
	214	+
198	215	o.bRep = this.bRep;
199		- if (this.bRep != null)
	216	+// July 2019 if (this.bRep != null)
	217	+// {
	218	+// o.transientrep = this.bRep.support;
	219	+// o.bRep.support = null;
	220	+// }
	221	+ o.selection = this.selection;
	222	+ o.versions = this.versions;
	223	+ o.versionindex = this.versionindex;
	224	+
	225	+ if (this.support != null)
200	226	{
201		- o.transientrep = this.bRep.support;
202		- o.bRep.support = null;
	227	+ if (o.transientrep != null)
	228	+ Grafreed.Assert(o.transientrep == this.support.bRep);
	229	+
	230	+ o.transientrep = this.support.bRep;
	231	+ this.support.bRep = null;
203	232	}
204	233
205	234	// o.support = this.support;
..	..	@@ -219,14 +248,14 @@
219	248	if (!hashtable.containsKey(GetUUID()))
220	249	return;
221	250
	251	+ Object3D o = hashtable.get(GetUUID());
	252	+
	253	+ RestoreBigData(o);
	254	+
222	255	if (blockloop)
223	256	return;
224	257
225	258	blockloop = true;
226		-
227		- Object3D o = hashtable.get(GetUUID());
228		-
229		- RestoreBigData(o);
230	259
231	260	//hashtable.remove(GetUUID());
232	261
..	..	@@ -241,8 +270,17 @@
241	270	void RestoreBigData(Object3D o)
242	271	{
243	272	this.bRep = o.bRep;
244		- if (this.bRep != null)
245		- this.bRep.support = o.transientrep;
	273	+ if (this.support != null && o.transientrep != null)
	274	+ {
	275	+ this.support.bRep = o.transientrep;
	276	+ }
	277	+
	278	+ this.selection = o.selection;
	279	+
	280	+ this.versions = o.versions;
	281	+ this.versionindex = o.versionindex;
	282	+// July 2019 if (this.bRep != null)
	283	+// this.bRep.support = o.transientrep;
246	284	// this.support = o.support;
247	285	// this.fileparent = o.fileparent;
248	286	}
..	..	@@ -388,6 +426,7 @@
388	426	}
389	427
390	428	boolean live = false;
	429	+ transient boolean keepdontselect;
391	430	boolean dontselect = false;
392	431	boolean hide = false;
393	432	boolean link2master = false; // performs reset support/master at each frame
..	..	@@ -1374,6 +1413,7 @@
1374	1413	toParent = LA.newMatrix();
1375	1414	fromParent = LA.newMatrix();
1376	1415	}
	1416	+
1377	1417	LA.matCopy(other.toParent, toParent);
1378	1418	LA.matCopy(other.fromParent, fromParent);
1379	1419
..	..	@@ -2527,7 +2567,8 @@
2527	2567	private static final int editSelf = 1;
2528	2568	private static final int editChild = 2;
2529	2569
2530		- void drawEditHandles(ClickInfo info, int level)
	2570	+ void drawEditHandles(//ClickInfo info,
	2571	+ int level)
2531	2572	{
2532	2573	if (level == 0)
2533	2574	{
..	..	@@ -2535,7 +2576,8 @@
2535	2576	return;
2536	2577
2537	2578	Object3D selectee;
2538		- for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(info, level + 1))
	2579	+ for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(//info,
	2580	+ level + 1))
2539	2581	{
2540	2582	selectee = (Object3D) e.nextElement();
2541	2583	}
..	..	@@ -2543,19 +2585,22 @@
2543	2585	} else
2544	2586	{
2545	2587	//super.
2546		- drawEditHandles0(info, level + 1);
	2588	+ drawEditHandles0(//info,
	2589	+ level + 1);
2547	2590	}
2548	2591	}
2549	2592
2550		- boolean doEditClick(ClickInfo info, int level)
	2593	+ boolean doEditClick(//ClickInfo info,
	2594	+ int level)
2551	2595	{
2552	2596	doSomething = 0;
2553	2597	if (level == 0)
2554	2598	{
2555		- return doParentClick(info);
	2599	+ return doParentClick(); //info);
2556	2600	}
2557	2601	if (//super.
2558		- doEditClick0(info, level))
	2602	+ doEditClick0(//info,
	2603	+ level))
2559	2604	{
2560	2605	doSomething = 1;
2561	2606	return true;
..	..	@@ -2565,7 +2610,7 @@
2565	2610	}
2566	2611	}
2567	2612
2568		- boolean doParentClick(ClickInfo info)
	2613	+ boolean doParentClick() //ClickInfo info)
2569	2614	{
2570	2615	if (selection == null)
2571	2616	{
..	..	@@ -2578,7 +2623,8 @@
2578	2623	for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
2579	2624	{
2580	2625	Object3D selectee = (Object3D) e.nextElement();
2581		- if (selectee.doEditClick(info, 1))
	2626	+ if (selectee.doEditClick(//info,
	2627	+ 1))
2582	2628	{
2583	2629	childToDrag = selectee;
2584	2630	doSomething = 2;
..	..	@@ -2590,13 +2636,15 @@
2590	2636	return retval;
2591	2637	}
2592	2638
2593		- void doEditDrag(ClickInfo info, boolean opposite)
	2639	+ void doEditDrag(//ClickInfo clickInfo,
	2640	+ boolean opposite)
2594	2641	{
2595	2642	switch (doSomething)
2596	2643	{
2597	2644	case 1: // '\001'
2598	2645	//super.
2599		- doEditDrag0(info, opposite);
	2646	+ doEditDrag0(//clickInfo,
	2647	+ opposite);
2600	2648	break;
2601	2649
2602	2650	case 2: // '\002'
..	..	@@ -2609,11 +2657,13 @@
2609	2657	{
2610	2658	//sel.hitSomething = childToDrag.hitSomething;
2611	2659	//childToDrag.doEditDrag(info);
2612		- sel.doEditDrag(info, opposite);
	2660	+ sel.doEditDrag(//clickInfo,
	2661	+ opposite);
2613	2662	} else
2614	2663	{
2615	2664	//super.
2616		- doEditDrag0(info, opposite);
	2665	+ doEditDrag0(//clickInfo,
	2666	+ opposite);
2617	2667	}
2618	2668	}
2619	2669	break;
..	..	@@ -2631,6 +2681,9 @@
2631	2681	{
2632	2682	deselectAll();
2633	2683	}
	2684	+
	2685	+ new Exception().printStackTrace();
	2686	+
2634	2687	ClickInfo newInfo = new ClickInfo();
2635	2688	newInfo.flags = info.flags;
2636	2689	newInfo.bounds = info.bounds;
..	..	@@ -3078,7 +3131,7 @@
3078	3131	{
3079	3132	if (bRep != null)
3080	3133	{
3081		- bRep.GenerateNormalsMINE();
	3134	+ bRep.MergeNormals(); //.GenerateNormalsMINE();
3082	3135	Touch();
3083	3136	}
3084	3137	}
..	..	@@ -5043,6 +5096,7 @@
5043	5096
5044	5097	if (child == null)
5045	5098	continue;
	5099	+
5046	5100	if (child.HasTransparency() && child.size() != 0)
5047	5101	{
5048	5102	cTreePath leaf = child.Select(indexcount, deselect);
..	..	@@ -5380,6 +5434,51 @@
5380	5434	blockloop = false;
5381	5435	}
5382	5436
	5437	+ void ResetSelectable()
	5438	+ {
	5439	+ if (blockloop)
	5440	+ return;
	5441	+
	5442	+ blockloop = true;
	5443	+
	5444	+ keepdontselect = dontselect;
	5445	+ dontselect = true;
	5446	+
	5447	+ Object3D child;
	5448	+ int nb = Size();
	5449	+ for (int i = 0; i < nb; i++)
	5450	+ {
	5451	+ child = (Object3D) get(i);
	5452	+ if (child == null)
	5453	+ continue;
	5454	+ child.ResetSelectable();
	5455	+ }
	5456	+
	5457	+ blockloop = false;
	5458	+ }
	5459	+
	5460	+ void RestoreSelectable()
	5461	+ {
	5462	+ if (blockloop)
	5463	+ return;
	5464	+
	5465	+ blockloop = true;
	5466	+
	5467	+ dontselect = keepdontselect;
	5468	+
	5469	+ Object3D child;
	5470	+ int nb = Size();
	5471	+ for (int i = 0; i < nb; i++)
	5472	+ {
	5473	+ child = (Object3D) get(i);
	5474	+ if (child == null)
	5475	+ continue;
	5476	+ child.RestoreSelectable();
	5477	+ }
	5478	+
	5479	+ blockloop = false;
	5480	+ }
	5481	+
5383	5482	boolean IsSelected()
5384	5483	{
5385	5484	if (parent == null)
..	..	@@ -5689,6 +5788,38 @@
5689	5788	}
5690	5789	}
5691	5790
	5791	+ void EmbedTextures(boolean embed)
	5792	+ {
	5793	+ if (blockloop)
	5794	+ return;
	5795	+
	5796	+ //if (GetTextures() != null)
	5797	+ if (embed)
	5798	+ CameraPane.EmbedTextures(GetTextures());
	5799	+ else
	5800	+ {
	5801	+ GetTextures().pigmentdata = null;
	5802	+ GetTextures().bumpdata = null;
	5803	+ GetTextures().pw = 0;
	5804	+ GetTextures().ph = 0;
	5805	+ GetTextures().bw = 0;
	5806	+ GetTextures().bh = 0;
	5807	+ }
	5808	+
	5809	+ int nb = Size();
	5810	+ for (int i = 0; i < nb; i++)
	5811	+ {
	5812	+ Object3D child = (Object3D) get(i);
	5813	+
	5814	+ if (child == null)
	5815	+ continue;
	5816	+
	5817	+ blockloop = true;
	5818	+ child.EmbedTextures(embed);
	5819	+ blockloop = false;
	5820	+ }
	5821	+ }
	5822	+
5692	5823	void draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5693	5824	{
5694	5825	Draw(display, root, selected, blocked);
..	..	@@ -5776,7 +5907,7 @@
5776	5907	support = support;
5777	5908
5778	5909	//boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5779		- boolean usecalllists = !IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5910	+ boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5780	5911
5781	5912	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5782	5913	{
..	..	@@ -5797,7 +5928,7 @@
5797	5928
5798	5929	if (!selectmode && //display.DrawMode() != display.SELECTION &&
5799	5930	//(touched \|\| (bRep != null && bRep.displaylist <= 0)))
5800		- (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && (bRep != null && bRep.displaylist <= 0)))
	5931	+ (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && Globals.COMPUTESHADOWWHENLIVE)) // \|\| (bRep != null && bRep.displaylist <= 0)))
5801	5932	{
5802	5933	Globals.lighttouched = true;
5803	5934	} // all panes...
..	..	@@ -5929,6 +6060,7 @@
5929	6060	if (GetBRep() != null)
5930	6061	{
5931	6062	display.NextIndex();
	6063	+
5932	6064	// vertex color conflict : gl.glCallList(list);
5933	6065	DrawNode(display, root, selected);
5934	6066	if (this instanceof BezierPatch)
..	..	@@ -7179,20 +7311,23 @@
7179	7311	}
7180	7312	}
7181	7313
7182		- protected void calcHotSpot(cVector in, ClickInfo info, Point outPt, Rectangle outRec)
	7314	+ static ClickInfo clickInfo = new ClickInfo();
	7315	+
	7316	+ protected void calcHotSpot(cVector in, //ClickInfo clickInfo,
	7317	+ Point outPt, Rectangle outRec)
7183	7318	{
7184		- int hc = info.bounds.x + info.bounds.width / 2;
7185		- int vc = info.bounds.y + info.bounds.height / 2;
7186		- double[][] toscreen = info.toScreen;
	7319	+ int hc = clickInfo.bounds.x + clickInfo.bounds.width / 2;
	7320	+ int vc = clickInfo.bounds.y + clickInfo.bounds.height / 2;
	7321	+ double[][] toscreen = clickInfo.toScreen;
7187	7322	if (toscreen == null)
7188	7323	{
7189		- toscreen = new Camera(info.camera.viewCode).toScreen;
	7324	+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
7190	7325	}
7191	7326	cVector vec = in;
7192	7327	LA.xformPos(in, toscreen, in);
7193	7328	//System.out.println("Distance = " + info.camera.Distance());
7194		- vec.x = 100 info.camera.SCALE / info.camera.Distance();
7195		- vec.y = 100 info.camera.SCALE / info.camera.Distance();
	7329	+ vec.x = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
	7330	+ vec.y = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
7196	7331	outPt.x = hc + (int) vec.x;
7197	7332	outPt.y = vc - (int) vec.y;
7198	7333	outRec.x = outPt.x - 3;
..	..	@@ -7200,15 +7335,18 @@
7200	7335	outRec.width = outRec.height = 6;
7201	7336	}
7202	7337
7203		- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
	7338	+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
	7339	+ )
7204	7340	{
7205	7341	Point pt = new Point(0, 0);
7206	7342	Rectangle rec = new Rectangle();
7207		- calcHotSpot(in, info, pt, rec);
	7343	+ calcHotSpot(in, //clickInfo,
	7344	+ pt, rec);
7208	7345	return rec;
7209	7346	}
7210	7347
7211		- void drawEditHandles0(ClickInfo info, int level)
	7348	+ void drawEditHandles0(//ClickInfo clickInfo,
	7349	+ int level)
7212	7350	{
7213	7351	if (level == 0)
7214	7352	{
..	..	@@ -7217,16 +7355,19 @@
7217	7355	{
7218	7356	cVector origin = new cVector();
7219	7357	//LA.xformPos(origin, toParent, origin);
7220		- Rectangle spot = calcHotSpot(origin, info);
	7358	+ if (this.clickInfo == null)
	7359	+ this.clickInfo = new ClickInfo();
	7360	+
	7361	+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
7221	7362	Rectangle boundary = new Rectangle();
7222	7363	boundary.x = spot.x - 30;
7223	7364	boundary.y = spot.y - 30;
7224	7365	boundary.width = spot.width + 60;
7225	7366	boundary.height = spot.height + 60;
7226		- info.g.setColor(Color.red);
	7367	+ clickInfo.g.setColor(Color.red);
7227	7368	int spotw = spot.x + spot.width;
7228	7369	int spoth = spot.y + spot.height;
7229		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7370	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7230	7371	// if (CameraPane.Xmin > spot.x)
7231	7372	// {
7232	7373	// CameraPane.Xmin = spot.x;
..	..	@@ -7246,8 +7387,8 @@
7246	7387	spot.translate(32, 32);
7247	7388	spotw = spot.x + spot.width;
7248	7389	spoth = spot.y + spot.height;
7249		- info.g.setColor(Color.cyan);
7250		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7390	+ clickInfo.g.setColor(Color.cyan);
	7391	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7251	7392	// if (CameraPane.Xmin > spot.x)
7252	7393	// {
7253	7394	// CameraPane.Xmin = spot.x;
..	..	@@ -7267,9 +7408,9 @@
7267	7408	// bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
7268	7409	//info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
7269	7410	spot.translate(0, -32);
7270		- info.g.setColor(Color.yellow);
7271		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7272		- info.g.setColor(Color.green);
	7411	+ clickInfo.g.setColor(Color.yellow);
	7412	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7413	+ clickInfo.g.setColor(Color.green);
7273	7414	// if (CameraPane.Xmin > spot.x)
7274	7415	// {
7275	7416	// CameraPane.Xmin = spot.x;
..	..	@@ -7286,8 +7427,8 @@
7286	7427	// {
7287	7428	// CameraPane.Ymax = spoth;
7288	7429	// }
7289		- info.g.drawArc(boundary.x, boundary.y,
7290		- boundary.width, boundary.height, 0, 360);
	7430	+ clickInfo.g.drawArc(boundary.x + clickInfo.DX, boundary.y + clickInfo.DY,
	7431	+ (int)(boundary.width * clickInfo.W), (int)(boundary.height * clickInfo.W), 0, 360);
7291	7432	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7292	7433	// if (CameraPane.Xmin > boundary.x)
7293	7434	// {
..	..	@@ -7309,7 +7450,8 @@
7309	7450	}
7310	7451	}
7311	7452
7312		- boolean doEditClick0(ClickInfo info, int level)
	7453	+ boolean doEditClick0(//ClickInfo clickInfo,
	7454	+ int level)
7313	7455	{
7314	7456	if (level == 0)
7315	7457	{
..	..	@@ -7318,8 +7460,8 @@
7318	7460
7319	7461	boolean retval = false;
7320	7462
7321		- startX = info.x;
7322		- startY = info.y;
	7463	+ startX = clickInfo.x;
	7464	+ startY = clickInfo.y;
7323	7465
7324	7466	hitSomething = -1;
7325	7467	cVector origin = new cVector();
..	..	@@ -7329,22 +7471,51 @@
7329	7471	{
7330	7472	centerPt = new Point(0, 0);
7331	7473	}
7332		- calcHotSpot(origin, info, centerPt, spot);
7333		- if (spot.contains(info.x, info.y))
	7474	+ calcHotSpot(origin, //info,
	7475	+ centerPt, spot);
	7476	+ if (spot.contains(clickInfo.x, clickInfo.y))
7334	7477	{
7335	7478	hitSomething = hitCenter;
7336	7479	retval = true;
7337	7480	}
7338	7481	spot.translate(32, 0);
7339		- if (spot.contains(info.x, info.y))
	7482	+ if (spot.contains(clickInfo.x, clickInfo.y))
7340	7483	{
7341	7484	hitSomething = hitRotate;
7342	7485	retval = true;
7343	7486	}
7344	7487	spot.translate(0, 32);
7345		- if (spot.contains(info.x, info.y))
	7488	+ if (spot.contains(clickInfo.x, clickInfo.y))
7346	7489	{
7347	7490	hitSomething = hitScale;
	7491	+
	7492	+ double scale = 0.005f * clickInfo.camera.Distance();
	7493	+ double hScale = (double) (clickInfo.x /- centerPt.x/) / 32;
	7494	+ double sign = 1;
	7495	+ if (hScale < 0)
	7496	+ {
	7497	+ sign = -1;
	7498	+ }
	7499	+ hScale = signMath.pow(signhScale, scale * 50);
	7500	+ if (hScale < 0.01)
	7501	+ {
	7502	+ //hScale = 0.01;
	7503	+ }
	7504	+
	7505	+ double vScale = (double) (clickInfo.y /- centerPt.y/) / 32;
	7506	+ sign = 1;
	7507	+ if (vScale < 0)
	7508	+ {
	7509	+ sign = -1;
	7510	+ }
	7511	+ vScale = signMath.pow(signvScale, scale * 50);
	7512	+ if (vScale < 0.01)
	7513	+ {
	7514	+ //vScale = 0.01;
	7515	+ }
	7516	+
	7517	+ clickInfo.scale = Math.sqrt(hScalehScale + vScalevScale);
	7518	+
7348	7519	retval = true;
7349	7520	}
7350	7521
..	..	@@ -7354,7 +7525,7 @@
7354	7525	}
7355	7526
7356	7527	//System.out.println("info.modifiers = " + info.modifiers);
7357		- modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
	7528	+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
7358	7529	//System.out.println("modified = " + modified);
7359	7530	//new Exception().printStackTrace();
7360	7531	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7382,7 +7553,8 @@
7382	7553	return true;
7383	7554	}
7384	7555
7385		- void doEditDrag0(ClickInfo info, boolean opposite)
	7556	+ void doEditDrag0(//ClickInfo info,
	7557	+ boolean opposite)
7386	7558	{
7387	7559	if (hitSomething == 0)
7388	7560	{
..	..	@@ -7396,7 +7568,7 @@
7396	7568
7397	7569	//System.out.println("hitSomething = " + hitSomething);
7398	7570
7399		- double scale = 0.005f * info.camera.Distance();
	7571	+ double scale = 0.005f * clickInfo.camera.Distance();
7400	7572
7401	7573	cVector xlate = new cVector();
7402	7574	//cVector xlate2 = new cVector();
..	..	@@ -7430,8 +7602,8 @@
7430	7602	toParent[3][i] = xlate.get(i);
7431	7603	LA.matInvert(toParent, fromParent);
7432	7604	*/
7433		- cVector delta = LA.newVector(0, 0, startY - info.y);
7434		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7605	+ cVector delta = LA.newVector(0, 0, startY - clickInfo.y);
	7606	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7435	7607
7436	7608	LA.matCopy(startMat, toParent);
7437	7609	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7440,7 +7612,7 @@
7440	7612	} else
7441	7613	{
7442	7614	//LA.xformDir(delta, info.camera.fromScreen, delta);
7443		- cVector up = new cVector(info.camera.up);
	7615	+ cVector up = new cVector(clickInfo.camera.up);
7444	7616	cVector away = new cVector();
7445	7617	//cVector right2 = new cVector();
7446	7618	//LA.vecCross(up, cVector.Z, right);
..	..	@@ -7457,19 +7629,19 @@
7457	7629	LA.xformDir(up, ClickInfo.matbuffer, up);
7458	7630	// if (!CameraPane.LOCALTRANSFORM)
7459	7631	LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7460		- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
	7632	+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
7461	7633	// if (!CameraPane.LOCALTRANSFORM)
7462	7634	LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7463	7635	//LA.vecCross(up, cVector.Z, right2);
7464	7636
7465		- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
	7637	+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
7466	7638
7467	7639	//System.out.println("DELTA0 = " + delta);
7468	7640	//System.out.println("AWAY = " + info.camera.away);
7469	7641	//System.out.println("UP = " + info.camera.up);
7470	7642	if (away.z > 0)
7471	7643	{
7472		- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
	7644	+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7473	7645	{
7474	7646	delta.x = -delta.x;
7475	7647	} else
..	..	@@ -7484,7 +7656,7 @@
7484	7656	//System.out.println("DELTA1 = " + delta);
7485	7657	LA.xformDir(delta, ClickInfo.matbuffer, delta);
7486	7658	//System.out.println("DELTA2 = " + delta);
7487		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7659	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7488	7660	LA.matCopy(startMat, toParent);
7489	7661	//System.out.println("DELTA3 = " + delta);
7490	7662	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7494,8 +7666,8 @@
7494	7666	break;
7495	7667
7496	7668	case hitRotate: // rotate
7497		- int dx = info.x - centerPt.x;
7498		- int dy = -(info.y - centerPt.y);
	7669	+ int dx = clickInfo.x - centerPt.x;
	7670	+ int dy = -(clickInfo.y - centerPt.y);
7499	7671	double angle = (double) Math.atan2(dx, dy);
7500	7672	angle = -(1.570796 - angle);
7501	7673
..	..	@@ -7518,7 +7690,7 @@
7518	7690	}
7519	7691	/**/
7520	7692
7521		- switch (info.pane.RenderCamera().viewCode)
	7693	+ switch (clickInfo.pane.RenderCamera().viewCode)
7522	7694	{
7523	7695	case 1: // '\001'
7524	7696	LA.matZRotate(toParent, angle);
..	..	@@ -7545,7 +7717,7 @@
7545	7717	break;
7546	7718
7547	7719	case hitScale: // scale
7548		- double hScale = (double) (info.x - centerPt.x) / 32;
	7720	+ double hScale = (double) (clickInfo.x /- centerPt.x/) / 32;
7549	7721	double sign = 1;
7550	7722	if (hScale < 0)
7551	7723	{
..	..	@@ -7557,7 +7729,7 @@
7557	7729	//hScale = 0.01;
7558	7730	}
7559	7731
7560		- double vScale = (double) (info.y - centerPt.y) / 32;
	7732	+ double vScale = (double) (clickInfo.y /- centerPt.y/) / 32;
7561	7733	sign = 1;
7562	7734	if (vScale < 0)
7563	7735	{
..	..	@@ -7568,6 +7740,7 @@
7568	7740	{
7569	7741	//vScale = 0.01;
7570	7742	}
	7743	+
7571	7744	LA.matCopy(startMat, toParent);
7572	7745	/**/
7573	7746	for (int i = 0; i < 3; i++)
..	..	@@ -7577,14 +7750,14 @@
7577	7750	}
7578	7751	/**/
7579	7752
7580		- double totalScale = Math.sqrt(hScalehScale + vScalevScale) / Math.sqrt(2);
	7753	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / clickInfo.scale;
7581	7754
7582	7755	if (totalScale < 0.01)
7583	7756	{
7584	7757	totalScale = 0.01;
7585	7758	}
7586	7759
7587		- switch (info.pane.RenderCamera().viewCode)
	7760	+ switch (clickInfo.pane.RenderCamera().viewCode)
7588	7761	{
7589	7762	case 3: // '\001'
7590	7763	if (modified \|\| opposite)
..	..	@@ -7651,7 +7824,7 @@
7651	7824	} // NEW ...
7652	7825
7653	7826
7654		- info.pane.repaint();
	7827	+ clickInfo.pane.repaint();
7655	7828	}
7656	7829
7657	7830	boolean overflow = false;
..	..	@@ -7994,6 +8167,8 @@
7994	8167	transient ObjEditor editWindow;
7995	8168	transient ObjEditor manipWindow;
7996	8169
	8170	+ transient boolean pinned;
	8171	+
7997	8172	transient ObjectUI objectUI;
7998	8173	public static int povDepth = 0;
7999	8174	private static cVector tbMin = new cVector();