RK/rk_island
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Automatic uniforms with binding.

Browse Source
This commit is contained in:
Roz K
2023-01-02 12:33:34 +01:00
parent 9131523ae7
commit 89e0b99d3a
2 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
game/game.py
View File

@ -186,23 +186,28 @@ def create_scene(keyboard, mouse):
sea_detail_texture = sea.load_detail_texture('data/sea_bump.png') sea_detail_texture = sea.load_detail_texture('data/sea_bump.png')
sea_triangles = sea.sea_triangles(64, proj_far_z - 0.1, proj_ratio) sea_triangles = sea.sea_triangles(64, proj_far_z - 0.1, proj_ratio)
assert tiles_shader.u_height_sampler == tests_shader.u_height_sampler
assert tiles_shader.u_normal_sampler == tests_shader.u_normal_sampler
return SceneNode( return SceneNode(
PerfNode('frame', PerfNode('frame',
TextureNode({1: heightmap, 2: normalmap}, TextureNode({tiles_shader.u_height_sampler: heightmap, tiles_shader.u_normal_sampler: normalmap},
FuncNode(update_camera, (mouse, camera, environment)), FuncNode(update_camera, (mouse, camera, environment)),
TextureNode({0: tiles_texture}, TextureNode({tiles_shader.u_texture_sampler: tiles_texture},
ShaderNode(tiles_shader, ShaderNode(tiles_shader,
InputNode(tiles_shader, camera, environment), InputNode(tiles_shader, camera, environment),
PerfNode('tiles_batch', PerfNode('tiles_batch',
DrawNode(tiles_batch)))), DrawNode(tiles_batch)))),
FuncNode(update_tests, (blob, cube, clouds)), FuncNode(update_tests, (blob, cube, clouds)),
TextureNode({0: tests_texture}, TextureNode({tests_shader.u_texture_sampler: tests_texture},
ShaderNode(tests_shader, ShaderNode(tests_shader,
InputNode(tests_shader, camera, environment), InputNode(tests_shader, camera, environment),
PerfNode('tests_batch', PerfNode('tests_batch',
DrawNode(tests_batch))))), DrawNode(tests_batch))))),
FuncNode(update_sea, (camera, sea_phase)), FuncNode(update_sea, (camera, sea_phase)),
TextureNode({0: sea_polar_textures, 1: sea_detail_texture}, TextureNode({
sea_shader.u_sea_polar_sampler: sea_polar_textures,
sea_shader.u_sea_detail_sampler: sea_detail_texture},
ShaderNode(sea_shader, ShaderNode(sea_shader,
InputNode(sea_shader, camera, environment, sea_phase), InputNode(sea_shader, camera, environment, sea_phase),
PerfNode('sea_triangles', PerfNode('sea_triangles',

23
game/shader.py
View File

@ -24,7 +24,7 @@ def _filter(line):
return line return line
def _subst(line): def _subst(line):
if line.startswith('#include '): if line.startswith('#include'):
path = Path('.') / 'game' / 'shaders' path = Path('.') / 'game' / 'shaders'
lines = [] lines = []
for name in line.split()[1:]: for name in line.split()[1:]:
@ -45,16 +45,27 @@ def _convert(line):
def _parse(shader, vert_lines, frag_lines): def _parse(shader, vert_lines, frag_lines):
uniforms = [] uniforms = []
for line in vert_lines: bindings = {}
if line.startswith('uniform '): def collect(line):
uniforms.append(line.split()[-1].strip(';')) if line.startswith('uniform'):
for line in frag_lines:
if line.startswith('uniform '):
name = line.split()[-1].strip(';') name = line.split()[-1].strip(';')
if name not in uniforms: if name not in uniforms:
uniforms.append(name) uniforms.append(name)
elif line.startswith('layout(binding='):
name = line.split()[-1].strip(';')
value = int(line[line.index('=') + 1 : line.index(')')].strip())
if name in bindings:
assert value == bindings[name]
else:
bindings[name] = value
for line in vert_lines:
collect(line)
for line in frag_lines:
collect(line)
for name in uniforms: for name in uniforms:
setattr(shader, name, resolve_input(shader._shader, bytes(name, 'utf-8'))) setattr(shader, name, resolve_input(shader._shader, bytes(name, 'utf-8')))
for name, value in bindings.items():
setattr(shader, name, value)
class Shader: class Shader:
__slots__ = '_shader', '__dict__' __slots__ = '_shader', '__dict__'