From 594ef41c41ad41019df8ce0926b3526f9cc8dc27 Mon Sep 17 00:00:00 2001 From: Keks1 <30904997+lucifer602288@users.noreply.github.com> Date: Sun, 18 Aug 2024 16:00:18 +0200 Subject: [PATCH] correction of "Render fog zones in Gothic 1" for Gothic 1.12f commited 11.02.2024 by ThielHater --- D3D11Engine/D3D11PFX_HeightFog.cpp | 6 +++--- D3D11Engine/GothicMemoryLocations1_12f.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/D3D11Engine/D3D11PFX_HeightFog.cpp b/D3D11Engine/D3D11PFX_HeightFog.cpp index 8bca5283..f80e41e5 100644 --- a/D3D11Engine/D3D11PFX_HeightFog.cpp +++ b/D3D11Engine/D3D11PFX_HeightFog.cpp @@ -59,7 +59,7 @@ XRESULT D3D11PFX_HeightFog::Render( RenderToTextureBuffer* fxbuffer ) { cb.HF_WeightZFar = std::min( cb.HF_WeightZFar, atmoMax ); cb.HF_WeightZNear = std::min( cb.HF_WeightZNear, atmoMin ); -#ifndef BUILD_GOTHIC_1_08k +#if !defined(BUILD_GOTHIC_1_08k) || !defined(BUILD_1_12F) float fogDensityFactor = 2; float fogDensityFactorRain = (1.0f - Engine::GAPI->GetFogOverride()); #else @@ -74,7 +74,7 @@ XRESULT D3D11PFX_HeightFog::Render( RenderToTextureBuffer* fxbuffer ) { // Override fog color when in fog zone color = Engine::GAPI->GetFogColor(); -#ifndef BUILD_GOTHIC_1_08k +#if !defined(BUILD_GOTHIC_1_08k) || !defined(BUILD_1_12F) // Make it z-Fog cb.HF_HeightFalloff = Toolbox::lerp( cb.HF_HeightFalloff, 0.000001f, Engine::GAPI->GetFogOverride() ); #endif @@ -82,7 +82,7 @@ XRESULT D3D11PFX_HeightFog::Render( RenderToTextureBuffer* fxbuffer ) { // Turn up density cb.HF_GlobalDensity = Toolbox::lerp( cb.HF_GlobalDensity, cb.HF_GlobalDensity * fogDensityFactor, Engine::GAPI->GetFogOverride() ); -#ifndef BUILD_GOTHIC_1_08k +#if !defined(BUILD_GOTHIC_1_08k) || !defined(BUILD_1_12F) // Use other fog-values for fog-zones float distNear = WORLD_SECTION_SIZE * ((ffar - fnear) / ffar); cb.HF_WeightZNear = Toolbox::lerp( cb.HF_WeightZNear, WORLD_SECTION_SIZE * 0.09f, Engine::GAPI->GetFogOverride() ); diff --git a/D3D11Engine/GothicMemoryLocations1_12f.h b/D3D11Engine/GothicMemoryLocations1_12f.h index 7017b758..5e005bff 100644 --- a/D3D11Engine/GothicMemoryLocations1_12f.h +++ b/D3D11Engine/GothicMemoryLocations1_12f.h @@ -109,8 +109,8 @@ struct GothicMemoryLocations { static const unsigned int Offset_MasterState = 0x74; static const unsigned int GetUnderwaterFX = 0x5D8600; - static const unsigned int Offset_OverrideColor = 0x558; - static const unsigned int Offset_OverrideFlag = 0x564; + static const unsigned int Offset_FarZ = 0x56C; + static const unsigned int Offset_Color = 0x580; static const unsigned int SetCameraLocationHint = 0x005DA380;