diff --git a/Sources/Tools/MaxConvert/Pch.h b/Sources/Tools/MaxConvert/Pch.h index 526e6c2a..e3877404 100644 --- a/Sources/Tools/MaxConvert/Pch.h +++ b/Sources/Tools/MaxConvert/Pch.h @@ -92,7 +92,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include #include #include -#include // MaxComponent #include "MaxComponent/plComponent.h" diff --git a/Sources/Tools/MaxConvert/hsControlConverter.cpp b/Sources/Tools/MaxConvert/hsControlConverter.cpp index 557f1d6a..39cfa8d1 100644 --- a/Sources/Tools/MaxConvert/hsControlConverter.cpp +++ b/Sources/Tools/MaxConvert/hsControlConverter.cpp @@ -53,7 +53,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include #include #include -#include #include #include #include diff --git a/Sources/Tools/MaxConvert/hsMaterialConverter.cpp b/Sources/Tools/MaxConvert/hsMaterialConverter.cpp index 5fc1d64d..e1bf0180 100644 --- a/Sources/Tools/MaxConvert/hsMaterialConverter.cpp +++ b/Sources/Tools/MaxConvert/hsMaterialConverter.cpp @@ -57,7 +57,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include #include #include -#include #pragma hdrstop #include "hsMaterialConverter.h" diff --git a/Sources/Tools/MaxPlasmaMtls/Pch.h b/Sources/Tools/MaxPlasmaMtls/Pch.h index d9ff94af..72b671aa 100644 --- a/Sources/Tools/MaxPlasmaMtls/Pch.h +++ b/Sources/Tools/MaxPlasmaMtls/Pch.h @@ -68,7 +68,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include #include #include -#include #include // MaxMain diff --git a/Sources/Tools/MaxPlasmaMtls/plBMSampler.cpp b/Sources/Tools/MaxPlasmaMtls/plBMSampler.cpp index 3619b05e..553c2b84 100644 --- a/Sources/Tools/MaxPlasmaMtls/plBMSampler.cpp +++ b/Sources/Tools/MaxPlasmaMtls/plBMSampler.cpp @@ -45,7 +45,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include #include -#include #include #pragma hdrstop @@ -105,9 +104,9 @@ AColor plBMSampler::Sample(ShadeContext& sc, float u,float v) BMM_Color_64 c; int x,y; - float fu,fv; - fu = frac(u); - fv = 1.0f-frac(v); + float fu,fv, intpart; + fu = modf(u, &intpart); + fv = 1.0f - modf(v, &intpart); if (fData.fEnableCrop) { if (fData.fCropPlacement) @@ -119,8 +118,8 @@ AColor plBMSampler::Sample(ShadeContext& sc, float u,float v) } else { - x = mod(clipx + (int)(fu*fclipw+0.5f),bmw); - y = mod(clipy + (int)(fv*fcliph+0.5f),bmh); + x = clipx + static_cast(fu * fclipw + 0.5f) % bmw; + y = clipy + static_cast(fv * fcliph + 0.5f) % bmh; } } else @@ -156,9 +155,9 @@ AColor plBMSampler::SampleFilter(ShadeContext& sc, float u,float v, float du, fl fBM->SetFilter(BMM_FILTER_PYRAMID); BMM_Color_64 c; - float fu,fv; - fu = frac(u); - fv = 1.0f-frac(v); + float fu, fv, intpart; + fu = modf(u, &intpart); + fv = 1.0f - modf(v, &intpart); if (fData.fEnableCrop) { if (fData.fCropPlacement)