~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -29,7 +29,7 @@
29	29	Object3D saveskeleton;
30	30	//
31	31
32		- byte[] versions[] = new byte[100][];
	32	+ byte[] versions[];
33	33	int versionindex = -1;
34	34
35	35	ScriptNode scriptnode;
..	..	@@ -426,6 +426,7 @@
426	426	}
427	427
428	428	boolean live = false;
	429	+ transient boolean keepdontselect;
429	430	boolean dontselect = false;
430	431	boolean hide = false;
431	432	boolean link2master = false; // performs reset support/master at each frame
..	..	@@ -2566,7 +2567,8 @@
2566	2567	private static final int editSelf = 1;
2567	2568	private static final int editChild = 2;
2568	2569
2569		- void drawEditHandles(ClickInfo info, int level)
	2570	+ void drawEditHandles(//ClickInfo info,
	2571	+ int level)
2570	2572	{
2571	2573	if (level == 0)
2572	2574	{
..	..	@@ -2574,7 +2576,8 @@
2574	2576	return;
2575	2577
2576	2578	Object3D selectee;
2577		- 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))
2578	2581	{
2579	2582	selectee = (Object3D) e.nextElement();
2580	2583	}
..	..	@@ -2582,19 +2585,22 @@
2582	2585	} else
2583	2586	{
2584	2587	//super.
2585		- drawEditHandles0(info, level + 1);
	2588	+ drawEditHandles0(//info,
	2589	+ level + 1);
2586	2590	}
2587	2591	}
2588	2592
2589		- boolean doEditClick(ClickInfo info, int level)
	2593	+ boolean doEditClick(//ClickInfo info,
	2594	+ int level)
2590	2595	{
2591	2596	doSomething = 0;
2592	2597	if (level == 0)
2593	2598	{
2594		- return doParentClick(info);
	2599	+ return doParentClick(); //info);
2595	2600	}
2596	2601	if (//super.
2597		- doEditClick0(info, level))
	2602	+ doEditClick0(//info,
	2603	+ level))
2598	2604	{
2599	2605	doSomething = 1;
2600	2606	return true;
..	..	@@ -2604,7 +2610,7 @@
2604	2610	}
2605	2611	}
2606	2612
2607		- boolean doParentClick(ClickInfo info)
	2613	+ boolean doParentClick() //ClickInfo info)
