~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -22,13 +22,20 @@
22	22	//static final long serialVersionUID = -607422624994562685L;
23	23	static final long serialVersionUID = 5022536242724664900L;
24	24
	25	+ // Use GetUUID for backward compatibility with null.
25	26	private UUID uuid = UUID.randomUUID();
26	27
27		- // TEMPORARY for mocap undo
28		- mocap.reader.BVHReader.BVHResult bvh;
29		- Object3D skeleton;
	28	+ // TEMPORARY for mocap undo. No need to be transient.
	29	+ mocap.reader.BVHReader.BVHResult savebvh;
	30	+ Object3D saveskeleton;
30	31	//
31	32
	33	+ String skyboxname;
	34	+ String skyboxext;
	35	+
	36	+ Object3D versionlist[];
	37	+ int versionindex = -1;
	38	+
32	39	ScriptNode scriptnode;
33	40
34	41	void InitOthers()
..	..	@@ -170,24 +177,35 @@
170	177
171	178	void ExtractBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
172	179	{
	180	+ Object3D o;
	181	+
173	182	if (hashtable.containsKey(GetUUID()))
174	183	{
175		- Object3D o = hashtable.get(GetUUID());
	184	+ o = hashtable.get(GetUUID());
176	185
177	186	Grafreed.Assert(this.bRep == o.bRep);
178		- if (this.bRep != null)
179		- assert(this.bRep.support == o.transientrep);
	187	+ //if (this.bRep != null)
	188	+ // assert(this.bRep.support == o.transientrep);
	189	+ if (this.support != null)
	190	+ assert(this.support.bRep == o.transientrep);
	191	+ }
	192	+ else
	193	+ {
	194	+ o = new Object3D("copy of " + this.name);
180	195
181		- return;
	196	+ hashtable.put(GetUUID(), o);
182	197	}
183	198
184		- Object3D o = new Object3D("copy of " + this.name);
185		-
186		- hashtable.put(GetUUID(), o);
187		-
188		- for (int i=0; i<Size(); i++)
	199	+ if (!blockloop)
189	200	{
190		- get(i).ExtractBigData(hashtable);
	201	+ blockloop = true;
	202	+
	203	+ for (int i=0; i<Size(); i++)
	204	+ {
	205	+ get(i).ExtractBigData(hashtable);
	206	+ }
	207	+
	208	+ blockloop = false;
191	209	}
192	210
193	211	ExtractBigData(o);
..	..	@@ -195,11 +213,26 @@
195	213
196	214	void ExtractBigData(Object3D o)
197	215	{
	216	+ if (o.bRep != null)
	217	+ Grafreed.Assert(o.bRep == this.bRep);
	218	+
198	219	o.bRep = this.bRep;
199		- if (this.bRep != null)
	220	+// July 2019 if (this.bRep != null)
	221	+// {
	222	+// o.transientrep = this.bRep.support;
	223	+// o.bRep.support = null;
	224	+// }
	225	+ o.selection = this.selection;
	226	+ o.versionlist = this.versionlist;
	227	+ o.versionindex = this.versionindex;
	228	+
	229	+ if (this.support != null)
200	230	{
201		- o.transientrep = this.bRep.support;
202		- o.bRep.support = null;
	231	+ if (o.transientrep != null)
	232	+ Grafreed.Assert(o.transientrep == this.support.bRep);
	233	+
	234	+ o.transientrep = this.support.bRep;
	235	+ this.support.bRep = null;
203	236	}
204	237
205	238	// o.support = this.support;
..	..	@@ -214,19 +247,42 @@
214	247	// this.fileparent = null;
215	248	}
216	249
	250	+// Object3D GetObject(java.util.UUID uuid)
	251	+// {
	252	+// if (this.uuid.equals(uuid))
	253	+// return this;
	254	+//
	255	+// if (blockloop)
	256	+// return null;
	257	+//
	258	+// blockloop = true;
	259	+//
	260	+// for (int i=0; i<Size(); i++)
	261	+// {
	262	+// Object3D o = get(i).GetObject(uuid);
	263	+//
	264	+// if (o != null)
	265	+// return o;
	266	+// }
	267	+//
	268	+// blockloop = false;
	269	+//
	270	+// return null;
	271	+// }
	272	+
217	273	void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
218	274	{
219	275	if (!hashtable.containsKey(GetUUID()))
220	276	return;
221	277
	278	+ Object3D o = hashtable.get(GetUUID());
	279	+
	280	+ RestoreBigData(o);
	281	+
222	282	if (blockloop)
223	283	return;
224	284
225	285	blockloop = true;
226		-
227		- Object3D o = hashtable.get(GetUUID());
228		-
229		- RestoreBigData(o);
230	286
231	287	//hashtable.remove(GetUUID());
232	288
..	..	@@ -241,8 +297,17 @@
241	297	void RestoreBigData(Object3D o)
242	298	{
243	299	this.bRep = o.bRep;
244		- if (this.bRep != null)
245		- this.bRep.support = o.transientrep;
	300	+ if (this.support != null && o.transientrep != null)
	301	+ {
	302	+ this.support.bRep = o.transientrep;
	303	+ }
	304	+
	305	+ this.selection = o.selection;
	306	+
	307	+ this.versionlist = o.versionlist;
	308	+ this.versionindex = o.versionindex;
	309	+// July 2019 if (this.bRep != null)
	310	+// this.bRep.support = o.transientrep;
246	311	// this.support = o.support;
247	312	// this.fileparent = o.fileparent;
248	313	}
..	..	@@ -388,6 +453,7 @@
388	453	}
389	454
390	455	boolean live = false;
	456	+ transient boolean keepdontselect;
391	457	boolean dontselect = false;
392	458	boolean hide = false;
393	459	boolean link2master = false; // performs reset support/master at each frame
..	..	@@ -973,6 +1039,9 @@
973	1039	if (material == null \|\| material.multiply)
974	1040	return true;
975	1041
	1042	+ if (projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
	1043	+ return false;
	1044	+
976	1045	// Transparent objects are dynamic because we have to sort the triangles.
977	1046	return material.opacity > 0.99;
978	1047	}
..	..	@@ -1374,6 +1443,7 @@
1374	1443	toParent = LA.newMatrix();
1375	1444	fromParent = LA.newMatrix();
1376	1445	}
	1446	+
