Format
This commit is contained in:
parent
b4c4afaa76
commit
4df19ef970
|
@ -1,7 +1,7 @@
|
||||||
#version 450
|
#version 450
|
||||||
|
|
||||||
in vec3 color;
|
in vec3 color;
|
||||||
out vec4[2] fragColor;
|
out vec4 fragColor[2];
|
||||||
|
|
||||||
void main() {
|
void main() {
|
||||||
fragColor[0] = vec4(1.0, 1.0, 0.0, 1.0);
|
fragColor[0] = vec4(1.0, 1.0, 0.0, 1.0);
|
||||||
|
|
|
@ -35,7 +35,7 @@ def make(context_id):
|
||||||
frag.add_uniform('sampler2D gbufferD')
|
frag.add_uniform('sampler2D gbufferD')
|
||||||
frag.add_uniform('mat4 invVP', '_inverseViewProjectionMatrix')
|
frag.add_uniform('mat4 invVP', '_inverseViewProjectionMatrix')
|
||||||
frag.add_uniform('mat4 invW', '_inverseWorldMatrix')
|
frag.add_uniform('mat4 invW', '_inverseWorldMatrix')
|
||||||
frag.add_out('vec4[2] fragColor')
|
frag.add_out('vec4 fragColor[2]')
|
||||||
|
|
||||||
frag.write_attrib(' vec3 n = normalize(wnormal);')
|
frag.write_attrib(' vec3 n = normalize(wnormal);')
|
||||||
|
|
||||||
|
|
|
@ -205,7 +205,7 @@ def make_deferred(con_mesh, rpasses):
|
||||||
|
|
||||||
gapi = arm.utils.get_gapi()
|
gapi = arm.utils.get_gapi()
|
||||||
if '_gbuffer2' in wrd.world_defs:
|
if '_gbuffer2' in wrd.world_defs:
|
||||||
frag.add_out('vec4[3] fragColor')
|
frag.add_out('vec4 fragColor[3]')
|
||||||
if '_Veloc' in wrd.world_defs:
|
if '_Veloc' in wrd.world_defs:
|
||||||
if tese == None:
|
if tese == None:
|
||||||
vert.add_uniform('mat4 prevWVP', link='_prevWorldViewProjectionMatrix')
|
vert.add_uniform('mat4 prevWVP', link='_prevWorldViewProjectionMatrix')
|
||||||
|
@ -236,9 +236,9 @@ def make_deferred(con_mesh, rpasses):
|
||||||
elif gapi.startswith('direct3d'):
|
elif gapi.startswith('direct3d'):
|
||||||
vert.add_out('vec4 wvpposition')
|
vert.add_out('vec4 wvpposition')
|
||||||
vert.write('wvpposition = gl_Position;')
|
vert.write('wvpposition = gl_Position;')
|
||||||
frag.add_out('vec4[2] fragColor')
|
frag.add_out('vec4 fragColor[2]')
|
||||||
else:
|
else:
|
||||||
frag.add_out('vec4[2] fragColor')
|
frag.add_out('vec4 fragColor[2]')
|
||||||
|
|
||||||
# Pack gbuffer
|
# Pack gbuffer
|
||||||
frag.add_include('std/gbuffer.glsl')
|
frag.add_include('std/gbuffer.glsl')
|
||||||
|
|
|
@ -15,7 +15,7 @@ def make(context_id):
|
||||||
frag = con_transluc.frag
|
frag = con_transluc.frag
|
||||||
tese = con_transluc.tese
|
tese = con_transluc.tese
|
||||||
|
|
||||||
frag.add_out('vec4[2] fragColor')
|
frag.add_out('vec4 fragColor[2]')
|
||||||
|
|
||||||
sh = tese if tese != None else vert
|
sh = tese if tese != None else vert
|
||||||
sh.add_out('vec4 wvpposition')
|
sh.add_out('vec4 wvpposition')
|
||||||
|
|
Loading…
Reference in a new issue