From 9f3f5a128b51d414481f14964dcc43f7d971dc65 Mon Sep 17 00:00:00 2001
From: Sean Lilley <lilleyse@gmail.com>
Date: Tue, 11 Jul 2023 15:32:05 -0400
Subject: [PATCH] Add cesium mdl search paths for cesium.omniverse.dev.kit

---
 apps/cesium.omniverse.dev.kit              | 12 +++++++++++-
 apps/cesium.omniverse.dev.python.debug.kit |  6 ------
 apps/cesium.omniverse.dev.trace.kit        |  6 ------
 apps/cesium.performance.kit                |  7 -------
 extern/CMakeLists.txt                      |  8 ++++++++
 5 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/apps/cesium.omniverse.dev.kit b/apps/cesium.omniverse.dev.kit
index 981f498bc..fbd3cfc0d 100644
--- a/apps/cesium.omniverse.dev.kit
+++ b/apps/cesium.omniverse.dev.kit
@@ -6,6 +6,7 @@ app = true
 [dependencies]
 # Include basic configuration (that brings most of basic extensions)
 "omni.app.dev" = {}
+"omni.kit.window.material_graph" = {}
 "cesium.omniverse" = {}
 "cesium.powertools" = {}
 #"omni.example.ui" = {}
@@ -17,6 +18,15 @@ app.useFabricSceneDelegate = true
 app.usdrt.scene_delegate.enableProxyCubes = false
 app.usdrt.scene_delegate.geometryStreaming.enabled = false
 app.fastShutdown = true
+# Both searchPaths settings must be set in order for material graph to find cesium mdl exports
+renderer.mdl.searchPaths.custom = "${app}/../exts/cesium.omniverse/mdl"
+materialConfig.searchPaths.custom = ["${app}/../exts/cesium.omniverse/mdl"]
+materialConfig.materialGraph.userAllowList = ["cesium.mdl"]
 
 [settings.app.exts]
-folders.'++' = ["${app}/../exts"] # Make extensions from this repo available.
+folders.'++' = [
+    "${app}", # Find other applications in this folder
+    "${app}/exts", # Find extensions in this folder
+    "${app}/../exts", # Find cesium.omniverse and cesium.usd.schemas
+    "${app}/../extern/nvidia/app/extscache" # Find omni.kit.window.material_graph
+]
diff --git a/apps/cesium.omniverse.dev.python.debug.kit b/apps/cesium.omniverse.dev.python.debug.kit
index 02af2a0ad..c64a3caa2 100644
--- a/apps/cesium.omniverse.dev.python.debug.kit
+++ b/apps/cesium.omniverse.dev.python.debug.kit
@@ -10,9 +10,3 @@ app = true
 
 [settings]
 app.window.title = "Cesium For Omniverse Python Debugging App"
-
-[settings.app.exts]
-folders.'++' = [
-    "${app}",
-    "${app}/../exts"
-]
diff --git a/apps/cesium.omniverse.dev.trace.kit b/apps/cesium.omniverse.dev.trace.kit
index da770c3bb..743bac538 100644
--- a/apps/cesium.omniverse.dev.trace.kit
+++ b/apps/cesium.omniverse.dev.trace.kit
@@ -9,9 +9,3 @@ app = true
 [settings]
 app.window.title = "Cesium For Omniverse Performance Tracing App"
 app.fastShutdown = false
-
-[settings.app.exts]
-folders.'++' = [
-    "${app}",
-    "${app}/../exts"
-]
diff --git a/apps/cesium.performance.kit b/apps/cesium.performance.kit
index 5b469500d..5a60d3f4a 100644
--- a/apps/cesium.performance.kit
+++ b/apps/cesium.performance.kit
@@ -9,10 +9,3 @@ app = true
 
 [settings]
 app.window.title = "Cesium For Omniverse Performance Testing App"
-
-[settings.app.exts]
-folders.'++' = [
-    "${app}",
-    "${app}/exts",
-    "${app}/../exts"
-]
diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt
index d2ef892e3..425114f5d 100644
--- a/extern/CMakeLists.txt
+++ b/extern/CMakeLists.txt
@@ -47,6 +47,14 @@ if(exit_code AND NOT exit_code EQUAL 0)
 endif()
 # cmake-format: on
 
+# Add a symlink to USD Composer (create) so that we can use its extensions (e.g. omni.kit.window.material_graph) in our internal applications
+# Don't check for errors because we can still proceed with the build
+if(UNIX)
+    execute_process(COMMAND bash "${PROJECT_SOURCE_DIR}/extern/nvidia/link_app.sh --app create")
+elseif(WIN32)
+    execute_process(COMMAND cmd /C "${PROJECT_SOURCE_DIR}/extern/nvidia/link_app.bat --app create")
+endif()
+
 if(WIN32)
     set(NVIDIA_PLATFORM_NAME "windows-x86_64")
 elseif(UNIX AND NOT APPLE)