~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("copy of " + this.name);
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;
..	..	@@ -219,14 +251,14 @@
219	251	if (!hashtable.containsKey(GetUUID()))
220	252	return;
221	253
	254	+ Object3D o = hashtable.get(GetUUID());
	255	+
	256	+ RestoreBigData(o);
	257	+
222	258	if (blockloop)
223	259	return;
224	260
225	261	blockloop = true;
226		-
227		- Object3D o = hashtable.get(GetUUID());
228		-
229		- RestoreBigData(o);
230	262
231	263	//hashtable.remove(GetUUID());
232	264
..	..	@@ -241,8 +273,17 @@
241	273	void RestoreBigData(Object3D o)
242	274	{
243	275	this.bRep = o.bRep;
244		- if (this.bRep != null)
245		- 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;
246	287	// this.support = o.support;
247	288	// this.fileparent = o.fileparent;
248	289	}
..	..	@@ -388,6 +429,7 @@
388	429	}
389	430
390	431	boolean live = false;
	432	+ transient boolean keepdontselect;
391	433	boolean dontselect = false;
392	434	boolean hide = false;
393	435	boolean link2master = false; // performs reset support/master at each frame
..	..	@@ -973,6 +1015,9 @@
973	1015	if (material == null \|\| material.multiply)
974	1016	return true;
975	1017
	1018	+ if (projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
	1019	+ return false;
	1020	+
976	1021	// Transparent objects are dynamic because we have to sort the triangles.
977	1022	return material.opacity > 0.99;
978	1023	}
..	..	@@ -1374,6 +1419,7 @@
1374	1419	toParent = LA.newMatrix();
1375	1420	fromParent = LA.newMatrix();
1376	1421	}
	1422	+
1377	1423	LA.matCopy(other.toParent, toParent);
1378	1424	LA.matCopy(other.fromParent, fromParent);
1379	1425
..	..	@@ -2527,7 +2573,8 @@
2527	2573	private static final int editSelf = 1;
2528	2574	private static final int editChild = 2;
2529	2575
2530		- void drawEditHandles(ClickInfo info, int level)
	2576	+ void drawEditHandles(//ClickInfo info,
	2577	+ int level)
2531	2578	{
2532	2579	if (level == 0)
2533	2580	{
..	..	@@ -2535,7 +2582,8 @@
2535	2582	return;
2536	2583
2537	2584	Object3D selectee;
2538		- for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(info, level + 1))
	2585	+ for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(//info,
	2586	+ level + 1))
2539	2587	{
2540	2588	selectee = (Object3D) e.nextElement();
2541	2589	}
..	..	@@ -2543,19 +2591,22 @@
2543	2591	} else
2544	2592	{
2545	2593	//super.
2546		- drawEditHandles0(info, level + 1);
	2594	+ drawEditHandles0(//info,
	2595	+ level + 1);
2547	2596	}
2548	2597	}
2549	2598
2550		- boolean doEditClick(ClickInfo info, int level)
	2599	+ boolean doEditClick(//ClickInfo info,
	2600	+ int level)
2551	2601	{
2552	2602	doSomething = 0;
2553	2603	if (level == 0)
2554	2604	{
2555		- return doParentClick(info);
	2605	+ return doParentClick(); //info);
2556	2606	}
2557	2607	if (//super.
2558		- doEditClick0(info, level))
	2608	+ doEditClick0(//info,
	2609	+ level))
2559	2610	{
2560	2611	doSomething = 1;
2561	2612	return true;
..	..	@@ -2565,7 +2616,7 @@
2565	2616	}
2566	2617	}
2567	2618
2568		- boolean doParentClick(ClickInfo info)
	2619	+ boolean doParentClick() //ClickInfo info)
