~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();
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;
..	..	@@ -223,19 +252,35 @@
223	252
224	253	RestoreBigData(o);
225	254
226		- hashtable.remove(GetUUID());
	255	+ if (blockloop)
	256	+ return;
	257	+
	258	+ blockloop = true;
	259	+
	260	+ //hashtable.remove(GetUUID());
227	261
228	262	for (int i=0; i<Size(); i++)
229	263	{
230	264	get(i).RestoreBigData(hashtable);
231	265	}
	266	+
	267	+ blockloop = false;
232	268	}
233	269
234	270	void RestoreBigData(Object3D o)
235	271	{
236	272	this.bRep = o.bRep;
237		- if (this.bRep != null)
238		- 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;
239	284	// this.support = o.support;
240	285	// this.fileparent = o.fileparent;
241	286	}
..	..	@@ -381,6 +426,7 @@
381	426	}
382	427
383	428	boolean live = false;
	429	+ transient boolean keepdontselect;
384	430	boolean dontselect = false;
385	431	boolean hide = false;
386	432	boolean link2master = false; // performs reset support/master at each frame
..	..	@@ -881,7 +927,7 @@
881	927
882	928	if (marked && Globals.isLIVE() && live &&
883	929	//TEMP21aug2018
884		- (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW) &&
	930	+ (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| !Globals.COMPUTESHADOWWHENLIVE) &&
885	931	currentframe != Globals.framecount)
886	932	{
887	933	currentframe = Globals.framecount;
..	..	@@ -966,6 +1012,7 @@
966	1012	if (material == null \|\| material.multiply)
967	1013	return true;
968	1014
	1015	+ // Transparent objects are dynamic because we have to sort the triangles.
969	1016	return material.opacity > 0.99;
970	1017	}
971	1018
..	..	@@ -1366,6 +1413,7 @@
1366	1413	toParent = LA.newMatrix();
1367	1414	fromParent = LA.newMatrix();
1368	1415	}
	1416	+
1369	1417	LA.matCopy(other.toParent, toParent);
1370	1418	LA.matCopy(other.fromParent, fromParent);
1371	1419
..	..	@@ -2387,6 +2435,10 @@
2387	2435	}
2388	2436	*/
2389	2437	}
	2438	+ else
	2439	+ {
	2440	+ //((ObjEditor)editWindow).SetupUI2(null);
	2441	+ }
2390	2442	}
2391	2443
2392	2444	void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
..	..	@@ -2428,6 +2480,14 @@
2428	2480	{
2429	2481	editWindow.refreshContents();
2430	2482	}
	2483	+ else
	2484	+ {
	2485	+ if (manipWindow != null)
	2486	+ {
	2487	+ manipWindow.refreshContents();
	2488	+ }
	2489	+ }
	2490	+
2431	2491	//if (parent != null)
2432	2492	//parent.refreshEditWindow();
2433	2493	}
..	..	@@ -2507,7 +2567,8 @@
2507	2567	private static final int editSelf = 1;
2508	2568	private static final int editChild = 2;
2509	2569
2510		- void drawEditHandles(ClickInfo info, int level)
	2570	+ void drawEditHandles(//ClickInfo info,
	2571	+ int level)
2511	2572	{
2512	2573	if (level == 0)
2513	2574	{
..	..	@@ -2515,7 +2576,8 @@
2515	2576	return;
2516	2577
2517	2578	Object3D selectee;
2518		- 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))
2519	2581	{
2520	2582	selectee = (Object3D) e.nextElement();
2521	2583	}
..	..	@@ -2523,19 +2585,22 @@
2523	2585	} else
2524	2586	{
2525	2587	//super.
2526		- drawEditHandles0(info, level + 1);
	2588	+ drawEditHandles0(//info,
	2589	+ level + 1);
2527	2590	}
2528	2591	}
2529	2592
2530		- boolean doEditClick(ClickInfo info, int level)
	2593	+ boolean doEditClick(//ClickInfo info,
	2594	+ int level)