2608	2614	{
2609	2615	if (selection == null)
2610	2616	{
..	..	@@ -2617,7 +2623,8 @@
2617	2623	for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
2618	2624	{
2619	2625	Object3D selectee = (Object3D) e.nextElement();
2620		- if (selectee.doEditClick(info, 1))
	2626	+ if (selectee.doEditClick(//info,
	2627	+ 1))
2621	2628	{
2622	2629	childToDrag = selectee;
2623	2630	doSomething = 2;
..	..	@@ -2629,13 +2636,15 @@
2629	2636	return retval;
2630	2637	}
2631	2638
2632		- void doEditDrag(ClickInfo info, boolean opposite)
	2639	+ void doEditDrag(//ClickInfo clickInfo,
	2640	+ boolean opposite)
2633	2641	{
2634	2642	switch (doSomething)
2635	2643	{
2636	2644	case 1: // '\001'
2637	2645	//super.
2638		- doEditDrag0(info, opposite);
	2646	+ doEditDrag0(//clickInfo,
	2647	+ opposite);
2639	2648	break;
2640	2649
2641	2650	case 2: // '\002'
..	..	@@ -2648,11 +2657,13 @@
2648	2657	{
2649	2658	//sel.hitSomething = childToDrag.hitSomething;
2650	2659	//childToDrag.doEditDrag(info);
2651		- sel.doEditDrag(info, opposite);
	2660	+ sel.doEditDrag(//clickInfo,
	2661	+ opposite);
2652	2662	} else
2653	2663	{
2654	2664	//super.
2655		- doEditDrag0(info, opposite);
	2665	+ doEditDrag0(//clickInfo,
	2666	+ opposite);
2656	2667	}
2657	2668	}
2658	2669	break;
..	..	@@ -2670,6 +2681,9 @@
2670	2681	{
2671	2682	deselectAll();
2672	2683	}
	2684	+
	2685	+ new Exception().printStackTrace();
	2686	+
2673	2687	ClickInfo newInfo = new ClickInfo();
2674	2688	newInfo.flags = info.flags;
2675	2689	newInfo.bounds = info.bounds;
..	..	@@ -3117,7 +3131,7 @@
3117	3131	{
3118	3132	if (bRep != null)
3119	3133	{
3120		- bRep.GenerateNormalsMINE();
	3134	+ bRep.MergeNormals(); //.GenerateNormalsMINE();
3121	3135	Touch();
3122	3136	}
3123	3137	}
..	..	@@ -5420,6 +5434,51 @@
5420	5434	blockloop = false;
5421	5435	}
5422	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	+
5423	5482	boolean IsSelected()
5424	5483	{
5425	5484	if (parent == null)
..	..	@@ -5729,6 +5788,38 @@
5729	5788	}
5730	5789	}
5731	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	+
5732	5823	void draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5733	5824	{
5734	5825	Draw(display, root, selected, blocked);
..	..	@@ -5816,7 +5907,7 @@
5816	5907	support = support;
5817	5908
5818	5909	//boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5819		- 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);
5820	5911
5821	5912	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5822	5913	{
..	..	@@ -7220,20 +7311,23 @@
7220	7311	}
7221	7312	}
7222	7313
7223		- 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)
7224	7318	{
7225		- int hc = info.bounds.x + info.bounds.width / 2;
7226		- int vc = info.bounds.y + info.bounds.height / 2;
7227		- 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;
7228	7322	if (toscreen == null)
7229	7323	{
7230		- toscreen = new Camera(info.camera.viewCode).toScreen;
	7324	+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
7231	7325	}
7232	7326	cVector vec = in;
7233	7327	LA.xformPos(in, toscreen, in);
7234	7328	//System.out.println("Distance = " + info.camera.Distance());
7235		- vec.x = 100 info.camera.SCALE / info.camera.Distance();
7236		- 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();
7237	7331	outPt.x = hc + (int) vec.x;
7238	7332	outPt.y = vc - (int) vec.y;
7239	7333	outRec.x = outPt.x - 3;
..	..	@@ -7241,15 +7335,18 @@
7241	7335	outRec.width = outRec.height = 6;
7242	7336	}
7243	7337
7244		- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
	7338	+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
	7339	+ )
7245	7340	{
7246	7341	Point pt = new Point(0, 0);
7247	7342	Rectangle rec = new Rectangle();
7248		- calcHotSpot(in, info, pt, rec);
	7343	+ calcHotSpot(in, //clickInfo,
	7344	+ pt, rec);
7249	7345	return rec;
7250	7346	}
7251	7347
7252		- void drawEditHandles0(ClickInfo info, int level)
	7348	+ void drawEditHandles0(//ClickInfo clickInfo,
	7349	+ int level)
7253	7350	{
7254	7351	if (level == 0)
7255	7352	{
..	..	@@ -7258,16 +7355,19 @@
7258	7355	{
7259	7356	cVector origin = new cVector();
7260	7357	//LA.xformPos(origin, toParent, origin);
7261		- Rectangle spot = calcHotSpot(origin, info);
	7358	+ if (this.clickInfo == null)
	7359	+ this.clickInfo = new ClickInfo();
	7360	+
	7361	+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
7262	7362	Rectangle boundary = new Rectangle();
7263	7363	boundary.x = spot.x - 30;
7264	7364	boundary.y = spot.y - 30;
7265	7365	boundary.width = spot.width + 60;
7266	7366	boundary.height = spot.height + 60;
7267		- info.g.setColor(Color.red);
	7367	+ clickInfo.g.setColor(Color.red);
7268	7368	int spotw = spot.x + spot.width;
7269	7369	int spoth = spot.y + spot.height;
7270		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7370	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7271	7371	// if (CameraPane.Xmin > spot.x)
7272	7372	// {
7273	7373	// CameraPane.Xmin = spot.x;
..	..	@@ -7287,8 +7387,8 @@
7287	7387	spot.translate(32, 32);
7288	7388	spotw = spot.x + spot.width;
7289	7389	spoth = spot.y + spot.height;
7290		- info.g.setColor(Color.cyan);
7291		- 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);
7292	7392	// if (CameraPane.Xmin > spot.x)
7293	7393	// {
7294	7394	// CameraPane.Xmin = spot.x;
..	..	@@ -7308,9 +7408,9 @@
7308	7408	// bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
7309	7409	//info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
7310	7410	spot.translate(0, -32);
7311		- info.g.setColor(Color.yellow);
7312		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7313		- 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);
7314	7414	// if (CameraPane.Xmin > spot.x)
7315	7415	// {
7316	7416	// CameraPane.Xmin = spot.x;
..	..	@@ -7327,8 +7427,8 @@
7327	7427	// {
7328	7428	// CameraPane.Ymax = spoth;
7329	7429	// }
7330		- info.g.drawArc(boundary.x + info.DX, boundary.y + info.DY,
7331		- (int)(boundary.width * info.W), (int)(boundary.height * info.W), 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);
7332	7432	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7333	7433	// if (CameraPane.Xmin > boundary.x)
7334	7434	// {
..	..	@@ -7350,7 +7450,8 @@
7350	7450	}
7351	7451	}
7352	7452
7353		- boolean doEditClick0(ClickInfo info, int level)
	7453	+ boolean doEditClick0(//ClickInfo clickInfo,
	7454	+ int level)
