From 58d79679d30d7634cc650e0c4eb09cb9fde07746 Mon Sep 17 00:00:00 2001
From: Joseph Davies <deledrius@gmail.com>
Date: Mon, 21 Apr 2014 05:35:54 -0700
Subject: [PATCH] Use std math functions in Max plugin.

VS12 provides math functions which were conflicting with ones defined
in texutil.h.  This removes the reliance on texutil.h and uses the
standard library's math in its place.
---
 Sources/Tools/MaxConvert/Pch.h                  |  1 -
 Sources/Tools/MaxConvert/hsControlConverter.cpp |  1 -
 .../Tools/MaxConvert/hsMaterialConverter.cpp    |  1 -
 Sources/Tools/MaxPlasmaMtls/Pch.h               |  1 -
 Sources/Tools/MaxPlasmaMtls/plBMSampler.cpp     | 17 ++++++++---------
 5 files changed, 8 insertions(+), 13 deletions(-)

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 <modstack.h>
 #include <notify.h>
 #include <stdmat.h>
-#include <texutil.h>
 
 // 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 <stdmat.h>
 #include <bmmlib.h>
 #include <istdplug.h>
-#include <texutil.h>
 #include <iparamb2.h>
 #include <modstack.h>
 #include <keyreduc.h>
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 <istdplug.h>
 #include <pbbitmap.h>
 #include <stdmat.h>
-#include <texutil.h>
 #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 <notetrck.h>
 #include <notify.h>
 #include <stdmat.h>
-#include <texutil.h>
 #include <triobj.h>
 
 // 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 <bmmlib.h>
 #include <max.h>
-#include <texutil.h>
 #include <iparamb2.h>
 #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<int>(fu * fclipw + 0.5f) % bmw;
+            y = clipy + static_cast<int>(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)