eu07/maszyna
17
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-11-12 09:24:12 +01:00
Code Issues 139 Wiki Activity

fix: the build after the merge of master

Browse Source
This commit is contained in:
Hirek
2026-11-07 16:46:11 +01:00
parent d4120ea5db
commit acbea51f81
5 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gl/ubo.h
View File

@@ -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"); 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 struct model_ubs
{ {

3
rendering/opengl46/opengl46renderer.cpp
View File

@@ -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 int opengl46_renderer::Primitive(gfx::geometry_handle const &Geometry) const
{ {
return static_cast<int>(m_geometry.type(Geometry)); auto const primitive{m_geometry.primitive(Geometry)};
return primitive == gfx::geometry_bank::no_primitive ? -1 : static_cast<int>(primitive);
} }
// material methods // material methods

3
rendering/vulkan14/vulkan14scene.cpp
View File

@@ -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 int vulkan14_renderer::Primitive(gfx::geometry_handle const &Geometry) const
{ {
return static_cast<int>(m_geometry.type(Geometry)); auto const primitive{m_geometry.primitive(Geometry)};
return primitive == gfx::geometry_bank::no_primitive ? -1 : static_cast<int>(primitive);
} }
// materials and their programs: the materials are read as for the opengl renderer, their programs are made of vertex.vert and // materials and their programs: the materials are read as for the opengl renderer, their programs are made of vertex.vert and

3
scene/scene.cpp
View File

@@ -352,7 +352,6 @@ void
basic_cell::insert( TAnimModel *Instance ) { basic_cell::insert( TAnimModel *Instance ) {
m_active = true; m_active = true;
m_instancecache.boundsversion = 0; // the renderer builds it anew
auto const flags = Instance->Flags(); auto const flags = Instance->Flags();
auto alpha = auto alpha =
@@ -455,8 +454,6 @@ basic_cell::unregister_end( TTrack *Path ) {
void void
basic_cell::erase( TAnimModel *Instance ) { basic_cell::erase( TAnimModel *Instance ) {
m_instancecache.boundsversion = 0; // the renderer builds it anew
auto const flags = Instance->Flags(); auto const flags = Instance->Flags();
auto alpha = auto alpha =
Instance->Material() != nullptr ? Instance->Material()->textures_alpha : 0x30300030; Instance->Material() != nullptr ? Instance->Material()->textures_alpha : 0x30300030;

2
utilities/Logs.cpp
View File

@@ -163,7 +163,7 @@ void LogService()
} }
} }
if (!quitting) if (!last)
std::this_thread::sleep_for(std::chrono::milliseconds(50)); std::this_thread::sleep_for(std::chrono::milliseconds(50));
} }
} }