Skip to content

Commit 874ff7f

Browse files
committed
Tweak examples
1 parent dedb3bf commit 874ff7f

9 files changed

+22
-42
lines changed

examples/cube_auto.py

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,10 @@
88

99

1010
canvas = RenderCanvas(
11-
size=(640, 480), title=f"The wgpu cube example on a {RenderCanvas.__name__}"
11+
title="The wgpu cube example on $backend", update_mode="continuous"
1212
)
1313
draw_frame = setup_drawing_sync(canvas)
14-
15-
16-
@canvas.request_draw
17-
def animate():
18-
draw_frame()
19-
canvas.request_draw()
14+
canvas.request_draw(draw_frame)
2015

2116

2217
if __name__ == "__main__":

examples/cube_glfw.py

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,11 @@
77
from rendercanvas.utils.cube import setup_drawing_sync
88

99

10-
canvas = RenderCanvas(size=(640, 480), title="The wgpu cube example on glfw")
10+
canvas = RenderCanvas(
11+
title="The wgpu cube example on $backend", update_mode="continuous"
12+
)
1113
draw_frame = setup_drawing_sync(canvas)
12-
13-
14-
@canvas.request_draw
15-
def animate():
16-
draw_frame()
17-
canvas.request_draw()
14+
canvas.request_draw(draw_frame)
1815

1916

2017
if __name__ == "__main__":

examples/cube_qt.py

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,12 @@
1919

2020

2121
from rendercanvas.qt import RenderCanvas, run
22-
2322
from rendercanvas.utils.cube import setup_drawing_sync
2423

2524

26-
canvas = RenderCanvas(size=(640, 480), title=f"The wgpu cube example on {lib}")
25+
canvas = RenderCanvas(title=f"The wgpu cube example on {lib}", update_mode="continuous")
2726
draw_frame = setup_drawing_sync(canvas)
28-
29-
30-
@canvas.request_draw
31-
def animate():
32-
draw_frame()
33-
canvas.request_draw()
27+
canvas.request_draw(draw_frame)
3428

3529

3630
if __name__ == "__main__":

examples/cube_wx.py

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,11 @@
77
from rendercanvas.utils.cube import setup_drawing_sync
88

99

10-
canvas = RenderCanvas(size=(640, 480), title="The wgpu cube example on wx")
10+
canvas = RenderCanvas(
11+
title="The wgpu cube example on $backend", update_mode="continuous"
12+
)
1113
draw_frame = setup_drawing_sync(canvas)
12-
13-
14-
@canvas.request_draw
15-
def animate():
16-
draw_frame()
17-
canvas.request_draw()
14+
canvas.request_draw(draw_frame)
1815

1916

2017
if __name__ == "__main__":

examples/demo.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727

2828
draw_frame = setup_drawing_sync(canvas)
29-
canvas.request_draw(lambda: (draw_frame(), canvas.request_draw()))
29+
canvas.request_draw(draw_frame)
3030

3131

3232
@canvas.add_event_handler("*")

examples/events.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
from rendercanvas.auto import RenderCanvas, run
66

77

8-
canvas = RenderCanvas(size=(640, 480), title="RenderCanvas events")
8+
canvas = RenderCanvas(title="RenderCanvas events")
99

1010

1111
@canvas.add_event_handler("*")
1212
def process_event(event):
13-
if event["event_type"] != "pointer_move":
13+
if event["event_type"] not in ["pointer_move", "before_draw", "draw"]:
1414
print(event)
1515

1616

examples/multiple.py

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,19 @@
11
"""
2-
Run triangle and cube examples two canvases.
2+
Run cube example in two canvases.
33
"""
44

55
# test_example = true
66

77
from rendercanvas.auto import RenderCanvas, loop
88

9-
from triangle import setup_drawing_sync as setup_drawing_sync_triangle
10-
from cube import setup_drawing_sync as setup_drawing_sync_cube
9+
from rendercanvas.utils.cube import setup_drawing_sync
1110

12-
13-
canvas1 = RenderCanvas(title=f"Triangle example on {RenderCanvas.__name__}")
14-
draw_frame1 = setup_drawing_sync_triangle(canvas1)
11+
canvas1 = RenderCanvas(title="$backend 1", update_mode="continuous")
12+
draw_frame1 = setup_drawing_sync(canvas1)
1513
canvas1.request_draw(draw_frame1)
1614

17-
canvas2 = RenderCanvas(title=f"Cube example on {RenderCanvas.__name__}")
18-
draw_frame2 = setup_drawing_sync_cube(canvas2)
15+
canvas2 = RenderCanvas(title="$backend 2", update_mode="continuous")
16+
draw_frame2 = setup_drawing_sync(canvas2)
1917
canvas2.request_draw(draw_frame2)
2018

2119

examples/offsceen_threaded.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
from rendercanvas.offscreen import RenderCanvas
2121

22-
from cube import setup_drawing_sync
22+
from rendercanvas.utils.cube import setup_drawing_sync
2323

2424

2525
# create canvas

examples/qt_app_asyncio.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ def __init__(self):
4747

4848
splitter = QtWidgets.QSplitter()
4949

50-
# todo: use update_mode = 'continuous' when that feature has arrived
5150
self.button = QtWidgets.QPushButton("Hello world", self)
5251
self.canvas = QRenderWidget(splitter, update_mode="continuous")
5352
self.output = QtWidgets.QTextEdit(splitter)

0 commit comments

Comments
 (0)