Skip to content
This repository was archived by the owner on Feb 13, 2025. It is now read-only.

Commit aaeeebd

Browse files
pknowlesnvbbarranpixeljetstreamakeley98NVmklefrancois
committedDec 16, 2023
Displacement-MicroMap-Toolkit squash
commit d139556f7b1171e8c3c0a8024d1b79412be9f4c4 Co-authored-by: Brian Barran <bbarran@nvidia.com> Co-authored-by: Christoph Kubisch <ckubisch@nvidia.com> Co-authored-by: David Akeley <dakeley@nvidia.com> Co-authored-by: Martin-Karl Lefrancois <mlefrancois@nvidia.com> Co-authored-by: Mathias Heyer <mheyer@nvidia.com> Co-authored-by: Neil Bickford <nbickford@nvidia.com> Co-authored-by: Pascal Gautron <pgautron@nvidia.com> Co-authored-by: Pyarelal Knowles <pknowles@nvidia.com> Co-authored-by: Tristan Lorach <tlorach@nvidia.com>
1 parent 00fde4a commit aaeeebd

File tree

84 files changed

+1623
-616
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+1623
-616
lines changed
 

‎.gitmodules

+3
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@
1010
path = external/libpng
1111
url = https://git.code.sf.net/p/libpng/code
1212
shallow = true
13+
[submodule "external/heightmap_rtx"]
14+
path = external/heightmap_rtx
15+
url = https://github.com/NVIDIAGameWorks/heightmap_rtx.git
1316
[submodule "external/Displacement-MicroMap-SDK"]
1417
path = external/Displacement-MicroMap-SDK
1518
url = ../Displacement-MicroMap-SDK.git

‎CMakeLists.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.13 FATAL_ERROR)
33
cmake_policy(SET CMP0079 NEW) # Allow linking with targets in other directories
44
project(
55
micromesh_toolkit
6-
VERSION 1.1
6+
VERSION 1.2
77
DESCRIPTION "Micromesh Tools"
88
LANGUAGES C CXX)
99

@@ -58,8 +58,7 @@ endif()
5858
#--------------------------------------------------------------------------------------------------
5959
# Package shared by all projects
6060

61-
# set(SUPPORT_AFTERMATH on)
62-
# _add_package_NsightAftermath()
61+
_add_package_NsightAftermath()
6362
_add_package_ZLIB()
6463
_add_package_VulkanSDK()
6564
_add_package_ShaderC()
@@ -141,6 +140,7 @@ target_link_libraries(png_static zlibstatic)
141140
target_include_directories(png_static PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/external/libpng> ${CMAKE_CURRENT_LIST_DIR}/external/libpng)
142141
###
143142
add_subdirectory(external/tinyexr)
143+
add_subdirectory(external/heightmap_rtx)
144144
add_subdirectory(meshops_core)
145145
add_subdirectory(meshops_bake)
146146
add_subdirectory(meshops_remesher)

0 commit comments

Comments
 (0)
This repository has been archived.