Skip to content

Commit 2c30068

Browse files
committed
Path fixes
1 parent 909b3c4 commit 2c30068

File tree

3 files changed

+7
-10
lines changed

3 files changed

+7
-10
lines changed

manim/mobject/types/opengl_surface.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ class OpenGLSurface(OpenGLMobject):
1818
("dv_point", np.float32, (3,)),
1919
("color", np.float32, (4,)),
2020
]
21+
shader_folder = "surface"
2122

2223
def __init__(
2324
self,

manim/mobject/types/opengl_vectorized_mobject.py

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,8 @@ class OpenGLVMobject(OpenGLMobject):
5656
("stroke_width", np.float32, (1,)),
5757
("color", np.float32, (4,)),
5858
]
59+
stroke_shader_folder = "quadratic_bezier_stroke"
60+
fill_shader_folder = "quadratic_bezier_fill"
5961

6062
def __init__(
6163
self,
@@ -76,9 +78,6 @@ def __init__(
7678
tolerance_for_point_equality=1e-8,
7779
n_points_per_curve=3,
7880
long_lines=False,
79-
# For shaders
80-
stroke_shader_folder="quadratic_bezier_stroke",
81-
fill_shader_folder="quadratic_bezier_fill",
8281
# Could also be "bevel", "miter", "round"
8382
joint_type="auto",
8483
flat_stroke=True,
@@ -105,9 +104,6 @@ def __init__(
105104
self.tolerance_for_point_equality = tolerance_for_point_equality
106105
self.n_points_per_curve = n_points_per_curve
107106
self.long_lines = long_lines
108-
# For shaders
109-
self.stroke_shader_folder = stroke_shader_folder
110-
self.fill_shader_folder = fill_shader_folder
111107
# Could also be "bevel", "miter", "round"
112108
self.joint_type = joint_type
113109
self.flat_stroke = flat_stroke
@@ -945,7 +941,7 @@ def get_fill_shader_wrapper(self):
945941
return ShaderWrapper(
946942
vert_data=self.get_fill_shader_data(),
947943
vert_indices=self.get_triangulation(),
948-
shader_folder="quadratic_bezier_fill",
944+
shader_folder=self.fill_shader_folder,
949945
render_primitive=moderngl.TRIANGLES,
950946
uniforms=self.get_fill_uniforms(),
951947
depth_test=self.depth_test,
@@ -956,7 +952,7 @@ def get_stroke_shader_wrapper(self):
956952

957953
return ShaderWrapper(
958954
vert_data=self.get_stroke_shader_data(),
959-
shader_folder="quadratic_bezier_stroke",
955+
shader_folder=self.stroke_shader_folder,
960956
render_primitive=moderngl.TRIANGLES,
961957
uniforms=self.get_stroke_uniforms(),
962958
depth_test=self.depth_test,

manim/renderer/shader_wrapper.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import numpy as np
55
import copy
66
from .. import logger
7-
7+
from pathlib import Path
88

99
# from manimlib.utils.directories import get_shader_dir
1010
# from manimlib.utils.file_ops import find_file
@@ -17,7 +17,7 @@
1717

1818

1919
def get_shader_dir():
20-
return "manim/renderer/shaders"
20+
return Path(__file__).parent / "shaders"
2121

2222

2323
def find_file(file_name, directories=None):

0 commit comments

Comments
 (0)