добавил clamp(fog_distance, 1.f, far_plane - 10); с аномалии

туман не должен быть такой же как far_plan а всегда меньше

Author: joye-ramone

ogsr_engine/Layers/xrRender/dxLensFlareRender.cpp

@@ -2,9 +2,9 @@
 #include "dxLensFlareRender.h"
 #include "../../xr_3da/xr_efflensflare.h"
 #include "../../xr_3da/iGame_persistent.h"
+
 #define MAX_Flares 24
 
-#define FAR_DIST g_pGamePersistent->Environment().CurrentEnv->far_plane
 
 void dxFlareRender::Copy(IFlareRender& _in) { *this = *(dxFlareRender*)&_in; }
 
@@ -31,7 +31,7 @@ void dxLensFlareRender::Render(CLensFlare& owner, BOOL bSun, BOOL bFlares, BOOL
     u32 VS_Offset;
     FVF::LIT* pv = (FVF::LIT*)RCache.Vertex.Lock(MAX_Flares * 4, hGeom.stride(), VS_Offset);
 
-    float fDistance = FAR_DIST * 0.75f;
+    float fDistance = g_pGamePersistent->Environment().CurrentEnv->far_plane * 0.75f;
 
     if (bSun)
     {

ogsr_engine/xr_3da/Environment_misc.cpp

@@ -490,6 +490,7 @@ void CEnvDescriptorMixer::lerp(CEnvironment* env, CEnvDescriptor& A, CEnvDescrip
     }
 
     fog_distance = (fi * A.fog_distance + f * B.fog_distance);
+    clamp(fog_distance, 1.f, far_plane - 10);
     fog_near = (1.0f - fog_density) * 0.85f * fog_distance;
     fog_far = 0.99f * fog_distance;
 

ogsr_engine/xr_3da/thunderbolt.cpp

@@ -244,7 +244,6 @@ BOOL CEffect_Thunderbolt::RayPick(const Fvector& s, const Fvector& d, float& dis
 
     return bRes;
 }
-#define FAR_DIST g_pGamePersistent->Environment().CurrentEnv->far_plane
 
 void CEffect_Thunderbolt::Bolt(shared_str id, float period, float lt)
 {
@@ -256,14 +255,16 @@ void CEffect_Thunderbolt::Bolt(shared_str id, float period, float lt)
     current = g_pGamePersistent->Environment().thunderbolt_collection(collection, id)->GetRandomDesc();
     VERIFY(current);
 
+    float far_plane = g_pGamePersistent->Environment().CurrentEnv->far_plane;
+
     Fmatrix XF, S;
     Fvector pos, dev;
     float sun_h, sun_p;
     CEnvironment& environment = g_pGamePersistent->Environment();
     environment.CurrentEnv->sun_dir.getHP(sun_h, sun_p);
     float alt = environment.p_var_alt; // Random.randF(environment.p_var_alt.x,environment.p_var_alt.y);
     float lng = Random.randF(sun_h - environment.p_var_long + PI, sun_h + environment.p_var_long + PI);
-    float dist = Random.randF(FAR_DIST * environment.p_min_dist, FAR_DIST * .95f);
+    float dist = Random.randF(far_plane * environment.p_min_dist, far_plane * .95f);
     current_direction.setHP(lng, alt);
     pos.mad(Device.vCameraPosition, current_direction, dist);
     dev.x = Random.randF(-environment.p_tilt, environment.p_tilt);
@@ -273,7 +274,7 @@ void CEffect_Thunderbolt::Bolt(shared_str id, float period, float lt)
 
     Fvector light_dir = {0.f, -1.f, 0.f};
     XF.transform_dir(light_dir);
-    lightning_size = FAR_DIST * 2.f;
+    lightning_size = far_plane * 2.f;
     RayPick(pos, light_dir, lightning_size);
 
     lightning_center.mad(pos, light_dir, lightning_size * 0.5f);

ogsr_engine/xr_3da/xr_efflensflare.cpp

@@ -16,8 +16,6 @@
 #include "xr_object.h"
 #include "igame_level.h"
 
-#define FAR_DIST g_pGamePersistent->Environment().CurrentEnv->far_plane
-
 //#define MAX_Flares	24
 //////////////////////////////////////////////////////////////////////////////
 // Globals ///////////////////////////////////////////////////////////////////
@@ -351,7 +349,7 @@ void CLensFlare::OnFrame(shared_str id)
         bRender = true;
 
     // Calculate the point directly in front of us, on the far clip plane
-    float fDistance = FAR_DIST * 0.75f;
+    float fDistance = g_pGamePersistent->Environment().CurrentEnv->far_plane * 0.75f;
     vecCenter.mul(vecDir, fDistance);
     vecCenter.add(vecPos);
     // Calculate position of light on the far clip plane