maxmustermann/armory
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Format

Browse source
This commit is contained in:
luboslenco 2019-01-30 17:45:54 +01:00
parent b4c4afaa76
commit 4df19ef970
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Shaders/debug_draw/line_deferred.frag.glsl
View file

@ -1,7 +1,7 @@
#version 450
in vec3 color;
out vec4[2] fragColor;
out vec4 fragColor[2];
void main() {
fragColor[0] = vec4(1.0, 1.0, 0.0, 1.0);

2
blender/arm/material/make_decal.py
View file

@ -35,7 +35,7 @@ def make(context_id):
frag.add_uniform('sampler2D gbufferD')
frag.add_uniform('mat4 invVP', '_inverseViewProjectionMatrix')
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);')

6
blender/arm/material/make_mesh.py
View file

@ -205,7 +205,7 @@ def make_deferred(con_mesh, rpasses):
gapi = arm.utils.get_gapi()
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 tese == None:
vert.add_uniform('mat4 prevWVP', link='_prevWorldViewProjectionMatrix')
@ -236,9 +236,9 @@ def make_deferred(con_mesh, rpasses):
elif gapi.startswith('direct3d'):
vert.add_out('vec4 wvpposition')
vert.write('wvpposition = gl_Position;')
frag.add_out('vec4[2] fragColor')
frag.add_out('vec4 fragColor[2]')
else:
frag.add_out('vec4[2] fragColor')
frag.add_out('vec4 fragColor[2]')
# Pack gbuffer
frag.add_include('std/gbuffer.glsl')

2
blender/arm/material/make_transluc.py
View file

@ -15,7 +15,7 @@ def make(context_id):
frag = con_transluc.frag
tese = con_transluc.tese
frag.add_out('vec4[2] fragColor')
frag.add_out('vec4 fragColor[2]')
sh = tese if tese != None else vert
sh.add_out('vec4 wvpposition')