Replaced the deprecated glTF-Sample-Models submodule with glTF-Sample…

…-Assets.
NVIDIA-RTX · Feb 10, 2024 · c0d8d9f · c0d8d9f
1 parent 6a8a03f
commit c0d8d9f
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 12 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,6 +1,6 @@
 [submodule "donut"]
 	path = donut
 	url = https://github.com/NVIDIAGameWorks/donut.git
-[submodule "media/glTF-Sample-Models"]
-	path = media/glTF-Sample-Models
-	url = https://github.com/KhronosGroup/glTF-Sample-Models.git
+[submodule "media/glTF-Sample-Assets"]
+	path = media/glTF-Sample-Assets
+	url = https://github.com/KhronosGroup/glTF-Sample-Assets.git
diff --git a/examples/bindless_rendering/bindless_rendering.cpp b/examples/bindless_rendering/bindless_rendering.cpp
@@ -75,7 +75,7 @@ class BindlessRendering : public app::ApplicationBase
 
     bool Init()
     {
-        std::filesystem::path sceneFileName = app::GetDirectoryWithExecutable().parent_path() / "media/glTF-Sample-Models/2.0/Sponza/glTF/Sponza.gltf";
+        std::filesystem::path sceneFileName = app::GetDirectoryWithExecutable().parent_path() / "media/glTF-Sample-Assets/Models/Sponza/glTF/Sponza.gltf";
         std::filesystem::path frameworkShaderPath = app::GetDirectoryWithExecutable() / "shaders/framework" / app::GetShaderTypeName(GetDevice()->getGraphicsAPI());
         std::filesystem::path appShaderPath = app::GetDirectoryWithExecutable() / "shaders/bindless_rendering" / app::GetShaderTypeName(GetDevice()->getGraphicsAPI());
 

diff --git a/examples/rt_reflections/rt_reflections.cpp b/examples/rt_reflections/rt_reflections.cpp
@@ -173,7 +173,7 @@ class VariableRateShading : public app::ApplicationBase
 
     bool Init()
     {
-        std::filesystem::path sceneFileName = app::GetDirectoryWithExecutable().parent_path() / "media/glTF-Sample-Models/2.0/Sponza/glTF/Sponza.gltf";
+        std::filesystem::path sceneFileName = app::GetDirectoryWithExecutable().parent_path() / "media/glTF-Sample-Assets/Models/Sponza/glTF/Sponza.gltf";
         std::filesystem::path frameworkShaderPath = app::GetDirectoryWithExecutable() / "shaders/framework" / app::GetShaderTypeName(GetDevice()->getGraphicsAPI());
         std::filesystem::path appShaderPath = app::GetDirectoryWithExecutable() / "shaders/rt_reflections" / app::GetShaderTypeName(GetDevice()->getGraphicsAPI());
 

diff --git a/examples/rt_shadows/rt_shadows.cpp b/examples/rt_shadows/rt_shadows.cpp
@@ -166,7 +166,7 @@ class RayTracedShadows : public app::ApplicationBase
 
     bool Init()
     {
-        std::filesystem::path sceneFileName = app::GetDirectoryWithExecutable().parent_path() / "media/glTF-Sample-Models/2.0/Sponza/glTF/Sponza.gltf";
+        std::filesystem::path sceneFileName = app::GetDirectoryWithExecutable().parent_path() / "media/glTF-Sample-Assets/Models/Sponza/glTF/Sponza.gltf";
         std::filesystem::path frameworkShaderPath = app::GetDirectoryWithExecutable() / "shaders/framework" / app::GetShaderTypeName(GetDevice()->getGraphicsAPI());
         std::filesystem::path appShaderPath = app::GetDirectoryWithExecutable() / "shaders/rt_shadows" / app::GetShaderTypeName(GetDevice()->getGraphicsAPI());
 

diff --git a/examples/threaded_rendering/threaded_rendering.cpp b/examples/threaded_rendering/threaded_rendering.cpp
@@ -68,7 +68,7 @@ class ThreadedRendering : public app::ApplicationBase
 
     bool Init()
     {
-        std::filesystem::path sceneFileName = app::GetDirectoryWithExecutable().parent_path() / "media/glTF-Sample-Models/2.0/Sponza/glTF/Sponza.gltf";
+        std::filesystem::path sceneFileName = app::GetDirectoryWithExecutable().parent_path() / "media/glTF-Sample-Assets/Models/Sponza/glTF/Sponza.gltf";
         std::filesystem::path frameworkShaderPath = app::GetDirectoryWithExecutable() / "shaders/framework" / app::GetShaderTypeName(GetDevice()->getGraphicsAPI());
 
         m_RootFS = std::make_shared<vfs::RootFileSystem>();

diff --git a/examples/variable_shading/variable_shading.cpp b/examples/variable_shading/variable_shading.cpp
@@ -187,7 +187,7 @@ class VariableRateShading : public app::ApplicationBase
     {
         m_UseRawD3D12 = useRawD3D12;
 
-        std::filesystem::path sceneFileName = app::GetDirectoryWithExecutable().parent_path() / "media/glTF-Sample-Models/2.0/Sponza/glTF/Sponza.gltf";
+        std::filesystem::path sceneFileName = app::GetDirectoryWithExecutable().parent_path() / "media/glTF-Sample-Assets/Models/Sponza/glTF/Sponza.gltf";
         std::filesystem::path frameworkShaderPath = app::GetDirectoryWithExecutable() / "shaders/framework" / app::GetShaderTypeName(GetDevice()->getGraphicsAPI());
         std::filesystem::path appShaderPath = app::GetDirectoryWithExecutable() / "shaders/variable_shading" / app::GetShaderTypeName(GetDevice()->getGraphicsAPI());
 

diff --git a/feature_demo/FeatureDemo.cpp b/feature_demo/FeatureDemo.cpp
@@ -341,7 +341,7 @@ class FeatureDemo : public ApplicationBase
         m_RootFs->mount("/shaders/donut", frameworkShaderPath);
         m_RootFs->mount("/native", nativeFS);
 
-        std::filesystem::path scenePath = "/media/glTF-Sample-Models/2.0";
+        std::filesystem::path scenePath = "/media/glTF-Sample-Assets/Models";
         m_SceneFilesAvailable = FindScenes(*m_RootFs, scenePath);
 
         if (sceneName.empty() && m_SceneFilesAvailable.empty())

diff --git a/media/glTF-Sample-Assets b/media/glTF-Sample-Assets
diff --git a/media/glTF-Sample-Models b/media/glTF-Sample-Models
diff --git a/media/sponza-plus.scene.json b/media/sponza-plus.scene.json
@@ -1,7 +1,7 @@
 {
 	"models": [
-		"glTF-Sample-Models/2.0/Sponza/glTF/Sponza.gltf",
-		"glTF-Sample-Models/2.0/BrainStem/glTF/BrainStem.gltf"
+		"glTF-Sample-Assets/Models/Sponza/glTF/Sponza.gltf",
+		"glTF-Sample-Assets/Models/BrainStem/glTF/BrainStem.gltf"
 	],
 	"graph": [
 		{