7354	7455	{
7355	7456	if (level == 0)
7356	7457	{
..	..	@@ -7359,8 +7460,8 @@
7359	7460
7360	7461	boolean retval = false;
7361	7462
7362		- startX = info.x;
7363		- startY = info.y;
	7463	+ startX = clickInfo.x;
	7464	+ startY = clickInfo.y;
7364	7465
7365	7466	hitSomething = -1;
7366	7467	cVector origin = new cVector();
..	..	@@ -7370,22 +7471,51 @@
7370	7471	{
7371	7472	centerPt = new Point(0, 0);
7372	7473	}
7373		- calcHotSpot(origin, info, centerPt, spot);
7374		- if (spot.contains(info.x, info.y))
	7474	+ calcHotSpot(origin, //info,
	7475	+ centerPt, spot);
	7476	+ if (spot.contains(clickInfo.x, clickInfo.y))
7375	7477	{
7376	7478	hitSomething = hitCenter;
7377	7479	retval = true;
7378	7480	}
7379	7481	spot.translate(32, 0);
7380		- if (spot.contains(info.x, info.y))
	7482	+ if (spot.contains(clickInfo.x, clickInfo.y))
7381	7483	{
7382	7484	hitSomething = hitRotate;
7383	7485	retval = true;
7384	7486	}
7385	7487	spot.translate(0, 32);
7386		- if (spot.contains(info.x, info.y))
	7488	+ if (spot.contains(clickInfo.x, clickInfo.y))
7387	7489	{
7388	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	+
7389	7519	retval = true;
7390	7520	}
7391	7521
..	..	@@ -7395,7 +7525,7 @@
7395	7525	}
7396	7526
7397	7527	//System.out.println("info.modifiers = " + info.modifiers);
7398		- modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
	7528	+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
7399	7529	//System.out.println("modified = " + modified);
7400	7530	//new Exception().printStackTrace();
7401	7531	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7423,7 +7553,8 @@
7423	7553	return true;
7424	7554	}
7425	7555
7426		- void doEditDrag0(ClickInfo info, boolean opposite)
	7556	+ void doEditDrag0(//ClickInfo info,
	7557	+ boolean opposite)
