zone/OpenAssetTools
zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-05-10 14:34:57 +00:00
Code Issues Packages Projects Wiki Activity

fix compilation on gcc

Browse Source
This commit is contained in:
Jan 2022-08-07 19:23:30 +02:00
parent 63e9dc0c43
commit 364d801d3f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderMaterial.cpp
View File

@ -429,7 +429,7 @@ namespace IW4
std::string eyeOffsetSuffix; std::string eyeOffsetSuffix;
const auto eyeOffsetDepth = ReadFloatProperty("eyeOffsetDepth"); const auto eyeOffsetDepth = ReadFloatProperty("eyeOffsetDepth");
if (fpclassify(eyeOffsetDepth) != FP_ZERO) if (std::fpclassify(eyeOffsetDepth) != FP_ZERO)
eyeOffsetSuffix = "_eyeoffset"; eyeOffsetSuffix = "_eyeoffset";
const auto materialType = ReadStringProperty("materialType"); const auto materialType = ReadStringProperty("materialType");
@ -496,12 +496,12 @@ namespace IW4
if (zFeather) if (zFeather)
{ {
const auto zFeatherDepth = ReadFloatProperty("zFeatherDepth"); const auto zFeatherDepth = ReadFloatProperty("zFeatherDepth");
if (fpclassify(zFeatherDepth) == FP_ZERO) if (std::fpclassify(zFeatherDepth) == FP_ZERO)
throw GdtReadingException("zFeatherDepth may not be zero"); throw GdtReadingException("zFeatherDepth may not be zero");
AddConstant("featherParms", Vector4f(1.0f / zFeatherDepth, zFeatherDepth, 0, 0)); AddConstant("featherParms", Vector4f(1.0f / zFeatherDepth, zFeatherDepth, 0, 0));
} }
if (fpclassify(eyeOffsetDepth) != FP_ZERO) if (std::fpclassify(eyeOffsetDepth) != FP_ZERO)
AddConstant("eyeOffsetParms", Vector4f(eyeOffsetDepth, 0, 0, 0)); AddConstant("eyeOffsetParms", Vector4f(eyeOffsetDepth, 0, 0, 0));
const auto colorTint = ReadVec4Property("colorTint", {1.0f, 1.0f, 1.0f, 1.0f}); const auto colorTint = ReadVec4Property("colorTint", {1.0f, 1.0f, 1.0f, 1.0f});