diff --git a/manimlib/mobject/mobject.py b/manimlib/mobject/mobject.py index a2ebc7c4..8a4acea8 100644 --- a/manimlib/mobject/mobject.py +++ b/manimlib/mobject/mobject.py @@ -69,7 +69,7 @@ class Mobject(object): shader_folder: str = "" render_primitive: int = moderngl.TRIANGLE_STRIP # Must match in attributes of vert shader - shader_dtype: np.dtype = np.dtype([ + data_dtype: np.dtype = np.dtype([ ('point', np.float32, (3,)), ('rgba', np.float32, (4,)), ]) @@ -133,7 +133,7 @@ class Mobject(object): return self.replicate(other) def init_data(self, length: int = 0): - self.data = np.zeros(length, dtype=self.shader_dtype) + self.data = np.zeros(length, dtype=self.data_dtype) self._data_defaults = np.ones(1, dtype=self.data.dtype) def init_uniforms(self): diff --git a/manimlib/mobject/types/dot_cloud.py b/manimlib/mobject/types/dot_cloud.py index f4a8504b..2174350f 100644 --- a/manimlib/mobject/types/dot_cloud.py +++ b/manimlib/mobject/types/dot_cloud.py @@ -26,7 +26,7 @@ DEFAULT_BUFF_RATIO = 0.5 class DotCloud(PMobject): shader_folder: str = "true_dot" render_primitive: int = moderngl.POINTS - shader_dtype: Sequence[Tuple[str, type, Tuple[int]]] = [ + data_dtype: Sequence[Tuple[str, type, Tuple[int]]] = [ ('point', np.float32, (3,)), ('radius', np.float32, (1,)), ('rgba', np.float32, (4,)), diff --git a/manimlib/mobject/types/image_mobject.py b/manimlib/mobject/types/image_mobject.py index 605c2aeb..0b1fea53 100644 --- a/manimlib/mobject/types/image_mobject.py +++ b/manimlib/mobject/types/image_mobject.py @@ -19,7 +19,7 @@ if TYPE_CHECKING: class ImageMobject(Mobject): shader_folder: str = "image" - shader_dtype: Sequence[Tuple[str, type, Tuple[int]]] = [ + data_dtype: Sequence[Tuple[str, type, Tuple[int]]] = [ ('point', np.float32, (3,)), ('im_coords', np.float32, (2,)), ('opacity', np.float32, (1,)), diff --git a/manimlib/mobject/types/surface.py b/manimlib/mobject/types/surface.py index c3c72583..4c866f90 100644 --- a/manimlib/mobject/types/surface.py +++ b/manimlib/mobject/types/surface.py @@ -26,7 +26,7 @@ if TYPE_CHECKING: class Surface(Mobject): render_primitive: int = moderngl.TRIANGLES shader_folder: str = "surface" - shader_dtype: np.dtype = np.dtype([ + data_dtype: np.dtype = np.dtype([ ('point', np.float32, (3,)), ('normal', np.float32, (3,)), ('rgba', np.float32, (4,)), @@ -289,7 +289,7 @@ class SGroup(Surface): class TexturedSurface(Surface): shader_folder: str = "textured_surface" - shader_dtype: Sequence[Tuple[str, type, Tuple[int]]] = [ + data_dtype: Sequence[Tuple[str, type, Tuple[int]]] = [ ('point', np.float32, (3,)), ('normal', np.float32, (3,)), ('im_coords', np.float32, (2,)), diff --git a/manimlib/mobject/types/vectorized_mobject.py b/manimlib/mobject/types/vectorized_mobject.py index 58b87f26..0d7b9512 100644 --- a/manimlib/mobject/types/vectorized_mobject.py +++ b/manimlib/mobject/types/vectorized_mobject.py @@ -65,7 +65,7 @@ DEFAULT_FILL_COLOR = GREY_C class VMobject(Mobject): - shader_dtype: np.dtype = np.dtype([ + data_dtype: np.dtype = np.dtype([ ('point', np.float32, (3,)), ('stroke_rgba', np.float32, (4,)), ('stroke_width', np.float32, (1,)), diff --git a/manimlib/scene/scene_file_writer.py b/manimlib/scene/scene_file_writer.py index 6aa9c051..2059b744 100644 --- a/manimlib/scene/scene_file_writer.py +++ b/manimlib/scene/scene_file_writer.py @@ -264,8 +264,8 @@ class SceneFileWriter(object): width, height = self.scene.camera.get_pixel_shape() vf_arg = 'vflip' - if self.pixel_format.startswith("yuv"): - vf_arg += f',eq=saturation={self.saturation}:gamma={self.gamma}' + # if self.pixel_format.startswith("yuv"): + vf_arg += f',eq=saturation={self.saturation}:gamma={self.gamma}' command = [ FFMPEG_BIN,