1377	1447	LA.matCopy(other.toParent, toParent);
1378	1448	LA.matCopy(other.fromParent, fromParent);
1379	1449
..	..	@@ -2398,6 +2468,11 @@
2398	2468	else
2399	2469	{
2400	2470	//((ObjEditor)editWindow).SetupUI2(null);
	2471	+ if (objectUI != null)
	2472	+ ((ObjEditor)objectUI).pinButton.setSelected(pinned);
	2473	+ else
	2474	+ //new Exception().printStackTrace();
	2475	+ System.err.println("objectUI is null");
2401	2476	}
2402	2477	}
2403	2478
..	..	@@ -2527,7 +2602,8 @@
2527	2602	private static final int editSelf = 1;
2528	2603	private static final int editChild = 2;
2529	2604
2530		- void drawEditHandles(ClickInfo info, int level)
	2605	+ void drawEditHandles(//ClickInfo info,
	2606	+ int level)
2531	2607	{
2532	2608	if (level == 0)
2533	2609	{
..	..	@@ -2535,7 +2611,8 @@
2535	2611	return;
2536	2612
2537	2613	Object3D selectee;
2538		- for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(info, level + 1))
	2614	+ for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(//info,
	2615	+ level + 1))
2539	2616	{
2540	2617	selectee = (Object3D) e.nextElement();
2541	2618	}
..	..	@@ -2543,19 +2620,22 @@
2543	2620	} else
2544	2621	{
2545	2622	//super.
2546		- drawEditHandles0(info, level + 1);
	2623	+ drawEditHandles0(//info,
	2624	+ level + 1);
2547	2625	}
2548	2626	}
2549	2627
2550		- boolean doEditClick(ClickInfo info, int level)
	2628	+ boolean doEditClick(//ClickInfo info,
	2629	+ int level)
