Skip to content

Commit

Permalink
Bump FBXSDK version to 2019.0
Browse files Browse the repository at this point in the history
  • Loading branch information
juhl committed Jul 13, 2018
1 parent 21ac6ed commit e4f66cd
Show file tree
Hide file tree
Showing 38 changed files with 932 additions and 325 deletions.
Binary file modified Bin/Win64/Debug/libfbxsdk.dll
Binary file not shown.
Binary file removed Bin/Win64/Debug/libfbxsdk.pdb
Binary file not shown.
Binary file modified Bin/Win64/Release/libfbxsdk.dll
Binary file not shown.
6 changes: 5 additions & 1 deletion Source/ThirdParty/FBXSDK/include/fbxsdk.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/****************************************************************************************
Copyright (C) 2015 Autodesk, Inc.
Copyright (C) 2016 Autodesk, Inc.
All rights reserved.
Use of this software is subject to the terms of the Autodesk license agreement
Expand Down Expand Up @@ -134,6 +134,8 @@

//---------------------------------------------------------------------------------------
//Scene Includes
#include <fbxsdk/scene/fbxaudio.h>
#include <fbxsdk/scene/fbxaudiolayer.h>
#include <fbxsdk/scene/fbxcollection.h>
#include <fbxsdk/scene/fbxcollectionexclusive.h>
#include <fbxsdk/scene/fbxcontainer.h>
Expand All @@ -144,6 +146,7 @@
#include <fbxsdk/scene/fbxenvironment.h>
#include <fbxsdk/scene/fbxgroupname.h>
#include <fbxsdk/scene/fbxlibrary.h>
#include <fbxsdk/scene/fbxmediaclip.h>
#include <fbxsdk/scene/fbxobjectmetadata.h>
#include <fbxsdk/scene/fbxpose.h>
#include <fbxsdk/scene/fbxreference.h>
Expand Down Expand Up @@ -262,6 +265,7 @@
#include <fbxsdk/utils/fbxrenamingstrategyutilities.h>
#include <fbxsdk/utils/fbxrootnodeutility.h>
#include <fbxsdk/utils/fbxusernotification.h>
#include <fbxsdk/utils/fbxscenecheckutility.h>

//---------------------------------------------------------------------------------------
#if defined(FBXSDK_NAMESPACE) && (FBXSDK_NAMESPACE_USING == 1)
Expand Down
4 changes: 2 additions & 2 deletions Source/ThirdParty/FBXSDK/include/fbxsdk/core/base/fbxarray.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/****************************************************************************************
Copyright (C) 2015 Autodesk, Inc.
Copyright (C) 2017 Autodesk, Inc.
All rights reserved.
Use of this software is subject to the terms of the Autodesk license agreement
Expand Down Expand Up @@ -211,7 +211,7 @@ template <class T> class FbxArray
* within capacity range, element count is increased such that Size() will become pIndex + 1. */
inline void SetAt(const int pIndex, const T& pElement)
{
FBX_ASSERT_RETURN(pIndex < mCapacity);
FBX_ASSERT_RETURN(pIndex >= 0 && pIndex < mCapacity);
if( pIndex >= mSize ) mSize = pIndex + 1;
if( mArray ) memcpy(&mArray[pIndex], &pElement, sizeof(T));
}
Expand Down
5 changes: 3 additions & 2 deletions Source/ThirdParty/FBXSDK/include/fbxsdk/core/base/fbxstatus.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/****************************************************************************************
Copyright (C) 2015 Autodesk, Inc.
Copyright (C) 2016 Autodesk, Inc.
All rights reserved.
Use of this software is subject to the terms of the Autodesk license agreement
Expand Down Expand Up @@ -37,7 +37,8 @@ class FBXSDK_DLL FbxStatus
eIndexOutOfRange, //!< Index value outside the valid range
ePasswordError, //!< Operation on FBX file password failed
eInvalidFileVersion, //!< File version not supported (anymore or yet)
eInvalidFile //!< Operation on the file access failed
eInvalidFile, //!< Operation on the file access failed
eSceneCheckFail //!< Scene validation failure
};

//! Default constructor.
Expand Down
8 changes: 6 additions & 2 deletions Source/ThirdParty/FBXSDK/include/fbxsdk/core/base/fbxutils.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,12 @@
FBXSDK_DLL FbxString FbxGetSystemTempPath();

/** Override the system temporary folder path name.
* \param pPathUTF8 The system temporary folder to use for override. */
FBXSDK_DLL void FbxSetSystemTempPath(const char* pPathUTF8);
* \param pPathUTF8 The system temporary folder to use for override.
* \return True if the system temporary folder path has been set and False otherwise.
* \remark The system temporary folder is limited to _MAX_PATH characters. Trying to set
* a longer value will fail and the current system temporary folder path is left unchanged.
*/
FBXSDK_DLL bool FbxSetSystemTempPath(const char* pPathUTF8);