2531	2595	{
2532	2596	doSomething = 0;
2533	2597	if (level == 0)
2534	2598	{
2535		- return doParentClick(info);
	2599	+ return doParentClick(); //info);
2536	2600	}
2537	2601	if (//super.
2538		- doEditClick0(info, level))
	2602	+ doEditClick0(//info,
	2603	+ level))
2539	2604	{
2540	2605	doSomething = 1;
2541	2606	return true;
..	..	@@ -2545,7 +2610,7 @@
2545	2610	}
2546	2611	}
2547	2612
2548		- boolean doParentClick(ClickInfo info)
	2613	+ boolean doParentClick() //ClickInfo info)
2549	2614	{
2550	2615	if (selection == null)
2551	2616	{
..	..	@@ -2558,7 +2623,8 @@
2558	2623	for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
2559	2624	{
2560	2625	Object3D selectee = (Object3D) e.nextElement();
2561		- if (selectee.doEditClick(info, 1))
	2626	+ if (selectee.doEditClick(//info,
	2627	+ 1))
2562	2628	{
2563	2629	childToDrag = selectee;
2564	2630	doSomething = 2;
..	..	@@ -2570,13 +2636,15 @@
2570	2636	return retval;
2571	2637	}
2572	2638
2573		- void doEditDrag(ClickInfo info, boolean opposite)
	2639	+ void doEditDrag(//ClickInfo clickInfo,
	2640	+ boolean opposite)
2574	2641	{
2575	2642	switch (doSomething)
2576	2643	{
2577	2644	case 1: // '\001'
2578	2645	//super.
2579		- doEditDrag0(info, opposite);
	2646	+ doEditDrag0(//clickInfo,
	2647	+ opposite);
2580	2648	break;
2581	2649
2582	2650	case 2: // '\002'
..	..	@@ -2589,11 +2657,13 @@
2589	2657	{
2590	2658	//sel.hitSomething = childToDrag.hitSomething;
2591	2659	//childToDrag.doEditDrag(info);
2592		- sel.doEditDrag(info, opposite);
	2660	+ sel.doEditDrag(//clickInfo,
	2661	+ opposite);
2593	2662	} else
2594	2663	{
2595	2664	//super.
2596		- doEditDrag0(info, opposite);
	2665	+ doEditDrag0(//clickInfo,
	2666	+ opposite);
2597	2667	}
2598	2668	}
2599	2669	break;
..	..	@@ -2611,6 +2681,9 @@
2611	2681	{
2612	2682	deselectAll();
2613	2683	}
	2684	+
	2685	+ new Exception().printStackTrace();
	2686	+
2614	2687	ClickInfo newInfo = new ClickInfo();
2615	2688	newInfo.flags = info.flags;
2616	2689	newInfo.bounds = info.bounds;
..	..	@@ -3058,7 +3131,7 @@
3058	3131	{
3059	3132	if (bRep != null)
3060	3133	{
3061		- bRep.GenerateNormalsMINE();
	3134	+ bRep.MergeNormals(); //.GenerateNormalsMINE();
3062	3135	Touch();
3063	3136	}
3064	3137	}
..	..	@@ -4958,6 +5031,14 @@
4958	5031	}
4959	5032	}
4960	5033
	5034	+ ObjEditor GetWindow()
	5035	+ {
	5036	+ if (editWindow != null)
	5037	+ return editWindow;
	5038	+
	5039	+ return manipWindow;
	5040	+ }
	5041	+
4961	5042	cTreePath Select(int indexcount, boolean deselect)
4962	5043	{
4963	5044	if (hide \|\| dontselect)
..	..	@@ -4994,10 +5075,11 @@
4994	5075	if (leaf != null)
4995	5076	{
4996	5077	cTreePath tp = new cTreePath(this, leaf);
4997		- if (editWindow != null)
	5078	+ ObjEditor window = GetWindow();
	5079	+ if (window != null)
4998	5080	{
4999	5081	//System.out.println("editWindow = " + editWindow + " vs " + this);
5000		- editWindow.Select(tp, deselect, true);
	5082	+ window.Select(tp, deselect, true);
5001	5083	}
5002	5084
5003	5085	return tp;
..	..	@@ -5014,6 +5096,7 @@
5014	5096
5015	5097	if (child == null)
5016	5098	continue;
	5099	+
5017	5100	if (child.HasTransparency() && child.size() != 0)
5018	5101	{
5019	5102	cTreePath leaf = child.Select(indexcount, deselect);
..	..	@@ -5023,9 +5106,10 @@
5023	5106	if (leaf != null)
5024	5107	{
5025	5108	cTreePath tp = new cTreePath(this, leaf);
5026		- if (editWindow != null)
	5109	+ ObjEditor window = GetWindow();
	5110	+ if (window != null)
5027	5111	{
5028		- editWindow.Select(tp, deselect, true);
	5112	+ window.Select(tp, deselect, true);
5029	5113	}
5030	5114
5031	5115	return tp;
..	..	@@ -5350,6 +5434,51 @@
5350	5434	blockloop = false;
5351	5435	}
5352	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	+
5353	5482	boolean IsSelected()
5354	5483	{
5355	5484	if (parent == null)
..	..	@@ -5659,6 +5788,38 @@
5659	5788	}
5660	5789	}
5661	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	+
5662	5823	void draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5663	5824	{
5664	5825	Draw(display, root, selected, blocked);
..	..	@@ -5746,7 +5907,7 @@
5746	5907	support = support;
5747	5908
5748	5909	//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);
	5910	+ boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5750	5911
5751	5912	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5752	5913	{
..	..	@@ -5767,7 +5928,7 @@
5767	5928
5768	5929	if (!selectmode && //display.DrawMode() != display.SELECTION &&
5769	5930	//(touched \|\| (bRep != null && bRep.displaylist <= 0)))
5770		- (Globals.isLIVE() \|\| touched && (bRep != null && bRep.displaylist <= 0)))
	5931	+ (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && Globals.COMPUTESHADOWWHENLIVE)) // \|\| (bRep != null && bRep.displaylist <= 0)))
5771	5932	{
5772	5933	Globals.lighttouched = true;
5773	5934	} // all panes...
..	..	@@ -5899,6 +6060,7 @@
5899	6060	if (GetBRep() != null)
5900	6061	{
5901	6062	display.NextIndex();
	6063	+
5902	6064	// vertex color conflict : gl.glCallList(list);
5903	6065	DrawNode(display, root, selected);
5904	6066	if (this instanceof BezierPatch)
..	..	@@ -6359,6 +6521,11 @@
6359	6521	// dec 2012
6360	6522	new Exception().printStackTrace();
6361	6523	return;
	6524	+ }
	6525	+
	6526	+ if (dontselect)
	6527	+ {
	6528	+ //bRep.GenerateNormalsMINE();
6362	6529	}
6363	6530
6364	6531	display.DrawGeometry(bRep, flipV, selectmode);
..	..	@@ -7144,20 +7311,23 @@
7144	7311	}
7145	7312	}
7146	7313
7147		- 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)
7148	7318	{
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;
	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;
7152	7322	if (toscreen == null)
7153	7323	{
7154		- toscreen = new Camera(info.camera.viewCode).toScreen;
	7324	+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
7155	7325	}
7156	7326	cVector vec = in;
7157	7327	LA.xformPos(in, toscreen, in);
7158	7328	//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();
	7329	+ vec.x = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
	7330	+ vec.y = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
7161	7331	outPt.x = hc + (int) vec.x;
7162	7332	outPt.y = vc - (int) vec.y;
7163	7333	outRec.x = outPt.x - 3;
..	..	@@ -7165,15 +7335,18 @@
7165	7335	outRec.width = outRec.height = 6;
7166	7336	}
7167	7337
7168		- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
	7338	+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
	7339	+ )
7169	7340	{
7170	7341	Point pt = new Point(0, 0);
7171	7342	Rectangle rec = new Rectangle();
7172		- calcHotSpot(in, info, pt, rec);
	7343	+ calcHotSpot(in, //clickInfo,
	7344	+ pt, rec);
7173	7345	return rec;
7174	7346	}
7175	7347
7176		- void drawEditHandles0(ClickInfo info, int level)
	7348	+ void drawEditHandles0(//ClickInfo clickInfo,
	7349	+ int level)
7177	7350	{
7178	7351	if (level == 0)
7179	7352	{
..	..	@@ -7182,16 +7355,19 @@
7182	7355	{
7183	7356	cVector origin = new cVector();
7184	7357	//LA.xformPos(origin, toParent, origin);
7185		- Rectangle spot = calcHotSpot(origin, info);
	7358	+ if (this.clickInfo == null)
	7359	+ this.clickInfo = new ClickInfo();
	7360	+
	7361	+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
7186	7362	Rectangle boundary = new Rectangle();
7187	7363	boundary.x = spot.x - 30;
7188	7364	boundary.y = spot.y - 30;
7189	7365	boundary.width = spot.width + 60;
7190	7366	boundary.height = spot.height + 60;
7191		- info.g.setColor(Color.red);
	7367	+ clickInfo.g.setColor(Color.red);
7192	7368	int spotw = spot.x + spot.width;
7193	7369	int spoth = spot.y + spot.height;
7194		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7370	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7195	7371	// if (CameraPane.Xmin > spot.x)
7196	7372	// {
7197	7373	// CameraPane.Xmin = spot.x;
..	..	@@ -7211,8 +7387,8 @@
7211	7387	spot.translate(32, 32);
7212	7388	spotw = spot.x + spot.width;
7213	7389	spoth = spot.y + spot.height;
7214		- info.g.setColor(Color.cyan);
7215		- 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);
7216	7392	// if (CameraPane.Xmin > spot.x)
7217	7393	// {
7218	7394	// CameraPane.Xmin = spot.x;
..	..	@@ -7232,9 +7408,9 @@
7232	7408	// bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
7233	7409	//info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
7234	7410	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);
	7411	+ clickInfo.g.setColor(Color.yellow);
	7412	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7413	+ clickInfo.g.setColor(Color.green);
7238	7414	// if (CameraPane.Xmin > spot.x)
7239	7415	// {
7240	7416	// CameraPane.Xmin = spot.x;
..	..	@@ -7251,8 +7427,8 @@
7251	7427	// {
7252	7428	// CameraPane.Ymax = spoth;
7253	7429	// }
7254		- info.g.drawArc(boundary.x, boundary.y,
7255		- 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);
7256	7432	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7257	7433	// if (CameraPane.Xmin > boundary.x)
7258	7434	// {
..	..	@@ -7274,7 +7450,8 @@
7274	7450	}
7275	7451	}
7276	7452
7277		- boolean doEditClick0(ClickInfo info, int level)
	7453	+ boolean doEditClick0(//ClickInfo clickInfo,
	7454	+ int level)
