~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -2567,7 +2567,8 @@
2567	2567	private static final int editSelf = 1;
2568	2568	private static final int editChild = 2;
2569	2569
2570		- void drawEditHandles(ClickInfo info, int level)
	2570	+ void drawEditHandles(//ClickInfo info,
	2571	+ int level)
2571	2572	{
2572	2573	if (level == 0)
2573	2574	{
..	..	@@ -2575,7 +2576,8 @@
2575	2576	return;
2576	2577
2577	2578	Object3D selectee;
2578		- 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))
2579	2581	{
2580	2582	selectee = (Object3D) e.nextElement();
2581	2583	}
..	..	@@ -2583,19 +2585,22 @@
2583	2585	} else
2584	2586	{
2585	2587	//super.
2586		- drawEditHandles0(info, level + 1);
	2588	+ drawEditHandles0(//info,
	2589	+ level + 1);
2587	2590	}
2588	2591	}
2589	2592
2590		- boolean doEditClick(ClickInfo info, int level)
	2593	+ boolean doEditClick(//ClickInfo info,
	2594	+ int level)
2591	2595	{
2592	2596	doSomething = 0;
2593	2597	if (level == 0)
2594	2598	{
2595		- return doParentClick(info);
	2599	+ return doParentClick(); //info);
2596	2600	}
2597	2601	if (//super.
2598		- doEditClick0(info, level))
	2602	+ doEditClick0(//info,
	2603	+ level))
2599	2604	{
2600	2605	doSomething = 1;
2601	2606	return true;
..	..	@@ -2605,7 +2610,7 @@
2605	2610	}
2606	2611	}
2607	2612
2608		- boolean doParentClick(ClickInfo info)
	2613	+ boolean doParentClick() //ClickInfo info)
2609	2614	{
2610	2615	if (selection == null)
2611	2616	{
..	..	@@ -2618,7 +2623,8 @@
2618	2623	for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
2619	2624	{
2620	2625	Object3D selectee = (Object3D) e.nextElement();
2621		- if (selectee.doEditClick(info, 1))
	2626	+ if (selectee.doEditClick(//info,
	2627	+ 1))
2622	2628	{
2623	2629	childToDrag = selectee;
2624	2630	doSomething = 2;
..	..	@@ -2630,13 +2636,15 @@
2630	2636	return retval;
2631	2637	}
2632	2638
2633		- void doEditDrag(ClickInfo info, boolean opposite)
	2639	+ void doEditDrag(//ClickInfo clickInfo,
	2640	+ boolean opposite)
2634	2641	{
2635	2642	switch (doSomething)
2636	2643	{
2637	2644	case 1: // '\001'
2638	2645	//super.
2639		- doEditDrag0(info, opposite);
	2646	+ doEditDrag0(//clickInfo,
	2647	+ opposite);
2640	2648	break;
2641	2649
2642	2650	case 2: // '\002'
..	..	@@ -2649,11 +2657,13 @@
2649	2657	{
2650	2658	//sel.hitSomething = childToDrag.hitSomething;
2651	2659	//childToDrag.doEditDrag(info);
2652		- sel.doEditDrag(info, opposite);
	2660	+ sel.doEditDrag(//clickInfo,
	2661	+ opposite);
2653	2662	} else
2654	2663	{
2655	2664	//super.
2656		- doEditDrag0(info, opposite);
	2665	+ doEditDrag0(//clickInfo,
	2666	+ opposite);
2657	2667	}
2658	2668	}
2659	2669	break;
..	..	@@ -2671,6 +2681,9 @@
2671	2681	{
2672	2682	deselectAll();
2673	2683	}
	2684	+
	2685	+ new Exception().printStackTrace();
	2686	+
2674	2687	ClickInfo newInfo = new ClickInfo();
2675	2688	newInfo.flags = info.flags;
2676	2689	newInfo.bounds = info.bounds;
..	..	@@ -5775,6 +5788,38 @@
5775	5788	}
5776	5789	}
5777	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	+
5778	5823	void draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5779	5824	{
5780	5825	Draw(display, root, selected, blocked);
..	..	@@ -5862,7 +5907,7 @@
5862	5907	support = support;
5863	5908
5864	5909	//boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5865		- 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);
5866	5911
5867	5912	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5868	5913	{
..	..	@@ -7266,20 +7311,23 @@
7266	7311	}
7267	7312	}
7268	7313
7269		- 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)
7270	7318	{
7271		- int hc = info.bounds.x + info.bounds.width / 2;
7272		- int vc = info.bounds.y + info.bounds.height / 2;
7273		- 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;
7274	7322	if (toscreen == null)
7275	7323	{
7276		- toscreen = new Camera(info.camera.viewCode).toScreen;
	7324	+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
7277	7325	}
7278	7326	cVector vec = in;
7279	7327	LA.xformPos(in, toscreen, in);
7280	7328	//System.out.println("Distance = " + info.camera.Distance());
7281		- vec.x = 100 info.camera.SCALE / info.camera.Distance();
7282		- 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();
7283	7331	outPt.x = hc + (int) vec.x;
7284	7332	outPt.y = vc - (int) vec.y;
7285	7333	outRec.x = outPt.x - 3;
..	..	@@ -7287,15 +7335,18 @@
7287	7335	outRec.width = outRec.height = 6;
7288	7336	}
7289	7337
7290		- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
	7338	+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
	7339	+ )
