cyberarm/cyberarm_engine
1
0
Fork 0
mirror of https://github.com/cyberarm/cyberarm_engine.git synced 2025-12-15 12:42:34 +00:00
Code Issues Projects Releases Wiki Activity

Refactored mesh handling, imported AABB tree implementation from I-MIC FPS

Browse Source
This commit is contained in:
Cyberarm
2025-05-03 18:21:11 -05:00
parent b3561f02c1
commit eabad4abd4
16 changed files with 356 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

124
assets/shaders/fragment/lighting.glsl
View File

@@ -1,14 +1,15 @@
#version 330 core
@include "light_struct"
out vec4 frag_color;
@include "light_struct"
const int DIRECTIONAL = 0;
const int POINT = 1;
const int SPOT = 2;
flat in Light out_lights[7];
in vec2 out_tex_coords;
flat in int out_light_count;
flat in Light out_lights[7];
uniform sampler2D diffuse, position, texcoord, normal, depth;
@@ -27,43 +28,88 @@ vec4 directionalLight(Light light) {
return vec4(_diffuse + _ambient + _specular, 1.0);
}
vec4 pointLight(Light light) {
return vec4(0.25, 0.25, 0.25, 1);
}
vec4 spotLight(Light light) {
return vec4(0.5, 0.5, 0.5, 1);
}
vec4 calculateLighting(Light light) {
vec4 result;
// switch(light.type) {
// case DIRECTIONAL: {
// result = directionalLight(light);
// }
// case SPOT: {
// result = spotLight(light);
// }
// default: {
// result = pointLight(light);
// }
// }
if (light.type == DIRECTIONAL) {
result = directionalLight(light);
} else {
result = pointLight(light);
}
return result;
}
void main() {
frag_color = vec4(0.0);
Light light;
light.type = DIRECTIONAL;
for(int i = 0; i < out_light_count; i++)
{
frag_color += texture(diffuse, out_tex_coords) * calculateLighting(out_lights[i]);
}
light.position = vec3(100, 100, 100);
light.diffuse = vec3(0.5, 0.5, 0.5);
light.ambient = vec3(0.8, 0.8, 0.8);
light.specular = vec3(0.2, 0.2, 0.2);
light.intensity = 1.0;
frag_color = texture(diffuse, out_tex_coords) * directionalLight(light);
}
// #version 330 core
// @include "light_struct"
// out vec4 frag_color;
// const int DIRECTIONAL = 0;
// const int POINT = 1;
// const int SPOT = 2;
// in vec2 out_tex_coords;
// flat in int out_light_count;
// flat in Light out_lights[7];
// uniform sampler2D diffuse, position, texcoord, normal, depth;
// vec4 directionalLight(Light light) {
// vec3 norm = normalize(texture(normal, out_tex_coords).rgb);
// vec3 diffuse_color = texture(diffuse, out_tex_coords).rgb;
// vec3 frag_pos = texture(position, out_tex_coords).rgb;
// vec3 lightDir = normalize(light.position - frag_pos);
// 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) {
// return vec4(0.25, 0.25, 0.25, 1);
// }
// vec4 spotLight(Light light) {
// return vec4(0.5, 0.5, 0.5, 1);
// }
// vec4 calculateLighting(Light light) {
// vec4 result;
// // switch(light.type) {
// // case DIRECTIONAL: {
// // result = directionalLight(light);
// // }
// // case SPOT: {
// // result = spotLight(light);
// // }
// // default: {
// // result = pointLight(light);
// // }
// // }
// if (light.type == DIRECTIONAL) {
// result = directionalLight(light);
// } else {
// result = pointLight(light);
// }
// return result;
// }
// void main() {
// frag_color = vec4(0.0);
// for(int i = 0; i < out_light_count; i++)
// {
// frag_color += texture(diffuse, out_tex_coords) * calculateLighting(out_lights[i]);
// }
// }

2
assets/shaders/vertex/g_buffer.glsl
View File

@@ -1,4 +1,4 @@
# version 330 core
#version 330 core
layout(location = 0) in vec3 in_position;
layout(location = 1) in vec3 in_color;