Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Testing better LoD voxelisation techniques

Browse Source
This commit is contained in:
Joshua Barretto 2023-10-17 00:06:44 +01:00
parent bbed1d85e8
commit 4d6c3a00f3
2 changed files with 44 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
assets/voxygen/shaders/lod-object-frag.glsl
View File

@ -106,6 +106,29 @@ void main() {
voxel_norm = mix(my_norm, voxel_norm == vec3(0.0) ? f_norm : voxel_norm, voxelize_factor);
#endif
vec3 f_pos2 = (f_pos + focus_off.xyz) * 0.7;//;
surf_color *= 0.7;
if (model_pos.z < 25.0 && dot(abs(model_pos.xy), vec2(1)) < 6.0) { surf_color = vec3(0.05, 0.02, 0.0); }
float t = -1.5;// / dot(cam_dir, f_norm);
for (int i = 0; i < 6; i ++) {
vec3 deltas = (step(vec3(0), cam_dir) - fract(f_pos2 + cam_dir * t)) / cam_dir;
float m = min(min(deltas.x, deltas.y), deltas.z);
t += max(m, 0.01);
vec3 block_pos = floor(f_pos2 + cam_dir * t) + 0.5;
if (dot(block_pos - f_pos2, -f_norm) < 0.0) {
vec3 to_center = abs(block_pos - (f_pos2 + cam_dir * t));
voxel_norm = step(max(max(to_center.x, to_center.y), to_center.z), to_center) * sign(cam_dir);
/* voxel_norm = f_norm; */
voxel_norm = normalize(mix(f_norm, voxel_norm, voxelize_factor));
f_ao = mix(1.0, clamp(1.0 + t * 1.5, 0.3, 1.0), voxelize_factor);
break;
}
}
vec3 emitted_light, reflected_light;
// To account for prior saturation.

21
assets/voxygen/shaders/lod-terrain-frag.glsl
View File

@ -359,6 +359,27 @@ void main() {
}
#endif
vec3 f_pos2 = (f_pos + focus_off.xyz) * 0.7;//;
f_ao = 1.0;
float t = -2.0;// / dot(cam_dir, f_norm);
for (int i = 0; i < 6; i ++) {
vec3 deltas = (step(vec3(0), cam_dir) - fract(f_pos2 + cam_dir * t)) / cam_dir;
float m = min(min(deltas.x, deltas.y), deltas.z);
t += max(m, 0.01);
vec3 block_pos = floor(f_pos2 + cam_dir * t) + 0.5;
if (dot(block_pos - f_pos2, -f_norm) < 0.0) {
vec3 to_center = abs(block_pos - (f_pos2 + cam_dir * t));
voxel_norm = step(max(max(to_center.x, to_center.y), to_center.z), to_center) * sign(cam_dir);
/* voxel_norm = f_norm; */
voxel_norm = normalize(mix(f_norm, voxel_norm, voxelize_factor));
f_ao = mix(1.0, clamp(1.0 + t * 0.5 / f_norm.z, 0.3, 1.0), voxelize_factor);
break;
}
}
// vec3 f_ao_view = max(vec3(dot(f_orig_view_dir.yz, sides.yz), dot(f_orig_view_dir.xz, sides.xz), dot(f_orig_view_dir.xy, sides.xy)), 0.0);
// delta_sides *= sqrt(1.0 - f_ao_view * f_ao_view);
// delta_sides *= 1.0 - mix(view_dir / f_ao_view, vec3(0.0), equal(f_ao_view, vec3(0.0)));// sqrt(1.0 - f_ao_view * f_ao_view);