Blast SDK 1.1.5 prerelease #1v1.1.5_pre1

5 files changed, 8 insertions, 13 deletions

diff --git a/sdk/compiler/cmake/NvBlastExtAuthoring.cmake b/sdk/compiler/cmake/NvBlastExtAuthoring.cmake
index e6295f4..b96f9d2 100755
--- a/sdk/compiler/cmake/NvBlastExtAuthoring.cmake
+++ b/sdk/compiler/cmake/NvBlastExtAuthoring.cmake
@@ -13,7 +13,6 @@ SET(COMMON_EXT_SOURCE_DIR ${PROJECT_SOURCE_DIR}/extensions/common/source)
 SET(AUTHORING_EXT_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/extensions/authoring/include)

 

 FIND_PACKAGE(PxSharedSDK $ENV{PM_PxShared_VERSION} REQUIRED)

-FIND_PACKAGE(PhysXSDK $ENV{PM_PhysX_VERSION} REQUIRED)

 FIND_PACKAGE(BoostMultiprecision $ENV{PM_BoostMultiprecision_VERSION} REQUIRED)

 

 # Include here after the directories are defined so that the platform specific file can use the variables.

@@ -21,19 +20,19 @@ include(${PROJECT_CMAKE_FILES_DIR}/${TARGET_BUILD_PLATFORM}/NvBlastExtAuthoring.
 

 SET(COMMON_FILES

 	${BLASTEXT_PLATFORM_COMMON_FILES}

-	

+	${COMMON_SOURCE_DIR}/NvBlastPxSharedHelpers.h

 	#${COMMON_SOURCE_DIR}/NvBlastAssert.cpp

 	#${COMMON_SOURCE_DIR}/NvBlastAssert.h

 )

 

 SET(PUBLIC_FILES

 	${AUTHORING_EXT_INCLUDE_DIR}/NvBlastExtAuthoringBondGenerator.h

-	${AUTHORING_EXT_INCLUDE_DIR}/NvBlastExtAuthoringCollisionBuilder.h

 	${AUTHORING_EXT_INCLUDE_DIR}/NvBlastExtAuthoringFractureTool.h

 	${AUTHORING_EXT_INCLUDE_DIR}/NvBlastExtAuthoring.h

 	${AUTHORING_EXT_INCLUDE_DIR}/NvBlastExtAuthoringMeshCleaner.h

 	${AUTHORING_EXT_INCLUDE_DIR}/NvBlastExtAuthoringCutout.h

-	

+

+	${AUTHORING_COMMON_EXT_INCLUDE_DIR}/NvBlastExtAuthoringConvexMeshBuilder.h	

 	${AUTHORING_COMMON_EXT_INCLUDE_DIR}/NvBlastExtAuthoringPatternGenerator.h

 	${AUTHORING_COMMON_EXT_INCLUDE_DIR}/NvBlastExtAuthoringMesh.h

 	${AUTHORING_COMMON_EXT_INCLUDE_DIR}/NvBlastExtAuthoringTypes.h

@@ -116,11 +115,8 @@ TARGET_INCLUDE_DIRECTORIES(NvBlastExtAuthoring
 	PUBLIC ${AUTHORING_COMMON_EXT_INCLUDE_DIR}

 	PRIVATE ${AUTHORING_COMMON_EXT_SOURCE_DIR}

 	

-	

-

 	PRIVATE ${PROJECT_SOURCE_DIR}/toolkit/include

-	PRIVATE ${PHYSX_EXT_INCLUDE_DIR}

-	

+		

 	PRIVATE ${PROJECT_SOURCE_DIR}/common

 	PRIVATE ${COMMON_EXT_SOURCE_DIR}

 	

@@ -129,7 +125,6 @@ TARGET_INCLUDE_DIRECTORIES(NvBlastExtAuthoring
 	PRIVATE ${PROJECT_SOURCE_DIR}/extensions/assetutils/include

 	PRIVATE ${PROJECT_SOURCE_DIR}/extensions/RT/source

 

-	PRIVATE ${PHYSXSDK_INCLUDE_DIRS}

 	PRIVATE ${PXSHAREDSDK_INCLUDE_DIRS}

 

 	PRIVATE ${BOOSTMULTIPRECISION_INCLUDE_DIRS}

diff --git a/sdk/compiler/cmake/NvBlastExtExporter.cmake b/sdk/compiler/cmake/NvBlastExtExporter.cmake
index b23c1fd..69f08cb 100755
--- a/sdk/compiler/cmake/NvBlastExtExporter.cmake
+++ b/sdk/compiler/cmake/NvBlastExtExporter.cmake
@@ -12,7 +12,6 @@ SET(EXT_AUTHORING_INCLUDE_DIR ${BLAST_ROOT_DIR}/sdk/extensions/authoring/include
 SET(TK_INCLUDE_DIR ${BLAST_ROOT_DIR}/sdk/toolkit/include)

 

 FIND_PACKAGE(PxSharedSDK $ENV{PM_PxShared_VERSION} REQUIRED)

-FIND_PACKAGE(PhysXSDK $ENV{PM_PhysX_VERSION} REQUIRED)

 FIND_PACKAGE(tinyObjLoader $ENV{PM_tinyObjLoader_VERSION} REQUIRED)

 FIND_PACKAGE(FBXSDK $ENV{PM_FBXSDK_VERSION} REQUIRED)

 

@@ -72,7 +71,6 @@ TARGET_INCLUDE_DIRECTORIES(NvBlastExtExporter
 	

 	PRIVATE ${EXPORTER_EXT_SOURCE_DIR}

 

-	PRIVATE ${PHYSXSDK_INCLUDE_DIRS}

 	PRIVATE ${PXSHAREDSDK_INCLUDE_DIRS}

 	

 	PRIVATE ${TINYOBJLOADER_INCLUDE_DIRS}

diff --git a/sdk/compiler/cmake/NvBlastExtPhysX.cmake b/sdk/compiler/cmake/NvBlastExtPhysX.cmake
index 51f74d6..00ff02e 100755
--- a/sdk/compiler/cmake/NvBlastExtPhysX.cmake
+++ b/sdk/compiler/cmake/NvBlastExtPhysX.cmake
@@ -32,6 +32,7 @@ SET(PUBLIC_FILES
 	${PHYSX_EXT_INCLUDE_DIR}/NvBlastExtPx.h

 	${PHYSX_EXT_INCLUDE_DIR}/NvBlastExtPxActor.h

 	${PHYSX_EXT_INCLUDE_DIR}/NvBlastExtPxAsset.h

+	${PHYSX_EXT_INCLUDE_DIR}/NvBlastExtPxCollisionBuilder.h

 	${PHYSX_EXT_INCLUDE_DIR}/NvBlastExtPxFamily.h

 	${PHYSX_EXT_INCLUDE_DIR}/NvBlastExtPxListener.h

 	${PHYSX_EXT_INCLUDE_DIR}/NvBlastExtPxManager.h

@@ -48,6 +49,8 @@ SET(EXT_PHYSICS_FILES
 	${PHYSX_EXT_SOURCE_DIR}/physics/NvBlastExtPxActorImpl.cpp

 	${PHYSX_EXT_SOURCE_DIR}/physics/NvBlastExtPxAssetImpl.h

 	${PHYSX_EXT_SOURCE_DIR}/physics/NvBlastExtPxAssetImpl.cpp

+	${PHYSX_EXT_SOURCE_DIR}/physics/NvBlastExtPxCollisionBuilderImpl.cpp

+	${PHYSX_EXT_SOURCE_DIR}/physics/NvBlastExtPxCollisionBuilderImpl.h

 	${PHYSX_EXT_SOURCE_DIR}/physics/NvBlastExtPxFamilyImpl.h

 	${PHYSX_EXT_SOURCE_DIR}/physics/NvBlastExtPxFamilyImpl.cpp

 	${PHYSX_EXT_SOURCE_DIR}/physics/NvBlastExtPxManagerImpl.h

@@ -96,6 +99,7 @@ TARGET_INCLUDE_DIRECTORIES(NvBlastExtPhysX
 	PRIVATE ${PHYSX_EXT_SOURCE_DIR}/sync

 	

    	PUBLIC ${PROJECT_SOURCE_DIR}/extensions/profiler/include

+	PUBLIC ${PROJECT_SOURCE_DIR}/extensions/authoringCommon/include

 

 	PUBLIC ${PHYSXSDK_INCLUDE_DIRS}

 	PRIVATE ${PXSHAREDSDK_INCLUDE_DIRS}

diff --git a/sdk/compiler/cmake/linux/CMakeLists.txt b/sdk/compiler/cmake/linux/CMakeLists.txt
index 187de7e..b3560aa 100755
--- a/sdk/compiler/cmake/linux/CMakeLists.txt
+++ b/sdk/compiler/cmake/linux/CMakeLists.txt
@@ -22,7 +22,6 @@ INCLUDE(${PROJECT_CMAKE_FILES_DIR}/NvBlastExtShaders.cmake)
 INCLUDE(${PROJECT_CMAKE_FILES_DIR}/NvBlastExtStress.cmake)

 INCLUDE(${PROJECT_CMAKE_FILES_DIR}/NvBlastExtPhysX.cmake)

 INCLUDE(${PROJECT_CMAKE_FILES_DIR}/NvBlastExtAuthoring.cmake)

-# INCLUDE(${PROJECT_CMAKE_FILES_DIR}/NvBlastExtRT.cmake)

 

 IF(${UE4_LINUX_CROSSCOMPILE})

 	#This uses the Windows CapnProto exe so it works

diff --git a/sdk/compiler/cmake/windows/CMakeLists.txt b/sdk/compiler/cmake/windows/CMakeLists.txt
index 836ee96..ee886ff 100755
--- a/sdk/compiler/cmake/windows/CMakeLists.txt
+++ b/sdk/compiler/cmake/windows/CMakeLists.txt
@@ -59,7 +59,6 @@ INCLUDE(${PROJECT_CMAKE_FILES_DIR}/NvBlastExtAuthoring.cmake)
 INCLUDE(${PROJECT_CMAKE_FILES_DIR}/NvBlastExtImport.cmake)

 INCLUDE(${PROJECT_CMAKE_FILES_DIR}/NvBlastExtAssetUtils.cmake)

 INCLUDE(${PROJECT_CMAKE_FILES_DIR}/NvBlastExtExporter.cmake)

-# INCLUDE(${PROJECT_CMAKE_FILES_DIR}/NvBlastExtRT.cmake)

 

 

 SET(SERIALIZATION_INCLUDED 1 PARENT_SCOPE)