Update shaders

This commit is contained in:
luboslenco
2024-10-02 23:17:50 +02:00
parent d5bf710dd1
commit 5afa08ff91
35 changed files with 107 additions and 123 deletions
+8 -13
View File
@@ -1,14 +1,4 @@
#ifndef _DEFERRED_LIGHT_GLSL_
#define _DEFERRED_LIGHT_GLSL_
#include "std/gbuffer.glsl"
#include "std/light.glsl"
#include "std/shirr.glsl"
#ifdef _Voxel
#include "std/conetrace.glsl"
#endif
uniform sampler2D gbufferD;
uniform sampler2D gbuffer0;
uniform sampler2D gbuffer1;
@@ -31,6 +21,13 @@ uniform vec3 eye_look;
uniform vec3 point_pos;
uniform vec3 point_col;
#include "gbuffer.glsl"
#include "light.glsl"
#include "shirr.glsl"
#ifdef _Voxel
#include "conetrace.glsl"
#endif
in vec2 tex_coord;
in vec3 view_ray;
out vec4 frag_color;
@@ -86,7 +83,7 @@ void main() {
if (matid == 1) { // Emission
frag_color.rgb += g1.rgb; // materialid
albedo = vec3(0.0);
albedo = vec3(0.0, 0.0, 0.0);
}
frag_color.rgb += sample_light(p, n, v, dotnv, point_pos, point_col, albedo, roughness, f0, occ
@@ -96,5 +93,3 @@ void main() {
);
frag_color.a = 1.0; // Mark as opaque
}
#endif