7278	7455	{
7279	7456	if (level == 0)
7280	7457	{
..	..	@@ -7283,8 +7460,8 @@
7283	7460
7284	7461	boolean retval = false;
7285	7462
7286		- startX = info.x;
7287		- startY = info.y;
	7463	+ startX = clickInfo.x;
	7464	+ startY = clickInfo.y;
7288	7465
7289	7466	hitSomething = -1;
7290	7467	cVector origin = new cVector();
..	..	@@ -7294,22 +7471,51 @@
7294	7471	{
7295	7472	centerPt = new Point(0, 0);
7296	7473	}
7297		- calcHotSpot(origin, info, centerPt, spot);
7298		- if (spot.contains(info.x, info.y))
	7474	+ calcHotSpot(origin, //info,
	7475	+ centerPt, spot);
	7476	+ if (spot.contains(clickInfo.x, clickInfo.y))
7299	7477	{
7300	7478	hitSomething = hitCenter;
7301	7479	retval = true;
7302	7480	}
7303	7481	spot.translate(32, 0);
7304		- if (spot.contains(info.x, info.y))
	7482	+ if (spot.contains(clickInfo.x, clickInfo.y))
7305	7483	{
7306	7484	hitSomething = hitRotate;
7307	7485	retval = true;
7308	7486	}
7309	7487	spot.translate(0, 32);
7310		- if (spot.contains(info.x, info.y))
	7488	+ if (spot.contains(clickInfo.x, clickInfo.y))
7311	7489	{
7312	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	+
7313	7519	retval = true;
7314	7520	}
7315	7521
..	..	@@ -7319,7 +7525,7 @@
7319	7525	}
7320	7526
7321	7527	//System.out.println("info.modifiers = " + info.modifiers);
7322		- modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
	7528	+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
7323	7529	//System.out.println("modified = " + modified);
7324	7530	//new Exception().printStackTrace();
7325	7531	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7347,7 +7553,8 @@
7347	7553	return true;
7348	7554	}
7349	7555
7350		- void doEditDrag0(ClickInfo info, boolean opposite)
	7556	+ void doEditDrag0(//ClickInfo info,
	7557	+ boolean opposite)
