update examples

Author: Vipitis

examples/cube.py

@@ -15,7 +15,7 @@
 import wgpu
 import numpy as np
 
-from wgpu.gui.auto import WgpuCanvas, run
+from rendercanvas.auto import RenderCanvas, loop
 
 
 # %% Entrypoints (sync and async)
@@ -459,7 +459,7 @@ async def draw_frame_async():
 for a in wgpu.gpu.enumerate_adapters_sync():
     print(a.summary)
 
-canvas = WgpuCanvas(size=(640, 480), title="wgpu cube example")
+canvas = RenderCanvas(size=(640, 480), title="wgpu cube example")
 
 draw_frame = setup_drawing_sync(canvas)
 
@@ -472,4 +472,4 @@ def animate():
 canvas.request_draw(animate)
 
 if __name__ == "__main__":
-    run()
+    loop.run()

examples/gui_auto.py

@@ -4,14 +4,14 @@
 
 # test_example = true
 
-from wgpu.gui.auto import WgpuCanvas, run
+from rendercanvas.auto import RenderCanvas, loop
 
 try:
     from .triangle import setup_drawing_sync
 except ImportError:
     from triangle import setup_drawing_sync
 
-canvas = WgpuCanvas(title=f"Triangle example on {WgpuCanvas.__name__}")
+canvas = RenderCanvas(title=f"Triangle example on {RenderCanvas.__name__}")
 draw_frame = setup_drawing_sync(canvas)
 
 
@@ -22,4 +22,4 @@ def animate():
 
 
 if __name__ == "__main__":
-    run()
+    loop.run()

examples/gui_events.py

@@ -2,10 +2,10 @@
 A simple example to demonstrate events.
 """
 
-from wgpu.gui.auto import WgpuCanvas, run
+from rendercanvas.auto import RenderCanvas, loop
 
 
-canvas = WgpuCanvas(size=(640, 480), title="wgpu events")
+canvas = RenderCanvas(size=(640, 480), title="wgpu events")
 
 
 @canvas.add_event_handler("*")
@@ -15,4 +15,4 @@ def process_event(event):
 
 
 if __name__ == "__main__":
-    run()
+    loop.run()

examples/gui_glfw.py

@@ -1,16 +1,16 @@
 """
-Run triangle/cube example in the glfw GUI backend.
+Run triangle/cube example in the glfw rendercanvas backend.
 """
 
 # run_example = false
 
-from wgpu.gui.glfw import WgpuCanvas, run
+from rendercanvas.glfw import GlfwRenderCanvas, loop
 
 from triangle import setup_drawing_sync
-# from cube import setup_drawing_sync
+# from cube import setup_drawing_sync #TODO: this variant spawns and additional window!
 
 
-canvas = WgpuCanvas(title=f"Triangle example on {WgpuCanvas.__name__}")
+canvas = GlfwRenderCanvas(title=f"Triangle example on {GlfwRenderCanvas.__name__}")
 draw_frame = setup_drawing_sync(canvas)
 
 
@@ -21,4 +21,4 @@ def animate():
 
 
 if __name__ == "__main__":
-    run()
+    loop.run()

examples/gui_qt.py

@@ -11,18 +11,19 @@
 for lib in ("PySide6", "PyQt6", "PySide2", "PyQt5"):
     try:
         QtWidgets = importlib.import_module(".QtWidgets", lib)
+        print(f"Using {lib} for Qt GUI")
         break
     except ModuleNotFoundError:
         pass
 
 
-from wgpu.gui.qt import WgpuCanvas  # noqa: E402
+from rendercanvas.qt import RenderCanvas  # noqa: E402
 
 from triangle import setup_drawing_sync  # noqa: E402
 
 
 app = QtWidgets.QApplication([])
-canvas = WgpuCanvas(title=f"Triangle example on {WgpuCanvas.__name__}")
+canvas = RenderCanvas(title=f"Triangle example on {RenderCanvas.__name__}")
 
 draw_frame = setup_drawing_sync(canvas)
 

examples/gui_qt_asyncio.py

@@ -18,7 +18,7 @@
 import asyncio
 
 from PySide6 import QtWidgets, QtAsyncio
-from wgpu.gui.qt import WgpuWidget
+from rendercanvas.qt import QRenderWidget
 from triangle import setup_drawing_sync
 
 
@@ -49,7 +49,7 @@ def __init__(self):
         splitter = QtWidgets.QSplitter()
 
         self.button = QtWidgets.QPushButton("Hello world", self)
-        self.canvas = WgpuWidget(splitter)
+        self.canvas = QRenderWidget(splitter)
         self.output = QtWidgets.QTextEdit(splitter)
 
         # self.button.clicked.connect(self.whenButtonClicked)  # see above :(

examples/gui_qt_embed.py

@@ -20,7 +20,7 @@
     except ModuleNotFoundError:
         pass
 
-from wgpu.gui.qt import WgpuWidget  # noqa: E402
+from rendercanvas.qt import QRenderWidget  # noqa: E402
 
 
 class ExampleWidget(QtWidgets.QWidget):
@@ -32,7 +32,7 @@ def __init__(self):
         splitter = QtWidgets.QSplitter()
 
         self.button = QtWidgets.QPushButton("Hello world", self)
-        self.canvas = WgpuWidget(splitter)
+        self.canvas = QRenderWidget(splitter)
         self.output = QtWidgets.QTextEdit(splitter)
 
         self.button.clicked.connect(self.whenButtonClicked)

examples/gui_wx.py

@@ -5,14 +5,14 @@
 # run_example = false
 
 import wx
-from wgpu.gui.wx import WgpuCanvas
+from rendercanvas.wx import RenderCanvas
 
 from triangle import setup_drawing_sync
 # from cube import setup_drawing_sync
 
 
 app = wx.App()
-canvas = WgpuCanvas(title=f"Triangle example on {WgpuCanvas.__name__}")
+canvas = RenderCanvas(title=f"Triangle example on {RenderCanvas .__name__}")
 
 draw_func = setup_drawing_sync(canvas)
 canvas.request_draw(draw_func)

examples/gui_wx_embed.py

@@ -5,7 +5,7 @@
 # run_example = false
 
 import wx
-from wgpu.gui.wx import WgpuWidget
+from rendercanvas.wx import WxRenderWidget
 
 from triangle import setup_drawing_sync
 
@@ -18,8 +18,8 @@ def __init__(self):
         splitter = wx.SplitterWindow(self)
 
         self.button = wx.Button(self, -1, "Hello world")
-        self.canvas1 = WgpuWidget(splitter)
-        self.canvas2 = WgpuWidget(splitter)
+        self.canvas1 = WxRenderWidget(splitter)
+        self.canvas2 = WxRenderWidget(splitter)
 
         splitter.SplitVertically(self.canvas1, self.canvas2)
         splitter.SetSashGravity(0.5)

examples/imgui_backend_sea.py

@@ -4,15 +4,15 @@
 # run_example = false
 """
 