2551	2630	{
2552	2631	doSomething = 0;
2553	2632	if (level == 0)
2554	2633	{
2555		- return doParentClick(info);
	2634	+ return doParentClick(); //info);
2556	2635	}
2557	2636	if (//super.
2558		- doEditClick0(info, level))
	2637	+ doEditClick0(//info,
	2638	+ level))
2559	2639	{
2560	2640	doSomething = 1;
2561	2641	return true;
..	..	@@ -2565,7 +2645,7 @@
2565	2645	}
2566	2646	}
2567	2647
2568		- boolean doParentClick(ClickInfo info)
	2648	+ boolean doParentClick() //ClickInfo info)
2569	2649	{
2570	2650	if (selection == null)
2571	2651	{
..	..	@@ -2578,7 +2658,8 @@
2578	2658	for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
2579	2659	{
2580	2660	Object3D selectee = (Object3D) e.nextElement();
2581		- if (selectee.doEditClick(info, 1))
	2661	+ if (selectee.doEditClick(//info,
	2662	+ 1))
2582	2663	{
2583	2664	childToDrag = selectee;
2584	2665	doSomething = 2;
..	..	@@ -2590,13 +2671,15 @@
2590	2671	return retval;
2591	2672	}
2592	2673
2593		- void doEditDrag(ClickInfo info, boolean opposite)
	2674	+ void doEditDrag(//ClickInfo clickInfo,
	2675	+ boolean opposite)
2594	2676	{
2595	2677	switch (doSomething)
2596	2678	{
2597	2679	case 1: // '\001'
2598	2680	//super.
2599		- doEditDrag0(info, opposite);
	2681	+ doEditDrag0(//clickInfo,
	2682	+ opposite);
2600	2683	break;
2601	2684
2602	2685	case 2: // '\002'
..	..	@@ -2609,11 +2692,13 @@
2609	2692	{
2610	2693	//sel.hitSomething = childToDrag.hitSomething;
2611	2694	//childToDrag.doEditDrag(info);
2612		- sel.doEditDrag(info, opposite);
	2695	+ sel.doEditDrag(//clickInfo,
	2696	+ opposite);
2613	2697	} else
2614	2698	{
2615	2699	//super.
2616		- doEditDrag0(info, opposite);
	2700	+ doEditDrag0(//clickInfo,
	2701	+ opposite);
2617	2702	}
2618	2703	}
2619	2704	break;
..	..	@@ -2631,6 +2716,9 @@
2631	2716	{
2632	2717	deselectAll();
2633	2718	}
	2719	+
	2720	+ new Exception().printStackTrace();
	2721	+
2634	2722	ClickInfo newInfo = new ClickInfo();
2635	2723	newInfo.flags = info.flags;
2636	2724	newInfo.bounds = info.bounds;
..	..	@@ -3078,7 +3166,7 @@
3078	3166	{
3079	3167	if (bRep != null)
3080	3168	{
3081		- bRep.GenerateNormalsMINE();
	3169	+ bRep.MergeNormals(); //.GenerateNormalsMINE();
3082	3170	Touch();
3083	3171	}
3084	3172	}
..	..	@@ -5381,6 +5469,51 @@
5381	5469	blockloop = false;
5382	5470	}
5383	5471
	5472	+ void ResetSelectable()
	5473	+ {
	5474	+ if (blockloop)
	5475	+ return;
	5476	+
	5477	+ blockloop = true;
	5478	+
	5479	+ keepdontselect = dontselect;
	5480	+ dontselect = true;
	5481	+
	5482	+ Object3D child;
	5483	+ int nb = Size();
	5484	+ for (int i = 0; i < nb; i++)
	5485	+ {
	5486	+ child = (Object3D) get(i);
	5487	+ if (child == null)
	5488	+ continue;
	5489	+ child.ResetSelectable();
	5490	+ }
	5491	+
	5492	+ blockloop = false;
	5493	+ }
	5494	+
	5495	+ void RestoreSelectable()
	5496	+ {
	5497	+ if (blockloop)
	5498	+ return;
	5499	+
	5500	+ blockloop = true;
	5501	+
	5502	+ dontselect = keepdontselect;
	5503	+
	5504	+ Object3D child;
	5505	+ int nb = Size();
	5506	+ for (int i = 0; i < nb; i++)
	5507	+ {
	5508	+ child = (Object3D) get(i);
	5509	+ if (child == null)
	5510	+ continue;
	5511	+ child.RestoreSelectable();
	5512	+ }
	5513	+
	5514	+ blockloop = false;
	5515	+ }
	5516	+
5384	5517	boolean IsSelected()
5385	5518	{
5386	5519	if (parent == null)
..	..	@@ -5690,6 +5823,38 @@
5690	5823	}
5691	5824	}
5692	5825
	5826	+ void EmbedTextures(boolean embed)
	5827	+ {
	5828	+ if (blockloop)
	5829	+ return;
	5830	+
	5831	+ //if (GetTextures() != null)
	5832	+ if (embed)
	5833	+ CameraPane.EmbedTextures(GetTextures());
	5834	+ else
	5835	+ {
	5836	+ GetTextures().pigmentdata = null;
	5837	+ GetTextures().bumpdata = null;
	5838	+ GetTextures().pw = 0;
	5839	+ GetTextures().ph = 0;
	5840	+ GetTextures().bw = 0;
	5841	+ GetTextures().bh = 0;
	5842	+ }
	5843	+
	5844	+ int nb = Size();
	5845	+ for (int i = 0; i < nb; i++)
	5846	+ {
	5847	+ Object3D child = (Object3D) get(i);
	5848	+
	5849	+ if (child == null)
	5850	+ continue;
	5851	+
	5852	+ blockloop = true;
	5853	+ child.EmbedTextures(embed);
	5854	+ blockloop = false;
	5855	+ }
	5856	+ }
	5857	+
5693	5858	void draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5694	5859	{
5695	5860	Draw(display, root, selected, blocked);
..	..	@@ -5776,8 +5941,10 @@
5776	5941	if (support != null)
5777	5942	support = support;
5778	5943
5779		- //boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5780		- boolean usecalllists = !IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5944	+ boolean usecalllists = !IsLive() && IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5945	+ //boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5946	+
	5947	+ //usecalllists &= display.DrawMode() == display.DEFAULT; // Don't compute list in shadow pass.
5781	5948
5782	5949	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5783	5950	{
..	..	@@ -5787,8 +5954,9 @@
5787	5954	// usecalllists &= !(parent instanceof RandomNode);
5788	5955	// usecalllists = false;
5789	5956
5790		- if (GetBRep() != null)
5791		- usecalllists = usecalllists;
	5957	+ if (display.DrawMode() == display.SHADOW)
	5958	+ //GetBRep() != null)
	5959	+ usecalllists = !!usecalllists;
5792	5960	//System.out.println("draw " + this);
5793	5961	//new Exception().printStackTrace();
5794	5962
..	..	@@ -5798,7 +5966,7 @@
5798	5966
5799	5967	if (!selectmode && //display.DrawMode() != display.SELECTION &&
5800	5968	//(touched \|\| (bRep != null && bRep.displaylist <= 0)))
5801		- (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5969	+ (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && Globals.COMPUTESHADOWWHENLIVE)) // \|\| (bRep != null && bRep.displaylist <= 0)))
5802	5970	{
5803	5971	Globals.lighttouched = true;
5804	5972	} // all panes...
..	..	@@ -5810,7 +5978,7 @@
5810	5978	if (!(this instanceof Composite))
5811	5979	touched = false;
5812	5980	//if (displaylist == -1 && usecalllists)
5813		- if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
	5981	+ if (bRep.displaylist <= 0 && usecalllists) // && display.DrawMode() == display.DEFAULT) // june 2013
5814	5982	{
5815	5983	bRep.displaylist = display.GenList();
5816	5984	assert(bRep.displaylist != 0);
..	..	@@ -5821,7 +5989,7 @@
5821	5989
5822	5990	//System.out.println("\tnew list " + list);
5823	5991	//gl.glDrawBuffer(gl.GL_NONE);
5824		- if (usecalllists)
	5992	+ if (usecalllists && bRep.displaylist > 0)
5825	5993	{
5826	5994	// System.err.println("new list " + bRep.displaylist + " for " + this);
5827	5995	display.NewList(bRep.displaylist);
..	..	@@ -5830,7 +5998,7 @@
5830	5998	CallList(display, root, selected, blocked);
5831	5999
5832	6000	// compiled = true;
5833		- if (usecalllists)
	6001	+ if (usecalllists && bRep.displaylist > 0)
5834	6002	{
5835	6003	// System.err.println("end list " + bRep.displaylist + " for " + this);
5836	6004	display.EndList();
..	..	@@ -7181,20 +7349,23 @@
7181	7349	}
7182	7350	}
7183	7351
7184		- protected void calcHotSpot(cVector in, ClickInfo info, Point outPt, Rectangle outRec)
	7352	+ static ClickInfo clickInfo = new ClickInfo();
	7353	+
	7354	+ protected void calcHotSpot(cVector in, //ClickInfo clickInfo,
	7355	+ Point outPt, Rectangle outRec)
7185	7356	{
7186		- int hc = info.bounds.x + info.bounds.width / 2;
7187		- int vc = info.bounds.y + info.bounds.height / 2;
7188		- double[][] toscreen = info.toScreen;
	7357	+ int hc = clickInfo.bounds.x + clickInfo.bounds.width / 2;
	7358	+ int vc = clickInfo.bounds.y + clickInfo.bounds.height / 2;
	7359	+ double[][] toscreen = clickInfo.toScreen;
7189	7360	if (toscreen == null)
7190	7361	{
7191		- toscreen = new Camera(info.camera.viewCode).toScreen;
	7362	+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
7192	7363	}
7193	7364	cVector vec = in;
7194	7365	LA.xformPos(in, toscreen, in);
7195	7366	//System.out.println("Distance = " + info.camera.Distance());
7196		- vec.x = 100 info.camera.SCALE / info.camera.Distance();
7197		- vec.y = 100 info.camera.SCALE / info.camera.Distance();
	7367	+ vec.x = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
	7368	+ vec.y = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
7198	7369	outPt.x = hc + (int) vec.x;
7199	7370	outPt.y = vc - (int) vec.y;
7200	7371	outRec.x = outPt.x - 3;
..	..	@@ -7202,15 +7373,18 @@
7202	7373	outRec.width = outRec.height = 6;
7203	7374	}
7204	7375
7205		- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
	7376	+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
	7377	+ )
7206	7378	{
7207	7379	Point pt = new Point(0, 0);
7208	7380	Rectangle rec = new Rectangle();
7209		- calcHotSpot(in, info, pt, rec);
	7381	+ calcHotSpot(in, //clickInfo,
	7382	+ pt, rec);
7210	7383	return rec;
7211	7384	}
7212	7385
7213		- void drawEditHandles0(ClickInfo info, int level)
	7386	+ void drawEditHandles0(//ClickInfo clickInfo,
	7387	+ int level)
7214	7388	{
7215	7389	if (level == 0)
7216	7390	{
..	..	@@ -7219,16 +7393,19 @@
7219	7393	{
7220	7394	cVector origin = new cVector();
7221	7395	//LA.xformPos(origin, toParent, origin);
7222		- Rectangle spot = calcHotSpot(origin, info);
	7396	+ if (this.clickInfo == null)
	7397	+ this.clickInfo = new ClickInfo();
	7398	+
	7399	+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
7223	7400	Rectangle boundary = new Rectangle();
7224	7401	boundary.x = spot.x - 30;
7225	7402	boundary.y = spot.y - 30;
7226	7403	boundary.width = spot.width + 60;
7227	7404	boundary.height = spot.height + 60;
7228		- info.g.setColor(Color.red);
	7405	+ clickInfo.g.setColor(Color.red);
7229	7406	int spotw = spot.x + spot.width;
7230	7407	int spoth = spot.y + spot.height;
7231		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7408	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7232	7409	// if (CameraPane.Xmin > spot.x)
7233	7410	// {
7234	7411	// CameraPane.Xmin = spot.x;
..	..	@@ -7248,8 +7425,8 @@
7248	7425	spot.translate(32, 32);
7249	7426	spotw = spot.x + spot.width;
7250	7427	spoth = spot.y + spot.height;
7251		- info.g.setColor(Color.cyan);
7252		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7428	+ clickInfo.g.setColor(Color.cyan);
	7429	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7253	7430	// if (CameraPane.Xmin > spot.x)
7254	7431	// {
7255	7432	// CameraPane.Xmin = spot.x;
..	..	@@ -7269,9 +7446,9 @@
7269	7446	// bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
7270	7447	//info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
7271	7448	spot.translate(0, -32);
7272		- info.g.setColor(Color.yellow);
7273		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7274		- info.g.setColor(Color.green);
	7449	+ clickInfo.g.setColor(Color.yellow);
	7450	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7451	+ clickInfo.g.setColor(Color.green);
7275	7452	// if (CameraPane.Xmin > spot.x)
7276	7453	// {
7277	7454	// CameraPane.Xmin = spot.x;
..	..	@@ -7288,8 +7465,8 @@
7288	7465	// {
7289	7466	// CameraPane.Ymax = spoth;
7290	7467	// }
7291		- info.g.drawArc(boundary.x, boundary.y,
7292		- boundary.width, boundary.height, 0, 360);
	7468	+ clickInfo.g.drawArc(boundary.x + clickInfo.DX, boundary.y + clickInfo.DY,
	7469	+ (int)(boundary.width * clickInfo.W), (int)(boundary.height * clickInfo.W), 0, 360);
7293	7470	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7294	7471	// if (CameraPane.Xmin > boundary.x)
7295	7472	// {
..	..	@@ -7311,7 +7488,8 @@
7311	7488	}
7312	7489	}
7313	7490
7314		- boolean doEditClick0(ClickInfo info, int level)
	7491	+ boolean doEditClick0(//ClickInfo clickInfo,
	7492	+ int level)
7315	7493	{
7316	7494	if (level == 0)
7317	7495	{
..	..	@@ -7320,8 +7498,8 @@
7320	7498
7321	7499	boolean retval = false;
7322	7500
7323		- startX = info.x;
7324		- startY = info.y;
	7501	+ startX = clickInfo.x;
	7502	+ startY = clickInfo.y;
7325	7503
7326	7504	hitSomething = -1;
7327	7505	cVector origin = new cVector();
..	..	@@ -7331,22 +7509,51 @@
7331	7509	{
7332	7510	centerPt = new Point(0, 0);
7333	7511	}
7334		- calcHotSpot(origin, info, centerPt, spot);
7335		- if (spot.contains(info.x, info.y))
	7512	+ calcHotSpot(origin, //info,
	7513	+ centerPt, spot);
	7514	+ if (spot.contains(clickInfo.x, clickInfo.y))
7336	7515	{
7337	7516	hitSomething = hitCenter;
7338	7517	retval = true;
7339	7518	}
7340	7519	spot.translate(32, 0);
7341		- if (spot.contains(info.x, info.y))
	7520	+ if (spot.contains(clickInfo.x, clickInfo.y))
7342	7521	{
7343	7522	hitSomething = hitRotate;
7344	7523	retval = true;
7345	7524	}
7346	7525	spot.translate(0, 32);
7347		- if (spot.contains(info.x, info.y))
	7526	+ if (spot.contains(clickInfo.x, clickInfo.y))
7348	7527	{
7349	7528	hitSomething = hitScale;
	7529	+
	7530	+ double scale = 0.005f * clickInfo.camera.Distance();
	7531	+ double hScale = (double) (clickInfo.x - centerPt.x) / 32;
	7532	+ double sign = 1;
	7533	+ if (hScale < 0)
	7534	+ {
	7535	+ sign = -1;
	7536	+ }
	7537	+ hScale = signMath.pow(signhScale, scale * 50);
	7538	+ if (hScale < 0.01)
	7539	+ {
	7540	+ //hScale = 0.01;
	7541	+ }
	7542	+
	7543	+ double vScale = (double) (clickInfo.y - centerPt.y) / 32;
	7544	+ sign = 1;
	7545	+ if (vScale < 0)
	7546	+ {
	7547	+ sign = -1;
	7548	+ }
	7549	+ vScale = signMath.pow(signvScale, scale * 50);
	7550	+ if (vScale < 0.01)
	7551	+ {
	7552	+ //vScale = 0.01;
	7553	+ }
	7554	+
	7555	+ clickInfo.scale = Math.sqrt(hScalehScale + vScalevScale);
	7556	+
7350	7557	retval = true;
7351	7558	}
7352	7559
..	..	@@ -7356,7 +7563,7 @@
7356	7563	}
7357	7564
7358	7565	//System.out.println("info.modifiers = " + info.modifiers);
7359		- modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
	7566	+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
7360	7567	//System.out.println("modified = " + modified);
7361	7568	//new Exception().printStackTrace();
7362	7569	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7384,7 +7591,8 @@
7384	7591	return true;
7385	7592	}
7386	7593
7387		- void doEditDrag0(ClickInfo info, boolean opposite)
	7594	+ void doEditDrag0(//ClickInfo info,
	7595	+ boolean opposite)
7388	7596	{
7389	7597	if (hitSomething == 0)
7390	7598	{
..	..	@@ -7398,7 +7606,7 @@
7398	7606
7399	7607	//System.out.println("hitSomething = " + hitSomething);
7400	7608
7401		- double scale = 0.005f * info.camera.Distance();
	7609	+ double scale = 0.005f * clickInfo.camera.Distance();
7402	7610
7403	7611	cVector xlate = new cVector();
7404	7612	//cVector xlate2 = new cVector();
..	..	@@ -7432,8 +7640,8 @@
7432	7640	toParent[3][i] = xlate.get(i);
7433	7641	LA.matInvert(toParent, fromParent);
7434	7642	*/
7435		- cVector delta = LA.newVector(0, 0, startY - info.y);
7436		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7643	+ cVector delta = LA.newVector(0, 0, startY - clickInfo.y);
	7644	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7437	7645
7438	7646	LA.matCopy(startMat, toParent);
7439	7647	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7442,7 +7650,7 @@
7442	7650	} else
7443	7651	{
7444	7652	//LA.xformDir(delta, info.camera.fromScreen, delta);
7445		- cVector up = new cVector(info.camera.up);
	7653	+ cVector up = new cVector(clickInfo.camera.up);
7446	7654	cVector away = new cVector();
7447	7655	//cVector right2 = new cVector();
7448	7656	//LA.vecCross(up, cVector.Z, right);
..	..	@@ -7459,19 +7667,19 @@
7459	7667	LA.xformDir(up, ClickInfo.matbuffer, up);
7460	7668	// if (!CameraPane.LOCALTRANSFORM)
7461	7669	LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7462		- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
	7670	+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
7463	7671	// if (!CameraPane.LOCALTRANSFORM)
7464	7672	LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7465	7673	//LA.vecCross(up, cVector.Z, right2);
7466	7674
7467		- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
	7675	+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
7468	7676
7469	7677	//System.out.println("DELTA0 = " + delta);
7470	7678	//System.out.println("AWAY = " + info.camera.away);
7471	7679	//System.out.println("UP = " + info.camera.up);
7472	7680	if (away.z > 0)
7473	7681	{
7474		- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
	7682	+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7475	7683	{
7476	7684	delta.x = -delta.x;
7477	7685	} else
..	..	@@ -7486,7 +7694,7 @@
7486	7694	//System.out.println("DELTA1 = " + delta);
7487	7695	LA.xformDir(delta, ClickInfo.matbuffer, delta);
7488	7696	//System.out.println("DELTA2 = " + delta);
7489		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7697	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7490	7698	LA.matCopy(startMat, toParent);
7491	7699	//System.out.println("DELTA3 = " + delta);
7492	7700	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7496,8 +7704,8 @@
7496	7704	break;
7497	7705
7498	7706	case hitRotate: // rotate
7499		- int dx = info.x - centerPt.x;
7500		- int dy = -(info.y - centerPt.y);
	7707	+ int dx = clickInfo.x - centerPt.x;
	7708	+ int dy = -(clickInfo.y - centerPt.y);
7501	7709	double angle = (double) Math.atan2(dx, dy);
7502	7710	angle = -(1.570796 - angle);
7503	7711
..	..	@@ -7520,7 +7728,7 @@
7520	7728	}
7521	7729	/**/
7522	7730
7523		- switch (info.pane.RenderCamera().viewCode)
	7731	+ switch (clickInfo.pane.RenderCamera().viewCode)
7524	7732	{
7525	7733	case 1: // '\001'
7526	7734	LA.matZRotate(toParent, angle);
..	..	@@ -7547,7 +7755,7 @@
7547	7755	break;
7548	7756
7549	7757	case hitScale: // scale
7550		- double hScale = (double) (info.x - centerPt.x) / 32;
	7758	+ double hScale = (double) (clickInfo.x - centerPt.x) / 32;
7551	7759	double sign = 1;
7552	7760	if (hScale < 0)
7553	7761	{
..	..	@@ -7559,7 +7767,7 @@
7559	7767	//hScale = 0.01;
7560	7768	}
7561	7769
7562		- double vScale = (double) (info.y - centerPt.y) / 32;
	7770	+ double vScale = (double) (clickInfo.y - centerPt.y) / 32;
7563	7771	sign = 1;
7564	7772	if (vScale < 0)
7565	7773	{
..	..	@@ -7570,6 +7778,7 @@
7570	7778	{
7571	7779	//vScale = 0.01;
7572	7780	}
	7781	+
7573	7782	LA.matCopy(startMat, toParent);
7574	7783	/**/
7575	7784	for (int i = 0; i < 3; i++)
..	..	@@ -7579,14 +7788,14 @@
7579	7788	}
7580	7789	/**/
7581	7790
7582		- double totalScale = Math.sqrt(hScalehScale + vScalevScale) / Math.sqrt(2);
	7791	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / clickInfo.scale;
7583	7792
7584	7793	if (totalScale < 0.01)
7585	7794	{
7586	7795	totalScale = 0.01;
7587	7796	}
7588	7797
7589		- switch (info.pane.RenderCamera().viewCode)
	7798	+ switch (clickInfo.pane.RenderCamera().viewCode)
7590	7799	{
7591	7800	case 3: // '\001'
7592	7801	if (modified \|\| opposite)
..	..	@@ -7653,7 +7862,7 @@
7653	7862	} // NEW ...
7654	7863
7655	7864
7656		- info.pane.repaint();
	7865	+ clickInfo.pane.repaint();
7657	7866	}
7658	7867
7659	7868	boolean overflow = false;