NvCloth 1.1.4 Release. (24070740)

4 files changed, 62 insertions, 7 deletions

diff --git a/NvCloth/samples/compiler/cmake/SampleBase.cmake b/NvCloth/samples/compiler/cmake/SampleBase.cmake
index cee4779..656074f 100644
--- a/NvCloth/samples/compiler/cmake/SampleBase.cmake
+++ b/NvCloth/samples/compiler/cmake/SampleBase.cmake
@@ -12,11 +12,13 @@ SET(SB_RENDERER_SOURCE_DIR ${SB_SOURCE_DIR}/renderer)
 SET(SB_SCENE_SOURCE_DIR ${SB_SOURCE_DIR}/scene)
 SET(SB_UI_SOURCE_DIR ${SB_SOURCE_DIR}/ui)
 SET(SB_UTILS_SOURCE_DIR ${SB_SOURCE_DIR}/utils)
+SET(SB_TASK_SOURCE_DIR ${SB_SOURCE_DIR}/task)
 
 FIND_PACKAGE(PxShared "1.0.21467209.1" REQUIRED)
 FIND_PACKAGE(DXUT "9.15.2016.1" REQUIRED)
 FIND_PACKAGE(DirectXTex "10.5.2016.2" REQUIRED)
 FIND_PACKAGE(imgui "1.49" REQUIRED)
+FIND_PACKAGE(Assimp "4.1.0" REQUIRED)
 #FIND_PACKAGE(tinyObjLoader $ENV{PM_tinyObjLoader_VERSION} REQUIRED)
 #FIND_PACKAGE(tclap $ENV{PM_tclap_VERSION} REQUIRED)
 