-from wgpu.gui.auto import WgpuCanvas, run
+from rendercanvas.auto import RenderCanvas, loop
 import wgpu
 import time
 import numpy as np
 from imgui_bundle import imgui
 from wgpu.utils.imgui import ImguiWgpuBackend
 
 # Create a canvas to render to
-canvas = WgpuCanvas(title="imgui_sea", size=(800, 450), max_fps=60)
+canvas = RenderCanvas(title="imgui_sea", size=(800, 450), max_fps=60, update_mode="continuous")
 
 # Create a wgpu device
 adapter = wgpu.gpu.request_adapter_sync(power_preference="high-performance")
@@ -410,11 +410,6 @@ def render():
     device.queue.submit([command_encoder.finish()])
 
 
-def loop():
-    render()
-    canvas.request_draw()
-
-
 if __name__ == "__main__":
-    canvas.request_draw(loop)
-    run()
+    canvas.request_draw(render)
+    loop.run()

examples/imgui_basic_example.py

@@ -7,12 +7,12 @@
 import wgpu
 import sys
 from imgui_bundle import imgui, imgui_ctx
-from wgpu.gui.auto import WgpuCanvas, run
+from rendercanvas.auto import RenderCanvas, loop
 from wgpu.utils.imgui import ImguiRenderer
 
 
 # Create a canvas to render to
-canvas = WgpuCanvas(title="imgui", size=(640, 480))
+canvas = RenderCanvas(title="imgui", size=(640, 480), max_fps=60, update_mode="continuous")
 
 # Create a wgpu device
 adapter = wgpu.gpu.request_adapter_sync(power_preference="high-performance")
@@ -75,11 +75,6 @@ def update_gui():
 imgui_renderer.set_gui(update_gui)
 
 
-def draw_frame():
-    imgui_renderer.render()
-    canvas.request_draw()
-
-
 if __name__ == "__main__":
-    canvas.request_draw(draw_frame)
-    run()
+    canvas.request_draw(imgui_renderer.render)
+    loop.run()

examples/imgui_cmap_picker.py

@@ -17,13 +17,13 @@
 
 import wgpu
 from imgui_bundle import imgui
-from wgpu.gui.auto import WgpuCanvas, run
+from rendercanvas.auto import RenderCanvas, loop
 from wgpu.utils.imgui import ImguiRenderer
 
 from cmap import Colormap
 
 # Create a canvas to render to
-canvas = WgpuCanvas(title="imgui", size=(512, 256))
+canvas = RenderCanvas(title="imgui", size=(512, 256), max_fps=60, update_mode="continuous")
 
 # Create a wgpu device
 adapter = wgpu.gpu.request_adapter_sync(power_preference="high-performance")