/** Retrieve the working directory of the system in UTF8 format.
* \return A string that contain the current working directory of the system. */
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/****************************************************************************************
Copyright (C) 2015 Autodesk, Inc.
Copyright (C) 2016 Autodesk, Inc.
All rights reserved.
Use of this software is subject to the terms of the Autodesk license agreement
Expand Down Expand Up @@ -35,10 +35,10 @@ class FBXSDK_DLL FbxLoadingStrategy : public FbxPluginContainer
*/
enum EState
{
eAllLoaded, //!< All plug-in are loaded.
eNoneLoaded, //!< No plug-in is loaded, i.e., there is not plug-in to load.
eAllFailed, //!< All plug-in are failed to load.
eSomeFailed //!< Some plug-ins are loaded but some are failed.
eAllLoaded, //!< Plug-ins are loaded.
eNoneLoaded, //!< No plug-ins are loaded.
eAllFailed, //!< Plug-ins failed to load.
eSomeFailed //!< Not all found plug-ins are loaded.
};

/**
Expand All @@ -47,7 +47,7 @@ class FBXSDK_DLL FbxLoadingStrategy : public FbxPluginContainer
//@{
/** Execute the operation of loading the plug-in(s). The way it is executed is determined by the specific implementations.
* \param pData Plug in data that can be access inside the plug-ins.
* \return If the plugin loading is successful return \c true, otherwise return \c false.
* \return The state of the loading action.
*/
EState Load(FbxPluginData& pData);

Expand Down
60 changes: 0 additions & 60 deletions Source/ThirdParty/FBXSDK/include/fbxsdk/core/fbxobject.h
Original file line number Diff line number Diff line change
Expand Up @@ -161,12 +161,6 @@ class FBXSDK_DLL FbxObject : public FbxEmitter
public:
//! \name General Object Management
//@{
/** Test if this class is a hierarchical children of the specified class type. This is the standard method to differentiate object classes. (Deprecated, please use Is<Type>() instead.)
* \param pClassId The class type to test against self.
* \return \c true if the object is a hierarchical children of the type specified.
* \remark This function will perform a complete search until it reaches the top level class, but it will stop as soon as one ClassId matches the test. */
FBX_DEPRECATED inline bool Is(const FbxClassId& pClassId) const { return GetClassId().Is(pClassId); }

/** Templated test if this class is a hierarchical children of the specified class type.
* \return \c true if the object is a hierarchical children of the type specified.
* \remark This function will perform a complete search until it reaches the top level class, but it will stop as soon as one ClassId matches the test. */
Expand Down Expand Up @@ -450,12 +444,6 @@ class FBXSDK_DLL FbxObject : public FbxEmitter
*/
inline bool DisconnectAllSrcObject(const FbxCriteria& pCriteria) { return RootProperty.DisconnectAllSrcObject(pCriteria); }

/** Disconnects this object from all source objects of a specific class type. (Deprecated, please use DisconnectAllSrcObject<Type>() instead.)
* \param pClassId The specific class type.
* \return \c True if it disconnects all source objects successfully, \c false otherwise.
*/
FBX_DEPRECATED inline bool DisconnectAllSrcObject(FbxClassId pClassId) { return RootProperty.DisconnectAllSrcObject(FbxCriteria::ObjectType(pClassId)); }

/** Returns the number of source objects with which this object connects.
* \return The number of source objects with which this object connects.
*/
Expand All @@ -467,12 +455,6 @@ class FBXSDK_DLL FbxObject : public FbxEmitter
*/
inline int GetSrcObjectCount(const FbxCriteria& pCriteria) const { return RootProperty.GetSrcObjectCount(pCriteria); }

/** Returns the number of source objects of the specific class type with which this object connects. (Deprecated, please use GetSrcObjectCount<Type>() instead.)
* \param pClassId The specific class type.
* \return The number of source objects of the specific class type with which this object connects.
*/
FBX_DEPRECATED inline int GetSrcObjectCount(FbxClassId pClassId) const { return RootProperty.GetSrcObjectCount(FbxCriteria::ObjectType(pClassId)); }

/** Returns the source object with which this object connects at the specified index.
* \param pIndex The specified index whose default value is 0.
* \return The source object at the specified index, NULL if not found.
Expand All @@ -486,13 +468,6 @@ class FBXSDK_DLL FbxObject : public FbxEmitter
*/
inline FbxObject* GetSrcObject(const FbxCriteria& pCriteria, int pIndex=0) const { return RootProperty.GetSrcObject(pCriteria,pIndex); }

/** Returns the source object of the specified class type at the specified index with which this object connects. (Deprecated, please use GetSrcObject<Type>() instead.)
* \param pClassId The specified class type.
* \param pIndex The specified index whose default value is 0.
* \return The source object of the specified class type at the specified index, NULL if not found.
*/
FBX_DEPRECATED inline FbxObject* GetSrcObject(FbxClassId pClassId, int pIndex=0) const { return RootProperty.GetSrcObject(FbxCriteria::ObjectType(pClassId), pIndex); }