@@ -64,6 +66,10 @@ SET(RENDERER_FILES
 	${SB_RENDERER_SOURCE_DIR}/ShaderUtils.h
 	${SB_RENDERER_SOURCE_DIR}/SkinnedRenderMesh.cpp
 	${SB_RENDERER_SOURCE_DIR}/SkinnedRenderMesh.h
+	${SB_RENDERER_SOURCE_DIR}/WeightedSkinRenderMesh.cpp
+	${SB_RENDERER_SOURCE_DIR}/WeightedSkinRenderMesh.h
+	${SB_RENDERER_SOURCE_DIR}/Model.cpp
+	${SB_RENDERER_SOURCE_DIR}/Model.h
 )
 
 SET(SCENE_FILES
@@ -108,10 +114,18 @@ SET(SCENES_FILES
 	${SB_SCENE_SOURCE_DIR}/scenes/CapsuleScene.h
 	${SB_SCENE_SOURCE_DIR}/scenes/CCDScene.cpp
 	${SB_SCENE_SOURCE_DIR}/scenes/CCDScene.h
+	${SB_SCENE_SOURCE_DIR}/scenes/CCDScene2.cpp
+	${SB_SCENE_SOURCE_DIR}/scenes/CCDScene2.h
 	${SB_SCENE_SOURCE_DIR}/scenes/MultiSolverScene.cpp
 	${SB_SCENE_SOURCE_DIR}/scenes/MultiSolverScene.h
 	${SB_SCENE_SOURCE_DIR}/scenes/ScaledScene.cpp
 	${SB_SCENE_SOURCE_DIR}/scenes/ScaledScene.h
+	${SB_SCENE_SOURCE_DIR}/scenes/TimeStepScene.cpp
+	${SB_SCENE_SOURCE_DIR}/scenes/TimeStepScene.h
+	${SB_SCENE_SOURCE_DIR}/scenes/VirtualParticleScene.cpp
+	${SB_SCENE_SOURCE_DIR}/scenes/VirtualParticleScene.h
+	${SB_SCENE_SOURCE_DIR}/scenes/TeleportScene.cpp
+	${SB_SCENE_SOURCE_DIR}/scenes/TeleportScene.h
 )
 
 SET(UI_FILES
@@ -138,8 +152,20 @@ SET(UTIL_FILES
 	${SB_UTILS_SOURCE_DIR}/DebugLineRenderBuffer.h
 	${SB_UTILS_SOURCE_DIR}/MeshGenerator.cpp
 	${SB_UTILS_SOURCE_DIR}/MeshGenerator.h
+	${SB_UTILS_SOURCE_DIR}/DataStream.cpp
+	${SB_UTILS_SOURCE_DIR}/DataStream.h
+	${SB_UTILS_SOURCE_DIR}/AnimatedModelUtilities.cpp
+	${SB_UTILS_SOURCE_DIR}/AnimatedModelUtilities.h
 	
 )
+SET(TASK_FILES
+	${SB_TASK_SOURCE_DIR}/PxCpuDispatcher.h
+	${SB_TASK_SOURCE_DIR}/PxGpuDispatcher.h
+	${SB_TASK_SOURCE_DIR}/PxGpuTask.h
+	${SB_TASK_SOURCE_DIR}/PxTask.h
+	${SB_TASK_SOURCE_DIR}/PxTaskDefine.h
+	${SB_TASK_SOURCE_DIR}/PxTaskManager.h
+)
 
 SET(ROOT_FILES
 	${SB_SOURCE_DIR}/Main.cpp
@@ -154,6 +180,7 @@ ADD_EXECUTABLE(SampleBase
 	
 	${UI_FILES}
 	${UTIL_FILES}
+	${TASK_FILES}
 	${ROOT_FILES}
 	
 	
@@ -169,6 +196,8 @@ SOURCE_GROUP("Source\\scene" FILES ${SCENE_FILES})
 SOURCE_GROUP("Source\\scene\\scenes" FILES ${SCENES_FILES})
 SOURCE_GROUP("Source\\ui" FILES ${UI_FILES})
 SOURCE_GROUP("Source\\utils" FILES ${UTIL_FILES})
+SOURCE_GROUP("Source\\task" FILES ${TASK_FILES})
+
 
 # Target specific compile options
 
@@ -176,6 +205,7 @@ TARGET_INCLUDE_DIRECTORIES(SampleBase
 	PRIVATE ${SAMPLEBASE_PLATFORM_INCLUDES}
 
 	PRIVATE ${DIRECTXTEX_INCLUDE_DIRS}
+	PRIVATE ${ASSIMP_INCLUDE_DIRS}
 	PRIVATE ${DXUT_INCLUDE_DIRS}
 	
 	PRIVATE ${NVCLOTH_ROOT_DIR}/samples/external/shadow_lib
@@ -214,7 +244,7 @@ TARGET_COMPILE_OPTIONS(SampleBase PRIVATE /wd4005 /wd4244)
 # Do final direct sets after the target has been defined
 TARGET_LINK_LIBRARIES(SampleBase 
 	PUBLIC d3dcompiler.lib d3d11.lib dxgi.lib comctl32.lib
-	PUBLIC ${HBAO_LIB} ${SHADOW_LIB} ${DXUT_LIBRARIES} ${DIRECTXTEX_LIBRARIES})
+	PUBLIC ${HBAO_LIB} ${SHADOW_LIB} ${DXUT_LIBRARIES} ${DIRECTXTEX_LIBRARIES} ${ASSIMP_LIBRARIES})
 	
 TARGET_LINK_LIBRARIES(SampleBase PUBLIC PxFoundation)
 TARGET_LINK_LIBRARIES(SampleBase PUBLIC NvCloth)
diff --git a/NvCloth/samples/compiler/cmake/windows/CMakeLists.txt b/NvCloth/samples/compiler/cmake/windows/CMakeLists.txt
index a222309..a7dc6b2 100644
--- a/NvCloth/samples/compiler/cmake/windows/CMakeLists.txt
+++ b/NvCloth/samples/compiler/cmake/windows/CMakeLists.txt
@@ -1,16 +1,14 @@
 #Platform specific compile flags and project includes
 
+MESSAGE("Windows/CMakeLists.txt [begin]")
 SET(GW_DEPS_ROOT $ENV{GW_DEPS_ROOT})
 
-SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}; $ENV{GW_DEPS_ROOT}/sw/physx/tools/CMakeModules)
-
-IF(EXISTS $ENV{GW_DEPS_ROOT}/Externals/CMakeModules)
-	SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}; $ENV{GW_DEPS_ROOT}/Externals/CMakeModules)
-ENDIF()
 
 
 IF(EXISTS $ENV{GW_DEPS_ROOT}/Externals/CMakeModules)
 	SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}; $ENV{GW_DEPS_ROOT}/Externals/CMakeModules)
+ELSE()
+	SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}; $ENV{GW_DEPS_ROOT}/sw/physx/tools/CMakeModules)
 ENDIF()
 
 SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}; "${CMAKE_CURRENT_SOURCE_DIR}/..")
