From acbea51f812b7889d70c02d9cd6aa7e8a5c075fd Mon Sep 17 00:00:00 2001 From: Hirek193 Date: Sat, 7 Nov 2026 16:46:11 +0100 Subject: [PATCH] fix: the build after the merge of master --- gl/ubo.h | 2 +- rendering/opengl46/opengl46renderer.cpp | 3 ++- rendering/vulkan14/vulkan14scene.cpp | 3 ++- scene/scene.cpp | 3 --- utilities/Logs.cpp | 2 +- 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/gl/ubo.h b/gl/ubo.h index d7a920d08..c933cf523 100644 --- a/gl/ubo.h +++ b/gl/ubo.h @@ -196,7 +196,7 @@ namespace gl static_assert(sizeof(scene_ubs) == 928 + 80 * MAX_HEADLIGHT_SHADOWS + 96 * MAX_CAB_PROBE_LAMPS, "bad size of ubs"); - const size_t MAX_PARAMS = 4; + const size_t MAX_PARAMS = 3; struct model_ubs { diff --git a/rendering/opengl46/opengl46renderer.cpp b/rendering/opengl46/opengl46renderer.cpp index 55959a4b9..3b18cfe0d 100644 --- a/rendering/opengl46/opengl46renderer.cpp +++ b/rendering/opengl46/opengl46renderer.cpp @@ -3161,7 +3161,8 @@ gfx::userdata_array const &opengl46_renderer::UserData(const gfx::geometry_handl int opengl46_renderer::Primitive(gfx::geometry_handle const &Geometry) const { - return static_cast(m_geometry.type(Geometry)); + auto const primitive{m_geometry.primitive(Geometry)}; + return primitive == gfx::geometry_bank::no_primitive ? -1 : static_cast(primitive); } // material methods diff --git a/rendering/vulkan14/vulkan14scene.cpp b/rendering/vulkan14/vulkan14scene.cpp index 3a5a38885..dccfc32d6 100644 --- a/rendering/vulkan14/vulkan14scene.cpp +++ b/rendering/vulkan14/vulkan14scene.cpp @@ -1313,7 +1313,8 @@ gfx::userdata_array const &vulkan14_renderer::UserData(gfx::geometry_handle cons int vulkan14_renderer::Primitive(gfx::geometry_handle const &Geometry) const { - return static_cast(m_geometry.type(Geometry)); + auto const primitive{m_geometry.primitive(Geometry)}; + return primitive == gfx::geometry_bank::no_primitive ? -1 : static_cast(primitive); } // materials and their programs: the materials are read as for the opengl renderer, their programs are made of vertex.vert and diff --git a/scene/scene.cpp b/scene/scene.cpp index 3722d6a12..96fe4c7b6 100644 --- a/scene/scene.cpp +++ b/scene/scene.cpp @@ -352,7 +352,6 @@ void basic_cell::insert( TAnimModel *Instance ) { m_active = true; - m_instancecache.boundsversion = 0; // the renderer builds it anew auto const flags = Instance->Flags(); auto alpha = @@ -455,8 +454,6 @@ basic_cell::unregister_end( TTrack *Path ) { void basic_cell::erase( TAnimModel *Instance ) { - m_instancecache.boundsversion = 0; // the renderer builds it anew - auto const flags = Instance->Flags(); auto alpha = Instance->Material() != nullptr ? Instance->Material()->textures_alpha : 0x30300030; diff --git a/utilities/Logs.cpp b/utilities/Logs.cpp index cd6d7670f..2ce6ac2ae 100644 --- a/utilities/Logs.cpp +++ b/utilities/Logs.cpp @@ -163,7 +163,7 @@ void LogService() } } - if (!quitting) + if (!last) std::this_thread::sleep_for(std::chrono::milliseconds(50)); } }