Skip to content

Commit d1dc797

Browse files
committed
Remove all references to PyOpenGL in mesh shader module
1 parent 284eb86 commit d1dc797

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

demosys/scene/shaders.py

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
1+
import moderngl as mgl
12
import os
23

34
from pyrr import Matrix33
45

6+
from demosys import context
57
from demosys.conf import settings
68
from demosys.resources import shaders
79

8-
from OpenGL import GL
9-
1010
settings.add_shader_dir(os.path.join(os.path.dirname(__file__), 'shaders'))
1111

1212

1313
class MeshShader:
1414

1515
def __init__(self, shader=None, **kwargs):
1616
self.shader = shader
17+
self.ctx = context.ctx()
1718

1819
def draw(self, mesh, proj_mat, view_mat):
1920
"""Minimal draw function. Should be overridden"""
@@ -54,9 +55,9 @@ def draw(self, mesh, proj_mat, view_mat):
5455

5556
if mesh.material:
5657
if mesh.material.double_sided:
57-
GL.glDisable(GL.GL_CULL_FACE)
58+
self.ctx.disable(mgl.CULL_FACE)
5859
else:
59-
GL.glEnable(GL.GL_CULL_FACE)
60+
self.ctx.enable(mgl.CULL_FACE)
6061

6162
if mesh.material.color:
6263
self.shader.uniform("color", tuple(mesh.material.color))
@@ -93,9 +94,9 @@ def draw(self, mesh, proj_mat, view_mat):
9394
m_normal = self.create_normal_matrix(view_mat)
9495

9596
if mesh.material.double_sided:
96-
GL.glDisable(GL.GL_CULL_FACE)
97+
self.ctx.disable(mgl.CULL_FACE)
9798
else:
98-
GL.glEnable(GL.GL_CULL_FACE)
99+
self.ctx.enable(mgl.CULL_FACE)
99100

100101
mesh.material.mat_texture.texture.use()
101102
self.shader.uniform("texture0", 0)

0 commit comments

Comments
 (0)