Skip to content

armgit / manim

Public Imported from GitHub
0

A community-maintained Python framework for creating mathematical animations.

Fixed :meth:`~OpenGLRenderer.get_frame` when window is created (#2070)

Ryan McCauleyf24e080ff333
diff --git a/manim/renderer/opengl_renderer.py b/manim/renderer/opengl_renderer.py
index 24bb90c62..8b4f44563 100644
--- a/manim/renderer/opengl_renderer.py
+++ b/manim/renderer/opengl_renderer.py
@@ -511,7 +511,8 @@ class OpenGLRenderer:
def get_frame(self):
# get current pixel values as numpy data in order to test output
raw = self.get_raw_frame_buffer_object_data(dtype="f1")
- result_dimensions = (config["pixel_height"], config["pixel_width"], 4)
+ pixel_shape = self.get_pixel_shape()
+ result_dimensions = (pixel_shape[1], pixel_shape[0], 4)
np_buf = np.frombuffer(raw, dtype="uint8").reshape(result_dimensions)
np_buf = np.flipud(np_buf)
return np_buf
diff --git a/tests/test_scene_rendering/conftest.py b/tests/test_scene_rendering/conftest.py
index 40b9f6581..331fd57e0 100644
--- a/tests/test_scene_rendering/conftest.py
+++ b/tests/test_scene_rendering/conftest.py
@@ -47,6 +47,12 @@ def infallible_scenes_path():
return str(Path(__file__).parent / "infallible_scenes.py")
+def use_opengl_renderer(enable_preview):
+ with tempconfig({"renderer": "opengl", "preview": enable_preview}):
+ yield
+
+
@pytest.fixture
def force_window_config_write_to_movie():
with tempconfig({"force_window": True, "write_to_movie": True}):
diff --git a/tests/test_scene_rendering/test_opengl_renderer.py b/tests/test_scene_rendering/test_opengl_renderer.py
new file mode 100644
index 000000000..1e5bebdfa
--- /dev/null
+++ b/tests/test_scene_rendering/test_opengl_renderer.py
@@ -0,0 +1,38 @@
+import pytest
+
+from manim.renderer.opengl_renderer import OpenGLRenderer
+
+from .simple_scenes import *
+
+
[email protected]("enable_preview", [False])
+def testGetFrameWithPreviewDisabled(use_opengl_renderer):
+ """Get frame is able to fetch frame with the correct dimensions when preview is disabled"""
+ scene = SquareToCircle()
+ assert isinstance(scene.renderer, OpenGLRenderer)
+ assert not config.preview
+
+ renderer = scene.renderer
+ renderer.update_frame(scene)
+ frame = renderer.get_frame()
+
+ # height and width are flipped
+ assert renderer.get_pixel_shape()[0] == frame.shape[1]
+ assert renderer.get_pixel_shape()[1] == frame.shape[0]
+
+
[email protected]("enable_preview", [True])
+def testGetFrameWithPreviewEnabled(use_opengl_renderer):
+ """Get frame is able to fetch frame with the correct dimensions when preview is enabled"""
+ scene = SquareToCircle()
+ assert isinstance(scene.renderer, OpenGLRenderer)
+ assert config.preview is True
+
+ renderer = scene.renderer
+ renderer.update_frame(scene)
+ frame = renderer.get_frame()
+
+ # height and width are flipped
+ assert renderer.get_pixel_shape()[0] == frame.shape[1]
+ assert renderer.get_pixel_shape()[1] == frame.shape[0]