diff options
| author | bgaldrikian <[email protected]> | 2020-11-10 20:53:31 -0800 |
|---|---|---|
| committer | bgaldrikian <[email protected]> | 2020-11-10 20:53:31 -0800 |
| commit | d61c455a4775f966b44cc47804b9e0f160d3d332 (patch) | |
| tree | 7eff987598048409fe4ec9a1f733a87356f3aa21 /sdk/extensions | |
| parent | * Updated license file (diff) | |
| download | blast-1.1.7_rc1.tar.xz blast-1.1.7_rc1.zip | |
Merge request #17 PhysX4 compatibilityv1.1.7_rc1
Other changes for linux and UE4CrossCompileLinux, and all packaging to work
Diffstat (limited to 'sdk/extensions')
4 files changed, 4 insertions, 1 deletions
diff --git a/sdk/extensions/authoring/source/NvBlastExtAuthoringCutoutImpl.cpp b/sdk/extensions/authoring/source/NvBlastExtAuthoringCutoutImpl.cpp index a1fc150..7764f7e 100755 --- a/sdk/extensions/authoring/source/NvBlastExtAuthoringCutoutImpl.cpp +++ b/sdk/extensions/authoring/source/NvBlastExtAuthoringCutoutImpl.cpp @@ -32,6 +32,7 @@ #include <PxMath.h>
#include <NvBlastPxSharedHelpers.h>
#include "NvBlastExtAuthoringCutoutImpl.h"
+#include <PxAssert.h>
#include <algorithm>
#include <set>
#include <map>
diff --git a/sdk/extensions/import/apexmodules/nvparutils/nvparameterized/NvParameterized.h b/sdk/extensions/import/apexmodules/nvparutils/nvparameterized/NvParameterized.h index 42ebaf5..ee3cc49 100755 --- a/sdk/extensions/import/apexmodules/nvparutils/nvparameterized/NvParameterized.h +++ b/sdk/extensions/import/apexmodules/nvparutils/nvparameterized/NvParameterized.h @@ -54,6 +54,7 @@ #include <stdio.h>
#include <stdarg.h>
#include <new> // for placement new
+#include <PxAssert.h>
PX_PUSH_PACK_DEFAULT
diff --git a/sdk/extensions/import/source/NvBlastExtApexImportTool.cpp b/sdk/extensions/import/source/NvBlastExtApexImportTool.cpp index bc0cd12..bbd9953 100755 --- a/sdk/extensions/import/source/NvBlastExtApexImportTool.cpp +++ b/sdk/extensions/import/source/NvBlastExtApexImportTool.cpp @@ -181,7 +181,7 @@ uint32_t getPartIndex(const DestructibleAssetParameters* prm, uint32_t id) ApexImportTool::ApexImportTool()
{
m_Foundation =
- PxCreateFoundation(PX_FOUNDATION_VERSION, NvBlastGetPxAllocatorCallback(), NvBlastGetPxErrorCallback());
+ PxCreateFoundation(PX_PHYSICS_VERSION, NvBlastGetPxAllocatorCallback(), NvBlastGetPxErrorCallback());
if (!m_Foundation)
{
NVBLAST_LOG_ERROR("Error: failed to create Foundation\n");
diff --git a/sdk/extensions/physx/include/NvBlastExtCustomProfiler.h b/sdk/extensions/physx/include/NvBlastExtCustomProfiler.h index 546850a..8b5c167 100755 --- a/sdk/extensions/physx/include/NvBlastExtCustomProfiler.h +++ b/sdk/extensions/physx/include/NvBlastExtCustomProfiler.h @@ -31,6 +31,7 @@ #include "NvBlastProfiler.h"
#include "PxProfiler.h"
+#include <PxFoundation.h>
#if NV_NVTX
#include "nvToolsExt.h"
|