Skip to content

Commit

Permalink
Merge branch 'experimental' of github.com:jsonvillanueva/manim into e…
Browse files Browse the repository at this point in the history
…xperimental
  • Loading branch information
MrDiver committed Sep 14, 2023
2 parents e50b82f + bffbc22 commit 4fb492c
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 6 deletions.
7 changes: 3 additions & 4 deletions example_scenes/test_new.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@
from pyglet import shapes
from pyglet.gl import Config
from pyglet.window import Window
from manim.mobject.text.numbers import DecimalNumber
from manim.mobject.text.text_mobject import Text

import manim.utils.color.manim_colors as col
from manim._config import config, tempconfig
Expand All @@ -17,6 +15,8 @@
from manim.mobject.geometry.polygram import Square
from manim.mobject.logo import ManimBanner
from manim.mobject.opengl.opengl_vectorized_mobject import OpenGLVMobject
from manim.mobject.text.numbers import DecimalNumber
from manim.mobject.text.text_mobject import Text
from manim.renderer.opengl_renderer import OpenGLRenderer

if __name__ == "__main__":
Expand Down Expand Up @@ -66,7 +66,7 @@
clock = pyglet.clock.get_default()

def update_circle(dt):
vm.move_to((np.sin(dt)*4, np.cos(dt)*4, -1))
vm.move_to((np.sin(dt) * 4, np.cos(dt) * 4, -1))

def p2m(x, y, z):
from manim._config import config
Expand Down Expand Up @@ -103,7 +103,6 @@ def on_draw():
renderer.render(camera, [vm, vm2, vm3, vm4, fps])
# update_circle(counter)


@win.event
def on_resize(width, height):
super(Window, win).on_resize(width, height)
Expand Down
10 changes: 9 additions & 1 deletion manim/mobject/svg/svg_mobject.py
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,15 @@ def __init__(
use_svg_cache: bool = True,
**kwargs,
):
super().__init__(color=color, stroke_color=stroke_color,stroke_opacity=stroke_opacity, stroke_width=stroke_width, fill_opacity=fill_opacity, fill_color=fill_color, **kwargs)
super().__init__(
color=color,
stroke_color=stroke_color,
stroke_opacity=stroke_opacity,
stroke_width=stroke_width,
fill_opacity=fill_opacity,
fill_color=fill_color,
**kwargs,
)

# process keyword arguments
self.file_name = Path(file_name) if file_name is not None else None
Expand Down
1 change: 0 additions & 1 deletion manim/renderer/opengl_renderer.py
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,6 @@ def __init__(
]
)


# Preparing vmobject shader
logger.debug("Initializing Shader Programs")
self.vmobject_fill_program = load_shader_program_by_folder(
Expand Down

0 comments on commit 4fb492c

Please sign in to comment.