@@ -121,11 +121,6 @@ def update_gui():
 imgui_renderer.set_gui(update_gui)
 
 
-def draw_frame():
-    imgui_renderer.render()
-    canvas.request_draw()
-
-
 if __name__ == "__main__":
-    canvas.request_draw(draw_frame)
-    run()
+    canvas.request_draw(imgui_renderer.render)
+    loop.run()

examples/imgui_multi_canvas.py

@@ -6,13 +6,13 @@
 
 import wgpu
 from imgui_bundle import imgui
-from wgpu.gui.auto import WgpuCanvas, run
+from rendercanvas.auto import RenderCanvas, loop
 from wgpu.utils.imgui import ImguiRenderer
 
 # Create a canvas to render to
-canvas1 = WgpuCanvas(title="imgui", size=(512, 256))
-canvas2 = WgpuCanvas(title="imgui", size=(512, 256))
-canvas3 = WgpuCanvas(title="imgui", size=(512, 256))
+canvas1 = RenderCanvas(title="imgui", size=(512, 256))
+canvas2 = RenderCanvas(title="imgui", size=(512, 256))
+canvas3 = RenderCanvas(title="imgui", size=(512, 256))
 
 canvases = [canvas1, canvas2, canvas3]
 
@@ -105,4 +105,4 @@ def draw3():
     canvas2.request_draw(draw2)
     canvas3.request_draw(draw3)
 
-    run()
+    loop.run()

examples/imgui_renderer_sea.py

@@ -4,15 +4,15 @@
 
 # run_example = false
 
-from wgpu.gui.auto import WgpuCanvas, run
+from rendercanvas.auto import RenderCanvas, loop
 import wgpu
 import time
 import numpy as np
 from imgui_bundle import imgui
 from wgpu.utils.imgui import ImguiRenderer, Stats
 
 # Create a canvas to render to
-canvas = WgpuCanvas(title="imgui_sea", size=(800, 450), max_fps=-1, vsync=False)
+canvas = RenderCanvas(title="imgui_sea", size=(800, 450), max_fps=-1, vsync=False)
 
 # Create a wgpu device
 adapter = wgpu.gpu.request_adapter_sync(power_preference="high-performance")
@@ -391,13 +391,13 @@ def render():
 stats.extra_data = stats_data
 
 
-def loop():
+def render_loop():
     with stats:
         render()
     imgui_renderer.render()
     canvas.request_draw()
 
 
 if __name__ == "__main__":
-    canvas.request_draw(loop)
-    run()
+    canvas.request_draw(render_loop)
+    loop.run()

examples/offscreen_hdr.py

@@ -13,8 +13,8 @@
 import numpy as np
 import png  # provided by the pypng package
 
-# from rendercanvas.offscreen import RenderCanvas
-from wgpu.gui.offscreen import WgpuCanvas as RenderCanvas
+from rendercanvas.offscreen import RenderCanvas
+# from wgpu.gui.offscreen import WgpuCanvas as RenderCanvas
 
 try:
     from .triangle import setup_drawing_sync

examples/tests/test_examples.py

@@ -42,12 +42,12 @@
 
 @pytest.fixture
 def force_offscreen():
-    """Force the offscreen canvas to be selected by the auto gui module."""
-    os.environ["WGPU_FORCE_OFFSCREEN"] = "true"
+    """Force the offscreen canvas to be selected by the auto rendercanvas module."""
+    os.environ["RENDERCANVAS_FORCE_OFFSCREEN"] = "true"
     try:
         yield
     finally:
-        del os.environ["WGPU_FORCE_OFFSCREEN"]
+        del os.environ["RENDERCANVAS_FORCE_OFFSCREEN"]
 
 
 @pytest.fixture
@@ -179,7 +179,7 @@ def test_examples_run(module, force_offscreen):
 
 if __name__ == "__main__":
     # Enable tweaking in an IDE by running in an interactive session.
-    os.environ["WGPU_FORCE_OFFSCREEN"] = "true"
+    os.environ["RENDERCANVAS_FORCE_OFFSCREEN"] = "true"
     pytest.getoption = lambda x: False
     is_lavapipe = True
     test_examples_screenshots("validate_volume", pytest, None, None)

examples/triangle.py

@@ -167,9 +167,9 @@ async def draw_frame_async():
 
 
 if __name__ == "__main__":
-    from wgpu.gui.auto import WgpuCanvas, run
+    from rendercanvas.auto import RenderCanvas, loop
 
-    canvas = WgpuCanvas(size=(640, 480), title="wgpu triangle example")
+    canvas = RenderCanvas(size=(640, 480), title="wgpu triangle example")
     draw_frame = setup_drawing_sync(canvas)
     canvas.request_draw(draw_frame)
-    run()
+    loop.run()