|
6 | 6 | "metadata": {}, |
7 | 7 | "outputs": [], |
8 | 8 | "source": [ |
9 | | - "import matplotlib.pyplot as plt\n", |
10 | | - "from mpl_toolkits.mplot3d import Axes3D, proj3d\n", |
11 | 9 | "import numpy as np\n", |
12 | | - "from ipycanvas import Canvas, hold_canvas\n", |
13 | | - "from ipywidgets import FloatSlider, Output\n", |
14 | | - "from math import pi" |
| 10 | + "from ipycanvas import Canvas, hold_canvas" |
15 | 11 | ] |
16 | 12 | }, |
17 | 13 | { |
|
20 | 16 | "metadata": {}, |
21 | 17 | "outputs": [], |
22 | 18 | "source": [ |
23 | | - "out = Output(layout={'border': '1px solid black'})" |
| 19 | + "from ipywidgets import FloatSlider" |
| 20 | + ] |
| 21 | + }, |
| 22 | + { |
| 23 | + "cell_type": "markdown", |
| 24 | + "metadata": {}, |
| 25 | + "source": [ |
| 26 | + "This module is local to the Notebook" |
| 27 | + ] |
| 28 | + }, |
| 29 | + { |
| 30 | + "cell_type": "code", |
| 31 | + "execution_count": null, |
| 32 | + "metadata": {}, |
| 33 | + "outputs": [], |
| 34 | + "source": [ |
| 35 | + "from py3d_engine import get_orbit_projection, project_vector" |
24 | 36 | ] |
25 | 37 | }, |
26 | 38 | { |
|
35 | 47 | " \n", |
36 | 48 | " self.width = 500\n", |
37 | 49 | " self.height = 500\n", |
38 | | - " \n", |
39 | | - " plt.ioff()\n", |
40 | | - " fig = plt.figure()\n", |
41 | | - " self.ax = Axes3D(fig)\n", |
42 | 50 | "\n", |
43 | 51 | " self.dragging = False\n", |
44 | 52 | " self.n = 200\n", |
45 | | - " self.x = np.random.rand(self.n)\n", |
46 | | - " self.y = np.random.rand(self.n)\n", |
47 | | - " self.z = np.random.rand(self.n)\n", |
48 | | - " \n", |
49 | | - " self.zoom = 4\n", |
| 53 | + " self.x = np.random.rand(self.n) - 0.5\n", |
| 54 | + " self.y = np.random.rand(self.n) - 0.5\n", |
| 55 | + " self.z = np.random.rand(self.n) - 0.5\n", |
| 56 | + "\n", |
| 57 | + " self.radius = 5\n", |
50 | 58 | " self.dx = 0\n", |
51 | 59 | " self.dy = 0\n", |
52 | | - " self.ax.view_init(elev=self.dx, azim=self.dy)\n", |
53 | | - " self.x2, self.y2, _ = proj3d.proj_transform(self.x, self.y, self.z, self.ax.get_proj())\n", |
54 | | - " self.draw()\n", |
55 | | - " \n", |
| 60 | + " self.update_matrix()\n", |
| 61 | + "\n", |
56 | 62 | " self.on_mouse_down(self.mouse_down_handler)\n", |
57 | 63 | " self.on_mouse_move(self.mouse_move_handler)\n", |
58 | 64 | " self.on_mouse_up(self.mouse_up_handler)\n", |
59 | 65 | " self.on_mouse_out(self.mouse_out_handler)\n", |
60 | 66 | "\n", |
61 | | - " #@out.capture()\n", |
| 67 | + " def update_matrix(self, dx=None, dy=None, radius=None):\n", |
| 68 | + " dx = dx if dx is not None else self.dx\n", |
| 69 | + " dy = dy if dy is not None else self.dy\n", |
| 70 | + " self.radius = radius if radius is not None else self.radius\n", |
| 71 | + "\n", |
| 72 | + " self.matrix = get_orbit_projection(\n", |
| 73 | + " dy, dx, self.radius, \n", |
| 74 | + " aspect=self.width / self.height\n", |
| 75 | + " )\n", |
| 76 | + " self.x2, self.y2, self.z2 = project_vector(self.x, self.y, self.z, self.matrix)\n", |
| 77 | + " self.draw()\n", |
| 78 | + "\n", |
62 | 79 | " def draw(self):\n", |
63 | | - " x = self.x2 * self.width * self.zoom + self.width / 2\n", |
64 | | - " y = self.y2 * self.width * self.zoom + self.height / 2\n", |
| 80 | + " x = self.x2 * self.width + self.width / 2\n", |
| 81 | + " y = self.y2 * self.height + self.height / 2\n", |
| 82 | + " size = 10 * (1 - self.z2) + 1\n", |
65 | 83 | " with hold_canvas(self):\n", |
66 | 84 | " self.clear()\n", |
67 | | - " self.save()\n", |
68 | | - " for i in range(self.n):\n", |
69 | | - " self.fill_arc(x[i], y[i], self.zoom, 0, 2*pi)\n", |
70 | | - " self.stroke_arc(x[i], y[i], self.zoom, 0, 2*pi)\n", |
71 | | - " self.restore()\n", |
| 85 | + " self.fill_circles(x, y, size)\n", |
72 | 86 | "\n", |
73 | 87 | " def mouse_down_handler(self, pixel_x, pixel_y):\n", |
74 | 88 | " self.dragging = True\n", |
|
79 | 93 | " if self.dragging:\n", |
80 | 94 | " self.dx_new = self.dx + pixel_x - self.x_mouse\n", |
81 | 95 | " self.dy_new = self.dy + pixel_y - self.y_mouse\n", |
82 | | - " self.ax.view_init(elev=self.dy_new, azim=self.dx_new)\n", |
83 | | - " self.x2, self.y2, _ = proj3d.proj_transform(self.x, self.y, self.z, self.ax.get_proj())\n", |
84 | | - " self.draw()\n", |
| 96 | + " \n", |
| 97 | + " self.update_matrix(- self.dx_new, self.dy_new)\n", |
85 | 98 | " \n", |
86 | 99 | " def mouse_up_handler(self, pixel_x, pixel_y):\n", |
87 | 100 | " if self.dragging:\n", |
|
114 | 127 | "metadata": {}, |
115 | 128 | "outputs": [], |
116 | 129 | "source": [ |
117 | | - "slider = FloatSlider(description='Zoom:', value=p.zoom, min=1, max=10)\n", |
| 130 | + "# Link Camera position to a slider widget\n", |
| 131 | + "slider = FloatSlider(description='Radius:', min=1., max=7., value=p.radius)\n", |
| 132 | + "\n", |
| 133 | + "def on_slider_move(change):\n", |
| 134 | + " slider_value = change['new']\n", |
118 | 135 | "\n", |
119 | | - "def on_slider_change(change):\n", |
120 | | - " p.zoom = slider.value\n", |
121 | | - " p.draw()\n", |
| 136 | + " p.update_matrix(radius=slider_value)\n", |
| 137 | + "\n", |
| 138 | + "slider.observe(on_slider_move, 'value')\n", |
122 | 139 | "\n", |
123 | | - "slider.observe(on_slider_change, 'value')\n", |
124 | 140 | "slider" |
125 | 141 | ] |
126 | | - }, |
127 | | - { |
128 | | - "cell_type": "markdown", |
129 | | - "metadata": {}, |
130 | | - "source": [ |
131 | | - "## Drag the figure with the mouse to rotate, use the slider to zoom" |
132 | | - ] |
133 | | - }, |
134 | | - { |
135 | | - "cell_type": "code", |
136 | | - "execution_count": null, |
137 | | - "metadata": {}, |
138 | | - "outputs": [], |
139 | | - "source": [ |
140 | | - "out" |
141 | | - ] |
142 | 142 | } |
143 | 143 | ], |
144 | 144 | "metadata": { |
|
157 | 157 | "name": "python", |
158 | 158 | "nbconvert_exporter": "python", |
159 | 159 | "pygments_lexer": "ipython3", |
160 | | - "version": "3.8.5" |
| 160 | + "version": "3.9.0" |
161 | 161 | } |
162 | 162 | }, |
163 | 163 | "nbformat": 4, |
|
0 commit comments