diff options
Diffstat (limited to 'samples')
| -rwxr-xr-x | samples/CMakeLists.txt | 6 | ||||
| -rwxr-xr-x | samples/SampleBase/blast/BlastController.cpp | 2 | ||||
| -rwxr-xr-x | samples/SampleBase/physx/PhysXController.cpp | 7 | ||||
| -rwxr-xr-x | samples/SampleBase/renderer/RenderMaterial.cpp | 1 | ||||
| -rwxr-xr-x | samples/SampleBase/renderer/Renderable.cpp | 1 | ||||
| -rwxr-xr-x | samples/SampleBase/renderer/Renderer.cpp | 2 | ||||
| -rwxr-xr-x | samples/SampleBase/renderer/SkinnedRenderMesh.cpp | 1 | ||||
| -rwxr-xr-x | samples/compiler/cmake/SampleAssetViewer.cmake | 12 | ||||
| -rwxr-xr-x | samples/compiler/cmake/SampleBase.cmake | 24 | ||||
| -rwxr-xr-x | samples/compiler/cmake/windows/SampleAssetViewer-AT.cmake | 2 | ||||
| -rwxr-xr-x | samples/compiler/cmake/windows/SampleBase-AT.cmake | 7 |
11 files changed, 47 insertions, 18 deletions
diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt index 9868567..1f08d97 100755 --- a/samples/CMakeLists.txt +++ b/samples/CMakeLists.txt @@ -57,9 +57,9 @@ ENDIF() IF (APPEND_CONFIG_NAME)
MESSAGE("Appending config to output names")
- SET(CMAKE_DEBUG_POSTFIX "DEBUG")
- SET(CMAKE_PROFILE_POSTFIX "PROFILE")
- SET(CMAKE_CHECKED_POSTFIX "CHECKED")
+ SET(CMAKE_DEBUG_POSTFIX "")
+ SET(CMAKE_PROFILE_POSTFIX "")
+ SET(CMAKE_CHECKED_POSTFIX "")
SET(CMAKE_RELEASE_POSTFIX "")
ENDIF()
diff --git a/samples/SampleBase/blast/BlastController.cpp b/samples/SampleBase/blast/BlastController.cpp index 52536f5..c457092 100755 --- a/samples/SampleBase/blast/BlastController.cpp +++ b/samples/SampleBase/blast/BlastController.cpp @@ -129,7 +129,7 @@ void BlastController::onSampleStart() m_replay = new BlastReplay();
m_taskManager =
- PxTaskManager::createTaskManager(NvBlastGetPxErrorCallback(), getPhysXController().getCPUDispatcher(), 0);
+ PxTaskManager::createTaskManager(NvBlastGetPxErrorCallback(), getPhysXController().getCPUDispatcher());
TkGroupDesc gdesc;
gdesc.workerCount = m_taskManager->getCpuDispatcher()->getWorkerCount();
diff --git a/samples/SampleBase/physx/PhysXController.cpp b/samples/SampleBase/physx/PhysXController.cpp index cc9ade0..1f91d1d 100755 --- a/samples/SampleBase/physx/PhysXController.cpp +++ b/samples/SampleBase/physx/PhysXController.cpp @@ -52,7 +52,6 @@ #include "PxRigidDynamic.h"
#include "PxRigidStatic.h"
#include "PxMaterial.h"
-#include "PxFoundationVersion.h"
#include "PxMath.h"
#include <imgui.h>
@@ -110,7 +109,7 @@ void PhysXController::onTerminate() void PhysXController::initPhysX()
{
- m_foundation = PxCreateFoundation(PX_FOUNDATION_VERSION, NvBlastGetPxAllocatorCallback(), NvBlastGetPxErrorCallback());
+ m_foundation = PxCreateFoundation(PX_PHYSICS_VERSION, NvBlastGetPxAllocatorCallback(), NvBlastGetPxErrorCallback());
m_pvd = PxCreatePvd(*m_foundation);
@@ -139,11 +138,11 @@ void PhysXController::initPhysX() sceneDesc.gravity = PxVec3(0.0f, -9.81f, 0.0f);
m_dispatcher = PxDefaultCpuDispatcherCreate(4);
sceneDesc.cpuDispatcher = m_dispatcher;
- sceneDesc.gpuDispatcher = m_cudaContext != NULL ? m_cudaContext->getGpuDispatcher() : NULL;
+ sceneDesc.cudaContextManager = m_cudaContext;
sceneDesc.filterShader = m_filterShader;
sceneDesc.flags |= PxSceneFlag::eENABLE_STABILIZATION;
sceneDesc.flags |= PxSceneFlag::eENABLE_PCM;
- if (sceneDesc.gpuDispatcher == nullptr)
+ if (sceneDesc.cudaContextManager == nullptr)
{
m_gpuPhysicsAvailable = false;
m_useGPUPhysics = false;
diff --git a/samples/SampleBase/renderer/RenderMaterial.cpp b/samples/SampleBase/renderer/RenderMaterial.cpp index c49ee8e..baddcfb 100755 --- a/samples/SampleBase/renderer/RenderMaterial.cpp +++ b/samples/SampleBase/renderer/RenderMaterial.cpp @@ -28,6 +28,7 @@ #include "RenderMaterial.h"
#include <DirectXMath.h>
+#include "PxAssert.h"
#include "ShaderUtils.h"
#include "Renderer.h"
diff --git a/samples/SampleBase/renderer/Renderable.cpp b/samples/SampleBase/renderer/Renderable.cpp index 40dd70e..903854d 100755 --- a/samples/SampleBase/renderer/Renderable.cpp +++ b/samples/SampleBase/renderer/Renderable.cpp @@ -27,6 +27,7 @@ #include "Renderable.h"
+#include "PxAssert.h"
#include "Renderer.h"
#include "RenderUtils.h"
diff --git a/samples/SampleBase/renderer/Renderer.cpp b/samples/SampleBase/renderer/Renderer.cpp index 8b15aff..221ed3e 100755 --- a/samples/SampleBase/renderer/Renderer.cpp +++ b/samples/SampleBase/renderer/Renderer.cpp @@ -30,7 +30,7 @@ #include "RenderUtils.h"
#include "UIHelpers.h"
#include "SampleProfiler.h"
-
+#include "PxAssert.h"
#include "PxRenderBuffer.h"
#include <set>
diff --git a/samples/SampleBase/renderer/SkinnedRenderMesh.cpp b/samples/SampleBase/renderer/SkinnedRenderMesh.cpp index db8d760..b8508e8 100755 --- a/samples/SampleBase/renderer/SkinnedRenderMesh.cpp +++ b/samples/SampleBase/renderer/SkinnedRenderMesh.cpp @@ -27,6 +27,7 @@ #include "SkinnedRenderMesh.h"
+#include "PxAssert.h"
#include "Renderer.h"
SkinnedRenderMesh::SkinnedRenderMesh(const std::vector<const SimpleMesh*>& meshes)
diff --git a/samples/compiler/cmake/SampleAssetViewer.cmake b/samples/compiler/cmake/SampleAssetViewer.cmake index bfef3b2..7040b3f 100755 --- a/samples/compiler/cmake/SampleAssetViewer.cmake +++ b/samples/compiler/cmake/SampleAssetViewer.cmake @@ -47,6 +47,18 @@ SET_TARGET_PROPERTIES(SampleAssetViewer PROPERTIES COMPILE_PDB_NAME_CHECKED "SampleAssetViewer${CMAKE_CHECKED_POSTFIX}"
COMPILE_PDB_NAME_PROFILE "SampleAssetViewer${CMAKE_PROFILE_POSTFIX}"
COMPILE_PDB_NAME_RELEASE "SampleAssetViewer${CMAKE_RELEASE_POSTFIX}"
+ ARCHIVE_OUTPUT_DIRECTORY_DEBUG "${BL_LIB_OUTPUT_DIR}/debug"
+ LIBRARY_OUTPUT_DIRECTORY_DEBUG "${BL_DLL_OUTPUT_DIR}/debug"
+ RUNTIME_OUTPUT_DIRECTORY_DEBUG "${BL_EXE_OUTPUT_DIR}/debug"
+ ARCHIVE_OUTPUT_DIRECTORY_CHECKED "${BL_LIB_OUTPUT_DIR}/checked"
+ LIBRARY_OUTPUT_DIRECTORY_CHECKED "${BL_DLL_OUTPUT_DIR}/checked"
+ RUNTIME_OUTPUT_DIRECTORY_CHECKED "${BL_EXE_OUTPUT_DIR}/checked"
+ ARCHIVE_OUTPUT_DIRECTORY_PROFILE "${BL_LIB_OUTPUT_DIR}/profile"
+ LIBRARY_OUTPUT_DIRECTORY_PROFILE "${BL_DLL_OUTPUT_DIR}/profile"
+ RUNTIME_OUTPUT_DIRECTORY_PROFILE "${BL_EXE_OUTPUT_DIR}/profile"
+ ARCHIVE_OUTPUT_DIRECTORY_RELEASE "${BL_LIB_OUTPUT_DIR}/release"
+ LIBRARY_OUTPUT_DIRECTORY_RELEASE "${BL_DLL_OUTPUT_DIR}/release"
+ RUNTIME_OUTPUT_DIRECTORY_RELEASE "${BL_EXE_OUTPUT_DIR}/release"
)
TARGET_COMPILE_OPTIONS(SampleAssetViewer PRIVATE /wd4005 /wd4244 ${SAMPLEASSETVIEWER_COMPILE_OPTIONS})
diff --git a/samples/compiler/cmake/SampleBase.cmake b/samples/compiler/cmake/SampleBase.cmake index bd3109e..8ffa4b8 100755 --- a/samples/compiler/cmake/SampleBase.cmake +++ b/samples/compiler/cmake/SampleBase.cmake @@ -14,8 +14,8 @@ SET(SB_UTILS_SOURCE_DIR ${SB_SOURCE_DIR}/utils) SET(SHARED_UTILS_SOURCE_DIR ${BLAST_ROOT_DIR}shared/utils)
-FIND_PACKAGE(PhysXSDK $ENV{PM_PhysX_VERSION} REQUIRED)
-FIND_PACKAGE(PxSharedSDK $ENV{PM_PxShared_VERSION} REQUIRED)
+FIND_PACKAGE(PxSharedSDK ${PM_physxsdk_VERSION} REQUIRED)
+FIND_PACKAGE(PhysXSDK ${PM_pxshared_VERSION} REQUIRED)
FIND_PACKAGE(DXUT $ENV{PM_DXUT_VERSION} REQUIRED)
FIND_PACKAGE(DirectXTex $ENV{PM_DirectXTex_VERSION} REQUIRED)
FIND_PACKAGE(imgui $ENV{PM_imgui_VERSION} REQUIRED)
@@ -200,6 +200,18 @@ SET_TARGET_PROPERTIES(SampleBase PROPERTIES COMPILE_PDB_NAME_CHECKED "SampleBase${CMAKE_CHECKED_POSTFIX}"
COMPILE_PDB_NAME_PROFILE "SampleBase${CMAKE_PROFILE_POSTFIX}"
COMPILE_PDB_NAME_RELEASE "SampleBase${CMAKE_RELEASE_POSTFIX}"
+ ARCHIVE_OUTPUT_DIRECTORY_DEBUG "${BL_LIB_OUTPUT_DIR}/debug"
+ LIBRARY_OUTPUT_DIRECTORY_DEBUG "${BL_DLL_OUTPUT_DIR}/debug"
+ RUNTIME_OUTPUT_DIRECTORY_DEBUG "${BL_EXE_OUTPUT_DIR}/debug"
+ ARCHIVE_OUTPUT_DIRECTORY_CHECKED "${BL_LIB_OUTPUT_DIR}/checked"
+ LIBRARY_OUTPUT_DIRECTORY_CHECKED "${BL_DLL_OUTPUT_DIR}/checked"
+ RUNTIME_OUTPUT_DIRECTORY_CHECKED "${BL_EXE_OUTPUT_DIR}/checked"
+ ARCHIVE_OUTPUT_DIRECTORY_PROFILE "${BL_LIB_OUTPUT_DIR}/profile"
+ LIBRARY_OUTPUT_DIRECTORY_PROFILE "${BL_DLL_OUTPUT_DIR}/profile"
+ RUNTIME_OUTPUT_DIRECTORY_PROFILE "${BL_EXE_OUTPUT_DIR}/profile"
+ ARCHIVE_OUTPUT_DIRECTORY_RELEASE "${BL_LIB_OUTPUT_DIR}/release"
+ LIBRARY_OUTPUT_DIRECTORY_RELEASE "${BL_DLL_OUTPUT_DIR}/release"
+ RUNTIME_OUTPUT_DIRECTORY_RELEASE "${BL_EXE_OUTPUT_DIR}/release"
)
TARGET_COMPILE_OPTIONS(SampleBase PRIVATE /wd4005 /wd4244)
@@ -207,10 +219,10 @@ TARGET_COMPILE_OPTIONS(SampleBase PRIVATE /wd4005 /wd4244) # Do final direct sets after the target has been defined
TARGET_LINK_LIBRARIES(SampleBase
PUBLIC NvBlast NvBlastExtShaders NvBlastExtPhysX NvBlastExtExporter NvBlastExtAssetUtils NvBlastExtSerialization NvBlastExtTkSerialization NvBlastExtPxSerialization NvBlastTk d3dcompiler.lib d3d11.lib dxgi.lib comctl32.lib
- PUBLIC $<$<CONFIG:debug>:${PXPVDSDK_LIB_DEBUG}> $<$<CONFIG:debug>:${PXFOUNDATION_LIB_DEBUG}> $<$<CONFIG:debug>:${PXTASK_LIB_DEBUG}> $<$<CONFIG:debug>:${PSFASTXML_LIB_DEBUG}> $<$<CONFIG:debug>:${PHYSX3COMMON_LIB_DEBUG}>
- PUBLIC $<$<CONFIG:checked>:${PXPVDSDK_LIB_CHECKED}> $<$<CONFIG:checked>:${PXFOUNDATION_LIB_CHECKED}> $<$<CONFIG:checked>:${PXTASK_LIB_CHECKED}> $<$<CONFIG:checked>:${PSFASTXML_LIB_CHECKED}> $<$<CONFIG:checked>:${PHYSX3COMMON_LIB_CHECKED}>
- PUBLIC $<$<CONFIG:profile>:${PXPVDSDK_LIB_PROFILE}> $<$<CONFIG:profile>:${PXFOUNDATION_LIB_PROFILE}> $<$<CONFIG:profile>:${PXTASK_LIB_PROFILE}> $<$<CONFIG:profile>:${PSFASTXML_LIB_PROFILE}> $<$<CONFIG:profile>:${PHYSX3COMMON_LIB_PROFILE}>
- PUBLIC $<$<CONFIG:release>:${PXPVDSDK_LIB}> $<$<CONFIG:release>:${PXFOUNDATION_LIB}> $<$<CONFIG:release>:${PXTASK_LIB}> $<$<CONFIG:release>:${PSFASTXML_LIB}> $<$<CONFIG:release>:${PHYSX3COMMON_LIB}>
+ PUBLIC $<$<CONFIG:debug>:${PHYSXPVDSDK_STATIC_LIB_DEBUG}> $<$<CONFIG:debug>:${PHYSXFOUNDATION_LIB_DEBUG}> $<$<CONFIG:debug>:${PHYSXTASK_STATIC_LIB_DEBUG}> $<$<CONFIG:debug>:${PSFASTXML_LIB_DEBUG}> $<$<CONFIG:debug>:${PHYSXCOMMON_LIB_DEBUG}>
+ PUBLIC $<$<CONFIG:checked>:${PHYSXPVDSDK_STATIC_LIB_CHECKED}> $<$<CONFIG:checked>:${PHYSXFOUNDATION_LIB_CHECKED}> $<$<CONFIG:checked>:${PHYSXTASK_STATIC_LIB_CHECKED}> $<$<CONFIG:checked>:${PSFASTXML_LIB_CHECKED}> $<$<CONFIG:checked>:${PHYSXCOMMON_LIB_CHECKED}>
+ PUBLIC $<$<CONFIG:profile>:${PHYSXPVDSDK_STATIC_LIB_PROFILE}> $<$<CONFIG:profile>:${PHYSXFOUNDATION_LIB_PROFILE}> $<$<CONFIG:profile>:${PHYSXTASK_STATIC_LIB_PROFILE}> $<$<CONFIG:profile>:${PSFASTXML_LIB_PROFILE}> $<$<CONFIG:profile>:${PHYSXCOMMON_LIB_PROFILE}>
+ PUBLIC $<$<CONFIG:release>:${PHYSXPVDSDK_STATIC_LIB}> $<$<CONFIG:release>:${PHYSXFOUNDATION_LIB}> $<$<CONFIG:release>:${PHYSXTASK_STATIC_LIB}> $<$<CONFIG:release>:${PSFASTXML_LIB}> $<$<CONFIG:release>:${PHYSXCOMMON_LIB}>
PUBLIC ${HBAO_PLUS_LIB} ${SHADOW_LIB_LIB} ${DXUT_LIBRARIES} ${DIRECTXTEX_LIBRARIES}
PUBLIC ${FBXSDK_LIBRARIES}
PUBLIC $<$<OR:$<CONFIG:debug>,$<CONFIG:checked>,$<CONFIG:profile>>:${NVTOOLSEXT_LIB}>
diff --git a/samples/compiler/cmake/windows/SampleAssetViewer-AT.cmake b/samples/compiler/cmake/windows/SampleAssetViewer-AT.cmake index a1bdc62..b77b202 100755 --- a/samples/compiler/cmake/windows/SampleAssetViewer-AT.cmake +++ b/samples/compiler/cmake/windows/SampleAssetViewer-AT.cmake @@ -2,6 +2,6 @@ ADD_CUSTOM_COMMAND(TARGET SampleAssetViewer POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different
- ${PXSHAREDSDK_DLLS} ${PHYSXSDK_DLLS}
+ ${PHYSXSDK_DLLS}
${BL_EXE_OUTPUT_DIR}
)
diff --git a/samples/compiler/cmake/windows/SampleBase-AT.cmake b/samples/compiler/cmake/windows/SampleBase-AT.cmake index b568350..46bcf2e 100755 --- a/samples/compiler/cmake/windows/SampleBase-AT.cmake +++ b/samples/compiler/cmake/windows/SampleBase-AT.cmake @@ -2,6 +2,9 @@ ADD_CUSTOM_COMMAND(TARGET SampleBase POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different
- ${PXSHAREDSDK_DLLS} ${PHYSXSDK_DLLS} ${SHADOW_LIB_DLL} ${HBAO_PLUS_DLL} ${D3DCOMPILER_DLL} ${NVTOOLSEXT_DLL}
- ${BL_EXE_OUTPUT_DIR}
+ ${PHYSXSDK_DLLS} ${NVTOOLSEXT_DLL} ${SHADOW_LIB_DLL} ${HBAO_PLUS_DLL} ${D3DCOMPILER_DLL}
+ $<$<CONFIG:debug>:${BL_EXE_OUTPUT_DIR}/debug>
+ $<$<CONFIG:checked>:${BL_EXE_OUTPUT_DIR}/checked>
+ $<$<CONFIG:profile>:${BL_EXE_OUTPUT_DIR}/profile>
+ $<$<CONFIG:release>:${BL_EXE_OUTPUT_DIR}/release>
)
|