steffen/VoxelEngine2
1
0
Fork 0
Code Issues6 Pull requests Projects Releases Packages Wiki Activity Actions

pre facing switch

Browse source
This commit is contained in:
zomseffen 2025-01-13 16:18:05 +01:00
parent 3f4656939c
commit dd568a75e3
5 changed files with 117 additions and 33 deletions

BIN
shaders/compiled/frag_rt_quad.spv
View file

Binary file not shown.

106
shaders/rt_quad.frag
View file

@ -133,8 +133,8 @@ vec3 get_light_position(uint light_index) {
return vec3(float(scene_info.infos[light_index]), float(scene_info.infos[light_index + 1]), float(scene_info.infos[light_index + 2]));
}
vec4 get_light_color(uint light_index) {
return vec4(float(scene_info.infos[light_index + 3]) / 255.0, float(scene_info.infos[light_index + 4]) / 255.0, float(scene_info.infos[light_index + 5]) / 255.0, 1.0);
vec3 get_light_color(uint light_index) {
return vec3(float(scene_info.infos[light_index + 3]) / 255.0, float(scene_info.infos[light_index + 4]) / 255.0, float(scene_info.infos[light_index + 5]) / 255.0);
}
void main() {
@ -147,22 +147,29 @@ void main() {
uint max_light_num = scene_info.infos[0];
uint light_num = 0;
uint volume_index = fragVolumeStart;
uint light_index = scene_info.infos[fragVolumeStart + 3];
uint volume_pos_x = scene_info.infos[volume_index + 0];
uint volume_pos_y = scene_info.infos[volume_index + 1];
uint volume_pos_z = scene_info.infos[volume_index + 2];
uint light_index = scene_info.infos[volume_index + 6];
vec3 light_direction = get_light_position(light_index) - origPosition;
vec4 light_color = get_light_color(light_index);
vec3 light_color = get_light_color(light_index);
bool x_pos = light_direction.x > 0.0;
bool x_null = light_direction.x == 0.0;
bool x_null = (light_direction.x == 0.0);
bool y_pos = light_direction.y > 0.0;
bool y_null = light_direction.y == 0.0;
bool y_null = (light_direction.y == 0.0);
bool z_pos = light_direction.z > 0.0;
bool z_null = light_direction.z == 0.0;
bool z_null = (light_direction.z == 0.0);
uint max_iterations = max_light_num * 20;
vec3 color_sum = vec3(0.0, 0.0, 0.0) + (color_sample.xyz * 0.01);
uint max_iterations = 2; //max_light_num * 20;
for (int i = 0; i < max_iterations; i++) {
float x_border = float(scene_info.infos[volume_index + 0] + scene_info.infos[volume_index + 3] * uint(x_pos));
float y_border = float(scene_info.infos[volume_index + 1] + scene_info.infos[volume_index + 4] * uint(y_pos));
float z_border = float(scene_info.infos[volume_index + 2] + scene_info.infos[volume_index + 5] * uint(z_pos));
float x_border = float(volume_pos_x + (scene_info.infos[volume_index + 3]) * uint(x_pos)) - 0.5;
float y_border = float(volume_pos_y + (scene_info.infos[volume_index + 4]) * uint(y_pos)) - 0.5;
float z_border = float(volume_pos_z + (scene_info.infos[volume_index + 5]) * uint(z_pos)) - 0.5;
bool needs_next_light = false;
// 2 is way behind the light position and should result in no collision being detected
float x_factor = 2.0;
@ -172,17 +179,84 @@ void main() {
x_factor = (x_border - origPosition.x) / light_direction.x;
}
if (!y_null) {
float y_factor = (y_border - origPosition.y) / light_direction.y;
y_factor = (y_border - origPosition.y) / light_direction.y;
}
if (!z_null) {
float z_factor = (z_border - origPosition.z) / light_direction.z;
z_factor = (z_border - origPosition.z) / light_direction.z;
}
if ((x_factor >= 0.999 && y_factor >= 0.999 && z_factor >= 0.999)) {
// no hit, add light color result
color_sum += (color_sample.xyz * light_color) / (0.01 * light_direction.length() * light_direction.length() + 1.0);
needs_next_light = true;
} else {
// if there is a border hit before reaching the light
// change to the relevant next volume
// Todo: look into removing ifs from this
uint hit_facing = 0;
uint u = 0;
uint v = 0;
if (x_factor <= y_factor && x_factor <= z_factor) {
if (x_pos) {
hit_facing = 3;
} else {
hit_facing = 2;
}
vec3 intersection_pos = origPosition + x_factor * light_direction;
u = uint(ceil(intersection_pos.y)) - volume_pos_y;
v = uint(ceil(intersection_pos.z)) - volume_pos_z;
}
if (y_factor <= x_factor && y_factor <= z_factor) {
if (y_pos) {
hit_facing = 5;
} else {
hit_facing = 4;
}
vec3 intersection_pos = origPosition + y_factor * light_direction;
u = uint(ceil(intersection_pos.x)) - volume_pos_x;
v = uint(ceil(intersection_pos.z)) - volume_pos_z;
}
if (z_factor <= x_factor && z_factor <= y_factor) {
if (y_pos) {
hit_facing = 0;
} else {
hit_facing = 1;
}
vec3 intersection_pos = origPosition + z_factor * light_direction;
u = uint(ceil(intersection_pos.x)) - volume_pos_x;
v = uint(ceil(intersection_pos.y)) - volume_pos_y;
}
uint next_neighbor = sample_neighbor_from_scene_info(volume_index, uvec2(u, v), hit_facing);
uvec4 color_sample = sample_color_from_scene_info(volume_index, uvec2(u, v), hit_facing);
if (color_sample == uvec4(0, 0, 0, 0)) {
// not a color hit, so check neighbor
if (next_neighbor != 0) {
color_sum = vec3(1.0, 0.0, 0.0);
volume_index = next_neighbor;
uint volume_pos_x = scene_info.infos[volume_index + 0];
uint volume_pos_y = scene_info.infos[volume_index + 1];
uint volume_pos_z = scene_info.infos[volume_index + 2];
} else {
color_sum = vec3(0.0, 0.0, 1.0);
// neightbor miss, shouldn't happen with a light inside of a volume. Might happen with ambient light. For now move on to next light.
needs_next_light = true;
}
} else {
color_sum = vec3(1.0, 0.0, 1.0);
// color hit, move on to next light (may change once transparents are implemnted)
needs_next_light = true;
}
}
if (needs_next_light) {
break;
}
}
outColor = color_sample;
// todo light color memory index does not contain the expected values -> check
outColor = vec4(color_sum, 1.0);
/*if (scene_info.infos[1] == 16) {
outColor = vec4(0, 1, 0, 1);