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

Replace RadToDeg and DegToRad with glm::degrees and glm::radians

Browse Source
This commit is contained in:
docentYT
2026-05-02 14:51:13 +02:00
parent ca699d117f
commit 7081dab3c2
5 changed files with 19 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
model/Model3d.cpp
View File

@@ -381,11 +381,11 @@ std::pair<int, int> TSubModel::Load(cParser &parser, bool dynamic)
// convert conve parameters if specified in degrees
if (fCosFalloffAngle > 1.0)
{
fCosFalloffAngle = std::cos(DegToRad(0.5f * fCosFalloffAngle));
fCosFalloffAngle = std::cos(glm::radians(0.5f * fCosFalloffAngle));
}
if (fCosHotspotAngle > 1.0)
{
fCosHotspotAngle = std::cos(DegToRad(0.5f * fCosHotspotAngle));
fCosHotspotAngle = std::cos(glm::radians(0.5f * fCosHotspotAngle));
}
m_geometry.vertex_count = 1;
iFlags |= 0x4030; // drawn both in solid (light point) and transparent (light glare) phases
@@ -2313,11 +2313,11 @@ void TSubModel::BinInit(TSubModel *s, float4x4 *m, std::vector<std::string> *t,
// intercept and fix hotspot values if specified in degrees and not directly
if (fCosFalloffAngle > 1.0f)
{
fCosFalloffAngle = std::cos(DegToRad(0.5f * fCosFalloffAngle));
fCosFalloffAngle = std::cos(glm::radians(0.5f * fCosFalloffAngle));
}
if (fCosHotspotAngle > 1.0f)
{
fCosHotspotAngle = std::cos(DegToRad(0.5f * fCosHotspotAngle));
fCosHotspotAngle = std::cos(glm::radians(0.5f * fCosHotspotAngle));
}
// cap specular values for legacy models
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)};