2569	2620	{
2570	2621	if (selection == null)
2571	2622	{
..	..	@@ -2578,7 +2629,8 @@
2578	2629	for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
2579	2630	{
2580	2631	Object3D selectee = (Object3D) e.nextElement();
2581		- if (selectee.doEditClick(info, 1))
	2632	+ if (selectee.doEditClick(//info,
	2633	+ 1))
2582	2634	{
2583	2635	childToDrag = selectee;
2584	2636	doSomething = 2;
..	..	@@ -2590,13 +2642,15 @@
2590	2642	return retval;
2591	2643	}
2592	2644
2593		- void doEditDrag(ClickInfo info, boolean opposite)
	2645	+ void doEditDrag(//ClickInfo clickInfo,
	2646	+ boolean opposite)
2594	2647	{
2595	2648	switch (doSomething)
2596	2649	{
2597	2650	case 1: // '\001'
2598	2651	//super.
2599		- doEditDrag0(info, opposite);
	2652	+ doEditDrag0(//clickInfo,
	2653	+ opposite);
2600	2654	break;
2601	2655
2602	2656	case 2: // '\002'
..	..	@@ -2609,11 +2663,13 @@
2609	2663	{
2610	2664	//sel.hitSomething = childToDrag.hitSomething;
2611	2665	//childToDrag.doEditDrag(info);
2612		- sel.doEditDrag(info, opposite);
	2666	+ sel.doEditDrag(//clickInfo,
	2667	+ opposite);
2613	2668	} else
2614	2669	{
2615	2670	//super.
2616		- doEditDrag0(info, opposite);
	2671	+ doEditDrag0(//clickInfo,
	2672	+ opposite);
2617	2673	}
2618	2674	}
2619	2675	break;
..	..	@@ -2631,6 +2687,9 @@
2631	2687	{
2632	2688	deselectAll();
2633	2689	}
	2690	+
	2691	+ new Exception().printStackTrace();
	2692	+
2634	2693	ClickInfo newInfo = new ClickInfo();
2635	2694	newInfo.flags = info.flags;
2636	2695	newInfo.bounds = info.bounds;
..	..	@@ -3078,7 +3137,7 @@
3078	3137	{
3079	3138	if (bRep != null)
3080	3139	{
3081		- bRep.GenerateNormalsMINE();
	3140	+ bRep.MergeNormals(); //.GenerateNormalsMINE();
3082	3141	Touch();
3083	3142	}
3084	3143	}
..	..	@@ -5043,6 +5102,7 @@
5043	5102
5044	5103	if (child == null)
5045	5104	continue;
	5105	+
5046	5106	if (child.HasTransparency() && child.size() != 0)
5047	5107	{
5048	5108	cTreePath leaf = child.Select(indexcount, deselect);
..	..	@@ -5380,6 +5440,51 @@
5380	5440	blockloop = false;
5381	5441	}
5382	5442
	5443	+ void ResetSelectable()
	5444	+ {
	5445	+ if (blockloop)
	5446	+ return;
	5447	+
	5448	+ blockloop = true;
	5449	+
	5450	+ keepdontselect = dontselect;
	5451	+ dontselect = true;
	5452	+
	5453	+ Object3D child;
	5454	+ int nb = Size();
	5455	+ for (int i = 0; i < nb; i++)
	5456	+ {
	5457	+ child = (Object3D) get(i);
	5458	+ if (child == null)
	5459	+ continue;
	5460	+ child.ResetSelectable();
	5461	+ }
	5462	+
	5463	+ blockloop = false;
	5464	+ }
	5465	+
	5466	+ void RestoreSelectable()
	5467	+ {
	5468	+ if (blockloop)
	5469	+ return;
	5470	+
	5471	+ blockloop = true;
	5472	+
	5473	+ dontselect = keepdontselect;
	5474	+
	5475	+ Object3D child;
	5476	+ int nb = Size();
	5477	+ for (int i = 0; i < nb; i++)
	5478	+ {
	5479	+ child = (Object3D) get(i);
	5480	+ if (child == null)
	5481	+ continue;
	5482	+ child.RestoreSelectable();
	5483	+ }
	5484	+
	5485	+ blockloop = false;
	5486	+ }
	5487	+
5383	5488	boolean IsSelected()
5384	5489	{
5385	5490	if (parent == null)
..	..	@@ -5689,6 +5794,38 @@
5689	5794	}
5690	5795	}
5691	5796
	5797	+ void EmbedTextures(boolean embed)
	5798	+ {
	5799	+ if (blockloop)
	5800	+ return;
	5801	+
	5802	+ //if (GetTextures() != null)
	5803	+ if (embed)
	5804	+ CameraPane.EmbedTextures(GetTextures());
	5805	+ else
	5806	+ {
	5807	+ GetTextures().pigmentdata = null;
	5808	+ GetTextures().bumpdata = null;
	5809	+ GetTextures().pw = 0;
	5810	+ GetTextures().ph = 0;
	5811	+ GetTextures().bw = 0;
	5812	+ GetTextures().bh = 0;
	5813	+ }
	5814	+
	5815	+ int nb = Size();
	5816	+ for (int i = 0; i < nb; i++)
	5817	+ {
	5818	+ Object3D child = (Object3D) get(i);
	5819	+
	5820	+ if (child == null)
	5821	+ continue;
	5822	+
	5823	+ blockloop = true;
	5824	+ child.EmbedTextures(embed);
	5825	+ blockloop = false;
	5826	+ }
	5827	+ }
	5828	+
5692	5829	void draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5693	5830	{
5694	5831	Draw(display, root, selected, blocked);
..	..	@@ -5775,8 +5912,10 @@
5775	5912	if (support != null)
5776	5913	support = support;
5777	5914
5778		- //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);
	5915	+ boolean usecalllists = !IsLive() && IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5916	+ //boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5917	+
	5918	+ //usecalllists &= display.DrawMode() == display.DEFAULT; // Don't compute list in shadow pass.
5780	5919
5781	5920	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5782	5921	{
..	..	@@ -5786,8 +5925,9 @@
5786	5925	// usecalllists &= !(parent instanceof RandomNode);
5787	5926	// usecalllists = false;
5788	5927
5789		- if (GetBRep() != null)
5790		- usecalllists = usecalllists;
	5928	+ if (display.DrawMode() == display.SHADOW)
	5929	+ //GetBRep() != null)
	5930	+ usecalllists = !!usecalllists;
5791	5931	//System.out.println("draw " + this);
5792	5932	//new Exception().printStackTrace();
5793	5933
..	..	@@ -5797,7 +5937,7 @@
5797	5937
5798	5938	if (!selectmode && //display.DrawMode() != display.SELECTION &&
5799	5939	//(touched \|\| (bRep != null && bRep.displaylist <= 0)))
5800		- (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && (bRep != null && bRep.displaylist <= 0)))
	5940	+ (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && Globals.COMPUTESHADOWWHENLIVE)) // \|\| (bRep != null && bRep.displaylist <= 0)))
5801	5941	{
5802	5942	Globals.lighttouched = true;
5803	5943	} // all panes...
..	..	@@ -5809,7 +5949,7 @@
5809	5949	if (!(this instanceof Composite))
5810	5950	touched = false;
5811	5951	//if (displaylist == -1 && usecalllists)
5812		- if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
	5952	+ if (bRep.displaylist <= 0 && usecalllists) // && display.DrawMode() == display.DEFAULT) // june 2013
5813	5953	{
5814	5954	bRep.displaylist = display.GenList();
5815	5955	assert(bRep.displaylist != 0);
..	..	@@ -5820,7 +5960,7 @@
5820	5960
5821	5961	//System.out.println("\tnew list " + list);
5822	5962	//gl.glDrawBuffer(gl.GL_NONE);
5823		- if (usecalllists)
	5963	+ if (usecalllists && bRep.displaylist > 0)
5824	5964	{
5825	5965	// System.err.println("new list " + bRep.displaylist + " for " + this);
5826	5966	display.NewList(bRep.displaylist);
..	..	@@ -5829,7 +5969,7 @@
5829	5969	CallList(display, root, selected, blocked);
5830	5970
5831	5971	// compiled = true;
5832		- if (usecalllists)
	5972	+ if (usecalllists && bRep.displaylist > 0)
5833	5973	{
5834	5974	// System.err.println("end list " + bRep.displaylist + " for " + this);
5835	5975	display.EndList();
..	..	@@ -5929,6 +6069,7 @@
5929	6069	if (GetBRep() != null)
5930	6070	{
5931	6071	display.NextIndex();
	6072	+
5932	6073	// vertex color conflict : gl.glCallList(list);
5933	6074	DrawNode(display, root, selected);
5934	6075	if (this instanceof BezierPatch)
..	..	@@ -7179,20 +7320,23 @@
7179	7320	}
7180	7321	}
7181	7322
7182		- protected void calcHotSpot(cVector in, ClickInfo info, Point outPt, Rectangle outRec)
	7323	+ static ClickInfo clickInfo = new ClickInfo();
	7324	+
	7325	+ protected void calcHotSpot(cVector in, //ClickInfo clickInfo,
	7326	+ Point outPt, Rectangle outRec)
7183	7327	{
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;
	7328	+ int hc = clickInfo.bounds.x + clickInfo.bounds.width / 2;
	7329	+ int vc = clickInfo.bounds.y + clickInfo.bounds.height / 2;
	7330	+ double[][] toscreen = clickInfo.toScreen;
7187	7331	if (toscreen == null)
7188	7332	{
7189		- toscreen = new Camera(info.camera.viewCode).toScreen;
	7333	+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
7190	7334	}
7191	7335	cVector vec = in;
7192	7336	LA.xformPos(in, toscreen, in);
7193	7337	//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();
	7338	+ vec.x = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
	7339	+ vec.y = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
7196	7340	outPt.x = hc + (int) vec.x;
7197	7341	outPt.y = vc - (int) vec.y;
7198	7342	outRec.x = outPt.x - 3;
..	..	@@ -7200,15 +7344,18 @@
7200	7344	outRec.width = outRec.height = 6;
7201	7345	}
7202	7346
7203		- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
	7347	+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
	7348	+ )
7204	7349	{
7205	7350	Point pt = new Point(0, 0);
7206	7351	Rectangle rec = new Rectangle();
7207		- calcHotSpot(in, info, pt, rec);
	7352	+ calcHotSpot(in, //clickInfo,
	7353	+ pt, rec);
7208	7354	return rec;
7209	7355	}
7210	7356
7211		- void drawEditHandles0(ClickInfo info, int level)
	7357	+ void drawEditHandles0(//ClickInfo clickInfo,
	7358	+ int level)
7212	7359	{
7213	7360	if (level == 0)
7214	7361	{
..	..	@@ -7217,16 +7364,19 @@
7217	7364	{
7218	7365	cVector origin = new cVector();
7219	7366	//LA.xformPos(origin, toParent, origin);
7220		- Rectangle spot = calcHotSpot(origin, info);
	7367	+ if (this.clickInfo == null)
	7368	+ this.clickInfo = new ClickInfo();
	7369	+
	7370	+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
7221	7371	Rectangle boundary = new Rectangle();
7222	7372	boundary.x = spot.x - 30;
7223	7373	boundary.y = spot.y - 30;
7224	7374	boundary.width = spot.width + 60;
7225	7375	boundary.height = spot.height + 60;
7226		- info.g.setColor(Color.red);
	7376	+ clickInfo.g.setColor(Color.red);
7227	7377	int spotw = spot.x + spot.width;
7228	7378	int spoth = spot.y + spot.height;
7229		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7379	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7230	7380	// if (CameraPane.Xmin > spot.x)
7231	7381	// {
7232	7382	// CameraPane.Xmin = spot.x;
..	..	@@ -7246,8 +7396,8 @@
7246	7396	spot.translate(32, 32);
7247	7397	spotw = spot.x + spot.width;
7248	7398	spoth = spot.y + spot.height;
7249		- info.g.setColor(Color.cyan);
7250		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7399	+ clickInfo.g.setColor(Color.cyan);
	7400	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7251	7401	// if (CameraPane.Xmin > spot.x)
7252	7402	// {
7253	7403	// CameraPane.Xmin = spot.x;
..	..	@@ -7267,9 +7417,9 @@
7267	7417	// bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
7268	7418	//info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
7269	7419	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);
	7420	+ clickInfo.g.setColor(Color.yellow);
	7421	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7422	+ clickInfo.g.setColor(Color.green);
7273	7423	// if (CameraPane.Xmin > spot.x)
7274	7424	// {
7275	7425	// CameraPane.Xmin = spot.x;
..	..	@@ -7286,8 +7436,8 @@
7286	7436	// {
7287	7437	// CameraPane.Ymax = spoth;
7288	7438	// }
7289		- info.g.drawArc(boundary.x, boundary.y,
7290		- boundary.width, boundary.height, 0, 360);
	7439	+ clickInfo.g.drawArc(boundary.x + clickInfo.DX, boundary.y + clickInfo.DY,
	7440	+ (int)(boundary.width * clickInfo.W), (int)(boundary.height * clickInfo.W), 0, 360);
7291	7441	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7292	7442	// if (CameraPane.Xmin > boundary.x)
7293	7443	// {
..	..	@@ -7309,7 +7459,8 @@
7309	7459	}
7310	7460	}
7311	7461
7312		- boolean doEditClick0(ClickInfo info, int level)
	7462	+ boolean doEditClick0(//ClickInfo clickInfo,
	7463	+ int level)
7313	7464	{
7314	7465	if (level == 0)
7315	7466	{
..	..	@@ -7318,8 +7469,8 @@
7318	7469
7319	7470	boolean retval = false;
7320	7471
7321		- startX = info.x;
7322		- startY = info.y;
	7472	+ startX = clickInfo.x;
	7473	+ startY = clickInfo.y;
7323	7474
7324	7475	hitSomething = -1;
7325	7476	cVector origin = new cVector();
..	..	@@ -7329,22 +7480,51 @@
7329	7480	{
7330	7481	centerPt = new Point(0, 0);
7331	7482	}
7332		- calcHotSpot(origin, info, centerPt, spot);
7333		- if (spot.contains(info.x, info.y))
	7483	+ calcHotSpot(origin, //info,
	7484	+ centerPt, spot);
	7485	+ if (spot.contains(clickInfo.x, clickInfo.y))
7334	7486	{
7335	7487	hitSomething = hitCenter;
7336	7488	retval = true;
7337	7489	}
7338	7490	spot.translate(32, 0);
7339		- if (spot.contains(info.x, info.y))
	7491	+ if (spot.contains(clickInfo.x, clickInfo.y))
7340	7492	{
7341	7493	hitSomething = hitRotate;
7342	7494	retval = true;
7343	7495	}
7344	7496	spot.translate(0, 32);
7345		- if (spot.contains(info.x, info.y))
	7497	+ if (spot.contains(clickInfo.x, clickInfo.y))
7346	7498	{
7347	7499	hitSomething = hitScale;
	7500	+
	7501	+ double scale = 0.005f * clickInfo.camera.Distance();
	7502	+ double hScale = (double) (clickInfo.x - centerPt.x) / 32;
	7503	+ double sign = 1;
	7504	+ if (hScale < 0)
	7505	+ {
	7506	+ sign = -1;
	7507	+ }
	7508	+ hScale = signMath.pow(signhScale, scale * 50);
	7509	+ if (hScale < 0.01)
	7510	+ {
	7511	+ //hScale = 0.01;
	7512	+ }
	7513	+
	7514	+ double vScale = (double) (clickInfo.y - centerPt.y) / 32;
	7515	+ sign = 1;
	7516	+ if (vScale < 0)
	7517	+ {
	7518	+ sign = -1;
	7519	+ }
	7520	+ vScale = signMath.pow(signvScale, scale * 50);
	7521	+ if (vScale < 0.01)
	7522	+ {
	7523	+ //vScale = 0.01;
	7524	+ }
	7525	+
	7526	+ clickInfo.scale = Math.sqrt(hScalehScale + vScalevScale);
	7527	+
7348	7528	retval = true;
7349	7529	}
7350	7530
..	..	@@ -7354,7 +7534,7 @@
7354	7534	}
7355	7535
7356	7536	//System.out.println("info.modifiers = " + info.modifiers);
7357		- modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
	7537	+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
7358	7538	//System.out.println("modified = " + modified);
7359	7539	//new Exception().printStackTrace();
7360	7540	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7382,7 +7562,8 @@
7382	7562	return true;
7383	7563	}
7384	7564
7385		- void doEditDrag0(ClickInfo info, boolean opposite)
	7565	+ void doEditDrag0(//ClickInfo info,
	7566	+ boolean opposite)
7386	7567	{
7387	7568	if (hitSomething == 0)
7388	7569	{
..	..	@@ -7396,7 +7577,7 @@
7396	7577
7397	7578	//System.out.println("hitSomething = " + hitSomething);
7398	7579
7399		- double scale = 0.005f * info.camera.Distance();
	7580	+ double scale = 0.005f * clickInfo.camera.Distance();
7400	7581
7401	7582	cVector xlate = new cVector();
7402	7583	//cVector xlate2 = new cVector();
..	..	@@ -7430,8 +7611,8 @@
7430	7611	toParent[3][i] = xlate.get(i);
7431	7612	LA.matInvert(toParent, fromParent);
7432	7613	*/
7433		- cVector delta = LA.newVector(0, 0, startY - info.y);
7434		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7614	+ cVector delta = LA.newVector(0, 0, startY - clickInfo.y);
	7615	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7435	7616
7436	7617	LA.matCopy(startMat, toParent);
7437	7618	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7440,7 +7621,7 @@
7440	7621	} else
7441	7622	{
7442	7623	//LA.xformDir(delta, info.camera.fromScreen, delta);
7443		- cVector up = new cVector(info.camera.up);
	7624	+ cVector up = new cVector(clickInfo.camera.up);
7444	7625	cVector away = new cVector();
7445	7626	//cVector right2 = new cVector();
7446	7627	//LA.vecCross(up, cVector.Z, right);
..	..	@@ -7457,19 +7638,19 @@
7457	7638	LA.xformDir(up, ClickInfo.matbuffer, up);
7458	7639	// if (!CameraPane.LOCALTRANSFORM)
7459	7640	LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7460		- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
	7641	+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
7461	7642	// if (!CameraPane.LOCALTRANSFORM)
7462	7643	LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7463	7644	//LA.vecCross(up, cVector.Z, right2);
7464	7645
7465		- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
	7646	+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
7466	7647
7467	7648	//System.out.println("DELTA0 = " + delta);
7468	7649	//System.out.println("AWAY = " + info.camera.away);
7469	7650	//System.out.println("UP = " + info.camera.up);
7470	7651	if (away.z > 0)
7471	7652	{
7472		- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
	7653	+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7473	7654	{
7474	7655	delta.x = -delta.x;
7475	7656	} else
..	..	@@ -7484,7 +7665,7 @@
7484	7665	//System.out.println("DELTA1 = " + delta);
7485	7666	LA.xformDir(delta, ClickInfo.matbuffer, delta);
7486	7667	//System.out.println("DELTA2 = " + delta);
7487		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7668	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7488	7669	LA.matCopy(startMat, toParent);
7489	7670	//System.out.println("DELTA3 = " + delta);
7490	7671	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7494,8 +7675,8 @@
7494	7675	break;
7495	7676
7496	7677	case hitRotate: // rotate
7497		- int dx = info.x - centerPt.x;
7498		- int dy = -(info.y - centerPt.y);
	7678	+ int dx = clickInfo.x - centerPt.x;
	7679	+ int dy = -(clickInfo.y - centerPt.y);
7499	7680	double angle = (double) Math.atan2(dx, dy);
7500	7681	angle = -(1.570796 - angle);
7501	7682
..	..	@@ -7518,7 +7699,7 @@
7518	7699	}
7519	7700	/**/
7520	7701
7521		- switch (info.pane.RenderCamera().viewCode)
	7702	+ switch (clickInfo.pane.RenderCamera().viewCode)
7522	7703	{
7523	7704	case 1: // '\001'
7524	7705	LA.matZRotate(toParent, angle);
..	..	@@ -7545,7 +7726,7 @@
7545	7726	break;
7546	7727
7547	7728	case hitScale: // scale
7548		- double hScale = (double) (info.x - centerPt.x) / 32;
	7729	+ double hScale = (double) (clickInfo.x - centerPt.x) / 32;
7549	7730	double sign = 1;
7550	7731	if (hScale < 0)
7551	7732	{
..	..	@@ -7557,7 +7738,7 @@
7557	7738	//hScale = 0.01;
7558	7739	}
7559	7740
7560		- double vScale = (double) (info.y - centerPt.y) / 32;
	7741	+ double vScale = (double) (clickInfo.y - centerPt.y) / 32;
7561	7742	sign = 1;
7562	7743	if (vScale < 0)
7563	7744	{
..	..	@@ -7568,6 +7749,7 @@
7568	7749	{
7569	7750	//vScale = 0.01;
7570	7751	}
	7752	+
7571	7753	LA.matCopy(startMat, toParent);
7572	7754	/**/
7573	7755	for (int i = 0; i < 3; i++)
..	..	@@ -7577,14 +7759,14 @@
7577	7759	}
7578	7760	/**/
7579	7761
7580		- double totalScale = Math.sqrt(hScalehScale + vScalevScale) / Math.sqrt(2);
	7762	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / clickInfo.scale;
7581	7763
7582	7764	if (totalScale < 0.01)
7583	7765	{
7584	7766	totalScale = 0.01;
7585	7767	}
7586	7768
7587		- switch (info.pane.RenderCamera().viewCode)
	7769	+ switch (clickInfo.pane.RenderCamera().viewCode)
7588	7770	{
7589	7771	case 3: // '\001'
7590	7772	if (modified \|\| opposite)
..	..	@@ -7651,7 +7833,7 @@
7651	7833	} // NEW ...
7652	7834
7653	7835
7654		- info.pane.repaint();
	7836	+ clickInfo.pane.repaint();
7655	7837	}
7656	7838
7657	7839	boolean overflow = false;
..	..	@@ -7994,6 +8176,8 @@
7994	8176	transient ObjEditor editWindow;
7995	8177	transient ObjEditor manipWindow;
7996	8178
	8179	+ transient boolean pinned;
	8180	+
7997	8181	transient ObjectUI objectUI;
7998	8182	public static int povDepth = 0;
7999	8183	private static cVector tbMin = new cVector();