mirrors/manim
2
0
Fork 0
mirror of https://github.com/ManimCommunity/manim.git synced 2026-06-22 10:01:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix color initialization in OpenGLVMobject.__init__() to prevent crashes in subclasses (#4056)

Browse source 
* Change order of statements in `OpenGLVMobject.__init__()`
This commit is contained in:
Francisco Manríquez Novoa 2024-12-13 16:08:42 -03:00 • committed by GitHub
commit 9360129365
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 23 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

9
manim/mobject/opengl/opengl_mobject.py
View file

@ -12,7 +12,7 @@ import sys
from dataclasses import dataclass
from functools import partialmethod, wraps
from math import ceil
from typing import TYPE_CHECKING, Generic
from typing import TYPE_CHECKING, Any, Generic
import numpy as np
from typing_extensions import TypedDict, TypeVar
@ -103,6 +103,7 @@ class MobjectStatus:
# TODO: add this to the **kwargs of all mobjects that use OpenGLMobject
class MobjectKwargs(TypedDict, total=False):
color: ParsableManimColor | Sequence[ParsableManimColor] | None
opacity: float
reflectiveness: float
shadow: float
@ -110,7 +111,7 @@ class MobjectKwargs(TypedDict, total=False):
is_fixed_in_frame: bool
is_fixed_orientation: bool
depth_test: bool
name: str
name: str | None
class OpenGLMobject:
@ -135,7 +136,7 @@ class OpenGLMobject:
# TypedDict above so that autocomplete works for users
def __init__(
self,
color=WHITE,
color: ParsableManimColor | Sequence[ParsableManimColor] | None = WHITE,
opacity: float = 1.0,
reflectiveness: float = 0.0,
shadow: float = 0.0,
@ -144,7 +145,7 @@ class OpenGLMobject:
is_fixed_orientation: bool = False,
depth_test: bool = True,
name: str | None = None,
**kwargs, # just dump
**kwargs: Any, # just dump
):
self.color = color
self.opacity = opacity

33
manim/mobject/opengl/opengl_vectorized_mobject.py
View file

@ -60,17 +60,19 @@ DEFAULT_FILL_COLOR = GREY_C
# TODO: add this to the **kwargs of all mobjects that use OpenGLVMobject
class VMobjectKwargs(MobjectKwargs, total=False):
color: ParsableManimColor | list[ParsableManimColor]
fill_color: ParsableManimColor | list[ParsableManimColor]
fill_opacity: float
stroke_color: ParsableManimColor | list[ParsableManimColor]
stroke_opacity: float
color: ParsableManimColor | Sequence[ParsableManimColor] | None
fill_color: ParsableManimColor | Sequence[ParsableManimColor] | None
fill_opacity: float | None
stroke_color: ParsableManimColor | Sequence[ParsableManimColor] | None
stroke_opacity: float | None
stroke_width: float
draw_stroke_behind_fill: bool
background_image_file: str
background_image_file: str | None
long_lines: bool
joint_type: LineJointType
flat_stroke: bool
shade_in_3d: bool
checkerboard_colors: bool # TODO: remove
class OpenGLVMobject(OpenGLMobject):
@ -95,17 +97,10 @@ class OpenGLVMobject(OpenGLMobject):
long_lines: bool = False,
joint_type: LineJointType = LineJointType.AUTO,
flat_stroke: bool = False,
shade_in_3d=False, # TODO: Can be ignored for now but we should think about using some sort of shader to introduce lighting after deferred rendering has completed
checkerboard_colors=False, # ignore,
shade_in_3d: bool = False, # TODO: Can be ignored for now but we should think about using some sort of shader to introduce lighting after deferred rendering has completed
checkerboard_colors: bool = False, # ignore,
**kwargs: Unpack[MobjectKwargs],
):
super().__init__(**kwargs)
if fill_color is None:
fill_color = self.color
if stroke_color is None:
stroke_color = self.color
self.set_fill(color=fill_color, opacity=fill_opacity)
self.set_stroke(color=stroke_color, opacity=stroke_opacity)
self.stroke_width = listify(stroke_width)
self.draw_stroke_behind_fill = draw_stroke_behind_fill
self.background_image_file = background_image_file
@ -116,6 +111,14 @@ class OpenGLVMobject(OpenGLMobject):
self.needs_new_triangulation = True
self.triangulation = np.zeros(0, dtype="i4")
super().__init__(**kwargs)
if fill_color is None:
fill_color = self.color
if stroke_color is None:
stroke_color = self.color
self.set_fill(color=fill_color, opacity=fill_opacity)
self.set_stroke(color=stroke_color, width=stroke_width, opacity=stroke_opacity)
# self.refresh_unit_normal()
def _assert_valid_submobjects(self, submobjects: Iterable[OpenGLVMobject]) -> Self: