A community-maintained Python framework for creating mathematical animations.
Fixed opengl Surface with reordering initialization process (#3089)
Tristan Schulz7d7c5055d4e2
diff --git a/manim/mobject/opengl/opengl_mobject.py b/manim/mobject/opengl/opengl_mobject.pyindex 864326497..69a472f44 100644--- a/manim/mobject/opengl/opengl_mobject.py+++ b/manim/mobject/opengl/opengl_mobject.py@@ -2627,12 +2627,15 @@ class OpenGLMobject:# For shader datadef refresh_shader_wrapper_id(self):- self.shader_wrapper.refresh_id()+ self.get_shader_wrapper().refresh_id()return selfdef get_shader_wrapper(self):from manim.renderer.shader_wrapper import ShaderWrapper+ # if hasattr(self, "__shader_wrapper"):+ # return self.__shader_wrapper+self.shader_wrapper = ShaderWrapper(vert_data=self.get_shader_data(),vert_indices=self.get_shader_vert_indices(),diff --git a/manim/mobject/opengl/opengl_surface.py b/manim/mobject/opengl/opengl_surface.pyindex 30641ca2f..64cbd43f5 100644--- a/manim/mobject/opengl/opengl_surface.py+++ b/manim/mobject/opengl/opengl_surface.py@@ -98,6 +98,7 @@ class OpenGLSurface(OpenGLMobject):# can crop up in the shaders.self.epsilon = epsilon+ self.triangle_indices = Nonesuper().__init__(color=color,opacity=opacity,@@ -127,7 +128,7 @@ class OpenGLSurface(OpenGLMobject):# - Those generated by values nudged by du# - Those generated by values nudged by dvpoint_lists = []- for (du, dv) in [(0, 0), (self.epsilon, 0), (0, self.epsilon)]:+ for du, dv in [(0, 0), (self.epsilon, 0), (0, self.epsilon)]:uv_grid = np.array([[[u + du, v + dv] for v in v_range] for u in u_range])point_grid = np.apply_along_axis(lambda p: self.uv_func(*p), 2, uv_grid)point_lists.append(point_grid.reshape((nu * nv, dim)))diff --git a/manim/mobject/opengl/opengl_vectorized_mobject.py b/manim/mobject/opengl/opengl_vectorized_mobject.pyindex 2c12462b0..8dc174e12 100644--- a/manim/mobject/opengl/opengl_vectorized_mobject.py+++ b/manim/mobject/opengl/opengl_vectorized_mobject.py@@ -137,6 +137,12 @@ class OpenGLVMobject(OpenGLMobject):self.needs_new_triangulation = Trueself.triangulation = np.zeros(0, dtype="i4")self.orientation = 1+ self.fill_data = None+ self.stroke_data = None+ self.fill_shader_wrapper = None+ self.stroke_shader_wrapper = None+ self.init_shader_data()+super().__init__(**kwargs)self.refresh_unit_normal()@@ -145,12 +151,6 @@ class OpenGLVMobject(OpenGLMobject):if stroke_color:self.stroke_color = Color(stroke_color)- self.fill_data = None- self.stroke_data = None- self.fill_shader_wrapper = None- self.stroke_shader_wrapper = None- self.init_shader_data()-def get_group_class(self):return OpenGLVGroupdiff --git a/tests/opengl/test_opengl_surface.py b/tests/opengl/test_opengl_surface.pynew file mode 100644index 000000000..d6897691d--- /dev/null+++ b/tests/opengl/test_opengl_surface.py@@ -0,0 +1,14 @@+import numpy as np++from manim.mobject.opengl.opengl_surface import OpenGLSurface+from manim.mobject.opengl.opengl_three_dimensions import OpenGLSurfaceMesh+++def test_surface_initialization(using_opengl_renderer):+ surface = OpenGLSurface(+ lambda u, v: (u, v, u * np.sin(v) + v * np.cos(u)),+ u_range=(-3, 3),+ v_range=(-3, 3),+ )++ mesh = OpenGLSurfaceMesh(surface)