Integrating latest 47acbe8

Code/Tools/SceneAPI/FbxSDKWrapper/CMakeLists.txt

@@ -9,9 +9,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #
 
-ly_get_list_relative_pal_filename(pal_dir ${CMAKE_CURRENT_LIST_DIR}/Platform/${PAL_PLATFORM_NAME})
 set(sdkwrapper_dir ${CMAKE_CURRENT_LIST_DIR}/../SDKWrapper)
-set(sdkwrapper_pal_dir ${sdkwrapper_dir}/Platform/${PAL_PLATFORM_NAME})
 
 if (NOT PAL_TRAIT_BUILD_HOST_TOOLS)
     return()
@@ -23,9 +21,6 @@ ly_add_target(
     FILES_CMAKE
         fbxsdkwrapper_files.cmake
         ${sdkwrapper_dir}/sdkwrapper_files.cmake
-        ${sdkwrapper_pal_dir}/platform_${PAL_PLATFORM_NAME_LOWERCASE}_files.cmake
-    PLATFORM_INCLUDE_FILES
-        ${pal_dir}/platform_${PAL_PLATFORM_NAME_LOWERCASE}.cmake
     INCLUDE_DIRECTORIES
         PUBLIC
             .
@@ -37,4 +32,5 @@ ly_add_target(
             AZ::AzToolsFramework
         PUBLIC
             3rdParty::FbxSdk
+            3rdParty::assimplib
 )

Code/Tools/SceneAPI/FbxSDKWrapper/FbxMaterialWrapper.cpp

@@ -102,7 +102,7 @@ namespace AZ
             return 10.f;
         }
 
-        uint64_t FbxMaterialWrapper::GetUniqueId() const
+        AZ::u64 FbxMaterialWrapper::GetUniqueId() const
         {
             return m_fbxMaterial->GetUniqueID();
         }

Code/Tools/SceneAPI/FbxSDKWrapper/FbxMaterialWrapper.h

@@ -38,7 +38,7 @@ namespace AZ
             AZ::Vector3 GetEmissiveColor() const override;
             float GetOpacity() const override;
             float GetShininess() const override;
-            uint64_t GetUniqueId() const override;
+            AZ::u64 GetUniqueId() const override;
         };
     } // namespace FbxSDKWrapper
 } // namespace AZ

Code/Tools/SceneAPI/FbxSDKWrapper/Platform/Linux/platform_linux.cmake

@@ -1,12 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-

Code/Tools/SceneAPI/FbxSDKWrapper/Platform/Mac/platform_mac.cmake

@@ -1,12 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-

Code/Tools/SceneAPI/FbxSDKWrapper/Platform/Windows/platform_windows.cmake

@@ -1,16 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-set(LY_BUILD_DEPENDENCIES
-        PUBLIC
-            3rdParty::AssImp
-)
-
-set(LY_COMPILE_DEFINITIONS PUBLIC ASSET_IMPORTER_SDK_SUPPORTED_TRAIT)