OU/CWE-ou-minkata
1
0
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-18 11:19:10 +00:00
Code Releases Activity

MinGW fix for plGLight isnan usage.

Browse Source
This commit is contained in:
Darryl Pogue
2015-02-08 23:20:37 -08:00
parent 352172e41b
commit 8010f5d051
2 changed files with 9 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Sources/Plasma/PubUtilLib/plGLight/plPerspDirSlave.cpp
View File

@ -50,10 +50,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include <cfloat> #include <cfloat>
#include <cmath> #include <cmath>
#ifdef HS_BUILD_FOR_WIN32
#define isnan _isnan
#endif
void plPerspDirSlave::Init() void plPerspDirSlave::Init()
{ {
plShadowSlave::Init(); plShadowSlave::Init();
@ -187,10 +183,10 @@ bool plPerspDirSlave::SetupViewTransform(plPipeline* pipe)
// This is my hack to get the Nexus age working. The real problem // This is my hack to get the Nexus age working. The real problem
// is probably data-side. I take full responsibility for this // is probably data-side. I take full responsibility for this
// hack-around breaking the entire system, loosing data, causing // hack-around breaking the entire system, loosing data, causing
// unauthorized credit card transactions, etc. // unauthorized credit card transactions, etc.
if (isnan(bnd.GetMins().fX) || isnan(bnd.GetMins().fY)) if (std::isnan(bnd.GetMins().fX) || std::isnan(bnd.GetMins().fY))
return false; return false;
if (isnan(bnd.GetMaxs().fX) || isnan(bnd.GetMaxs().fY)) if (std::isnan(bnd.GetMaxs().fX) || std::isnan(bnd.GetMaxs().fY))
return false; return false;
// THIS IS EVEN MORE WRONG // THIS IS EVEN MORE WRONG
@ -248,10 +244,10 @@ bool plPerspDirSlave::SetupViewTransform(plPipeline* pipe)
// This is my hack to get the Nexus age working. The real problem // This is my hack to get the Nexus age working. The real problem
// is probably data-side. I take full responsibility for this // is probably data-side. I take full responsibility for this
// hack-around breaking the entire system, loosing data, causing // hack-around breaking the entire system, loosing data, causing
// unauthorized credit card transactions, etc. // unauthorized credit card transactions, etc.
if (isnan(bnd.GetMins().fX) || isnan(bnd.GetMins().fY)) if (std::isnan(bnd.GetMins().fX) || std::isnan(bnd.GetMins().fY))
return false; return false;
if (isnan(bnd.GetMaxs().fX) || isnan(bnd.GetMaxs().fY)) if (std::isnan(bnd.GetMaxs().fX) || std::isnan(bnd.GetMaxs().fY))
return false; return false;
plConst(float) kMinMinZ(1.f); plConst(float) kMinMinZ(1.f);

10
Sources/Plasma/PubUtilLib/plGLight/plShadowSlave.cpp
View File

@ -48,10 +48,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include <cfloat> #include <cfloat>
#include <cmath> #include <cmath>
#ifdef HS_BUILD_FOR_WIN32
#define isnan _isnan
#endif
static const float kMinMinZ = 1.f; // totally random arbitrary number (has to be > 0). static const float kMinMinZ = 1.f; // totally random arbitrary number (has to be > 0).
bool plShadowSlave::ISetupOrthoViewTransform() bool plShadowSlave::ISetupOrthoViewTransform()
@ -136,10 +132,10 @@ bool plShadowSlave::ISetupPerspViewTransform()
// This is my hack to get the Nexus age working. The real problem // This is my hack to get the Nexus age working. The real problem
// is probably data-side. I take full responsibility for this // is probably data-side. I take full responsibility for this
// hack-around breaking the entire system, loosing data, causing // hack-around breaking the entire system, loosing data, causing
// unauthorized credit card transactions, etc. // unauthorized credit card transactions, etc.
if (isnan(bnd.GetMins().fX) || isnan(bnd.GetMins().fY)) if (std::isnan(bnd.GetMins().fX) || std::isnan(bnd.GetMins().fY))
return false; return false;
if (isnan(bnd.GetMaxs().fX) || isnan(bnd.GetMaxs().fY)) if (std::isnan(bnd.GetMaxs().fX) || std::isnan(bnd.GetMaxs().fY))
return false; return false;
float cotX, cotY; float cotX, cotY;