eu07/maszyna
17
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-10-17 12:09:19 +02:00
Code Issues 150 Wiki Activity

fix(sonar): addressing reliability/security issues

Browse Source
This commit is contained in:
jerrrrycho
2026-10-03 20:21:28 +02:00
parent 51521a135a
commit d88fa5d8e2
32 changed files with 189 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
model/Model3d.cpp
View File

@@ -1529,7 +1529,9 @@ void TSubModel::ParentMatrix(float4x4 *m) const
void TSubModel::ReplaceMatrix(const glm::mat4 &mat)
{
*fMatrix = float4x4(glm::value_ptr(mat));
for (int column = 0; column < 4; ++column)
for (int row = 0; row < 4; ++row)
fMatrix->e[column * 4 + row] = mat[column][row];
}
void TSubModel::ReplaceMaterial(const std::string &name)
@@ -1618,13 +1620,8 @@ TSubModel *TModel3d::GetFromName(std::string const &Name) const
{ // wyszukanie submodelu po nazwie
if (Name.empty())
return Root; // potrzebne do terenu z E3D
if (iFlags & 0x0200) // wczytany z pliku tekstowego, wyszukiwanie rekurencyjne
return Root ? Root->GetFromName(Name) : nullptr;
else // wczytano z pliku binarnego, można wyszukać iteracyjnie
{
// for (int i=0;i<iSubModelsCount;++i)
return Root ? Root->GetFromName(Name) : nullptr;
}
// both text and binary models are searched recursively
return Root ? Root->GetFromName(Name) : nullptr;
};
// locates particle source submodels and stores them on internal list