From 9cac064be8ebc1a7c221d50033ba96ff6d9e7f41 Mon Sep 17 00:00:00 2001 From: Lukas Aldershaab Date: Sun, 3 Jan 2021 11:35:08 +0100 Subject: [PATCH] Avoid negative heights in texture blending --- Engine/source/terrain/glsl/terrFeatureGLSL.cpp | 2 +- Engine/source/terrain/hlsl/terrFeatureHLSL.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Engine/source/terrain/glsl/terrFeatureGLSL.cpp b/Engine/source/terrain/glsl/terrFeatureGLSL.cpp index efcbe7889..d35eb5d6a 100644 --- a/Engine/source/terrain/glsl/terrFeatureGLSL.cpp +++ b/Engine/source/terrain/glsl/terrFeatureGLSL.cpp @@ -1376,7 +1376,7 @@ void TerrainHeightMapBlendGLSL::processPix(Vector& componentLi detailH, blendDepth)); } - meta->addStatement(new GenOp(" @ = (@ * 2.0f - 1.0f) * @;\r\n", + meta->addStatement(new GenOp(" @ = max((@ * 2.0f - 1.0f) * @, 0.0f);\r\n", detailH, detailH, blendContrast)); meta->addStatement(new GenOp(" }\r\n")); diff --git a/Engine/source/terrain/hlsl/terrFeatureHLSL.cpp b/Engine/source/terrain/hlsl/terrFeatureHLSL.cpp index 4e10a081a..c7d59a4c8 100644 --- a/Engine/source/terrain/hlsl/terrFeatureHLSL.cpp +++ b/Engine/source/terrain/hlsl/terrFeatureHLSL.cpp @@ -1456,7 +1456,7 @@ void TerrainHeightMapBlendHLSL::processPix(Vector& componentLi detailH, blendDepth)); } - meta->addStatement(new GenOp(" @ = (@ * 2.0f - 1.0f) * @;\r\n", + meta->addStatement(new GenOp(" @ = max((@ * 2.0f - 1.0f) * @, 0.0f);\r\n", detailH, detailH, blendContrast)); meta->addStatement(new GenOp(" }\r\n"));