@@ -80,3 +78,5 @@ ADD_SUBDIRECTORY(${NVCLOTH_ROOT_DIR}/compiler/cmake/windows "${CMAKE_CURRENT_BIN
 INCLUDE(${PROJECT_CMAKE_FILES_DIR}/SampleBase.cmake)
 
 
+
+MESSAGE("Windows/CMakeLists.txt [end]")
\ No newline at end of file
diff --git a/NvCloth/samples/compiler/cmake/windows/SampleBase-AT.cmake b/NvCloth/samples/compiler/cmake/windows/SampleBase-AT.cmake
index 1b40447..ec59323 100644
--- a/NvCloth/samples/compiler/cmake/windows/SampleBase-AT.cmake
+++ b/NvCloth/samples/compiler/cmake/windows/SampleBase-AT.cmake
@@ -1,7 +1,25 @@
 # Copy the dlls from the deps
 
+MESSAGE("Windows/SampleBase-AT.cmake [begin]")
 ADD_CUSTOM_COMMAND(TARGET SampleBase POST_BUILD
 	COMMAND ${CMAKE_COMMAND} -E copy_if_different 
-	${SHADOW_DLLS} ${HBAO_DLLS} ${D3DCOMPILER_DLL}
+	${SHADOW_DLLS} 
 	${BL_EXE_OUTPUT_DIR}
 )
+ADD_CUSTOM_COMMAND(TARGET SampleBase POST_BUILD
+	COMMAND ${CMAKE_COMMAND} -E copy_if_different 
+	${HBAO_DLLS} 
+	${BL_EXE_OUTPUT_DIR}
+)
+ADD_CUSTOM_COMMAND(TARGET SampleBase POST_BUILD
+	COMMAND ${CMAKE_COMMAND} -E copy_if_different 
+	${D3DCOMPILER_DLL} 
+	${BL_EXE_OUTPUT_DIR}
+)
+ADD_CUSTOM_COMMAND(TARGET SampleBase POST_BUILD
+	COMMAND ${CMAKE_COMMAND} -E copy_if_different 
+	${ASSIMP_DLLS}
+	${BL_EXE_OUTPUT_DIR}
+)
+
+MESSAGE("Windows/SampleBase.cmake [end]")
\ No newline at end of file
diff --git a/NvCloth/samples/compiler/cmake/windows/SampleBase.cmake b/NvCloth/samples/compiler/cmake/windows/SampleBase.cmake
index 5cabf1e..0d5e040 100644
--- a/NvCloth/samples/compiler/cmake/windows/SampleBase.cmake
+++ b/NvCloth/samples/compiler/cmake/windows/SampleBase.cmake
@@ -1,6 +1,7 @@
 #
 # Build SampleBase Windows
 #
+MESSAGE("Windows/SampleBase.cmake [begin]")
 
 FIND_PACKAGE(CUDA 8 REQUIRED)
 
@@ -33,6 +34,8 @@ if (CMAKE_CL_64)
 	SET(HBAO_DLLS ${NVCLOTH_ROOT_DIR}/samples/external/hbao/GFSDK_SSAO_D3D11.win64.dll)
 
 	SET(D3DCOMPILER_DLL "\"$(VC_ExecutablePath_x64_x64)/d3dcompiler_47.dll\"")
+	
+	SET(ASSIMP_DLLS ${ASSIMP_DLL_PATH}/Release/assimp-vc140-mt.dll)
 else()
 	SET(SHADOW_LIB ${NVCLOTH_ROOT_DIR}/samples/external/shadow_lib/GFSDK_ShadowLib_DX11.win32.lib)
 	SET(SHADOW_DLLS ${NVCLOTH_ROOT_DIR}/samples/external/shadow_lib/GFSDK_ShadowLib_DX11.win32.dll)
@@ -41,5 +44,9 @@ else()
 	SET(HBAO_DLLS ${NVCLOTH_ROOT_DIR}/samples/external/hbao/GFSDK_SSAO_D3D11.win32.dll)
 
 	SET(D3DCOMPILER_DLL "\"$(VC_ExecutablePath_x86_x86)/d3dcompiler_47.dll\"")
+	
+	SET(ASSIMP_DLLS ${ASSIMP_DLL_PATH}/Release/assimp-vc140-mt.dll)
 endif()
 
+
+MESSAGE("Windows/SampleBase.cmake [end]")
\ No newline at end of file