diff --git a/res/shaders/main.glslv b/res/shaders/main.glslv index 8fd38d20..4d50e5d9 100644 --- a/res/shaders/main.glslv +++ b/res/shaders/main.glslv @@ -51,7 +51,9 @@ void main() { mat4 viewmodel = u_view * u_model; a_distance = length(viewmodel * vec4(pos3d, 0.0)); +#ifndef ADVANCED_RENDER a_fog = calc_fog(length(viewmodel * vec4(pos3d * FOG_POS_SCALE, 0.0)) / 256.0); +#endif a_emission = v_normal.w; vec4 viewmodelpos = u_view * a_modelpos; diff --git a/src/graphics/render/WorldRenderer.cpp b/src/graphics/render/WorldRenderer.cpp index 1e77272b..93039d2c 100644 --- a/src/graphics/render/WorldRenderer.cpp +++ b/src/graphics/render/WorldRenderer.cpp @@ -164,14 +164,14 @@ void WorldRenderer::setupWorldShader( auto inventory = player.getInventory(); ItemStack& stack = inventory->getSlot(player.getChosenSlot()); auto& item = indices->items.require(stack.getItemId()); - float multiplier = 0.5f; + float multiplier = 0.75f; shader.uniform3f( "u_torchlightColor", item.emission[0] / 15.0f * multiplier, item.emission[1] / 15.0f * multiplier, item.emission[2] / 15.0f * multiplier ); - shader.uniform1f("u_torchlightDistance", 6.0f); + shader.uniform1f("u_torchlightDistance", 8.0f); } } diff --git a/src/io/engine_paths.cpp b/src/io/engine_paths.cpp index 4c424f95..3526f387 100644 --- a/src/io/engine_paths.cpp +++ b/src/io/engine_paths.cpp @@ -220,6 +220,7 @@ void EnginePaths::cleanup() { io::remove_device(entryPoint); } entryPoints.clear(); + writeables.clear(); } void EnginePaths::setEntryPoints(std::vector entryPoints) {