From cdb1edf7ca4523f3e13ccb0645dc1bd4e1b10f11 Mon Sep 17 00:00:00 2001 From: pushfoo <36696816+pushfoo@users.noreply.github.com> Date: Thu, 27 Apr 2023 03:42:15 -0400 Subject: [PATCH 1/3] Fix broken wireframe toggle display --- arcade/examples/gl/3d_sphere.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arcade/examples/gl/3d_sphere.py b/arcade/examples/gl/3d_sphere.py index 11da87a34..ac08f1fea 100644 --- a/arcade/examples/gl/3d_sphere.py +++ b/arcade/examples/gl/3d_sphere.py @@ -154,7 +154,7 @@ def on_key_press(self, key, modifiers): else: self.flags.add(self.ctx.CULL_FACE) - self.text_wireframe.text = f"SPACE: Toggle wireframe ({self.ctx.wireframe})" + self.text_wireframe.text = f"SPACE: Toggle wireframe ({self.wireframe})" self.text_fs.text = f"F: Toggle fullscreen ({self.fullscreen})" self.text_depth.text = f"F1: Toggle depth test ({self.ctx.DEPTH_TEST in self.flags})" self.text_cull.text = f"F2: Toggle cull face ({self.ctx.CULL_FACE in self.flags})" From 6e13961f8a1deac5d5ce265204eced0fdd78e03c Mon Sep 17 00:00:00 2001 From: pushfoo <36696816+pushfoo@users.noreply.github.com> Date: Thu, 27 Apr 2023 03:46:37 -0400 Subject: [PATCH 2/3] Stop updating irrelevant labels during keypresses --- arcade/examples/gl/3d_sphere.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/arcade/examples/gl/3d_sphere.py b/arcade/examples/gl/3d_sphere.py index ac08f1fea..96961dc6b 100644 --- a/arcade/examples/gl/3d_sphere.py +++ b/arcade/examples/gl/3d_sphere.py @@ -138,26 +138,29 @@ def on_update(self, dt): def on_key_press(self, key, modifiers): if key == arcade.key.ESCAPE: self.close() + elif key == arcade.key.F: self.set_fullscreen(not self.fullscreen) + self.text_fs.text = f"F: Toggle fullscreen ({self.fullscreen})" + elif key == arcade.key.SPACE: self.wireframe = not self.wireframe self.set_vsync(True) + self.text_wireframe.text = f"SPACE: Toggle wireframe ({self.wireframe})" + elif key == arcade.key.F1: if self.ctx.DEPTH_TEST in self.flags: self.flags.remove(self.ctx.DEPTH_TEST) else: self.flags.add(self.ctx.DEPTH_TEST) + self.text_depth.text = f"F1: Toggle depth test ({self.ctx.DEPTH_TEST in self.flags})" + elif key == arcade.key.F2: if self.ctx.CULL_FACE in self.flags: self.flags.remove(self.ctx.CULL_FACE) else: self.flags.add(self.ctx.CULL_FACE) - - self.text_wireframe.text = f"SPACE: Toggle wireframe ({self.wireframe})" - self.text_fs.text = f"F: Toggle fullscreen ({self.fullscreen})" - self.text_depth.text = f"F1: Toggle depth test ({self.ctx.DEPTH_TEST in self.flags})" - self.text_cull.text = f"F2: Toggle cull face ({self.ctx.CULL_FACE in self.flags})" + self.text_cull.text = f"F2: Toggle cull face ({self.ctx.CULL_FACE in self.flags})" def on_mouse_drag(self, x, y, dx, dy, buttons, modifiers): self.drag = True From 5ed29574a5887511e0ac0aded078f20bf257ffd9 Mon Sep 17 00:00:00 2001 From: pushfoo <36696816+pushfoo@users.noreply.github.com> Date: Thu, 27 Apr 2023 03:47:20 -0400 Subject: [PATCH 3/3] Fix initial capitalization on cull face label --- arcade/examples/gl/3d_sphere.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arcade/examples/gl/3d_sphere.py b/arcade/examples/gl/3d_sphere.py index 96961dc6b..c63869c7b 100644 --- a/arcade/examples/gl/3d_sphere.py +++ b/arcade/examples/gl/3d_sphere.py @@ -68,7 +68,7 @@ def __init__(self, width, height, title): self.text_batch = Batch() self.text_cull = arcade.Text( - "F2: Toggle cull face (true)", + "F2: Toggle cull face (True)", start_x=10, start_y=10, font_size=15, color=arcade.color.WHITE, batch=self.text_batch )