/** Searches the source object with the specified name, starting at the specified index.
* \param pName The object name.
* \param pStartIndex The start index.
Expand All @@ -508,14 +483,6 @@ class FBXSDK_DLL FbxObject : public FbxEmitter
*/
inline FbxObject* FindSrcObject(const FbxCriteria& pCriteria, const char* pName, int pStartIndex=0) const { return RootProperty.FindSrcObject(pCriteria,pName,pStartIndex); }

/** Searches the source object with the specified name which is also the specified class type, starting at the specified index. (Deprecated, please use FindSrcObject<Type>() instead.)
* \param pClassId The specified class type.
* \param pName The object name.
* \param pStartIndex The start index.
* \return The source object with the name, NULL if not found.
*/
FBX_DEPRECATED inline FbxObject* FindSrcObject(FbxClassId pClassId, const char* pName, int pStartIndex=0) const { return RootProperty.FindSrcObject(FbxCriteria::ObjectType(pClassId), pName, pStartIndex); }

/** Disconnects this object from all source objects of the specified class type.
* \return \c true if it disconnects all source objects successfully, \c false otherwise. */
template <class T> inline bool DisconnectAllSrcObject() { return RootProperty.DisconnectAllSrcObject(FbxCriteria::ObjectType(T::ClassId)); }
Expand Down Expand Up @@ -588,12 +555,6 @@ class FBXSDK_DLL FbxObject : public FbxEmitter
*/
inline bool DisconnectAllDstObject(const FbxCriteria& pCriteria) { return RootProperty.DisconnectAllDstObject(pCriteria); }

/** Disconnects this object from all destination objects of the specified class type. (Deprecated, please use DisconnectAllDstObject<Type>() instead.)
* \param pClassId The specified class type.
* \return \c True if it disconnects all destination objects of the specified class type successfully, \c false otherwise.
*/
FBX_DEPRECATED inline bool DisconnectAllDstObject(FbxClassId pClassId) { return RootProperty.DisconnectAllDstObject(FbxCriteria::ObjectType(pClassId)); }

/** Returns the number of destination objects with which this object connects.
* \return The number of destination objects with which this object connects.
*/
Expand All @@ -605,12 +566,6 @@ class FBXSDK_DLL FbxObject : public FbxEmitter
*/
inline int GetDstObjectCount(const FbxCriteria& pCriteria) const { return RootProperty.GetDstObjectCount(pCriteria); }

/** Returns the number of destination objects of the specified class type with which this object connects. (Deprecated, please use GetDstObjectCount<Type>() instead.)
* \param pClassId The specified class type.
* \return The number of destination objects of the specified class type with which this object connects.
*/
FBX_DEPRECATED inline int GetDstObjectCount(FbxClassId pClassId) const { return RootProperty.GetDstObjectCount(FbxCriteria::ObjectType(pClassId)); }

/** Returns the destination object at the specified index with which this object connects.
* \param pIndex The specified index whose default value is 0.
* \return The destination object at the specified index, NULL if not found.
Expand All @@ -624,13 +579,6 @@ class FBXSDK_DLL FbxObject : public FbxEmitter
*/
inline FbxObject* GetDstObject(const FbxCriteria& pCriteria, int pIndex=0) const { return RootProperty.GetDstObject(pCriteria,pIndex); }

/** Returns the destination object of the specified class type with which this object connects at the specified index. (Deprecated, please use GetDstObject<Type>() instead.)
* \param pClassId The specified class type.
* \param pIndex The specified index whose default value is 0.
* \return The destination object of the specified class type at the specified index, NULL if not found.
*/
FBX_DEPRECATED inline FbxObject* GetDstObject(FbxClassId pClassId, int pIndex=0) const { return RootProperty.GetDstObject(FbxCriteria::ObjectType(pClassId), pIndex); }

/** Searches the destination object with the specified name, starting at the specified index.
* \param pName The object name.
* \param pStartIndex The start index.
Expand All @@ -646,14 +594,6 @@ class FBXSDK_DLL FbxObject : public FbxEmitter
*/
inline FbxObject* FindDstObject(const FbxCriteria& pCriteria, const char* pName, int pStartIndex=0) const { return RootProperty.FindDstObject(pCriteria,pName,pStartIndex); }

/** Searches the destination object with the specified name which is the specified class type, starting at the specified index. (Deprecated, please use FindDstObject<Type>() instead.)
* \param pClassId The specified class type.
* \param pName The object name.
* \param pStartIndex The start index.
* \return The destination object with the name, NULL if not found.
*/
FBX_DEPRECATED inline FbxObject* FindDstObject(FbxClassId pClassId, const char* pName,int pStartIndex=0) const { return RootProperty.FindDstObject(FbxCriteria::ObjectType(pClassId), pName, pStartIndex); }

/** Disconnects this object from all destination objects of the specified class type.
* \return \c true if it disconnects all destination objects of the specified class type successfully, \c false otherwise. */
template <class T> inline bool DisconnectAllDstObject() { return RootProperty.DisconnectAllDstObject(FbxCriteria::ObjectType(T::ClassId)); }
Expand Down
Loading

0 comments on commit e4f66cd

Please sign in to comment.