Changes for 1.1.1

See README.md

5 files changed, 36 insertions, 4 deletions

diff --git a/sdk/compiler/cmake/NvBlastExtAuthoring.cmake b/sdk/compiler/cmake/NvBlastExtAuthoring.cmake
index 9ba6173..00ecfc1 100644
--- a/sdk/compiler/cmake/NvBlastExtAuthoring.cmake
+++ b/sdk/compiler/cmake/NvBlastExtAuthoring.cmake
@@ -13,7 +13,6 @@ 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.
 include(${PROJECT_CMAKE_FILES_DIR}/${TARGET_BUILD_PLATFORM}/NvBlastExtAuthoring.cmake)
 
@@ -63,16 +62,35 @@ SET(EXT_AUTHORING_FILES
 	${AUTHORING_EXT_SOURCE_DIR}/NvBlastExtAuthoringMeshCleanerImpl.cpp
 )
 
+SET(VHACD_SOURCE_FILES
+	${AUTHORING_EXT_SOURCE_DIR}/VHACD/src/btAlignedAllocator.cpp
+	${AUTHORING_EXT_SOURCE_DIR}/VHACD/src/btConvexHullComputer.cpp
+	${AUTHORING_EXT_SOURCE_DIR}/VHACD/src/FloatMath.cpp
+	${AUTHORING_EXT_SOURCE_DIR}/VHACD/src/FloatMath.inl
+	${AUTHORING_EXT_SOURCE_DIR}/VHACD/src/VHACD.cpp
+	${AUTHORING_EXT_SOURCE_DIR}/VHACD/src/VHACD-ASYNC.cpp
+	${AUTHORING_EXT_SOURCE_DIR}/VHACD/src/vhacdICHull.cpp
+	${AUTHORING_EXT_SOURCE_DIR}/VHACD/src/vhacdManifoldMesh.cpp
+	${AUTHORING_EXT_SOURCE_DIR}/VHACD/src/vhacdMesh.cpp
+	${AUTHORING_EXT_SOURCE_DIR}/VHACD/src/vhacdRaycastMesh.cpp
+	${AUTHORING_EXT_SOURCE_DIR}/VHACD/src/vhacdVolume.cpp
+)
+
+SET_SOURCE_FILES_PROPERTIES(${VHACD_SOURCE_FILES} PROPERTIES COMPILE_FLAGS "${VHACD_COMPILE_FLAGS}")
+
+
 ADD_LIBRARY(NvBlastExtAuthoring ${BLAST_EXT_SHARED_LIB_TYPE} 
 	${COMMON_FILES}
 	${PUBLIC_FILES}
 
 	${EXT_AUTHORING_FILES}
+	${VHACD_SOURCE_FILES}
 )
 
 SOURCE_GROUP("common" FILES ${COMMON_FILES})
 SOURCE_GROUP("public" FILES ${PUBLIC_FILES})
 SOURCE_GROUP("src" FILES ${EXT_AUTHORING_FILES})
+SOURCE_GROUP("VHACD/src" FILES ${VHACD_SOURCE_FILES})
 
 
 # Target specific compile options
