Skip to content

Commit

Permalink
remove separate Shader class
Browse files Browse the repository at this point in the history
  • Loading branch information
@szabolcsdombi
szabolcsdombi committed Feb 10, 2018
1 parent 78394fd commit 8821674
Show file tree
Hide file tree
Showing 123 changed files with 684 additions and 1,348 deletions.
2 changes: 1 addition & 1 deletion docs/_static/css/custom.css
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.wy-nav-content {
max-width: 920px;
/* max-width: 800px; */
}

.hll {
Expand Down
7 changes: 1 addition & 6 deletions docs/reference/context.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,9 @@ Create
ModernGL Objects
----------------

.. automethod:: Context.program(shaders, varyings=()) -> Program
.. automethod:: Context.program(vertex_shader, fragment_shader=None, geometry_shader=None, tess_control_shader=None, tess_evaluation_shader=None, varyings=()) -> Program
.. automethod:: Context.simple_vertex_array(program, buffer, *attributes, index_buffer=None) -> VertexArray
.. automethod:: Context.vertex_array(program, content, index_buffer=None) -> VertexArray
.. automethod:: Context.vertex_shader(source) -> Shader
.. automethod:: Context.fragment_shader(source) -> Shader
.. automethod:: Context.geometry_shader(source) -> Shader
.. automethod:: Context.tess_evaluation_shader(source) -> Shader
.. automethod:: Context.tess_control_shader(source) -> Shader
.. automethod:: Context.buffer(data=None, reserve=0, dynamic=False) -> Buffer
.. automethod:: Context.texture(size, components, data=None, samples=0, alignment=1, dtype='f1') -> Texture
.. automethod:: Context.depth_texture(size, data=None, samples=0, alignment=4) -> Texture
Expand Down
1 change: 0 additions & 1 deletion docs/reference/index.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ Reference
buffer.rst
vertex_array.rst
program.rst
shader.rst
texture.rst
texture3d.rst
texture_cube.rst
Expand Down
2 changes: 1 addition & 1 deletion docs/reference/program.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Program
Create
------

.. automethod:: Context.program(shaders, varyings=()) -> Program
.. automethod:: Context.program(vertex_shader, fragment_shader=None, geometry_shader=None, tess_control_shader=None, tess_evaluation_shader=None, varyings=()) -> Program
:noindex:

Methods
Expand Down
68 changes: 0 additions & 68 deletions docs/reference/shader.rst
View file

This file was deleted.

2 changes: 1 addition & 1 deletion examples/00_empty_window.py
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import moderngl
from moderngl.ext.examples import run_example
from moderngl_ext_examples import run_example


class Example:
Expand Down
14 changes: 7 additions & 7 deletions examples/01_a_hello_world.py
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import moderngl
from moderngl.ext.examples import run_example
from moderngl_ext_examples import run_example
import numpy as np

"""
Expand All @@ -12,26 +12,26 @@ def __init__(self, wnd):
self.wnd = wnd
self.ctx = moderngl.create_context()

self.prog = self.ctx.program([
self.ctx.vertex_shader('''
self.prog = self.ctx.program(
vertex_shader='''
#version 330
in vec2 in_vert;
void main() {
gl_Position = vec4(in_vert, 0.0, 1.0);
}
'''),
self.ctx.fragment_shader('''
''',
fragment_shader='''
#version 330
out vec4 f_color;
void main() {
f_color = vec4(0.3, 0.5, 1.0, 1.0);
}
'''),
])
''',
)

vertices = np.array([
0.0, 0.8,
Expand Down
44 changes: 22 additions & 22 deletions examples/01_b_simple_color_triangle.py
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import moderngl
from moderngl.ext.examples import run_example
from moderngl_ext_examples import run_example
import numpy as np

"""
Expand All @@ -12,32 +12,32 @@ def __init__(self, wnd):
self.wnd = wnd
self.ctx = moderngl.create_context()

self.prog = self.ctx.program([
self.ctx.vertex_shader('''
#version 330
self.prog = self.ctx.program(
vertex_shader='''
#version 330
in vec2 in_vert;
in vec2 in_vert;
in vec3 in_color;
out vec3 v_color; // Goes to the fragment shader
in vec3 in_color;
out vec3 v_color; // Goes to the fragment shader
void main() {
gl_Position = vec4(in_vert, 0.0, 1.0);
v_color = in_color;
}
'''),
self.ctx.fragment_shader('''
#version 330
void main() {
gl_Position = vec4(in_vert, 0.0, 1.0);
v_color = in_color;
}
''',
fragment_shader='''
#version 330
in vec3 v_color;
out vec4 f_color;
in vec3 v_color;
out vec4 f_color;
void main() {
// We're not interested in changing the alpha value
f_color = vec4(v_color, 1.0);
}
'''),
])
void main() {
// We're not interested in changing the alpha value
f_color = vec4(v_color, 1.0);
}
''',
)

# Point coordinates are put followed by the vec3 color values
vertices = np.array([
Expand Down
54 changes: 27 additions & 27 deletions examples/02_uniforms_and_attributes.py
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import moderngl
from moderngl.ext.examples import run_example
from moderngl_ext_examples import run_example
import numpy as np

"""
Expand All @@ -12,32 +12,32 @@ def __init__(self, wnd):
self.wnd = wnd
self.ctx = moderngl.create_context()

self.prog = self.ctx.program([
self.ctx.vertex_shader('''
#version 330
in vec2 vert;
uniform vec2 scale;
uniform float rotation;
void main() {
mat2 rot = mat2(
cos(rotation), sin(rotation),
-sin(rotation), cos(rotation)
);
gl_Position = vec4((rot * vert) * scale, 0.0, 1.0);
}
'''),
self.ctx.fragment_shader('''
#version 330
out vec4 color;
void main() {
color = vec4(0.3, 0.5, 1.0, 1.0);
}
'''),
])
self.prog = self.ctx.program(
vertex_shader='''
#version 330
in vec2 vert;
uniform vec2 scale;
uniform float rotation;
void main() {
mat2 rot = mat2(
cos(rotation), sin(rotation),
-sin(rotation), cos(rotation)
);
gl_Position = vec4((rot * vert) * scale, 0.0, 1.0);
}
''',
fragment_shader='''
#version 330
out vec4 color;
void main() {
color = vec4(0.3, 0.5, 1.0, 1.0);
}
''',
)

self.scale = self.prog['scale']
self.rotation = self.prog['rotation']
Expand Down
58 changes: 29 additions & 29 deletions examples/03_alpha_blending.py
View file
Original file line number Diff line number Diff line change
@@ -1,41 +1,41 @@
import moderngl
import numpy as np
from moderngl.ext.examples import run_example
from moderngl_ext_examples import run_example


class Example:
def __init__(self, wnd):
self.wnd = wnd
self.ctx = moderngl.create_context()

self.prog = self.ctx.program([
self.ctx.vertex_shader('''
#version 330
in vec2 vert;
in vec4 vert_color;
out vec4 frag_color;
uniform vec2 scale;
uniform float rotation;
void main() {
frag_color = vert_color;
float r = rotation * (0.5 + gl_InstanceID * 0.05);
mat2 rot = mat2(cos(r), sin(r), -sin(r), cos(r));
gl_Position = vec4((rot * vert) * scale, 0.0, 1.0);
}
'''),
self.ctx.fragment_shader('''
#version 330
in vec4 frag_color;
out vec4 color;
void main() {
color = vec4(frag_color);
}
'''),
])
self.prog = self.ctx.program(
vertex_shader='''
#version 330
in vec2 vert;
in vec4 vert_color;
out vec4 frag_color;
uniform vec2 scale;
uniform float rotation;
void main() {
frag_color = vert_color;
float r = rotation * (0.5 + gl_InstanceID * 0.05);
mat2 rot = mat2(cos(r), sin(r), -sin(r), cos(r));
gl_Position = vec4((rot * vert) * scale, 0.0, 1.0);
}
''',
fragment_shader='''
#version 330
in vec4 frag_color;
out vec4 color;
void main() {
color = vec4(frag_color);
}
''',
)

self.scale = self.prog['scale']
self.rotation = self.prog['rotation']
Expand Down
16 changes: 8 additions & 8 deletions examples/04_colors_and_texture.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

import moderngl
import numpy as np
from moderngl.ext.examples import run_example
from moderngl.ext.obj import Obj
from moderngl_ext_examples import run_example
from moderngl_ext_obj import Obj
from PIL import Image
from pyrr import Matrix44

Expand All @@ -21,8 +21,8 @@ def __init__(self, wnd):
self.wnd = wnd
self.ctx = moderngl.create_context()

self.prog = self.ctx.program([
self.ctx.vertex_shader('''
self.prog = self.ctx.program(
vertex_shader='''
#version 330
uniform mat4 Mvp;
Expand All @@ -41,8 +41,8 @@ def __init__(self, wnd):
v_norm = in_norm;
v_text = in_text;
}
'''),
self.ctx.fragment_shader('''
''',
fragment_shader='''
#version 330
uniform vec3 Light;
Expand All @@ -64,8 +64,8 @@ def __init__(self, wnd):
f_color = vec4(Color * lum, 1.0);
}
}
'''),
])
''',
)

self.mvp = self.prog['Mvp']
self.light = self.prog['Light']
Expand Down
Loading

0 comments on commit 8821674

Please sign in to comment.