поправил вылет если переключать r3_volumetric_smoke с 0 на 1

поправил исчезновение НПЦ\ мобов при коллизии с fluid smoke хз зачем там этот create_animation_collision в physics_collision physics_collision используется сейчас только что б получить геометрию НПЦ
OGSR · Jun 9, 2024 · 0ab4584 · 0ab4584
1 parent 69a55dc
commit 0ab4584
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/ogsr_engine/Layers/xrRenderDX10/3DFluid/dx103DFluidManager.cpp b/ogsr_engine/Layers/xrRenderDX10/3DFluid/dx103DFluidManager.cpp
@@ -35,8 +35,9 @@ dx103DFluidManager::~dx103DFluidManager() { Destroy(); }
 
 void dx103DFluidManager::Initialize(int width, int height, int depth)
 {
-    if (!ps_r2_ls_flags.test(R3FLAG_VOLUMETRIC_SMOKE))
-        return;
+    // if (strstr(Core.Params,"-no_volumetric_fog"))
+    /*if (!ps_r2_ls_flags.test(R3FLAG_VOLUMETRIC_SMOKE))
+        return;*/
 
     Destroy();
 

diff --git a/ogsr_engine/Layers/xrRenderDX10/3DFluid/dx103DFluidObstacles.cpp b/ogsr_engine/Layers/xrRenderDX10/3DFluid/dx103DFluidObstacles.cpp
@@ -145,9 +145,9 @@ void dx103DFluidObstacles::ProcessDynamicObstacles(const dx103DFluidData& FluidD
     box.getradius(size);
 
     // Traverse object database
-    g_SpatialSpace->q_box(m_lstRenderables,
-                          0, // ISpatial_DB::O_ORDERED,
-                          STYPE_RENDERABLE, center, size);
+    //g_SpatialSpace->q_box(m_lstRenderables,
+    //                      0, // ISpatial_DB::O_ORDERED,
+    //                      STYPE_RENDERABLE, center, size);
 
     // Determine visibility for dynamic part of scene
     for (u32 i = 0; i < m_lstRenderables.size(); ++i)

diff --git a/ogsr_engine/xrGame/PhysicsShellHolder.cpp b/ogsr_engine/xrGame/PhysicsShellHolder.cpp
@@ -239,9 +239,9 @@ IPhysicsElement* CPhysicsShellHolder::physics_character() const
 
 const IObjectPhysicsCollision* CPhysicsShellHolder::physics_collision()
 {
-    CCharacterPhysicsSupport* char_support = character_physics_support();
+    /*CCharacterPhysicsSupport* char_support = character_physics_support();
     if (char_support)
-        char_support->create_animation_collision();
+        char_support->create_animation_collision();*/
 
     return this;
 }