Updated to CL 22661993:

* docs updates
* authoring fixes
* asset view in sample fix
* latest blast_tools_and_samples-windows.zip

5 files changed, 9 insertions, 8 deletions

diff --git a/samples/SampleAssetViewer/Main.cpp b/samples/SampleAssetViewer/Main.cpp
index 210bb83..155794a 100644
--- a/samples/SampleAssetViewer/Main.cpp
+++ b/samples/SampleAssetViewer/Main.cpp
@@ -141,6 +141,7 @@ int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLi
 		asset.transform.q = PxQuat(r.w, PxVec3(r.x, r.y, r.z).getNormalized());
 		asset.name = addAssetArg.getValue();
 		asset.id = asset.name;
+		asset.file = asset.name;
 		config.additionalAssetList.models.push_back(asset);
 	}
 
diff --git a/samples/SampleBase/physx/PhysXController.cpp b/samples/SampleBase/physx/PhysXController.cpp
index b473c8e..50502d4 100644
--- a/samples/SampleBase/physx/PhysXController.cpp
+++ b/samples/SampleBase/physx/PhysXController.cpp
@@ -66,7 +66,6 @@ const DirectX::XMFLOAT4 PLANE_COLOR(1.0f, 1.0f, 1.0f, 1.0f);
 const DirectX::XMFLOAT4 HOOK_LINE_COLOR(1.0f, 1.0f, 1.0f, 1.0f);
 const float DEFAULT_FIXED_TIMESTEP = 1.0f / 60.0f;
 
-static Nv::Blast::ExtCustomProfiler gBlastProfiler;
 
 PhysXController::PhysXController(PxSimulationFilterShader filterShader)
 : m_filterShader(filterShader)
@@ -115,6 +114,7 @@ void PhysXController::initPhysX()
 
 	m_pvd = PxCreatePvd(*m_foundation);
 
+	static Nv::Blast::ExtCustomProfiler gBlastProfiler;
 	NvBlastProfilerSetCallback(&gBlastProfiler);
 	NvBlastProfilerSetDetail(Nv::Blast::ProfilerDetail::LOW);
 	gBlastProfiler.setPlatformEnabled(false);
diff --git a/samples/compiler/cmake/SampleBase.cmake b/samples/compiler/cmake/SampleBase.cmake
index f627574..55ff982 100644
--- a/samples/compiler/cmake/SampleBase.cmake
+++ b/samples/compiler/cmake/SampleBase.cmake
@@ -25,6 +25,7 @@ FIND_PACKAGE(hbao_plus $ENV{PM_hbao_plus_VERSION} REQUIRED)
 FIND_PACKAGE(shadow_lib $ENV{PM_shadow_lib_VERSION} REQUIRED)
 FIND_PACKAGE(d3dcompiler $ENV{PM_d3dcompiler_VERSION} REQUIRED)
 FIND_PACKAGE(FBXSDK $ENV{PM_FBXSDK_VERSION} REQUIRED)
+FIND_PACKAGE(nvToolsExt $ENV{PM_nvToolsExt_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}/SampleBase.cmake)
@@ -186,6 +187,8 @@ TARGET_INCLUDE_DIRECTORIES(SampleBase
 	PRIVATE ${PHYSXSDK_INCLUDE_DIRS}
 	PRIVATE ${PXSHAREDSDK_INCLUDE_DIRS}
 	PRIVATE ${FBXSDK_INCLUDE_DIRS}	
+    
+    PRIVATE $<$<OR:$<CONFIG:debug>,$<CONFIG:checked>,$<CONFIG:profile>>:${NVTOOLSEXT_INCLUDE_DIRS}>
 )
 
 TARGET_COMPILE_DEFINITIONS(SampleBase
@@ -210,6 +213,7 @@ TARGET_LINK_LIBRARIES(SampleBase
 	PUBLIC $<$<CONFIG:release>:${PXPVDSDK_LIB}> $<$<CONFIG:release>:${PXFOUNDATION_LIB}> $<$<CONFIG:release>:${PXTASK_LIB}> $<$<CONFIG:release>:${PSFASTXML_LIB}> $<$<CONFIG:release>:${PHYSX3COMMON_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}>
 	)
 
 include(${PROJECT_CMAKE_FILES_DIR}/${TARGET_BUILD_PLATFORM}/SampleBase-AT.cmake OPTIONAL)
diff --git a/samples/compiler/cmake/windows/CMakeLists.txt b/samples/compiler/cmake/windows/CMakeLists.txt
index 6820dde..3d007ea 100644
--- a/samples/compiler/cmake/windows/CMakeLists.txt
+++ b/samples/compiler/cmake/windows/CMakeLists.txt
@@ -28,9 +28,9 @@ ENDIF(CMAKE_CL_64)
 SET(SAMPLES_SLN_COMPILE_DEFS _UNICODE;UNICODE;WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_ALLOW_ITERATOR_DEBUG_LEVEL_MISMATCH;_ALLOW_RUNTIME_LIBRARY_MISMATCH;__GFSDK_DX11__;)
 #NvBlastExt doesn't have the _CONSOLE flag
 
-SET(SAMPLES_SLN_DEBUG_COMPILE_DEFS _DEBUG;NV_DEBUG=1;)
-SET(SAMPLES_SLN_CHECKED_COMPILE_DEFS NDEBUG;NV_CHECKED=1;)
-SET(SAMPLES_SLN_PROFILE_COMPILE_DEFS NDEBUG;NV_PROFILE=1;)
+SET(SAMPLES_SLN_DEBUG_COMPILE_DEFS _DEBUG;NV_DEBUG=1;NV_NVTX=1;)
+SET(SAMPLES_SLN_CHECKED_COMPILE_DEFS NDEBUG;NV_CHECKED=1;NV_NVTX=1;)
+SET(SAMPLES_SLN_PROFILE_COMPILE_DEFS NDEBUG;NV_PROFILE=1;NV_NVTX=1;)
 SET(SAMPLES_SLN_RELEASE_COMPILE_DEFS NDEBUG;)
 
 IF(CMAKE_CL_64)
diff --git a/samples/compiler/cmake/windows/SampleAssetViewer.cmake b/samples/compiler/cmake/windows/SampleAssetViewer.cmake
index 172b2ea..20b9f67 100644
--- a/samples/compiler/cmake/windows/SampleAssetViewer.cmake
+++ b/samples/compiler/cmake/windows/SampleAssetViewer.cmake
@@ -19,7 +19,3 @@ SET(SAMPLEASSETVIEWER_COMPILE_DEFS
 )
 
 SET(SAMPLEASSETVIEWER_LINK_FLAGS "/SUBSYSTEM:WINDOWS")
-
-
-#TARGET_LINK_LIBRARIES(NvBlast PUBLIC ${NVTOOLSEXT_LIBRARIES})
-#SET_TARGET_PROPERTIES(NvBlast PROPERTIES LINK_FLAGS "/MAP"	)