public-mirrors/3b1b-manim
1
0
Fork 0
mirror of https://github.com/3b1b/manim.git synced 2025-11-14 17:58:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Ensure scroll zooming works better in 3d

Browse source
This commit is contained in:
Grant Sanderson 2023-01-30 15:03:05 -08:00
parent af69cf9c7d
commit 9628adc957
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
manimlib/scene/scene.py
View file

@ -60,6 +60,7 @@ QUIT_KEY = 'q'
class Scene(object): class Scene(object):
random_seed: int = 0 random_seed: int = 0
pan_sensitivity: float = 0.5 pan_sensitivity: float = 0.5
scroll_sensitivity: float = 20
max_num_saved_states: int = 50 max_num_saved_states: int = 50
default_camera_config: dict = dict() default_camera_config: dict = dict()
default_window_config: dict = dict() default_window_config: dict = dict()
@ -864,16 +865,20 @@ class Scene(object):
def on_mouse_scroll( def on_mouse_scroll(
self, self,
point: Vect3, point: Vect3,
offset: Vect3 offset: Vect3,
x_pixel_offset: float,
y_pixel_offset: float
) -> None: ) -> None:
event_data = {"point": point, "offset": offset} event_data = {"point": point, "offset": offset}
propagate_event = EVENT_DISPATCHER.dispatch(EventType.MouseScrollEvent, **event_data) propagate_event = EVENT_DISPATCHER.dispatch(EventType.MouseScrollEvent, **event_data)
if propagate_event is not None and propagate_event is False: if propagate_event is not None and propagate_event is False:
return return
frame = self.camera.frame rel_offset = y_pixel_offset / self.camera.get_pixel_height()
ff_offset = offset / frame.get_scale() self.frame.scale(
frame.scale(1 - ff_offset[1], about_point=point) 1 - self.scroll_sensitivity * rel_offset,
about_point=point
)
def on_key_release( def on_key_release(
self, self,

2
manimlib/window.py
View file

@ -114,7 +114,7 @@ class Window(PygletWindow):
super().on_mouse_scroll(x, y, x_offset, y_offset) super().on_mouse_scroll(x, y, x_offset, y_offset)
point = self.pixel_coords_to_space_coords(x, y) point = self.pixel_coords_to_space_coords(x, y)
offset = self.pixel_coords_to_space_coords(x_offset, y_offset, relative=True) offset = self.pixel_coords_to_space_coords(x_offset, y_offset, relative=True)
self.scene.on_mouse_scroll(point, offset) self.scene.on_mouse_scroll(point, offset, x_offset, y_offset)
def on_key_press(self, symbol: int, modifiers: int) -> None: def on_key_press(self, symbol: int, modifiers: int) -> None:
self.pressed_keys.add(symbol) # Modifiers? self.pressed_keys.add(symbol) # Modifiers?