@@ -91,10 +109,15 @@ TARGET_INCLUDE_DIRECTORIES(NvBlastExtAuthoring
 	
 	PRIVATE ${AUTHORING_EXT_SOURCE_DIR}
 
+	PRIVATE ${PROJECT_SOURCE_DIR}/extensions/assetutils/include
+
 	PRIVATE ${PHYSXSDK_INCLUDE_DIRS}
 	PRIVATE ${PXSHAREDSDK_INCLUDE_DIRS}
 
 	PRIVATE ${BOOSTMULTIPRECISION_INCLUDE_DIRS}
+	
+	PRIVATE ${AUTHORING_EXT_SOURCE_DIR}/VHACD/inc
+	PRIVATE ${AUTHORING_EXT_SOURCE_DIR}/VHACD/public
 )
 
 TARGET_COMPILE_DEFINITIONS(NvBlastExtAuthoring
diff --git a/sdk/compiler/cmake/NvBlastExtShaders.cmake b/sdk/compiler/cmake/NvBlastExtShaders.cmake
index f918326..cb7599e 100644
--- a/sdk/compiler/cmake/NvBlastExtShaders.cmake
+++ b/sdk/compiler/cmake/NvBlastExtShaders.cmake
@@ -23,6 +23,10 @@ SET(PUBLIC_FILES
 
 SET(EXT_SOURCE_FILES
 	${SHADERS_EXT_SOURCE_DIR}/NvBlastExtDamageShaders.cpp
+	${SHADERS_EXT_SOURCE_DIR}/NvBlastExtDamageAcceleratorInternal.h
+	${SHADERS_EXT_SOURCE_DIR}/NvBlastExtDamageAcceleratorAABBTree.h
+	${SHADERS_EXT_SOURCE_DIR}/NvBlastExtDamageAcceleratorAABBTree.cpp
+	${SHADERS_EXT_SOURCE_DIR}/NvBlastExtDamageAccelerators.cpp
 )
 
 ADD_LIBRARY(NvBlastExtShaders ${BLAST_EXT_SHARED_LIB_TYPE} 
@@ -47,6 +51,8 @@ TARGET_INCLUDE_DIRECTORIES(NvBlastExtShaders
 
 	PRIVATE ${SHADERS_EXT_SOURCE_DIR}
 	PRIVATE ${PROJECT_SOURCE_DIR}/common
+
+	PRIVATE ${PXSHAREDSDK_INCLUDE_DIRS}
 )
 
 TARGET_COMPILE_DEFINITIONS(NvBlastExtShaders
@@ -68,6 +74,6 @@ SET_TARGET_PROPERTIES(NvBlastExtShaders PROPERTIES
 # Do final direct sets after the target has been defined
 #TARGET_LINK_LIBRARIES(NvBlastExtShaders NvBlast ${PHYSXSDK_LIBRARIES} ${APEXSDK_LIBRARIES} ${PXSHAREDSDK_LIBRARIES})
 TARGET_LINK_LIBRARIES(NvBlastExtShaders 
-	PUBLIC NvBlast
+	PUBLIC NvBlast NvBlastGlobals
 	PUBLIC ${BLASTEXT_PLATFORM_LINKED_LIBS}
 )
diff --git a/sdk/compiler/cmake/NvBlastGlobals.cmake b/sdk/compiler/cmake/NvBlastGlobals.cmake
index 4f528df..f854ccc 100644
--- a/sdk/compiler/cmake/NvBlastGlobals.cmake
+++ b/sdk/compiler/cmake/NvBlastGlobals.cmake
@@ -23,6 +23,7 @@ SET(PUBLIC_FILES
 	${GLOBALS_DIR}/include/NvBlastGlobals.h
 	${GLOBALS_DIR}/include/NvBlastAllocator.h
 	${GLOBALS_DIR}/include/NvBlastProfiler.h
+	${GLOBALS_DIR}/include/NvBlastDebugRender.h
 )
 
 ADD_LIBRARY(NvBlastGlobals SHARED 
diff --git a/sdk/compiler/cmake/linux/NvBlastExtAuthoring.cmake b/sdk/compiler/cmake/linux/NvBlastExtAuthoring.cmake
index 3d7bb78..b640582 100644
--- a/sdk/compiler/cmake/linux/NvBlastExtAuthoring.cmake
+++ b/sdk/compiler/cmake/linux/NvBlastExtAuthoring.cmake
@@ -24,6 +24,8 @@ SET(BLAST_EXT_SHARED_LIB_TYPE SHARED)
 #This option doesn't work on Clang
 IF (NOT "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
 	SET(BLASTEXT_PLATFORM_COMPILE_OPTIONS "-Wno-maybe-uninitialized" "-fexceptions" "-Wno-unused-parameter")
+	SET(VHACD_COMPILE_FLAGS "-Wno-type-limits -Wno-ignored-qualifiers -Wno-unused-result")
 ELSE ()
 	SET(BLASTEXT_PLATFORM_COMPILE_OPTIONS "-Wno-return-type-c-linkage" "-pedantic" "-fexceptions" "-Wno-unused-parameter")
-ENDIF()
\ No newline at end of file
+	SET(VHACD_COMPILE_FLAGS "-Wno-logical-op-parentheses -Wno-ignored-qualifiers")
+ENDIF()
diff --git a/sdk/compiler/cmake/linux/NvBlastExtShaders.cmake b/sdk/compiler/cmake/linux/NvBlastExtShaders.cmake
index a5c8c67..28cc234 100644
--- a/sdk/compiler/cmake/linux/NvBlastExtShaders.cmake
+++ b/sdk/compiler/cmake/linux/NvBlastExtShaders.cmake
@@ -20,4 +20,4 @@ SET(BLASTEXT_COMPILE_DEFS
 
 SET(BLAST_EXT_SHARED_LIB_TYPE SHARED)
 
-SET(BLASTEXT_PLATFORM_COMPILE_OPTIONS "-Wno-unknown-pragmas" "-pedantic")
+SET(BLASTEXT_PLATFORM_COMPILE_OPTIONS "-Wno-unknown-pragmas" "-Wno-return-type-c-linkage" "-pedantic")