Import ShaderWrapper in necessary methods

Author: eulertour

manim/mobject/opengl_mobject.py

@@ -31,7 +31,6 @@
 from ..utils.space_ops import angle_of_vector
 from ..utils.space_ops import get_norm
 from ..utils.space_ops import rotation_matrix_transpose
-from ..renderer.shader_wrapper import ShaderWrapper
 
 
 class OpenGLMobject:
@@ -95,7 +94,8 @@ def __init__(
         # self.init_event_listners()
         self.init_points()
         self.init_colors()
-        self.init_shader_data()
+
+        self.shader_indices = None
 
         if self.depth_test:
             self.apply_depth_test()
@@ -1380,23 +1380,12 @@ def set_color_by_xyz_func(
 
     # For shader data
 
-    def init_shader_data(self):
-        # TODO, only call this when needed?
-        self.shader_data = np.zeros(len(self.get_points()), dtype=self.shader_dtype)
-        self.shader_indices = None
-        self.shader_wrapper = ShaderWrapper(
-            vert_data=self.shader_data,
-            shader_folder=self.__class__.shader_folder,
-            texture_paths=self.texture_paths,
-            depth_test=self.depth_test,
-            render_primitive=self.render_primitive,
-        )
-
     # def refresh_shader_wrapper_id(self):
     #     self.shader_wrapper.refresh_id()
     #     return self
 
     def get_shader_wrapper(self):
+        from ..renderer.shader_wrapper import ShaderWrapper
         self.shader_wrapper = ShaderWrapper(
             vert_data=self.get_shader_data(),
             vert_indices=self.get_shader_vert_indices(),

manim/mobject/types/opengl_vectorized_mobject.py

@@ -32,7 +32,6 @@
 
 from ...utils.space_ops import z_to_vector
 
-from ...renderer.shader_wrapper import ShaderWrapper
 
 JOINT_TYPE_MAP = {
     "auto": 0,
@@ -41,6 +40,7 @@
     "miter": 3,
 }
 
+
 class OpenGLVMobject(OpenGLMobject):
     fill_dtype = [
         ("point", np.float32, (3,)),
@@ -918,6 +918,8 @@ def flip(self, *args, **kwargs):
 
     # For shaders
     def init_shader_data(self):
+        from ...renderer.shader_wrapper import ShaderWrapper
+
         self.fill_data = np.zeros(0, dtype=self.fill_dtype)
         self.stroke_data = np.zeros(0, dtype=self.stroke_dtype)
         self.fill_shader_wrapper = ShaderWrapper(
@@ -938,6 +940,8 @@ def refresh_shader_wrapper_id(self):
         return self
 
     def get_fill_shader_wrapper(self):
+        from ...renderer.shader_wrapper import ShaderWrapper
+
         return ShaderWrapper(
             vert_data=self.get_fill_shader_data(),
             vert_indices=self.get_triangulation(),
@@ -948,6 +952,8 @@ def get_fill_shader_wrapper(self):
         )
 
     def get_stroke_shader_wrapper(self):
+        from ...renderer.shader_wrapper import ShaderWrapper
+
         return ShaderWrapper(
             vert_data=self.get_stroke_shader_data(),
             shader_folder="quadratic_bezier_stroke",
@@ -957,6 +963,8 @@ def get_stroke_shader_wrapper(self):
         )
 
     def get_shader_wrapper_list(self):
+        from ...renderer.shader_wrapper import ShaderWrapper
+
         # Build up data lists
         fill_shader_wrappers = []
         stroke_shader_wrappers = []