public-mirrors/3b1b-manim
1
0
Fork 0
mirror of https://github.com/3b1b/manim.git synced 2025-09-01 00:48:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use pyglet.window.key for key constant values

Browse source
This commit is contained in:
Grant Sanderson 2024-12-10 20:00:03 -06:00
parent 9f785a5fba
commit 9fcdd0de5f
2 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
manimlib/scene/interactive_scene.py
View file

@ -49,10 +49,13 @@ CURSOR_KEY = 'k'
COPY_FRAME_POSITION_KEY = 'p' COPY_FRAME_POSITION_KEY = 'p'
# For keyboard interactions # For keyboard interactions
CTRL_SYMBOL: int = 65508
SHIFT_SYMBOL: int = 65505 ARROW_SYMBOLS: list[int] = [
DELETE_SYMBOL: int = 65288 PygletWindowKeys.LEFT,
ARROW_SYMBOLS: list[int] = list(range(65361, 65365)) PygletWindowKeys.UP,
PygletWindowKeys.RIGHT,
PygletWindowKeys.DOWN,
]
ALL_MODIFIERS = PygletWindowKeys.MOD_CTRL | PygletWindowKeys.MOD_COMMAND | PygletWindowKeys.MOD_SHIFT ALL_MODIFIERS = PygletWindowKeys.MOD_CTRL | PygletWindowKeys.MOD_COMMAND | PygletWindowKeys.MOD_SHIFT
@ -477,7 +480,7 @@ class InteractiveScene(Scene):
self.prepare_grab() self.prepare_grab()
elif char == RESIZE_KEY and (modifiers & PygletWindowKeys.MOD_SHIFT): elif char == RESIZE_KEY and (modifiers & PygletWindowKeys.MOD_SHIFT):
self.prepare_resizing(about_corner=((modifiers & PygletWindowKeys.MOD_SHIFT) > 0)) self.prepare_resizing(about_corner=((modifiers & PygletWindowKeys.MOD_SHIFT) > 0))
elif symbol == SHIFT_SYMBOL: elif symbol == PygletWindowKeys.LSHIFT:
if self.window.is_key_pressed(ord("t")): if self.window.is_key_pressed(ord("t")):
self.prepare_resizing(about_corner=True) self.prepare_resizing(about_corner=True)
elif char == COLOR_KEY and (modifiers & ALL_MODIFIERS) == 0: elif char == COLOR_KEY and (modifiers & ALL_MODIFIERS) == 0:
@ -491,7 +494,7 @@ class InteractiveScene(Scene):
elif char == "x" and (modifiers & (PygletWindowKeys.MOD_COMMAND | PygletWindowKeys.MOD_CTRL)): elif char == "x" and (modifiers & (PygletWindowKeys.MOD_COMMAND | PygletWindowKeys.MOD_CTRL)):
self.copy_selection() self.copy_selection()
self.delete_selection() self.delete_selection()
elif symbol == DELETE_SYMBOL: elif symbol == PygletWindowKeys.BACKSPACE:
self.delete_selection() self.delete_selection()
elif char == "a" and (modifiers & (PygletWindowKeys.MOD_COMMAND | PygletWindowKeys.MOD_CTRL)): elif char == "a" and (modifiers & (PygletWindowKeys.MOD_COMMAND | PygletWindowKeys.MOD_CTRL)):
self.clear_selection() self.clear_selection()
@ -532,7 +535,7 @@ class InteractiveScene(Scene):
self.is_grabbing = False self.is_grabbing = False
elif chr(symbol) == INFORMATION_KEY: elif chr(symbol) == INFORMATION_KEY:
self.display_information(False) self.display_information(False)
elif symbol == SHIFT_SYMBOL and self.window.is_key_pressed(ord(RESIZE_KEY)): elif symbol == PygletWindowKeys.LSHIFT and self.window.is_key_pressed(ord(RESIZE_KEY)):
self.prepare_resizing(about_corner=False) self.prepare_resizing(about_corner=False)
# Mouse actions # Mouse actions
@ -549,7 +552,7 @@ class InteractiveScene(Scene):
if not hasattr(self, "scale_about_point"): if not hasattr(self, "scale_about_point"):
return return
vect = point - self.scale_about_point vect = point - self.scale_about_point
if self.window.is_key_pressed(CTRL_SYMBOL): if self.window.is_key_pressed(PygletWindowKeys.LCTRL):
for i in (0, 1): for i in (0, 1):
scalar = vect[i] / self.scale_ref_vect[i] scalar = vect[i] / self.scale_ref_vect[i]
self.selection.rescale_to_fit( self.selection.rescale_to_fit(
@ -594,7 +597,7 @@ class InteractiveScene(Scene):
self.handle_grabbing(point) self.handle_grabbing(point)
elif self.window.is_key_pressed(ord(RESIZE_KEY)): elif self.window.is_key_pressed(ord(RESIZE_KEY)):
self.handle_resizing(point) self.handle_resizing(point)
elif self.window.is_key_pressed(ord(SELECT_KEY)) and self.window.is_key_pressed(SHIFT_SYMBOL): elif self.window.is_key_pressed(ord(SELECT_KEY)) and self.window.is_key_pressed(PygletWindowKeys.LSHIFT):
self.handle_sweeping_selection(point) self.handle_sweeping_selection(point)
def on_mouse_drag( def on_mouse_drag(

3
manimlib/scene/scene.py
View file

@ -17,7 +17,6 @@ from manimlib.camera.camera import Camera
from manimlib.camera.camera_frame import CameraFrame from manimlib.camera.camera_frame import CameraFrame
from manimlib.config import get_camera_config from manimlib.config import get_camera_config
from manimlib.config import get_file_writer_config from manimlib.config import get_file_writer_config
from manimlib.constants import ARROW_SYMBOLS
from manimlib.event_handler import EVENT_DISPATCHER from manimlib.event_handler import EVENT_DISPATCHER
from manimlib.event_handler.event_type import EventType from manimlib.event_handler.event_type import EventType
from manimlib.logger import log from manimlib.logger import log
@ -846,7 +845,7 @@ class Scene(object):
elif char == QUIT_KEY and (modifiers & (PygletWindowKeys.MOD_COMMAND | PygletWindowKeys.MOD_CTRL)): elif char == QUIT_KEY and (modifiers & (PygletWindowKeys.MOD_COMMAND | PygletWindowKeys.MOD_CTRL)):
self.quit_interaction = True self.quit_interaction = True
# Space or right arrow # Space or right arrow
elif char == " " or symbol == ARROW_SYMBOLS[2]: elif char == " " or symbol == PygletWindowKeys.RIGHT:
self.hold_on_wait = False self.hold_on_wait = False
def on_resize(self, width: int, height: int) -> None: def on_resize(self, width: int, height: int) -> None: