eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-17 23:39:18 +02:00
Code Issues 121 Wiki Activity

Replace clamp with std::clamp

Browse Source
This commit is contained in:
docentYT
2026-05-01 22:14:29 +02:00
parent 1bdd000443
commit d1f16411a1
36 changed files with 271 additions and 287 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
model/AnimModel.cpp
View File

@@ -457,7 +457,7 @@ void TAnimModel::RaAnimate( unsigned int const Framestamp ) {
else
opacity -= m_transition ? timedelta / transitionofftime : 1.f; // reduce to zero
// Clamp the opacity
opacity = clamp(opacity, 0.f, 1.f);
opacity = std::clamp(opacity, 0.f, 1.f);
}
// Ra 2F1I: to by można pomijać dla modeli bez animacji, których jest większość
@@ -600,7 +600,7 @@ std::optional<std::tuple<float, float, std::optional<glm::vec3>> > TAnimModel::L
void TAnimModel::SkinSet( int const Index, material_handle const Material ) {
m_materialdata.replacable_skins[ clamp( Index, 1, 4 ) ] = Material;
m_materialdata.replacable_skins[ std::clamp( Index, 1, 4 ) ] = Material;
}
void TAnimModel::AnimUpdate(double dt)

2
model/Model3d.cpp
View File

@@ -2321,7 +2321,7 @@ void TSubModel::BinInit(TSubModel *s, float4x4 *m, std::vector<std::string> *t,
fCosHotspotAngle = std::cos(DegToRad(0.5f * fCosHotspotAngle));
}
// cap specular values for legacy models
f4Specular = glm::vec4{clamp(f4Specular.r, 0.0f, 1.0f), clamp(f4Specular.g, 0.0f, 1.0f), clamp(f4Specular.b, 0.0f, 1.0f), clamp(f4Specular.a, 0.0f, 1.0f)};
f4Specular = glm::vec4{std::clamp(f4Specular.r, 0.0f, 1.0f), std::clamp(f4Specular.g, 0.0f, 1.0f), std::clamp(f4Specular.b, 0.0f, 1.0f), std::clamp(f4Specular.a, 0.0f, 1.0f)};
iFlags &= ~0x0200; // wczytano z pliku binarnego (nie jest właścicielem tablic)