opensource/manim
1
0
Fork 0
mirror of https://github.com/3b1b/manim.git synced 2025-07-28 12:32:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Treat is_fixed_in_frame as a float in uniforms, to allow for transformations between

Browse Source
This commit is contained in:
Grant Sanderson
2024-02-03 18:48:54 -06:00
parent 4aef0d1bf5
commit ebe689dede
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
manimlib/mobject/mobject.py
View File

@ -48,7 +48,7 @@ from manimlib.utils.space_ops import rotation_matrix_transpose
from typing import TYPE_CHECKING from typing import TYPE_CHECKING
if TYPE_CHECKING: if TYPE_CHECKING:
from typing import Callable, Iterable, Iterator, Union, Tuple, Optional, TypeVar, Any from typing import Callable, Iterable, Iterator, Union, Tuple, Optional, TypeVar
import numpy.typing as npt import numpy.typing as npt
from manimlib.typing import ManimColor, Vect3, Vect4, Vect3Array, UniformDict, Self from manimlib.typing import ManimColor, Vect3, Vect4, Vect3Array, UniformDict, Self
from moderngl.context import Context from moderngl.context import Context
@ -89,7 +89,6 @@ class Mobject(object):
self.opacity = opacity self.opacity = opacity
self.shading = shading self.shading = shading
self.texture_paths = texture_paths self.texture_paths = texture_paths
self._is_fixed_in_frame = is_fixed_in_frame
self.depth_test = depth_test self.depth_test = depth_test
# Internal state # Internal state
@ -118,6 +117,8 @@ class Mobject(object):
if self.depth_test: if self.depth_test:
self.apply_depth_test() self.apply_depth_test()
if is_fixed_in_frame:
self.fix_in_frame()
def __str__(self): def __str__(self):
return self.__class__.__name__ return self.__class__.__name__
@ -135,7 +136,7 @@ class Mobject(object):
def init_uniforms(self): def init_uniforms(self):
self.uniforms: UniformDict = { self.uniforms: UniformDict = {
"is_fixed_in_frame": float(self._is_fixed_in_frame), "is_fixed_in_frame": 0.0,
"shading": np.array(self.shading, dtype=float), "shading": np.array(self.shading, dtype=float),
} }
@ -2135,16 +2136,15 @@ class Group(Mobject):
def __init__(self, *mobjects: Mobject, **kwargs): def __init__(self, *mobjects: Mobject, **kwargs):
if not all([isinstance(m, Mobject) for m in mobjects]): if not all([isinstance(m, Mobject) for m in mobjects]):
raise Exception("All submobjects must be of type Mobject") raise Exception("All submobjects must be of type Mobject")
Mobject.__init__(self, **kwargs) super().__init__(**kwargs)
self.add(*mobjects) self.add(*mobjects)
if any(m.is_fixed_in_frame() for m in mobjects):
self.fix_in_frame()
def __add__(self, other: Mobject | Group) -> Self: def __add__(self, other: Mobject | Group) -> Self:
assert(isinstance(other, Mobject)) assert isinstance(other, Mobject)
return self.add(other) return self.add(other)
class Point(Mobject): class Point(Mobject):
def __init__( def __init__(
self, self,