Tweaks

Author: Xottab-DUTY

src/Layers/xrRender/DetailManager.cpp

@@ -458,4 +458,4 @@ void CDetailManager::DispatchMTCalc()
         UpdateVisibleM();
     });
 }
-}
+} // namespace xray::render::RENDER_NAMESPACE

src/Layers/xrRender/xrRender_console.cpp

@@ -22,14 +22,19 @@
 #   endif // MASTER_GOLD
 #endif // (RENDER == R_R3) || (RENDER == R_R4)
 
-extern ENGINE_API float ps_r3_dyn_wet_surf_near; // 10.0f
-extern ENGINE_API float ps_r3_dyn_wet_surf_far; // 30.0f
-extern ENGINE_API int ps_r3_dyn_wet_surf_sm_res; // 256
 
 namespace xray::render::RENDER_NAMESPACE
 {
 u32 ps_Preset = 2;
-const xr_token qpreset_token[] = {{"Minimum", 0}, {"Low", 1}, {"Default", 2}, {"High", 3}, {"Extreme", 4}, {nullptr, 0}};
+const xr_token qpreset_token[] =
+{
+    { "Minimum", 0 },
+    { "Low", 1 },
+    { "Default", 2 },
+    { "High", 3 },
+    { "Extreme", 4 },
+    { nullptr, 0 }
+};
 
 u32 ps_r2_smapsize = 2048;
 const xr_token qsmapsize_token[] =
@@ -237,6 +242,10 @@ Fvector3 ps_r2_dof = Fvector3().set(-1.25f, 1.4f, 600.f);
 float ps_r2_dof_sky = 30; //    distance to sky
 float ps_r2_dof_kernel_size = 5.0f; //  7.0f
 
+float ps_r3_dyn_wet_surf_near = 5.f; // 10.0f
+float ps_r3_dyn_wet_surf_far = 20.f; // 30.0f
+int ps_r3_dyn_wet_surf_sm_res = 256; // 256
+
 u32 ps_steep_parallax = 0;
 int ps_r__detail_radius = 49;
 

src/Layers/xrRender/xrRender_console.h

@@ -1,9 +1,6 @@
 #pragma once
 
 extern ENGINE_API int ps_r__Supersample;
-extern ENGINE_API float ps_r3_dyn_wet_surf_near; // 10.0f
-extern ENGINE_API float ps_r3_dyn_wet_surf_far; // 30.0f
-extern ENGINE_API int ps_r3_dyn_wet_surf_sm_res; // 256
 
 namespace xray::render::RENDER_NAMESPACE
 {
@@ -160,6 +157,10 @@ extern ECORE_API Fvector3 ps_r2_dof;
 extern ECORE_API float ps_r2_dof_sky; //	distance to sky
 extern ECORE_API float ps_r2_dof_kernel_size; //	7.0f
 
+extern ECORE_API float ps_r3_dyn_wet_surf_near; // 10.0f
+extern ECORE_API float ps_r3_dyn_wet_surf_far; // 30.0f
+extern ECORE_API int ps_r3_dyn_wet_surf_sm_res; // 256
+
 enum
 {
     R2FLAG_SUN = (1 << 0),

src/Layers/xrRenderDX11/dx11ResourceManager_Scripting.cpp

@@ -24,6 +24,12 @@ class adopt_dx10options
     {
         return RImplementation.o.msaa_alphatest == CRender::MSAA_ATEST_DX10_0_ATOC;
     }
+
+    LPCSTR _get_level()
+    {
+        const shared_str level_name = g_pGameLevel->name();
+        return level_name.c_str();
+    }
 };
 
 // wrapper
@@ -288,6 +294,11 @@ class adopt_compiler
         C->r_StencilRef(Ref);
         return *this;
     }
+    adopt_compiler& _dx10CullMode(u32 Ref)
+    {
+        C->r_CullMode((D3DCULL)Ref);
+        return *this;
+    }
     adopt_compiler& _dx10ATOC(bool Enable)
     {
         C->RS.SetRS(XRDX11RS_ALPHATOCOVERAGE, Enable);
@@ -331,6 +342,7 @@ void CResourceManager::LS_Load()
         [
             class_<adopt_dx10options>("_dx10options")
                .def("dx10_msaa_alphatest_atoc", &adopt_dx10options::_dx10_msaa_alphatest_atoc)
+			   .def("getLevel", &adopt_dx10options::_get_level)
                //.def("",					&adopt_dx10options::_dx10Options		),	// returns options-object
             ,
 
@@ -376,6 +388,7 @@ void CResourceManager::LS_Load()
                 .def("dx10texture",            &adopt_compiler::_dx10texture,        return_reference_to<1>())
                 .def("dx10stencil",            &adopt_compiler::_dx10Stencil,        return_reference_to<1>())
                 .def("dx10stencil_ref",        &adopt_compiler::_dx10StencilRef,     return_reference_to<1>())
+                .def("dx10cullmode",           &adopt_compiler::_dx10CullMode,       return_reference_to<1>())
                 .def("dx10atoc",               &adopt_compiler::_dx10ATOC,           return_reference_to<1>())
                 .def("dx10zfunc",              &adopt_compiler::_dx10ZFunc,          return_reference_to<1>())
 

src/Layers/xrRender_R2/r2_rendertarget.cpp

@@ -19,8 +19,6 @@
 #    include "Layers/xrRender/blenders/dx11HDAOCSBlender.h"
 #endif
 
-extern ENGINE_API float ps_r3_dyn_wet_surf_far; // 30.0f
-
 namespace xray::render::RENDER_NAMESPACE
 {
 void CRenderTarget::u_stencil_optimize(CBackend& cmd_list, eStencilOptimizeMode eSOM)

src/Layers/xrRender_R2/render_phase_sun.cpp

@@ -406,4 +406,4 @@ void render_sun::accumulate_cascade(u32 cascade_ind)
     dsgraph.cmd_list.submit(); // TODO: move into release (rename to submit?)
     RImplementation.release_context(dsgraph.context_id);
 }
-}
+} // namespace xray::render::RENDER_NAMESPACE

src/xrEngine/CMakeLists.txt

@@ -204,7 +204,6 @@ target_sources_grouped(
     IGame_ObjectPool.h
     IGame_Persistent.cpp
     IGame_Persistent.h
-    IGame_Persistent_Effects.cpp
     pure_relcase.cpp
     pure_relcase.h
     xr_object.h

src/xrEngine/Environment.cpp

@@ -44,10 +44,6 @@ CEnvironment::CEnvironment()
 
     fTimeFactor = 12.f;
 
-    wind_strength_factor = 0.f;
-    wind_gust_factor = 0.f;
-
-    wind_blast_strength = 0.f;
     wind_blast_direction.set(1.f, 0.f, 0.f);
 
     // fill clouds hemi verts & faces

src/xrEngine/IGame_Persistent.cpp

@@ -32,8 +32,6 @@ IGame_Persistent::IGame_Persistent()
     Device.seqAppActivate.Add(this);
     Device.seqAppDeactivate.Add(this);
 
-    m_pMainMenu = nullptr;
-
     pEnvironment = xr_new<CEnvironment>();
 
     m_pGShaderConstants = xr_new<ShadersExternalData>(); //--#SM+#--

src/xrEngine/Stats.cpp

@@ -27,8 +27,6 @@ ENGINE_API CStatTimer gTestTimer3;
 //////////////////////////////////////////////////////////////////////
 ENGINE_API bool g_bDisableRedText = false;
 int g_bShowRedText = 1;
-ENGINE_API int ps_disable_lens_flare = 0;
-
 CStats::CStats()
 {
     statsFont = nullptr;