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

Make no terrain pop the default

Browse Source
This commit is contained in:
Joshua Barretto 2023-10-17 15:44:00 +01:00
parent 6a82fcf703
commit ba763f2da5
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/voxygen/shaders/fluid-vert.glsl
View File

@ -64,7 +64,7 @@ void main() {
// Terrain 'pop-in' effect
#ifndef EXPERIMENTAL_BAREMINIMUM
#ifndef EXPERIMENTAL_NOTERRAINPOP
#ifdef EXPERIMENTAL_TERRAINPOP
f_pos.z -= 250.0 * (1.0 - min(1.0001 - 0.02 / pow(time_since(load_time), 10.0), 1.0));
// f_pos.z -= min(32.0, 25.0 * pow(distance(focus_pos.xy, f_pos.xy) / view_distance.x, 20.0));
#endif

2
assets/voxygen/shaders/lod-object-vert.glsl
View File

@ -36,7 +36,7 @@ void main() {
model_pos = v_pos;
float pull_down = 1.0 / pow(distance(focus_pos.xy, obj_pos.xy) / (view_distance.x * 0.95), 150.0);
#ifndef EXPERIMENTAL_NOTERRAINPOP
#ifdef EXPERIMENTAL_TERRAINPOP
f_pos.z -= pull_down;
#else
f_pos.z -= step(0.1, pull_down) * 10000.0;

2
assets/voxygen/shaders/sprite-vert.glsl
View File

@ -147,7 +147,7 @@ void main() {
f_pos += chunk_offs;
#ifndef EXPERIMENTAL_BAREMINIMUM
#ifndef EXPERIMENTAL_NOTERRAINPOP
#ifdef EXPERIMENTAL_TERRAINPOP
// Terrain 'pop-in' effect
f_pos.z -= 250.0 * (1.0 - min(1.0001 - 0.02 / pow(time_since(load_time), 10.0), 1.0));
#endif

2
assets/voxygen/shaders/terrain-vert.glsl
View File

@ -81,7 +81,7 @@ void main() {
// Terrain 'pop-in' effect
#ifndef EXPERIMENTAL_BAREMINIMUM
#ifndef EXPERIMENTAL_NOTERRAINPOP
#ifdef EXPERIMENTAL_TERRAINPOP
v_pos.z -= 250.0 * (1.0 - min(1.0001 - 0.02 / pow(time_since(load_time), 10.0), 1.0));
// f_pos.z -= min(32.0, 25.0 * pow(distance(focus_pos.xy, f_pos.xy) / view_distance.x, 20.0));
#endif

4
voxygen/src/render/mod.rs
View File

@ -513,8 +513,8 @@ pub enum ExperimentalShader {
LowGlowNearCamera,
/// Disable the fake voxel effect on LoD features.
NoLodVoxels,
/// Disable the 'pop-in' effect when loading terrain.
NoTerrainPop,
/// Enable a 'pop-in' effect when loading terrain.
TerrainPop,
/// Display grid lines to visualize the distribution of shadow map texels
/// for the directional light from the sun.
DirectionalShadowMapTexelGrid,