7351	7558	{
7352	7559	if (hitSomething == 0)
7353	7560	{
..	..	@@ -7361,7 +7568,7 @@
7361	7568
7362	7569	//System.out.println("hitSomething = " + hitSomething);
7363	7570
7364		- double scale = 0.005f * info.camera.Distance();
	7571	+ double scale = 0.005f * clickInfo.camera.Distance();
7365	7572
7366	7573	cVector xlate = new cVector();
7367	7574	//cVector xlate2 = new cVector();
..	..	@@ -7395,8 +7602,8 @@
7395	7602	toParent[3][i] = xlate.get(i);
7396	7603	LA.matInvert(toParent, fromParent);
7397	7604	*/
7398		- cVector delta = LA.newVector(0, 0, startY - info.y);
7399		- 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);
7400	7607
7401	7608	LA.matCopy(startMat, toParent);
7402	7609	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7405,7 +7612,7 @@
7405	7612	} else
7406	7613	{
7407	7614	//LA.xformDir(delta, info.camera.fromScreen, delta);
7408		- cVector up = new cVector(info.camera.up);
	7615	+ cVector up = new cVector(clickInfo.camera.up);
7409	7616	cVector away = new cVector();
7410	7617	//cVector right2 = new cVector();
7411	7618	//LA.vecCross(up, cVector.Z, right);
..	..	@@ -7422,19 +7629,19 @@
7422	7629	LA.xformDir(up, ClickInfo.matbuffer, up);
7423	7630	// if (!CameraPane.LOCALTRANSFORM)
7424	7631	LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7425		- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
	7632	+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
7426	7633	// if (!CameraPane.LOCALTRANSFORM)
7427	7634	LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7428	7635	//LA.vecCross(up, cVector.Z, right2);
7429	7636
7430		- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
	7637	+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
7431	7638
7432	7639	//System.out.println("DELTA0 = " + delta);
7433	7640	//System.out.println("AWAY = " + info.camera.away);
7434	7641	//System.out.println("UP = " + info.camera.up);
7435	7642	if (away.z > 0)
7436	7643	{
7437		- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
	7644	+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7438	7645	{
7439	7646	delta.x = -delta.x;
7440	7647	} else
..	..	@@ -7449,7 +7656,7 @@
7449	7656	//System.out.println("DELTA1 = " + delta);
7450	7657	LA.xformDir(delta, ClickInfo.matbuffer, delta);
7451	7658	//System.out.println("DELTA2 = " + delta);
7452		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7659	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7453	7660	LA.matCopy(startMat, toParent);
7454	7661	//System.out.println("DELTA3 = " + delta);
7455	7662	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7459,8 +7666,8 @@
7459	7666	break;
7460	7667
7461	7668	case hitRotate: // rotate
7462		- int dx = info.x - centerPt.x;
7463		- int dy = -(info.y - centerPt.y);
	7669	+ int dx = clickInfo.x - centerPt.x;
	7670	+ int dy = -(clickInfo.y - centerPt.y);
7464	7671	double angle = (double) Math.atan2(dx, dy);
7465	7672	angle = -(1.570796 - angle);
7466	7673
..	..	@@ -7483,7 +7690,7 @@
7483	7690	}
7484	7691	/**/
7485	7692
7486		- switch (info.pane.RenderCamera().viewCode)
	7693	+ switch (clickInfo.pane.RenderCamera().viewCode)
7487	7694	{
7488	7695	case 1: // '\001'
7489	7696	LA.matZRotate(toParent, angle);
..	..	@@ -7510,7 +7717,7 @@
7510	7717	break;
7511	7718
7512	7719	case hitScale: // scale
7513		- double hScale = (double) (info.x - centerPt.x) / 32;
	7720	+ double hScale = (double) (clickInfo.x /- centerPt.x/) / 32;
7514	7721	double sign = 1;
7515	7722	if (hScale < 0)
7516	7723	{
..	..	@@ -7522,7 +7729,7 @@
7522	7729	//hScale = 0.01;
7523	7730	}
7524	7731
7525		- double vScale = (double) (info.y - centerPt.y) / 32;
	7732	+ double vScale = (double) (clickInfo.y /- centerPt.y/) / 32;
7526	7733	sign = 1;
7527	7734	if (vScale < 0)
7528	7735	{
..	..	@@ -7533,6 +7740,7 @@
7533	7740	{
7534	7741	//vScale = 0.01;
7535	7742	}
	7743	+
7536	7744	LA.matCopy(startMat, toParent);
7537	7745	/**/
7538	7746	for (int i = 0; i < 3; i++)
..	..	@@ -7542,14 +7750,14 @@
7542	7750	}
7543	7751	/**/
7544	7752
7545		- double totalScale = Math.sqrt(hScalehScale + vScalevScale) / Math.sqrt(2);
	7753	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / clickInfo.scale;
7546	7754
7547	7755	if (totalScale < 0.01)
7548	7756	{
7549	7757	totalScale = 0.01;
7550	7758	}
7551	7759
7552		- switch (info.pane.RenderCamera().viewCode)
	7760	+ switch (clickInfo.pane.RenderCamera().viewCode)
7553	7761	{
7554	7762	case 3: // '\001'
7555	7763	if (modified \|\| opposite)
..	..	@@ -7616,7 +7824,7 @@
7616	7824	} // NEW ...
7617	7825
7618	7826
7619		- info.pane.repaint();
	7827	+ clickInfo.pane.repaint();
7620	7828	}
7621	7829
7622	7830	boolean overflow = false;
..	..	@@ -7796,6 +8004,10 @@
7796	8004	editWindow = null;
7797	8005	} // ?
7798	8006	}
	8007	+ else
	8008	+ {
	8009	+ //editWindow.closeUI();
	8010	+ }
7799	8011	}
7800	8012
7801	8013	boolean root; // patch for edit windows
..	..	@@ -7953,6 +8165,10 @@
7953	8165	}
7954	8166
7955	8167	transient ObjEditor editWindow;
	8168	+ transient ObjEditor manipWindow;
	8169	+
	8170	+ transient boolean pinned;
	8171	+
7956	8172	transient ObjectUI objectUI;
7957	8173	public static int povDepth = 0;
7958	8174	private static cVector tbMin = new cVector();