bloeys/nmage
1
0
Fork 0
mirror of https://github.com/bloeys/nmage.git synced 2025-12-29 13:28:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move dirLight&camPos&projViewMat to ubos

Browse Source
This commit is contained in:
bloeys
2024-09-15 08:40:05 +04:00
parent 3be4ad9c45
commit f2b757c606
2 changed files with 136 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
res/shaders/simple.glsl
View File

@ -14,22 +14,14 @@ layout(location=3) in vec2 vertUV0In;
layout(location=4) in vec3 vertColorIn;
//
// Uniforms
// UBOs
//
uniform vec3 camPos;
uniform mat4 modelMat;
uniform mat3 normalMat;
uniform mat4 projViewMat;
uniform mat4 dirLightProjViewMat;
uniform mat4 spotLightProjViewMats[NUM_SPOT_LIGHTS];
struct DirLight {
vec3 dir;
vec3 diffuseColor;
vec3 specularColor;
sampler2D shadowMap;
};
uniform DirLight dirLight;
uniform sampler2D dirLightShadowMap;
struct PointLight {
vec3 pos;
@ -41,7 +33,6 @@ struct PointLight {
float nearPlane;
float farPlane;
};
uniform PointLight pointLights[NUM_POINT_LIGHTS];
struct SpotLight {
vec3 pos;
@ -51,7 +42,24 @@ struct SpotLight {
float innerCutoff;
float outerCutoff;
};
layout (std140) uniform GlobalMatrices {
vec3 camPos;
mat4 projViewMat;
};
layout (std140) uniform Lights {
DirLight dirLight;
};
//
// Uniforms
//
uniform PointLight pointLights[NUM_POINT_LIGHTS];
uniform SpotLight spotLights[NUM_SPOT_LIGHTS];
uniform mat4 modelMat;
uniform mat4 dirLightProjViewMat;
uniform mat4 spotLightProjViewMats[NUM_SPOT_LIGHTS];
//
// Outputs
@ -165,9 +173,8 @@ struct DirLight {
vec3 dir;
vec3 diffuseColor;
vec3 specularColor;
sampler2D shadowMap;
};
uniform DirLight dirLight;
uniform sampler2D dirLightShadowMap;
struct PointLight {
vec3 pos;
@ -193,6 +200,15 @@ struct SpotLight {
uniform SpotLight spotLights[NUM_SPOT_LIGHTS];
uniform sampler2DArray spotLightShadowMaps;
layout (std140) uniform GlobalMatrices {
vec3 camPos;
mat4 projViewMat;
};
layout (std140) uniform Lights {
DirLight dirLight;
};
uniform vec3 ambientColor = vec3(0.2, 0.2, 0.2);
//
@ -260,7 +276,7 @@ vec3 CalcDirLight()
vec3 finalSpecular = specularAmount * dirLight.specularColor * specularTexColor.rgb;
// Shadow
float shadow = CalcDirShadow(dirLight.shadowMap, lightDir);
float shadow = CalcDirShadow(dirLightShadowMap, lightDir);
return (finalDiffuse + finalSpecular) * (1 - shadow);
}