From 9bb9b93f6044a48ec968e85cd7c63c91d562dd0d Mon Sep 17 00:00:00 2001 From: AnotherCommander Date: Mon, 16 Oct 2017 22:39:13 +0200 Subject: [PATCH] Test Release builds: Make relief intensity on planets adjustable by the p3dnsf (P3D Normal Scale Factor) user defaults setting. Default value is 1.0. --- src/Core/Materials/OOPlanetTextureGenerator.m | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/Core/Materials/OOPlanetTextureGenerator.m b/src/Core/Materials/OOPlanetTextureGenerator.m index 7da31b7ea..5c661d11a 100644 --- a/src/Core/Materials/OOPlanetTextureGenerator.m +++ b/src/Core/Materials/OOPlanetTextureGenerator.m @@ -430,7 +430,12 @@ - (void) loadTexture float seaBias = _info.landFraction - 1.0f; _info.paleSeaColor = Blend(0.35f, _info.polarSeaColor, Blend(0.7f, _info.seaColor, _info.landColor)); - float normalScale = 1 << _planetScale; + float normalScale = (1 << _planetScale) +#ifndef NDEBUG + // test-release only, make normalScale adjustable from within user defaults + * [[NSUserDefaults standardUserDefaults] oo_floatForKey:@"p3dnsf" defaultValue:1.0f] +#endif + ; // float normalScale = ... if (!generateNormalMap) normalScale *= 3.0f; // Deep sea colour: sea darker past the continental shelf.