diff --git a/ray_tracing__advance/main.cpp b/ray_tracing__advance/main.cpp index e91897d..28ce493 100644 --- a/ray_tracing__advance/main.cpp +++ b/ray_tracing__advance/main.cpp @@ -129,8 +129,8 @@ int main(int argc, char** argv) return 1; } glfwWindowHint(GLFW_CLIENT_API, GLFW_NO_API); - GLFWwindow* window = glfwCreateWindow(SAMPLE_WIDTH, SAMPLE_HEIGHT, - "NVIDIA Vulkan Raytracing Tutorial", nullptr, nullptr); + GLFWwindow* window = + glfwCreateWindow(SAMPLE_WIDTH, SAMPLE_HEIGHT, PROJECT_NAME, nullptr, nullptr); // Setup camera CameraManip.setWindowSize(SAMPLE_WIDTH, SAMPLE_HEIGHT); @@ -148,10 +148,10 @@ int main(int argc, char** argv) // Search path for shaders and other media defaultSearchPaths = { - PROJECT_ABSDIRECTORY, - PROJECT_ABSDIRECTORY "../", - NVPSystem::exePath() + std::string(PROJECT_RELDIRECTORY), - NVPSystem::exePath() + std::string(PROJECT_RELDIRECTORY) + std::string("../"), + PROJECT_ABSDIRECTORY, // shaders + PROJECT_ABSDIRECTORY "../", // media + PROJECT_NAME, // installed: shaders + media + NVPSystem::exePath() + std::string(PROJECT_NAME), }; // Enabling the extension feature diff --git a/ray_tracing__before/main.cpp b/ray_tracing__before/main.cpp index 5d77bce..480c56f 100644 --- a/ray_tracing__before/main.cpp +++ b/ray_tracing__before/main.cpp @@ -98,8 +98,8 @@ int main(int argc, char** argv) return 1; } glfwWindowHint(GLFW_CLIENT_API, GLFW_NO_API); - GLFWwindow* window = glfwCreateWindow(SAMPLE_WIDTH, SAMPLE_HEIGHT, - "NVIDIA Vulkan Raytracing Tutorial", nullptr, nullptr); + GLFWwindow* window = + glfwCreateWindow(SAMPLE_WIDTH, SAMPLE_HEIGHT, PROJECT_NAME, nullptr, nullptr); // Setup camera diff --git a/ray_tracing__simple/main.cpp b/ray_tracing__simple/main.cpp index f645120..e448f03 100644 --- a/ray_tracing__simple/main.cpp +++ b/ray_tracing__simple/main.cpp @@ -96,8 +96,8 @@ int main(int argc, char** argv) return 1; } glfwWindowHint(GLFW_CLIENT_API, GLFW_NO_API); - GLFWwindow* window = glfwCreateWindow(SAMPLE_WIDTH, SAMPLE_HEIGHT, - "NVIDIA Vulkan Raytracing Tutorial", nullptr, nullptr); + GLFWwindow* window = + glfwCreateWindow(SAMPLE_WIDTH, SAMPLE_HEIGHT, PROJECT_NAME, nullptr, nullptr); // Setup camera CameraManip.setWindowSize(SAMPLE_WIDTH, SAMPLE_HEIGHT); @@ -115,10 +115,10 @@ int main(int argc, char** argv) // Search path for shaders and other media defaultSearchPaths = { - PROJECT_ABSDIRECTORY, - PROJECT_ABSDIRECTORY "../", - NVPSystem::exePath() + std::string(PROJECT_RELDIRECTORY), - NVPSystem::exePath() + std::string(PROJECT_RELDIRECTORY) + std::string("../"), + PROJECT_ABSDIRECTORY, // shaders + PROJECT_ABSDIRECTORY "../", // media + PROJECT_NAME, // installed: shaders + media + NVPSystem::exePath() + std::string(PROJECT_NAME), }; diff --git a/ray_tracing_animation/main.cpp b/ray_tracing_animation/main.cpp index f353117..7e8e548 100644 --- a/ray_tracing_animation/main.cpp +++ b/ray_tracing_animation/main.cpp @@ -97,8 +97,8 @@ int main(int argc, char** argv) return 1; } glfwWindowHint(GLFW_CLIENT_API, GLFW_NO_API); - GLFWwindow* window = glfwCreateWindow(SAMPLE_WIDTH, SAMPLE_HEIGHT, - "NVIDIA Vulkan Raytracing Tutorial", nullptr, nullptr); + GLFWwindow* window = + glfwCreateWindow(SAMPLE_WIDTH, SAMPLE_HEIGHT, PROJECT_NAME, nullptr, nullptr); // Setup camera CameraManip.setWindowSize(SAMPLE_WIDTH, SAMPLE_HEIGHT); @@ -116,10 +116,10 @@ int main(int argc, char** argv) // Search path for shaders and other media defaultSearchPaths = { - PROJECT_ABSDIRECTORY, - PROJECT_ABSDIRECTORY "../", - NVPSystem::exePath() + std::string(PROJECT_RELDIRECTORY), - NVPSystem::exePath() + std::string(PROJECT_RELDIRECTORY) + std::string("../"), + PROJECT_ABSDIRECTORY, // shaders + PROJECT_ABSDIRECTORY "../", // media + PROJECT_NAME, // installed: shaders + media + NVPSystem::exePath() + std::string(PROJECT_NAME), }; // Enabling the extension feature diff --git a/ray_tracing_anyhit/main.cpp b/ray_tracing_anyhit/main.cpp index 50eaf37..3d38da3 100644 --- a/ray_tracing_anyhit/main.cpp +++ b/ray_tracing_anyhit/main.cpp @@ -96,8 +96,8 @@ int main(int argc, char** argv) return 1; } glfwWindowHint(GLFW_CLIENT_API, GLFW_NO_API); - GLFWwindow* window = glfwCreateWindow(SAMPLE_WIDTH, SAMPLE_HEIGHT, - "NVIDIA Vulkan Raytracing Tutorial", nullptr, nullptr); + GLFWwindow* window = + glfwCreateWindow(SAMPLE_WIDTH, SAMPLE_HEIGHT, PROJECT_NAME, nullptr, nullptr); // Setup camera CameraManip.setWindowSize(SAMPLE_WIDTH, SAMPLE_HEIGHT); diff --git a/ray_tracing_callable/main.cpp b/ray_tracing_callable/main.cpp index dd4bb20..f3604bf 100644 --- a/ray_tracing_callable/main.cpp +++ b/ray_tracing_callable/main.cpp @@ -113,8 +113,8 @@ int main(int argc, char** argv) return 1; } glfwWindowHint(GLFW_CLIENT_API, GLFW_NO_API); - GLFWwindow* window = glfwCreateWindow(SAMPLE_WIDTH, SAMPLE_HEIGHT, - "NVIDIA Vulkan Raytracing Tutorial", nullptr, nullptr); + GLFWwindow* window = + glfwCreateWindow(SAMPLE_WIDTH, SAMPLE_HEIGHT, PROJECT_NAME, nullptr, nullptr); // Setup camera CameraManip.setWindowSize(SAMPLE_WIDTH, SAMPLE_HEIGHT); @@ -132,10 +132,10 @@ int main(int argc, char** argv) // Search path for shaders and other media defaultSearchPaths = { - PROJECT_ABSDIRECTORY, - PROJECT_ABSDIRECTORY "../", - NVPSystem::exePath() + std::string(PROJECT_RELDIRECTORY), - NVPSystem::exePath() + std::string(PROJECT_RELDIRECTORY) + std::string("../"), + PROJECT_ABSDIRECTORY, // shaders + PROJECT_ABSDIRECTORY "../", // media + PROJECT_NAME, // installed: shaders + media + NVPSystem::exePath() + std::string(PROJECT_NAME), }; // Enabling the extension feature diff --git a/ray_tracing_gltf/main.cpp b/ray_tracing_gltf/main.cpp index 0220c98..c8469a4 100644 --- a/ray_tracing_gltf/main.cpp +++ b/ray_tracing_gltf/main.cpp @@ -96,8 +96,8 @@ int main(int argc, char** argv) return 1; } glfwWindowHint(GLFW_CLIENT_API, GLFW_NO_API); - GLFWwindow* window = glfwCreateWindow(SAMPLE_WIDTH, SAMPLE_HEIGHT, - "NVIDIA Vulkan Raytracing Tutorial", nullptr, nullptr); + GLFWwindow* window = + glfwCreateWindow(SAMPLE_WIDTH, SAMPLE_HEIGHT, PROJECT_NAME, nullptr, nullptr); // Setup camera CameraManip.setWindowSize(SAMPLE_WIDTH, SAMPLE_HEIGHT); @@ -115,10 +115,10 @@ int main(int argc, char** argv) // Search path for shaders and other media defaultSearchPaths = { - PROJECT_ABSDIRECTORY, - PROJECT_ABSDIRECTORY "../", - NVPSystem::exePath() + std::string(PROJECT_RELDIRECTORY), - NVPSystem::exePath() + std::string(PROJECT_RELDIRECTORY) + std::string("../"), + PROJECT_ABSDIRECTORY, // shaders + PROJECT_ABSDIRECTORY "../", // media + PROJECT_NAME, // installed: shaders + media + NVPSystem::exePath() + std::string(PROJECT_NAME), }; diff --git a/ray_tracing_instances/main.cpp b/ray_tracing_instances/main.cpp index f81b90f..27a9f1c 100644 --- a/ray_tracing_instances/main.cpp +++ b/ray_tracing_instances/main.cpp @@ -97,8 +97,8 @@ int main(int argc, char** argv) return 1; } glfwWindowHint(GLFW_CLIENT_API, GLFW_NO_API); - GLFWwindow* window = glfwCreateWindow(SAMPLE_WIDTH, SAMPLE_HEIGHT, - "NVIDIA Vulkan Raytracing Tutorial", nullptr, nullptr); + GLFWwindow* window = + glfwCreateWindow(SAMPLE_WIDTH, SAMPLE_HEIGHT, PROJECT_NAME, nullptr, nullptr); // Setup camera CameraManip.setWindowSize(SAMPLE_WIDTH, SAMPLE_HEIGHT); @@ -116,10 +116,10 @@ int main(int argc, char** argv) // Search path for shaders and other media defaultSearchPaths = { - PROJECT_ABSDIRECTORY, - PROJECT_ABSDIRECTORY "../", - NVPSystem::exePath() + std::string(PROJECT_RELDIRECTORY), - NVPSystem::exePath() + std::string(PROJECT_RELDIRECTORY) + std::string("../"), + PROJECT_ABSDIRECTORY, // shaders + PROJECT_ABSDIRECTORY "../", // media + PROJECT_NAME, // installed: shaders + media + NVPSystem::exePath() + std::string(PROJECT_NAME), }; // Enabling the extension feature diff --git a/ray_tracing_intersection/main.cpp b/ray_tracing_intersection/main.cpp index 115103a..700edaa 100644 --- a/ray_tracing_intersection/main.cpp +++ b/ray_tracing_intersection/main.cpp @@ -97,8 +97,8 @@ int main(int argc, char** argv) return 1; } glfwWindowHint(GLFW_CLIENT_API, GLFW_NO_API); - GLFWwindow* window = glfwCreateWindow(SAMPLE_WIDTH, SAMPLE_HEIGHT, - "NVIDIA Vulkan Raytracing Tutorial", nullptr, nullptr); + GLFWwindow* window = + glfwCreateWindow(SAMPLE_WIDTH, SAMPLE_HEIGHT, PROJECT_NAME, nullptr, nullptr); // Setup camera CameraManip.setWindowSize(SAMPLE_WIDTH, SAMPLE_HEIGHT); @@ -116,10 +116,10 @@ int main(int argc, char** argv) // Search path for shaders and other media defaultSearchPaths = { - PROJECT_ABSDIRECTORY, - PROJECT_ABSDIRECTORY "../", - NVPSystem::exePath() + std::string(PROJECT_RELDIRECTORY), - NVPSystem::exePath() + std::string(PROJECT_RELDIRECTORY) + std::string("../"), + PROJECT_ABSDIRECTORY, // shaders + PROJECT_ABSDIRECTORY "../", // media + PROJECT_NAME, // installed: shaders + media + NVPSystem::exePath() + std::string(PROJECT_NAME), }; // Enabling the extension feature diff --git a/ray_tracing_jitter_cam/main.cpp b/ray_tracing_jitter_cam/main.cpp index 108400d..9f75d76 100644 --- a/ray_tracing_jitter_cam/main.cpp +++ b/ray_tracing_jitter_cam/main.cpp @@ -104,8 +104,8 @@ int main(int argc, char** argv) return 1; } glfwWindowHint(GLFW_CLIENT_API, GLFW_NO_API); - GLFWwindow* window = glfwCreateWindow(SAMPLE_WIDTH, SAMPLE_HEIGHT, - "NVIDIA Vulkan Raytracing Tutorial", nullptr, nullptr); + GLFWwindow* window = + glfwCreateWindow(SAMPLE_WIDTH, SAMPLE_HEIGHT, PROJECT_NAME, nullptr, nullptr); // Setup camera CameraManip.setWindowSize(SAMPLE_WIDTH, SAMPLE_HEIGHT); @@ -123,10 +123,10 @@ int main(int argc, char** argv) // Search path for shaders and other media defaultSearchPaths = { - PROJECT_ABSDIRECTORY, - PROJECT_ABSDIRECTORY "../", - NVPSystem::exePath() + std::string(PROJECT_RELDIRECTORY), - NVPSystem::exePath() + std::string(PROJECT_RELDIRECTORY) + std::string("../"), + PROJECT_ABSDIRECTORY, // shaders + PROJECT_ABSDIRECTORY "../", // media + PROJECT_NAME, // installed: shaders + media + NVPSystem::exePath() + std::string(PROJECT_NAME), }; // Enabling the extension feature diff --git a/ray_tracing_manyhits/main.cpp b/ray_tracing_manyhits/main.cpp index e72bcd3..be00d6b 100644 --- a/ray_tracing_manyhits/main.cpp +++ b/ray_tracing_manyhits/main.cpp @@ -95,8 +95,8 @@ int main(int argc, char** argv) return 1; } glfwWindowHint(GLFW_CLIENT_API, GLFW_NO_API); - GLFWwindow* window = glfwCreateWindow(SAMPLE_WIDTH, SAMPLE_HEIGHT, - "NVIDIA Vulkan Raytracing Tutorial", nullptr, nullptr); + GLFWwindow* window = + glfwCreateWindow(SAMPLE_WIDTH, SAMPLE_HEIGHT, PROJECT_NAME, nullptr, nullptr); // Setup camera CameraManip.setWindowSize(SAMPLE_WIDTH, SAMPLE_HEIGHT); @@ -114,10 +114,10 @@ int main(int argc, char** argv) // Search path for shaders and other media defaultSearchPaths = { - PROJECT_ABSDIRECTORY, - PROJECT_ABSDIRECTORY "../", - NVPSystem::exePath() + std::string(PROJECT_RELDIRECTORY), - NVPSystem::exePath() + std::string(PROJECT_RELDIRECTORY) + std::string("../"), + PROJECT_ABSDIRECTORY, // shaders + PROJECT_ABSDIRECTORY "../", // media + PROJECT_NAME, // installed: shaders + media + NVPSystem::exePath() + std::string(PROJECT_NAME), }; // Enabling the extension feature diff --git a/ray_tracing_rayquery/main.cpp b/ray_tracing_rayquery/main.cpp index 76195b3..faeebad 100644 --- a/ray_tracing_rayquery/main.cpp +++ b/ray_tracing_rayquery/main.cpp @@ -98,8 +98,8 @@ int main(int argc, char** argv) return 1; } glfwWindowHint(GLFW_CLIENT_API, GLFW_NO_API); - GLFWwindow* window = glfwCreateWindow(SAMPLE_WIDTH, SAMPLE_HEIGHT, - "NVIDIA Vulkan Raytracing Tutorial", nullptr, nullptr); + GLFWwindow* window = + glfwCreateWindow(SAMPLE_WIDTH, SAMPLE_HEIGHT, PROJECT_NAME, nullptr, nullptr); // Setup camera CameraManip.setWindowSize(SAMPLE_WIDTH, SAMPLE_HEIGHT); @@ -117,10 +117,10 @@ int main(int argc, char** argv) // Search path for shaders and other media defaultSearchPaths = { - PROJECT_ABSDIRECTORY, - PROJECT_ABSDIRECTORY "../", - NVPSystem::exePath() + std::string(PROJECT_RELDIRECTORY), - NVPSystem::exePath() + std::string(PROJECT_RELDIRECTORY) + std::string("../"), + PROJECT_ABSDIRECTORY, // shaders + PROJECT_ABSDIRECTORY "../", // media + PROJECT_NAME, // installed: shaders + media + NVPSystem::exePath() + std::string(PROJECT_NAME), }; // Enabling the extension feature diff --git a/ray_tracing_reflections/main.cpp b/ray_tracing_reflections/main.cpp index 4a14aa0..f39bb95 100644 --- a/ray_tracing_reflections/main.cpp +++ b/ray_tracing_reflections/main.cpp @@ -97,8 +97,8 @@ int main(int argc, char** argv) return 1; } glfwWindowHint(GLFW_CLIENT_API, GLFW_NO_API); - GLFWwindow* window = glfwCreateWindow(SAMPLE_WIDTH, SAMPLE_HEIGHT, - "NVIDIA Vulkan Raytracing Tutorial", nullptr, nullptr); + GLFWwindow* window = + glfwCreateWindow(SAMPLE_WIDTH, SAMPLE_HEIGHT, PROJECT_NAME, nullptr, nullptr); // Setup camera CameraManip.setWindowSize(SAMPLE_WIDTH, SAMPLE_HEIGHT); @@ -116,10 +116,10 @@ int main(int argc, char** argv) // Search path for shaders and other media defaultSearchPaths = { - PROJECT_ABSDIRECTORY, - PROJECT_ABSDIRECTORY "../", - NVPSystem::exePath() + std::string(PROJECT_RELDIRECTORY), - NVPSystem::exePath() + std::string(PROJECT_RELDIRECTORY) + std::string("../"), + PROJECT_ABSDIRECTORY, // shaders + PROJECT_ABSDIRECTORY "../", // media + PROJECT_NAME, // installed: shaders + media + NVPSystem::exePath() + std::string(PROJECT_NAME), }; // Enabling the extension feature