partial revert 0ab4584 + fix warnings

OGSR · Jun 23, 2024 · 9e1f76e · 9e1f76e
1 parent 0b16bef
commit 9e1f76e
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 7 deletions.
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/Level.cpp b/ogsr_engine/xrGame/Level.cpp
@@ -49,8 +49,6 @@
 #include "physicobject.h"
 #endif
 
-#include <execution>
-
 #include "LevelDebugScript.h"
 #include "physicobject.h"
 #include "UIGameSP.h"

diff --git a/ogsr_engine/xr_3da/IGame_Persistent.cpp b/ogsr_engine/xr_3da/IGame_Persistent.cpp
@@ -399,7 +399,7 @@ void IGame_Persistent::GrassBendersUpdateAnimations()
                 grass_shader_data.time[idx] += Device.fTimeDelta * grass_shader_data.speed[idx];
 
                 // Perlin Noise
-                float curve = std::clamp(PerlinNoise1D->GetContinious(grass_shader_data.time[idx]) + 0.5f, 0.f, 1.f) * -1.0;
+                float curve = std::clamp(PerlinNoise1D->GetContinious(grass_shader_data.time[idx]) + 0.5f, 0.f, 1.f) * -1.0f;
 
                 // Intensity using Perlin
                 grass_shader_data.dir[idx].w = curve * grass_shader_data.str_target[idx];

diff --git a/ogsr_engine/xr_3da/IGame_Persistent.h b/ogsr_engine/xr_3da/IGame_Persistent.h
@@ -45,7 +45,7 @@ class ENGINE_API IGame_Persistent : public DLL_Pure, public pureAppStart, public
     xr_set<CPS_Instance*> ps_active, ps_destroy;
     xr_vector<CPS_Instance*> ps_needtoplay;
 
-    enum GrassBenders_Anim
+    enum GrassBenders_Anim : s8
     {
         BENDER_ANIM_EXPLOSION = 0,
         BENDER_ANIM_DEFAULT = 1,