未验证 提交 b48d75c4 编写于 作者: R Rémi Arnaud 提交者: GitHub

Merge pull request #549 from KhronosGroup/misc/maya2018

adding maya2018 support
此差异已折叠。
......@@ -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
......
此差异已折叠。
......@@ -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) );
}
// ------------------------------------------------------------
......
此差异已折叠。
此差异已折叠。
......@@ -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
......
此差异已折叠。
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册