Merge pull request #549 from KhronosGroup/misc/maya2018

adding maya2018 support
KhronosGroup · Nov 1, 2017 · b48d75c · b48d75c
2 parents e1f8a40 + ef72ed3
commit b48d75c
Show file tree

Hide file tree

Showing 19 changed files with 1,088 additions and 3,700 deletions.
diff --git a/COLLADABaseUtils/scripts/COLLADABaseUtils.vcxproj b/COLLADABaseUtils/scripts/COLLADABaseUtils.vcxproj
diff --git a/COLLADAFramework/scripts/COLLADAFramework.vcxproj b/COLLADAFramework/scripts/COLLADAFramework.vcxproj
diff --git a/COLLADAMax/COLLADAMax.sln b/COLLADAMax/COLLADAMax.sln
diff --git a/COLLADAMaya/BUILD_WIN.TXT b/COLLADAMaya/BUILD_WIN.TXT
@@ -10,12 +10,17 @@ Supported versions of Autodesk Maya are:
 	Autodesk Maya 2013
 	Autodesk Maya 2014
 	Autodesk Maya 2015
+	Autodesk Maya 2016
+	Autodesk Maya 2017
+	Autodesk Maya 2018
 
 -	Microsoft Visual Studio 2013 (for loading the solution, 2012 may work too)
     AND additioal versions of Visual Studio depending of the Maya version:
         Visual 2008 for Maya 2011-2012
 	Visual 2010 for Maya 2013-2014
-	Visual 2012 for Maya 2014-2015
+	Visual 2012 for Maya 2014-2016
+	Visual 2012 update 4 for Maya 2017
+        Visual Studio 2015 update 3 for Maya 2018
 
 
 You find the MVS solution file in COLLADAMaya/COLLADAMaya.sln

diff --git a/COLLADAMaya/COLLADAMaya.sln b/COLLADAMaya/COLLADAMaya.sln
diff --git a/COLLADAMaya/scripts/COLLADAMaya.vcxproj b/COLLADAMaya/scripts/COLLADAMaya.vcxproj
diff --git a/COLLADAMaya/src/COLLADAMayaAnimationExporter.cpp b/COLLADAMaya/src/COLLADAMayaAnimationExporter.cpp
@@ -2641,7 +2641,11 @@ namespace COLLADAMaya
         // --------------------------------
         // In-tangent
 
+#if MAYA_API_VERSION >= 20180000
+		double slopeX, slopeY;
+#else
         float slopeX, slopeY;
+#endif
         animCurveFn.getTangent ( keyPosition, slopeX, slopeY, true /*keyPosition>0*/ );
 
         if ( !isWeightedCurve )
@@ -2659,12 +2663,12 @@ namespace COLLADAMaya
             slopeX /= 3.0f;
             slopeY /= 3.0f; 
         }
-        bkey->inTangent = TangentPoint ( bkey->input - slopeX, bkey->output - slopeY );
+        bkey->inTangent = TangentPoint ( (float)(bkey->input - slopeX), (float)(bkey->output - slopeY) );
 
         // --------------------------------
         // Out-tangent
 
-        animCurveFn.getTangent ( keyPosition, slopeX, slopeY, false /*keyPosition>=keyCount-1*/ );
+		animCurveFn.getTangent(keyPosition, slopeX, slopeY, false /*keyPosition>=keyCount-1*/);
 
         if ( !isWeightedCurve )
         {
@@ -2682,7 +2686,7 @@ namespace COLLADAMaya
             slopeY /= 3.0f;
         }
 
-        bkey->outTangent = TangentPoint ( bkey->input + slopeX, bkey->output + slopeY );
+        bkey->outTangent = TangentPoint ( (float)(bkey->input + slopeX), (float)(bkey->output + slopeY) );
     }
 
     // ------------------------------------------------------------

diff --git a/COLLADASaxFrameworkLoader/scripts/COLLADASaxFrameworkLoader.vcxproj b/COLLADASaxFrameworkLoader/scripts/COLLADASaxFrameworkLoader.vcxproj
diff --git a/COLLADAStreamWriter/scripts/COLLADAStreamWriter.vcxproj b/COLLADAStreamWriter/scripts/COLLADAStreamWriter.vcxproj
diff --git a/Externals/LibXML/scripts/LibXML.vcxproj b/Externals/LibXML/scripts/LibXML.vcxproj
diff --git a/Externals/MathMLSolver/scripts/MathMLSolver.vcxproj b/Externals/MathMLSolver/scripts/MathMLSolver.vcxproj
diff --git a/Externals/pcre/scripts/pcre.vcxproj b/Externals/pcre/scripts/pcre.vcxproj
diff --git a/Externals/zlib/scripts/zlib.vcxproj b/Externals/zlib/scripts/zlib.vcxproj
diff --git a/Externals/zziplib/scripts/zzip.vcxproj b/Externals/zziplib/scripts/zzip.vcxproj
diff --git a/G3DWarehouseBrowser/scripts/G3DWarehouseBrowser.vcxproj b/G3DWarehouseBrowser/scripts/G3DWarehouseBrowser.vcxproj
diff --git a/GeneratedSaxParser/scripts/GeneratedSaxParser.vcxproj b/GeneratedSaxParser/scripts/GeneratedSaxParser.vcxproj
diff --git a/common/libBuffer/scripts/libBuffer.vcxproj b/common/libBuffer/scripts/libBuffer.vcxproj
diff --git a/dae2ma/include/DAE2MAGeometryImporter.h b/dae2ma/include/DAE2MAGeometryImporter.h
@@ -35,7 +35,7 @@
 #ifdef __GNUC__
 #include <ext/hash_map>
 #else
-#include <hash_map>
+#include "COLLADABUhash_map.h"
 #endif
 
 
@@ -56,7 +56,7 @@ namespace DAE2MA
 
         /** The map for searching edge indices. */
 #ifndef __GNUC__
-        typedef stdext::hash_map<COLLADAFW::Edge,size_t> EdgeMap;
+        typedef COLLADABU_HASH_MAP<COLLADAFW::Edge,size_t> EdgeMap;
 #else        
         typedef __gnu_cxx::hash_map<COLLADAFW::Edge,size_t> EdgeMap;
 #endif

diff --git a/dae2ma/scripts/dae2ma.vcxproj b/dae2ma/scripts/dae2ma.vcxproj