7291	7340	{
7292	7341	Point pt = new Point(0, 0);
7293	7342	Rectangle rec = new Rectangle();
7294		- calcHotSpot(in, info, pt, rec);
	7343	+ calcHotSpot(in, //clickInfo,
	7344	+ pt, rec);
7295	7345	return rec;
7296	7346	}
7297	7347
7298		- void drawEditHandles0(ClickInfo info, int level)
	7348	+ void drawEditHandles0(//ClickInfo clickInfo,
	7349	+ int level)
7299	7350	{
7300	7351	if (level == 0)
7301	7352	{
..	..	@@ -7304,16 +7355,19 @@
7304	7355	{
7305	7356	cVector origin = new cVector();
7306	7357	//LA.xformPos(origin, toParent, origin);
7307		- Rectangle spot = calcHotSpot(origin, info);
	7358	+ if (this.clickInfo == null)
	7359	+ this.clickInfo = new ClickInfo();
	7360	+
	7361	+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
7308	7362	Rectangle boundary = new Rectangle();
7309	7363	boundary.x = spot.x - 30;
7310	7364	boundary.y = spot.y - 30;
7311	7365	boundary.width = spot.width + 60;
7312	7366	boundary.height = spot.height + 60;
7313		- info.g.setColor(Color.red);
	7367	+ clickInfo.g.setColor(Color.red);
7314	7368	int spotw = spot.x + spot.width;
7315	7369	int spoth = spot.y + spot.height;
7316		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7370	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7317	7371	// if (CameraPane.Xmin > spot.x)
7318	7372	// {
7319	7373	// CameraPane.Xmin = spot.x;
..	..	@@ -7333,8 +7387,8 @@
7333	7387	spot.translate(32, 32);
7334	7388	spotw = spot.x + spot.width;
7335	7389	spoth = spot.y + spot.height;
7336		- info.g.setColor(Color.cyan);
7337		- 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);
7338	7392	// if (CameraPane.Xmin > spot.x)
7339	7393	// {
7340	7394	// CameraPane.Xmin = spot.x;
..	..	@@ -7354,9 +7408,9 @@
7354	7408	// bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
7355	7409	//info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
7356	7410	spot.translate(0, -32);
7357		- info.g.setColor(Color.yellow);
7358		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7359		- 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);
7360	7414	// if (CameraPane.Xmin > spot.x)
7361	7415	// {
7362	7416	// CameraPane.Xmin = spot.x;
..	..	@@ -7373,8 +7427,8 @@
7373	7427	// {
7374	7428	// CameraPane.Ymax = spoth;
7375	7429	// }
7376		- info.g.drawArc(boundary.x + info.DX, boundary.y + info.DY,
7377		- (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);
7378	7432	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7379	7433	// if (CameraPane.Xmin > boundary.x)
7380	7434	// {
..	..	@@ -7396,7 +7450,8 @@
7396	7450	}
7397	7451	}
7398	7452
7399		- boolean doEditClick0(ClickInfo info, int level)
	7453	+ boolean doEditClick0(//ClickInfo clickInfo,
	7454	+ int level)
7400	7455	{
7401	7456	if (level == 0)
7402	7457	{
..	..	@@ -7405,8 +7460,8 @@
7405	7460
7406	7461	boolean retval = false;
7407	7462
7408		- startX = info.x;
7409		- startY = info.y;
	7463	+ startX = clickInfo.x;
	7464	+ startY = clickInfo.y;
7410	7465
7411	7466	hitSomething = -1;
7412	7467	cVector origin = new cVector();
..	..	@@ -7416,22 +7471,51 @@
7416	7471	{
7417	7472	centerPt = new Point(0, 0);
7418	7473	}
7419		- calcHotSpot(origin, info, centerPt, spot);
7420		- if (spot.contains(info.x, info.y))
	7474	+ calcHotSpot(origin, //info,
	7475	+ centerPt, spot);
	7476	+ if (spot.contains(clickInfo.x, clickInfo.y))
7421	7477	{
7422	7478	hitSomething = hitCenter;
7423	7479	retval = true;
7424	7480	}
7425	7481	spot.translate(32, 0);
7426		- if (spot.contains(info.x, info.y))
	7482	+ if (spot.contains(clickInfo.x, clickInfo.y))
7427	7483	{
7428	7484	hitSomething = hitRotate;
7429	7485	retval = true;
7430	7486	}
7431	7487	spot.translate(0, 32);
7432		- if (spot.contains(info.x, info.y))
	7488	+ if (spot.contains(clickInfo.x, clickInfo.y))
7433	7489	{
7434	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	+
7435	7519	retval = true;
7436	7520	}
7437	7521
..	..	@@ -7441,7 +7525,7 @@
7441	7525	}
7442	7526
7443	7527	//System.out.println("info.modifiers = " + info.modifiers);
7444		- modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
	7528	+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
7445	7529	//System.out.println("modified = " + modified);
7446	7530	//new Exception().printStackTrace();
7447	7531	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7469,7 +7553,8 @@
7469	7553	return true;
7470	7554	}
7471	7555
7472		- void doEditDrag0(ClickInfo info, boolean opposite)
	7556	+ void doEditDrag0(//ClickInfo info,
	7557	+ boolean opposite)
7473	7558	{
7474	7559	if (hitSomething == 0)
7475	7560	{
..	..	@@ -7483,7 +7568,7 @@
7483	7568
7484	7569	//System.out.println("hitSomething = " + hitSomething);
7485	7570
7486		- double scale = 0.005f * info.camera.Distance();
	7571	+ double scale = 0.005f * clickInfo.camera.Distance();
7487	7572
7488	7573	cVector xlate = new cVector();
7489	7574	//cVector xlate2 = new cVector();
..	..	@@ -7517,8 +7602,8 @@
7517	7602	toParent[3][i] = xlate.get(i);
7518	7603	LA.matInvert(toParent, fromParent);
7519	7604	*/
7520		- cVector delta = LA.newVector(0, 0, startY - info.y);
7521		- 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);
7522	7607
7523	7608	LA.matCopy(startMat, toParent);
7524	7609	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7527,7 +7612,7 @@
7527	7612	} else
7528	7613	{
7529	7614	//LA.xformDir(delta, info.camera.fromScreen, delta);
7530		- cVector up = new cVector(info.camera.up);
	7615	+ cVector up = new cVector(clickInfo.camera.up);
7531	7616	cVector away = new cVector();
7532	7617	//cVector right2 = new cVector();
7533	7618	//LA.vecCross(up, cVector.Z, right);
..	..	@@ -7544,19 +7629,19 @@
7544	7629	LA.xformDir(up, ClickInfo.matbuffer, up);
7545	7630	// if (!CameraPane.LOCALTRANSFORM)
7546	7631	LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7547		- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
	7632	+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
7548	7633	// if (!CameraPane.LOCALTRANSFORM)
7549	7634	LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7550	7635	//LA.vecCross(up, cVector.Z, right2);
7551	7636
7552		- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
	7637	+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
7553	7638
7554	7639	//System.out.println("DELTA0 = " + delta);
7555	7640	//System.out.println("AWAY = " + info.camera.away);
7556	7641	//System.out.println("UP = " + info.camera.up);
7557	7642	if (away.z > 0)
7558	7643	{
7559		- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
	7644	+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7560	7645	{
7561	7646	delta.x = -delta.x;
7562	7647	} else
..	..	@@ -7571,7 +7656,7 @@
7571	7656	//System.out.println("DELTA1 = " + delta);
7572	7657	LA.xformDir(delta, ClickInfo.matbuffer, delta);
7573	7658	//System.out.println("DELTA2 = " + delta);
7574		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7659	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7575	7660	LA.matCopy(startMat, toParent);
7576	7661	//System.out.println("DELTA3 = " + delta);
7577	7662	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7581,8 +7666,8 @@
7581	7666	break;
7582	7667
7583	7668	case hitRotate: // rotate
7584		- int dx = info.x - centerPt.x;
7585		- int dy = -(info.y - centerPt.y);
	7669	+ int dx = clickInfo.x - centerPt.x;
	7670	+ int dy = -(clickInfo.y - centerPt.y);
7586	7671	double angle = (double) Math.atan2(dx, dy);
7587	7672	angle = -(1.570796 - angle);
7588	7673
..	..	@@ -7605,7 +7690,7 @@
7605	7690	}
7606	7691	/**/
7607	7692
7608		- switch (info.pane.RenderCamera().viewCode)
	7693	+ switch (clickInfo.pane.RenderCamera().viewCode)
7609	7694	{
7610	7695	case 1: // '\001'
7611	7696	LA.matZRotate(toParent, angle);
..	..	@@ -7632,7 +7717,7 @@
7632	7717	break;
7633	7718
7634	7719	case hitScale: // scale
7635		- double hScale = (double) (info.x - centerPt.x) / 32;
	7720	+ double hScale = (double) (clickInfo.x /- centerPt.x/) / 32;
7636	7721	double sign = 1;
7637	7722	if (hScale < 0)
7638	7723	{
..	..	@@ -7644,7 +7729,7 @@
7644	7729	//hScale = 0.01;
7645	7730	}
7646	7731
7647		- double vScale = (double) (info.y - centerPt.y) / 32;
	7732	+ double vScale = (double) (clickInfo.y /- centerPt.y/) / 32;
7648	7733	sign = 1;
7649	7734	if (vScale < 0)
7650	7735	{
..	..	@@ -7655,6 +7740,7 @@
7655	7740	{
7656	7741	//vScale = 0.01;
7657	7742	}
	7743	+
7658	7744	LA.matCopy(startMat, toParent);
7659	7745	/**/
7660	7746	for (int i = 0; i < 3; i++)
..	..	@@ -7664,14 +7750,14 @@
7664	7750	}
7665	7751	/**/
7666	7752
7667		- double totalScale = Math.sqrt(hScalehScale + vScalevScale) / Math.sqrt(2);
	7753	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / clickInfo.scale;
7668	7754
7669	7755	if (totalScale < 0.01)
7670	7756	{
7671	7757	totalScale = 0.01;
7672	7758	}
7673	7759
7674		- switch (info.pane.RenderCamera().viewCode)
	7760	+ switch (clickInfo.pane.RenderCamera().viewCode)
7675	7761	{
7676	7762	case 3: // '\001'
7677	7763	if (modified \|\| opposite)
..	..	@@ -7738,7 +7824,7 @@
7738	7824	} // NEW ...
7739	7825
7740	7826
7741		- info.pane.repaint();
	7827	+ clickInfo.pane.repaint();
7742	7828	}
7743	7829
7744	7830	boolean overflow = false;