7427	7558	{
7428	7559	if (hitSomething == 0)
7429	7560	{
..	..	@@ -7437,7 +7568,7 @@
7437	7568
7438	7569	//System.out.println("hitSomething = " + hitSomething);
7439	7570
7440		- double scale = 0.005f * info.camera.Distance();
	7571	+ double scale = 0.005f * clickInfo.camera.Distance();
7441	7572
7442	7573	cVector xlate = new cVector();
7443	7574	//cVector xlate2 = new cVector();
..	..	@@ -7471,8 +7602,8 @@
7471	7602	toParent[3][i] = xlate.get(i);
7472	7603	LA.matInvert(toParent, fromParent);
7473	7604	*/
7474		- cVector delta = LA.newVector(0, 0, startY - info.y);
7475		- 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);
7476	7607
7477	7608	LA.matCopy(startMat, toParent);
7478	7609	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7481,7 +7612,7 @@
7481	7612	} else
7482	7613	{
7483	7614	//LA.xformDir(delta, info.camera.fromScreen, delta);
7484		- cVector up = new cVector(info.camera.up);
	7615	+ cVector up = new cVector(clickInfo.camera.up);
7485	7616	cVector away = new cVector();
7486	7617	//cVector right2 = new cVector();
7487	7618	//LA.vecCross(up, cVector.Z, right);
..	..	@@ -7498,19 +7629,19 @@
7498	7629	LA.xformDir(up, ClickInfo.matbuffer, up);
7499	7630	// if (!CameraPane.LOCALTRANSFORM)
7500	7631	LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7501		- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
	7632	+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
7502	7633	// if (!CameraPane.LOCALTRANSFORM)
7503	7634	LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7504	7635	//LA.vecCross(up, cVector.Z, right2);
7505	7636
7506		- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
	7637	+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
7507	7638
7508	7639	//System.out.println("DELTA0 = " + delta);
7509	7640	//System.out.println("AWAY = " + info.camera.away);
7510	7641	//System.out.println("UP = " + info.camera.up);
7511	7642	if (away.z > 0)
7512	7643	{
7513		- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
	7644	+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7514	7645	{
7515	7646	delta.x = -delta.x;
7516	7647	} else
..	..	@@ -7525,7 +7656,7 @@
7525	7656	//System.out.println("DELTA1 = " + delta);
7526	7657	LA.xformDir(delta, ClickInfo.matbuffer, delta);
7527	7658	//System.out.println("DELTA2 = " + delta);
7528		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7659	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7529	7660	LA.matCopy(startMat, toParent);
7530	7661	//System.out.println("DELTA3 = " + delta);
7531	7662	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7535,8 +7666,8 @@
7535	7666	break;
7536	7667
7537	7668	case hitRotate: // rotate
7538		- int dx = info.x - centerPt.x;
7539		- int dy = -(info.y - centerPt.y);
	7669	+ int dx = clickInfo.x - centerPt.x;
	7670	+ int dy = -(clickInfo.y - centerPt.y);
7540	7671	double angle = (double) Math.atan2(dx, dy);
7541	7672	angle = -(1.570796 - angle);
7542	7673
..	..	@@ -7559,7 +7690,7 @@
7559	7690	}
7560	7691	/**/
7561	7692
7562		- switch (info.pane.RenderCamera().viewCode)
	7693	+ switch (clickInfo.pane.RenderCamera().viewCode)
7563	7694	{
7564	7695	case 1: // '\001'
7565	7696	LA.matZRotate(toParent, angle);
..	..	@@ -7586,7 +7717,7 @@
7586	7717	break;
7587	7718
7588	7719	case hitScale: // scale
7589		- double hScale = (double) (info.x - centerPt.x) / 32;
	7720	+ double hScale = (double) (clickInfo.x /- centerPt.x/) / 32;
7590	7721	double sign = 1;
7591	7722	if (hScale < 0)
7592	7723	{
..	..	@@ -7598,7 +7729,7 @@
7598	7729	//hScale = 0.01;
7599	7730	}
7600	7731
7601		- double vScale = (double) (info.y - centerPt.y) / 32;
	7732	+ double vScale = (double) (clickInfo.y /- centerPt.y/) / 32;
7602	7733	sign = 1;
7603	7734	if (vScale < 0)
7604	7735	{
..	..	@@ -7609,6 +7740,7 @@
7609	7740	{
7610	7741	//vScale = 0.01;
7611	7742	}
	7743	+
7612	7744	LA.matCopy(startMat, toParent);
7613	7745	/**/
7614	7746	for (int i = 0; i < 3; i++)
..	..	@@ -7618,14 +7750,14 @@
7618	7750	}
7619	7751	/**/
7620	7752
7621		- double totalScale = Math.sqrt(hScalehScale + vScalevScale) / Math.sqrt(2);
	7753	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / clickInfo.scale;
7622	7754
7623	7755	if (totalScale < 0.01)
7624	7756	{
7625	7757	totalScale = 0.01;
7626	7758	}
7627	7759
7628		- switch (info.pane.RenderCamera().viewCode)
	7760	+ switch (clickInfo.pane.RenderCamera().viewCode)
7629	7761	{
7630	7762	case 3: // '\001'
7631	7763	if (modified \|\| opposite)
..	..	@@ -7692,7 +7824,7 @@
7692	7824	} // NEW ...
7693	7825
7694	7826
7695		- info.pane.repaint();
	7827	+ clickInfo.pane.repaint();
7696	7828	}
7697	7829
7698	7830	boolean overflow = false;