cyberarm/i-mic-fps
1
0
Fork 0
mirror of https://github.com/cyberarm/i-mic-fps.git synced 2025-12-16 08:02:36 +00:00
Code Issues Projects Releases Wiki Activity

Initial reimplementation of shader based lighting

Browse Source
This commit is contained in:
Cyberarm
2020-07-10 07:19:09 -05:00
parent 635f4e3720
commit 9264ef6e58
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
maps/test_map.json
View File

@@ -22,7 +22,7 @@
"lights":[ "lights":[
{ {
"type":"directional", "type":"point",
"intensity": 1, "intensity": 1,
"position": { "position": {
"x":30, "x":30,

18
shaders/fragment/lighting.glsl
View File

@@ -12,7 +12,18 @@ flat in Light outLight[1];
uniform sampler2D diffuse, position, texcoord, normal, depth; uniform sampler2D diffuse, position, texcoord, normal, depth;
vec4 directionalLight(Light light) { vec4 directionalLight(Light light) {
return vec4(0,0,0,1); vec3 norm = normalize(texture(normal, outTexCoords).rgb);
vec3 diffuse_color = texture(diffuse, outTexCoords).rgb;
vec3 fragPos = texture(position, outTexCoords).rgb;
vec3 lightDir = normalize(light.position - fragPos);
float diff = max(dot(norm, lightDir), 0);
vec3 _ambient = light.ambient;
vec3 _diffuse = light.diffuse * diff;
vec3 _specular = light.specular;
return vec4(_diffuse + _ambient + _specular, 1.0);
} }
vec4 pointLight(Light light) { vec4 pointLight(Light light) {
@@ -24,7 +35,7 @@ vec4 spotLight(Light light) {
} }
vec4 calculateLighting(Light light) { vec4 calculateLighting(Light light) {
vec4 result = vec4(0,0,0,0); vec4 result;
switch(light.type) { switch(light.type) {
case DIRECTIONAL: { case DIRECTIONAL: {
@@ -37,7 +48,8 @@ vec4 calculateLighting(Light light) {
result = spotLight(light); result = spotLight(light);
} }
default: { default: {
result = vec4(1,1,1,1); // result = vec4(1,1,1,1);
result = directionalLight(light);
} }
} }