~ Should be float

+ SetTextureEx exported to lua for CUIStatic, which allows setting shader name as second param = UIDragDropListEx | Fix improper use of std::unique. The idea is to cull cells of same dimensions or less for drawing but this optimization did not work due to this error. Co-Authored-By: Revo Lucas <[email protected]>
OpenXRay · Jun 3, 2018 · 33ae25a · 33ae25a
1 parent 40fc8b4
commit 33ae25a
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 5 deletions.
diff --git a/src/Layers/xrRenderPC_R1/FStaticRender_RenderTarget.cpp b/src/Layers/xrRenderPC_R1/FStaticRender_RenderTarget.cpp
@@ -28,7 +28,7 @@ CRenderTarget::CRenderTarget()
     param_color_map_influence = 0.0f;
     param_color_map_interpolate = 0.0f;
 
-    im_noise_time = 1 / 100.0f;
+    im_noise_time = 1.f / 100.0f;
     im_noise_shift_w = 0;
     im_noise_shift_h = 0;
 

diff --git a/src/Layers/xrRenderPC_R2/r2_rendertarget.cpp b/src/Layers/xrRenderPC_R2/r2_rendertarget.cpp
@@ -196,7 +196,7 @@ CRenderTarget::CRenderTarget()
     param_noise_fps = 25.f;
     param_noise_scale = 1.f;
 
-    im_noise_time = 1 / 100.0f;
+    im_noise_time = 1.f / 100.0f;
     im_noise_shift_w = 0;
     im_noise_shift_h = 0;
 

diff --git a/src/Layers/xrRenderPC_R3/r3_rendertarget.cpp b/src/Layers/xrRenderPC_R3/r3_rendertarget.cpp
@@ -292,7 +292,7 @@ CRenderTarget::CRenderTarget()
     param_noise_fps = 25.f;
     param_noise_scale = 1.f;
 
-    im_noise_time = 1 / 100.0f;
+    im_noise_time = 1.f / 100.0f;
     im_noise_shift_w = 0;
     im_noise_shift_h = 0;
 

diff --git a/src/Layers/xrRenderPC_R4/r4_rendertarget.cpp b/src/Layers/xrRenderPC_R4/r4_rendertarget.cpp
@@ -294,7 +294,7 @@ CRenderTarget::CRenderTarget()
     param_noise_fps = 25.f;
     param_noise_scale = 1.f;
 
-    im_noise_time = 1 / 100.0f;
+    im_noise_time = 1.f / 100.0f;
     im_noise_shift_w = 0;
     im_noise_shift_h = 0;
 

diff --git a/src/xrGame/ui/UIDragDropListEx.cpp b/src/xrGame/ui/UIDragDropListEx.cpp
@@ -743,7 +743,7 @@ u32 CUICellContainer::GetCellsInRange(const Irect& rect, UI_CELLS_VEC& res)
         for (int y = rect.y1; y <= rect.y2; ++y)
             res.push_back(GetCellAt(Ivector2().set(x, y)));
 
-    std::unique(res.begin(), res.end());
+    res.erase(std::unique(res.begin(), res.end()), res.end());
     return res.size();
 }
 

diff --git a/src/xrGame/ui/UIStatic_script.cpp b/src/xrGame/ui/UIStatic_script.cpp
@@ -20,6 +20,7 @@ SCRIPT_EXPORT(CUIStatic, (CUIWindow), {
                          .def(constructor<>())
                          .def("TextControl", &CUIStatic::TextItemControl)
                          .def("InitTexture", &CUIStatic::InitTexture)
+                         .def("InitTextureEx", &CUIStatic::InitTextureEx)
                          .def("SetTextureRect", &CUIStatic::SetTextureRect_script)
                          .def("SetStretchTexture", &CUIStatic::SetStretchTexture)
                          .def("GetTextureRect", &CUIStatic::GetTextureRect_script)];