Using PROJECT_NAME for the window title
This commit is contained in:
parent
b0d592776f
commit
c32b1d3163
13 changed files with 70 additions and 70 deletions
|
|
@ -129,8 +129,8 @@ int main(int argc, char** argv)
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
glfwWindowHint(GLFW_CLIENT_API, GLFW_NO_API);
|
glfwWindowHint(GLFW_CLIENT_API, GLFW_NO_API);
|
||||||
GLFWwindow* window = glfwCreateWindow(SAMPLE_WIDTH, SAMPLE_HEIGHT,
|
GLFWwindow* window =
|
||||||
"NVIDIA Vulkan Raytracing Tutorial", nullptr, nullptr);
|
glfwCreateWindow(SAMPLE_WIDTH, SAMPLE_HEIGHT, PROJECT_NAME, nullptr, nullptr);
|
||||||
|
|
||||||
// Setup camera
|
// Setup camera
|
||||||
CameraManip.setWindowSize(SAMPLE_WIDTH, SAMPLE_HEIGHT);
|
CameraManip.setWindowSize(SAMPLE_WIDTH, SAMPLE_HEIGHT);
|
||||||
|
|
@ -148,10 +148,10 @@ int main(int argc, char** argv)
|
||||||
|
|
||||||
// Search path for shaders and other media
|
// Search path for shaders and other media
|
||||||
defaultSearchPaths = {
|
defaultSearchPaths = {
|
||||||
PROJECT_ABSDIRECTORY,
|
PROJECT_ABSDIRECTORY, // shaders
|
||||||
PROJECT_ABSDIRECTORY "../",
|
PROJECT_ABSDIRECTORY "../", // media
|
||||||
NVPSystem::exePath() + std::string(PROJECT_RELDIRECTORY),
|
PROJECT_NAME, // installed: shaders + media
|
||||||
NVPSystem::exePath() + std::string(PROJECT_RELDIRECTORY) + std::string("../"),
|
NVPSystem::exePath() + std::string(PROJECT_NAME),
|
||||||
};
|
};
|
||||||
|
|
||||||
// Enabling the extension feature
|
// Enabling the extension feature
|
||||||
|
|
|
||||||
|
|
@ -98,8 +98,8 @@ int main(int argc, char** argv)
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
glfwWindowHint(GLFW_CLIENT_API, GLFW_NO_API);
|
glfwWindowHint(GLFW_CLIENT_API, GLFW_NO_API);
|
||||||
GLFWwindow* window = glfwCreateWindow(SAMPLE_WIDTH, SAMPLE_HEIGHT,
|
GLFWwindow* window =
|
||||||
"NVIDIA Vulkan Raytracing Tutorial", nullptr, nullptr);
|
glfwCreateWindow(SAMPLE_WIDTH, SAMPLE_HEIGHT, PROJECT_NAME, nullptr, nullptr);
|
||||||
|
|
||||||
|
|
||||||
// Setup camera
|
// Setup camera
|
||||||
|
|
|
||||||
|
|
@ -96,8 +96,8 @@ int main(int argc, char** argv)
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
glfwWindowHint(GLFW_CLIENT_API, GLFW_NO_API);
|
glfwWindowHint(GLFW_CLIENT_API, GLFW_NO_API);
|
||||||
GLFWwindow* window = glfwCreateWindow(SAMPLE_WIDTH, SAMPLE_HEIGHT,
|
GLFWwindow* window =
|
||||||
"NVIDIA Vulkan Raytracing Tutorial", nullptr, nullptr);
|
glfwCreateWindow(SAMPLE_WIDTH, SAMPLE_HEIGHT, PROJECT_NAME, nullptr, nullptr);
|
||||||
|
|
||||||
// Setup camera
|
// Setup camera
|
||||||
CameraManip.setWindowSize(SAMPLE_WIDTH, SAMPLE_HEIGHT);
|
CameraManip.setWindowSize(SAMPLE_WIDTH, SAMPLE_HEIGHT);
|
||||||
|
|
@ -115,10 +115,10 @@ int main(int argc, char** argv)
|
||||||
|
|
||||||
// Search path for shaders and other media
|
// Search path for shaders and other media
|
||||||
defaultSearchPaths = {
|
defaultSearchPaths = {
|
||||||
PROJECT_ABSDIRECTORY,
|
PROJECT_ABSDIRECTORY, // shaders
|
||||||
PROJECT_ABSDIRECTORY "../",
|
PROJECT_ABSDIRECTORY "../", // media
|
||||||
NVPSystem::exePath() + std::string(PROJECT_RELDIRECTORY),
|
PROJECT_NAME, // installed: shaders + media
|
||||||
NVPSystem::exePath() + std::string(PROJECT_RELDIRECTORY) + std::string("../"),
|
NVPSystem::exePath() + std::string(PROJECT_NAME),
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -97,8 +97,8 @@ int main(int argc, char** argv)
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
glfwWindowHint(GLFW_CLIENT_API, GLFW_NO_API);
|
glfwWindowHint(GLFW_CLIENT_API, GLFW_NO_API);
|
||||||
GLFWwindow* window = glfwCreateWindow(SAMPLE_WIDTH, SAMPLE_HEIGHT,
|
GLFWwindow* window =
|
||||||
"NVIDIA Vulkan Raytracing Tutorial", nullptr, nullptr);
|
glfwCreateWindow(SAMPLE_WIDTH, SAMPLE_HEIGHT, PROJECT_NAME, nullptr, nullptr);
|
||||||
|
|
||||||
// Setup camera
|
// Setup camera
|
||||||
CameraManip.setWindowSize(SAMPLE_WIDTH, SAMPLE_HEIGHT);
|
CameraManip.setWindowSize(SAMPLE_WIDTH, SAMPLE_HEIGHT);
|
||||||
|
|
@ -116,10 +116,10 @@ int main(int argc, char** argv)
|
||||||
|
|
||||||
// Search path for shaders and other media
|
// Search path for shaders and other media
|
||||||
defaultSearchPaths = {
|
defaultSearchPaths = {
|
||||||
PROJECT_ABSDIRECTORY,
|
PROJECT_ABSDIRECTORY, // shaders
|
||||||
PROJECT_ABSDIRECTORY "../",
|
PROJECT_ABSDIRECTORY "../", // media
|
||||||
NVPSystem::exePath() + std::string(PROJECT_RELDIRECTORY),
|
PROJECT_NAME, // installed: shaders + media
|
||||||
NVPSystem::exePath() + std::string(PROJECT_RELDIRECTORY) + std::string("../"),
|
NVPSystem::exePath() + std::string(PROJECT_NAME),
|
||||||
};
|
};
|
||||||
|
|
||||||
// Enabling the extension feature
|
// Enabling the extension feature
|
||||||
|
|
|
||||||
|
|
@ -96,8 +96,8 @@ int main(int argc, char** argv)
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
glfwWindowHint(GLFW_CLIENT_API, GLFW_NO_API);
|
glfwWindowHint(GLFW_CLIENT_API, GLFW_NO_API);
|
||||||
GLFWwindow* window = glfwCreateWindow(SAMPLE_WIDTH, SAMPLE_HEIGHT,
|
GLFWwindow* window =
|
||||||
"NVIDIA Vulkan Raytracing Tutorial", nullptr, nullptr);
|
glfwCreateWindow(SAMPLE_WIDTH, SAMPLE_HEIGHT, PROJECT_NAME, nullptr, nullptr);
|
||||||
|
|
||||||
// Setup camera
|
// Setup camera
|
||||||
CameraManip.setWindowSize(SAMPLE_WIDTH, SAMPLE_HEIGHT);
|
CameraManip.setWindowSize(SAMPLE_WIDTH, SAMPLE_HEIGHT);
|
||||||
|
|
|
||||||
|
|
@ -113,8 +113,8 @@ int main(int argc, char** argv)
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
glfwWindowHint(GLFW_CLIENT_API, GLFW_NO_API);
|
glfwWindowHint(GLFW_CLIENT_API, GLFW_NO_API);
|
||||||
GLFWwindow* window = glfwCreateWindow(SAMPLE_WIDTH, SAMPLE_HEIGHT,
|
GLFWwindow* window =
|
||||||
"NVIDIA Vulkan Raytracing Tutorial", nullptr, nullptr);
|
glfwCreateWindow(SAMPLE_WIDTH, SAMPLE_HEIGHT, PROJECT_NAME, nullptr, nullptr);
|
||||||
|
|
||||||
// Setup camera
|
// Setup camera
|
||||||
CameraManip.setWindowSize(SAMPLE_WIDTH, SAMPLE_HEIGHT);
|
CameraManip.setWindowSize(SAMPLE_WIDTH, SAMPLE_HEIGHT);
|
||||||
|
|
@ -132,10 +132,10 @@ int main(int argc, char** argv)
|
||||||
|
|
||||||
// Search path for shaders and other media
|
// Search path for shaders and other media
|
||||||
defaultSearchPaths = {
|
defaultSearchPaths = {
|
||||||
PROJECT_ABSDIRECTORY,
|
PROJECT_ABSDIRECTORY, // shaders
|
||||||
PROJECT_ABSDIRECTORY "../",
|
PROJECT_ABSDIRECTORY "../", // media
|
||||||
NVPSystem::exePath() + std::string(PROJECT_RELDIRECTORY),
|
PROJECT_NAME, // installed: shaders + media
|
||||||
NVPSystem::exePath() + std::string(PROJECT_RELDIRECTORY) + std::string("../"),
|
NVPSystem::exePath() + std::string(PROJECT_NAME),
|
||||||
};
|
};
|
||||||
|
|
||||||
// Enabling the extension feature
|
// Enabling the extension feature
|
||||||
|
|
|
||||||
|
|
@ -96,8 +96,8 @@ int main(int argc, char** argv)
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
glfwWindowHint(GLFW_CLIENT_API, GLFW_NO_API);
|
glfwWindowHint(GLFW_CLIENT_API, GLFW_NO_API);
|
||||||
GLFWwindow* window = glfwCreateWindow(SAMPLE_WIDTH, SAMPLE_HEIGHT,
|
GLFWwindow* window =
|
||||||
"NVIDIA Vulkan Raytracing Tutorial", nullptr, nullptr);
|
glfwCreateWindow(SAMPLE_WIDTH, SAMPLE_HEIGHT, PROJECT_NAME, nullptr, nullptr);
|
||||||
|
|
||||||
// Setup camera
|
// Setup camera
|
||||||
CameraManip.setWindowSize(SAMPLE_WIDTH, SAMPLE_HEIGHT);
|
CameraManip.setWindowSize(SAMPLE_WIDTH, SAMPLE_HEIGHT);
|
||||||
|
|
@ -115,10 +115,10 @@ int main(int argc, char** argv)
|
||||||
|
|
||||||
// Search path for shaders and other media
|
// Search path for shaders and other media
|
||||||
defaultSearchPaths = {
|
defaultSearchPaths = {
|
||||||
PROJECT_ABSDIRECTORY,
|
PROJECT_ABSDIRECTORY, // shaders
|
||||||
PROJECT_ABSDIRECTORY "../",
|
PROJECT_ABSDIRECTORY "../", // media
|
||||||
NVPSystem::exePath() + std::string(PROJECT_RELDIRECTORY),
|
PROJECT_NAME, // installed: shaders + media
|
||||||
NVPSystem::exePath() + std::string(PROJECT_RELDIRECTORY) + std::string("../"),
|
NVPSystem::exePath() + std::string(PROJECT_NAME),
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -97,8 +97,8 @@ int main(int argc, char** argv)
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
glfwWindowHint(GLFW_CLIENT_API, GLFW_NO_API);
|
glfwWindowHint(GLFW_CLIENT_API, GLFW_NO_API);
|
||||||
GLFWwindow* window = glfwCreateWindow(SAMPLE_WIDTH, SAMPLE_HEIGHT,
|
GLFWwindow* window =
|
||||||
"NVIDIA Vulkan Raytracing Tutorial", nullptr, nullptr);
|
glfwCreateWindow(SAMPLE_WIDTH, SAMPLE_HEIGHT, PROJECT_NAME, nullptr, nullptr);
|
||||||
|
|
||||||
// Setup camera
|
// Setup camera
|
||||||
CameraManip.setWindowSize(SAMPLE_WIDTH, SAMPLE_HEIGHT);
|
CameraManip.setWindowSize(SAMPLE_WIDTH, SAMPLE_HEIGHT);
|
||||||
|
|
@ -116,10 +116,10 @@ int main(int argc, char** argv)
|
||||||
|
|
||||||
// Search path for shaders and other media
|
// Search path for shaders and other media
|
||||||
defaultSearchPaths = {
|
defaultSearchPaths = {
|
||||||
PROJECT_ABSDIRECTORY,
|
PROJECT_ABSDIRECTORY, // shaders
|
||||||
PROJECT_ABSDIRECTORY "../",
|
PROJECT_ABSDIRECTORY "../", // media
|
||||||
NVPSystem::exePath() + std::string(PROJECT_RELDIRECTORY),
|
PROJECT_NAME, // installed: shaders + media
|
||||||
NVPSystem::exePath() + std::string(PROJECT_RELDIRECTORY) + std::string("../"),
|
NVPSystem::exePath() + std::string(PROJECT_NAME),
|
||||||
};
|
};
|
||||||
|
|
||||||
// Enabling the extension feature
|
// Enabling the extension feature
|
||||||
|
|
|
||||||
|
|
@ -97,8 +97,8 @@ int main(int argc, char** argv)
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
glfwWindowHint(GLFW_CLIENT_API, GLFW_NO_API);
|
glfwWindowHint(GLFW_CLIENT_API, GLFW_NO_API);
|
||||||
GLFWwindow* window = glfwCreateWindow(SAMPLE_WIDTH, SAMPLE_HEIGHT,
|
GLFWwindow* window =
|
||||||
"NVIDIA Vulkan Raytracing Tutorial", nullptr, nullptr);
|
glfwCreateWindow(SAMPLE_WIDTH, SAMPLE_HEIGHT, PROJECT_NAME, nullptr, nullptr);
|
||||||
|
|
||||||
// Setup camera
|
// Setup camera
|
||||||
CameraManip.setWindowSize(SAMPLE_WIDTH, SAMPLE_HEIGHT);
|
CameraManip.setWindowSize(SAMPLE_WIDTH, SAMPLE_HEIGHT);
|
||||||
|
|
@ -116,10 +116,10 @@ int main(int argc, char** argv)
|
||||||
|
|
||||||
// Search path for shaders and other media
|
// Search path for shaders and other media
|
||||||
defaultSearchPaths = {
|
defaultSearchPaths = {
|
||||||
PROJECT_ABSDIRECTORY,
|
PROJECT_ABSDIRECTORY, // shaders
|
||||||
PROJECT_ABSDIRECTORY "../",
|
PROJECT_ABSDIRECTORY "../", // media
|
||||||
NVPSystem::exePath() + std::string(PROJECT_RELDIRECTORY),
|
PROJECT_NAME, // installed: shaders + media
|
||||||
NVPSystem::exePath() + std::string(PROJECT_RELDIRECTORY) + std::string("../"),
|
NVPSystem::exePath() + std::string(PROJECT_NAME),
|
||||||
};
|
};
|
||||||
|
|
||||||
// Enabling the extension feature
|
// Enabling the extension feature
|
||||||
|
|
|
||||||
|
|
@ -104,8 +104,8 @@ int main(int argc, char** argv)
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
glfwWindowHint(GLFW_CLIENT_API, GLFW_NO_API);
|
glfwWindowHint(GLFW_CLIENT_API, GLFW_NO_API);
|
||||||
GLFWwindow* window = glfwCreateWindow(SAMPLE_WIDTH, SAMPLE_HEIGHT,
|
GLFWwindow* window =
|
||||||
"NVIDIA Vulkan Raytracing Tutorial", nullptr, nullptr);
|
glfwCreateWindow(SAMPLE_WIDTH, SAMPLE_HEIGHT, PROJECT_NAME, nullptr, nullptr);
|
||||||
|
|
||||||
// Setup camera
|
// Setup camera
|
||||||
CameraManip.setWindowSize(SAMPLE_WIDTH, SAMPLE_HEIGHT);
|
CameraManip.setWindowSize(SAMPLE_WIDTH, SAMPLE_HEIGHT);
|
||||||
|
|
@ -123,10 +123,10 @@ int main(int argc, char** argv)
|
||||||
|
|
||||||
// Search path for shaders and other media
|
// Search path for shaders and other media
|
||||||
defaultSearchPaths = {
|
defaultSearchPaths = {
|
||||||
PROJECT_ABSDIRECTORY,
|
PROJECT_ABSDIRECTORY, // shaders
|
||||||
PROJECT_ABSDIRECTORY "../",
|
PROJECT_ABSDIRECTORY "../", // media
|
||||||
NVPSystem::exePath() + std::string(PROJECT_RELDIRECTORY),
|
PROJECT_NAME, // installed: shaders + media
|
||||||
NVPSystem::exePath() + std::string(PROJECT_RELDIRECTORY) + std::string("../"),
|
NVPSystem::exePath() + std::string(PROJECT_NAME),
|
||||||
};
|
};
|
||||||
|
|
||||||
// Enabling the extension feature
|
// Enabling the extension feature
|
||||||
|
|
|
||||||
|
|
@ -95,8 +95,8 @@ int main(int argc, char** argv)
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
glfwWindowHint(GLFW_CLIENT_API, GLFW_NO_API);
|
glfwWindowHint(GLFW_CLIENT_API, GLFW_NO_API);
|
||||||
GLFWwindow* window = glfwCreateWindow(SAMPLE_WIDTH, SAMPLE_HEIGHT,
|
GLFWwindow* window =
|
||||||
"NVIDIA Vulkan Raytracing Tutorial", nullptr, nullptr);
|
glfwCreateWindow(SAMPLE_WIDTH, SAMPLE_HEIGHT, PROJECT_NAME, nullptr, nullptr);
|
||||||
|
|
||||||
// Setup camera
|
// Setup camera
|
||||||
CameraManip.setWindowSize(SAMPLE_WIDTH, SAMPLE_HEIGHT);
|
CameraManip.setWindowSize(SAMPLE_WIDTH, SAMPLE_HEIGHT);
|
||||||
|
|
@ -114,10 +114,10 @@ int main(int argc, char** argv)
|
||||||
|
|
||||||
// Search path for shaders and other media
|
// Search path for shaders and other media
|
||||||
defaultSearchPaths = {
|
defaultSearchPaths = {
|
||||||
PROJECT_ABSDIRECTORY,
|
PROJECT_ABSDIRECTORY, // shaders
|
||||||
PROJECT_ABSDIRECTORY "../",
|
PROJECT_ABSDIRECTORY "../", // media
|
||||||
NVPSystem::exePath() + std::string(PROJECT_RELDIRECTORY),
|
PROJECT_NAME, // installed: shaders + media
|
||||||
NVPSystem::exePath() + std::string(PROJECT_RELDIRECTORY) + std::string("../"),
|
NVPSystem::exePath() + std::string(PROJECT_NAME),
|
||||||
};
|
};
|
||||||
|
|
||||||
// Enabling the extension feature
|
// Enabling the extension feature
|
||||||
|
|
|
||||||
|
|
@ -98,8 +98,8 @@ int main(int argc, char** argv)
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
glfwWindowHint(GLFW_CLIENT_API, GLFW_NO_API);
|
glfwWindowHint(GLFW_CLIENT_API, GLFW_NO_API);
|
||||||
GLFWwindow* window = glfwCreateWindow(SAMPLE_WIDTH, SAMPLE_HEIGHT,
|
GLFWwindow* window =
|
||||||
"NVIDIA Vulkan Raytracing Tutorial", nullptr, nullptr);
|
glfwCreateWindow(SAMPLE_WIDTH, SAMPLE_HEIGHT, PROJECT_NAME, nullptr, nullptr);
|
||||||
|
|
||||||
// Setup camera
|
// Setup camera
|
||||||
CameraManip.setWindowSize(SAMPLE_WIDTH, SAMPLE_HEIGHT);
|
CameraManip.setWindowSize(SAMPLE_WIDTH, SAMPLE_HEIGHT);
|
||||||
|
|
@ -117,10 +117,10 @@ int main(int argc, char** argv)
|
||||||
|
|
||||||
// Search path for shaders and other media
|
// Search path for shaders and other media
|
||||||
defaultSearchPaths = {
|
defaultSearchPaths = {
|
||||||
PROJECT_ABSDIRECTORY,
|
PROJECT_ABSDIRECTORY, // shaders
|
||||||
PROJECT_ABSDIRECTORY "../",
|
PROJECT_ABSDIRECTORY "../", // media
|
||||||
NVPSystem::exePath() + std::string(PROJECT_RELDIRECTORY),
|
PROJECT_NAME, // installed: shaders + media
|
||||||
NVPSystem::exePath() + std::string(PROJECT_RELDIRECTORY) + std::string("../"),
|
NVPSystem::exePath() + std::string(PROJECT_NAME),
|
||||||
};
|
};
|
||||||
|
|
||||||
// Enabling the extension feature
|
// Enabling the extension feature
|
||||||
|
|
|
||||||
|
|
@ -97,8 +97,8 @@ int main(int argc, char** argv)
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
glfwWindowHint(GLFW_CLIENT_API, GLFW_NO_API);
|
glfwWindowHint(GLFW_CLIENT_API, GLFW_NO_API);
|
||||||
GLFWwindow* window = glfwCreateWindow(SAMPLE_WIDTH, SAMPLE_HEIGHT,
|
GLFWwindow* window =
|
||||||
"NVIDIA Vulkan Raytracing Tutorial", nullptr, nullptr);
|
glfwCreateWindow(SAMPLE_WIDTH, SAMPLE_HEIGHT, PROJECT_NAME, nullptr, nullptr);
|
||||||
|
|
||||||
// Setup camera
|
// Setup camera
|
||||||
CameraManip.setWindowSize(SAMPLE_WIDTH, SAMPLE_HEIGHT);
|
CameraManip.setWindowSize(SAMPLE_WIDTH, SAMPLE_HEIGHT);
|
||||||
|
|
@ -116,10 +116,10 @@ int main(int argc, char** argv)
|
||||||
|
|
||||||
// Search path for shaders and other media
|
// Search path for shaders and other media
|
||||||
defaultSearchPaths = {
|
defaultSearchPaths = {
|
||||||
PROJECT_ABSDIRECTORY,
|
PROJECT_ABSDIRECTORY, // shaders
|
||||||
PROJECT_ABSDIRECTORY "../",
|
PROJECT_ABSDIRECTORY "../", // media
|
||||||
NVPSystem::exePath() + std::string(PROJECT_RELDIRECTORY),
|
PROJECT_NAME, // installed: shaders + media
|
||||||
NVPSystem::exePath() + std::string(PROJECT_RELDIRECTORY) + std::string("../"),
|
NVPSystem::exePath() + std::string(PROJECT_NAME),
|
||||||
};
|
};
|
||||||
|
|
||||||
// Enabling the extension feature
|
// Enabling the extension feature
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue