Commit29e4c75

committed

Fix 3D rotation precession

1 parent7f3738d commit29e4c75Copy full SHA for 29e4c75

File tree

-8

lines changed

-8

lines changed

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1568,10 +1568,11 @@ def _on_move(self, event):`
`1568`	`1568`	`q=_Quaternion.from_cardan_angles(elev,azim,roll)`
`1569`	`1569`
`1570`	`1570`	`# Update quaternion - a variation on Ken Shoemake's ARCBALL`
`1571`		`-current_vec=self._arcball(self._sx/w,self._sy/h)`
`1572`		`-new_vec=self._arcball(x/w,y/h)`
	`1571`	`+scale=np.sqrt(2)/2# slow down the rate of rotation`
	`1572`	`+current_vec=self._arcball(self._sxscale/w,self._syscale/h)`
	`1573`	`+new_vec=self._arcball(xscale/w,yscale/h)`
`1573`	`1574`	`dq=_Quaternion.rotate_from_to(current_vec,new_vec)`
`1574`		`-q=dq*q`
	`1575`	`+q=dqdqq`
`1575`	`1576`
`1576`	`1577`	`# Convert to elev, azim, roll`
`1577`	`1578`	`elev,azim,roll=q.as_cardan_angles()`

Lines changed: 4 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -1952,8 +1952,8 @@ def test_rotate():`
`1952`	`1952`	`[30,0.5,0,30,-90,0],`
`1953`	`1953`	`[0,0,0.5,-90,0,0],`
`1954`	`1954`	`[30,0,0.5,-60,-90,90],`
`1955`		`- [0,0.5,0.5,-45,-90,45],`
`1956`		`- [30,0.5,0.5,-15,-90,45]]:`
	`1955`	`+ [0,0.5,0.5,0,-180,90],`
	`1956`	`+ [30,0.5,0.5,0,-180,60]]:`
`1957`	`1957`	`fig=plt.figure()`
`1958`	`1958`	`ax=fig.add_subplot(1,1,1,projection='3d')`
`1959`	`1959`	`ax.view_init(0,0,roll)`
`@@ -1967,9 +1967,8 @@ def test_rotate():`
`1967`	`1967`	`xdata=dxax._pseudo_w,ydata=dyax._pseudo_h))`
`1968`	`1968`	`fig.canvas.draw()`
`1969`	`1969`
`1970`		`-assertnp.isclose(ax.elev,new_elev)`
`1971`		`-assertnp.isclose(ax.azim,new_azim)`
`1972`		`-assertnp.isclose(ax.roll,new_roll)`
	`1970`	`+np.testing.assert_allclose((ax.elev,ax.azim,ax.roll),`
	`1971`	`+ (new_elev,new_azim,new_roll),atol=1e-5)`
`1973`	`1972`
`1974`	`1973`
`1975`	`1974`	`deftest_pan():`

Comments

(0)