Ray tracing samples can now also use the UI overlay
General cleanup, changed default settings.overlay value
This commit is contained in:
parent
d0f0e1698e
commit
3b1ff1eece
73 changed files with 129 additions and 87 deletions
|
|
@ -97,7 +97,6 @@ public:
|
|||
{
|
||||
title = "Bloom (offscreen rendering)";
|
||||
timerSpeed *= 0.5f;
|
||||
settings.overlay = true;
|
||||
camera.type = Camera::CameraType::lookat;
|
||||
camera.setPosition(glm::vec3(0.0f, 0.0f, -10.25f));
|
||||
camera.setRotation(glm::vec3(7.5f, -343.0f, 0.0f));
|
||||
|
|
|
|||
|
|
@ -96,7 +96,6 @@ public:
|
|||
camera.setPerspective(60.0f, (float)width / (float)height, 0.1f, 512.0f);
|
||||
camera.setRotation(glm::vec3(-30.0f, -45.0f, 0.0f));
|
||||
camera.setTranslation(glm::vec3(0.0f, 0.0f, -5.0f));
|
||||
settings.overlay = true;
|
||||
}
|
||||
|
||||
~VulkanExample()
|
||||
|
|
|
|||
|
|
@ -98,7 +98,6 @@ public:
|
|||
camera.setPerspective(60.0f, (float)width / (float)height, 0.1f, 512.0f);
|
||||
camera.setTranslation(glm::vec3(0.5f, 0.0f, 0.0f));
|
||||
camera.movementSpeed = 5.0f;
|
||||
settings.overlay = true;
|
||||
memset(&indirectStats, 0, sizeof(indirectStats));
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -82,7 +82,6 @@ public:
|
|||
VulkanExample() : VulkanExampleBase(ENABLE_VALIDATION)
|
||||
{
|
||||
title = "Compute shader N-body system";
|
||||
settings.overlay = true;
|
||||
camera.type = Camera::CameraType::lookat;
|
||||
camera.setPerspective(60.0f, (float)width / (float)height, 0.1f, 512.0f);
|
||||
camera.setRotation(glm::vec3(-26.0f, 75.0f, 0.0f));
|
||||
|
|
|
|||
|
|
@ -78,7 +78,6 @@ public:
|
|||
VulkanExample() : VulkanExampleBase(ENABLE_VALIDATION)
|
||||
{
|
||||
title = "Compute shader particle system";
|
||||
settings.overlay = true;
|
||||
}
|
||||
|
||||
~VulkanExample()
|
||||
|
|
|
|||
|
|
@ -81,7 +81,6 @@ public:
|
|||
VulkanExample() : VulkanExampleBase(ENABLE_VALIDATION)
|
||||
{
|
||||
title = "Compute shader ray tracing";
|
||||
settings.overlay = true;
|
||||
compute.ubo.aspectRatio = (float)width / (float)height;
|
||||
timerSpeed *= 0.25f;
|
||||
|
||||
|
|
|
|||
|
|
@ -74,7 +74,6 @@ public:
|
|||
camera.setPosition(glm::vec3(0.0f, 0.0f, -2.0f));
|
||||
camera.setRotation(glm::vec3(0.0f));
|
||||
camera.setPerspective(60.0f, (float)width * 0.5f / (float)height, 1.0f, 256.0f);
|
||||
settings.overlay = true;
|
||||
}
|
||||
|
||||
~VulkanExample()
|
||||
|
|
|
|||
|
|
@ -43,7 +43,6 @@ public:
|
|||
VulkanExample() : VulkanExampleBase(ENABLE_VALIDATION)
|
||||
{
|
||||
title = "Conditional rendering";
|
||||
settings.overlay = true;
|
||||
camera.type = Camera::CameraType::lookat;
|
||||
camera.setPerspective(45.0f, (float)width / (float)height, 0.1f, 512.0f);
|
||||
camera.setRotation(glm::vec3(-2.25f, -52.0f, 0.0f));
|
||||
|
|
|
|||
|
|
@ -87,7 +87,6 @@ public:
|
|||
VulkanExample() : VulkanExampleBase(ENABLE_VALIDATION)
|
||||
{
|
||||
title = "Conservative rasterization";
|
||||
settings.overlay = true;
|
||||
|
||||
camera.type = Camera::CameraType::lookat;
|
||||
camera.setPerspective(60.0f, (float)width / (float)height, 0.1f, 512.0f);
|
||||
|
|
|
|||
|
|
@ -218,7 +218,6 @@ public:
|
|||
VulkanExample() : VulkanExampleBase(ENABLE_VALIDATION)
|
||||
{
|
||||
title = "Debugging with VK_EXT_debug_marker";
|
||||
settings.overlay = true;
|
||||
camera.setRotation(glm::vec3(-4.35f, 16.25f, 0.0f));
|
||||
camera.setRotationSpeed(0.5f);
|
||||
camera.setPosition(glm::vec3(0.1f, 1.1f, -8.5f));
|
||||
|
|
|
|||
|
|
@ -111,7 +111,6 @@ public:
|
|||
camera.position = { 2.15f, 0.3f, -8.75f };
|
||||
camera.setRotation(glm::vec3(-0.75f, 12.5f, 0.0f));
|
||||
camera.setPerspective(60.0f, (float)width / (float)height, 0.1f, 256.0f);
|
||||
settings.overlay = true;
|
||||
}
|
||||
|
||||
~VulkanExample()
|
||||
|
|
|
|||
|
|
@ -102,7 +102,6 @@ public:
|
|||
camera.setRotation(glm::vec3(-0.75f, 12.5f, 0.0f));
|
||||
camera.setPerspective(60.0f, (float)width / (float)height, 0.1f, 256.0f);
|
||||
paused = true;
|
||||
settings.overlay = true;
|
||||
}
|
||||
|
||||
~VulkanExample()
|
||||
|
|
|
|||
|
|
@ -146,7 +146,6 @@ public:
|
|||
camera.setPerspective(60.0f, (float)width / (float)height, zNear, zFar);
|
||||
timerSpeed *= 0.25f;
|
||||
paused = true;
|
||||
settings.overlay = true;
|
||||
}
|
||||
|
||||
~VulkanExample()
|
||||
|
|
|
|||
|
|
@ -48,7 +48,6 @@ public:
|
|||
VulkanExample() : VulkanExampleBase(ENABLE_VALIDATION)
|
||||
{
|
||||
title = "Descriptor indexing";
|
||||
settings.overlay = true;
|
||||
camera.type = Camera::CameraType::lookat;
|
||||
camera.setPosition(glm::vec3(0.0f, 0.0f, -10.0f));
|
||||
camera.setRotation(glm::vec3(-35.0f, 0.0f, 0.0f));
|
||||
|
|
|
|||
|
|
@ -41,7 +41,6 @@ public:
|
|||
VulkanExample() : VulkanExampleBase(ENABLE_VALIDATION)
|
||||
{
|
||||
title = "Using descriptor Sets";
|
||||
settings.overlay = true;
|
||||
camera.type = Camera::CameraType::lookat;
|
||||
camera.setPerspective(60.0f, (float)width / (float)height, 0.1f, 512.0f);
|
||||
camera.setRotation(glm::vec3(0.0f, 0.0f, 0.0f));
|
||||
|
|
|
|||
|
|
@ -55,7 +55,6 @@ public:
|
|||
camera.setPosition(glm::vec3(0.0f, 0.0f, -1.25f));
|
||||
camera.setRotation(glm::vec3(-20.0f, 45.0f, 0.0f));
|
||||
camera.setPerspective(60.0f, (float)width / (float)height, 0.1f, 256.0f);
|
||||
settings.overlay = true;
|
||||
}
|
||||
|
||||
~VulkanExample()
|
||||
|
|
|
|||
|
|
@ -100,7 +100,6 @@ public:
|
|||
camera.setPosition(glm::vec3(0.0f, 0.0f, -2.0f));
|
||||
camera.setRotation(glm::vec3(0.0f));
|
||||
camera.setPerspective(splitScreen ? 30.0f : 45.0f, (float)width / (float)(height * ((splitScreen) ? 0.5f : 1.0f)), 1.0f, 256.0f);
|
||||
settings.overlay = true;
|
||||
}
|
||||
|
||||
~VulkanExample()
|
||||
|
|
|
|||
|
|
@ -101,7 +101,6 @@ public:
|
|||
camera.setPosition(glm::vec3(0.0f, 0.0f, -30.0f));
|
||||
camera.setRotation(glm::vec3(0.0f));
|
||||
camera.setPerspective(60.0f, (float)width / (float)height, 0.1f, 256.0f);
|
||||
settings.overlay = true;
|
||||
}
|
||||
|
||||
~VulkanExample()
|
||||
|
|
|
|||
|
|
@ -38,7 +38,6 @@ public:
|
|||
camera.setRotation(glm::vec3(-23.75f, 41.25f, 21.0f));
|
||||
camera.setPerspective(60.0f, (float)width / (float)height, 0.001f, 256.0f);
|
||||
timerSpeed *= 0.25f;
|
||||
settings.overlay = true;
|
||||
}
|
||||
|
||||
~VulkanExample()
|
||||
|
|
|
|||
|
|
@ -51,7 +51,6 @@ public:
|
|||
camera.setPosition(glm::vec3(0.0f, 0.0f, -1.0f));
|
||||
camera.setRotation(glm::vec3(0.0f, -25.0f, 0.0f));
|
||||
camera.setPerspective(60.0f, (float)width / (float)height, 0.1f, 128.0f);
|
||||
settings.overlay = true;
|
||||
}
|
||||
|
||||
~VulkanExample()
|
||||
|
|
|
|||
|
|
@ -409,7 +409,6 @@ public:
|
|||
camera.setPosition(glm::vec3(0.0f, -0.1f, -1.0f));
|
||||
camera.setRotation(glm::vec3(0.0f, -135.0f, 0.0f));
|
||||
camera.setPerspective(60.0f, (float)width / (float)height, 0.1f, 256.0f);
|
||||
settings.overlay = true;
|
||||
}
|
||||
|
||||
~VulkanExample()
|
||||
|
|
|
|||
|
|
@ -291,7 +291,6 @@ VulkanExample::VulkanExample() : VulkanExampleBase(ENABLE_VALIDATION)
|
|||
camera.setPosition(glm::vec3(0.0f, 1.0f, 0.0f));
|
||||
camera.setRotation(glm::vec3(0.0f, -90.0f, 0.0f));
|
||||
camera.setPerspective(60.0f, (float)width / (float)height, 0.1f, 256.0f);
|
||||
settings.overlay = true;
|
||||
}
|
||||
|
||||
VulkanExample::~VulkanExample()
|
||||
|
|
|
|||
|
|
@ -649,7 +649,6 @@ VulkanExample::VulkanExample() :
|
|||
camera.setPosition(glm::vec3(0.0f, 0.75f, -2.0f));
|
||||
camera.setRotation(glm::vec3(0.0f, 0.0f, 0.0f));
|
||||
camera.setPerspective(60.0f, (float) width / (float) height, 0.1f, 256.0f);
|
||||
settings.overlay = true;
|
||||
}
|
||||
|
||||
VulkanExample::~VulkanExample()
|
||||
|
|
|
|||
|
|
@ -109,7 +109,6 @@ public:
|
|||
camera.setPosition(glm::vec3(0.0f, 0.0f, -6.0f));
|
||||
camera.setRotation(glm::vec3(0.0f, 0.0f, 0.0f));
|
||||
camera.setPerspective(60.0f, (float)width / (float)height, 0.1f, 256.0f);
|
||||
settings.overlay = true;
|
||||
}
|
||||
|
||||
~VulkanExample()
|
||||
|
|
|
|||
|
|
@ -99,7 +99,6 @@ public:
|
|||
camera.setRotation(glm::vec3(-12.0f, 159.0f, 0.0f));
|
||||
camera.setTranslation(glm::vec3(0.4f, 1.25f, 0.0f));
|
||||
camera.movementSpeed = 5.0f;
|
||||
settings.overlay = true;
|
||||
}
|
||||
|
||||
~VulkanExample()
|
||||
|
|
|
|||
|
|
@ -72,7 +72,6 @@ public:
|
|||
camera.setPerspective(60.0f, (float)width / (float)height, 0.1f, 256.0f);
|
||||
camera.movementSpeed = 4.0f;
|
||||
camera.rotationSpeed = 0.25f;
|
||||
settings.overlay = true;
|
||||
|
||||
srand((unsigned int)time(0));
|
||||
|
||||
|
|
|
|||
|
|
@ -79,7 +79,6 @@ public:
|
|||
camera.setPosition(glm::vec3(1.65f, 1.75f, -6.15f));
|
||||
camera.setRotation(glm::vec3(-12.75f, 380.0f, 0.0f));
|
||||
camera.setPerspective(60.0f, (float)width / (float)height, 0.1f, 256.0f);
|
||||
settings.overlay = true;
|
||||
UIOverlay.subpass = 1;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -79,7 +79,6 @@ public:
|
|||
camera.setPosition(glm::vec3(5.5f, -1.85f, -18.5f));
|
||||
camera.setRotation(glm::vec3(-17.2f, -4.7f, 0.0f));
|
||||
camera.setPerspective(60.0f, (float)width / (float)height, 1.0f, 256.0f);
|
||||
settings.overlay = true;
|
||||
}
|
||||
|
||||
~VulkanExample()
|
||||
|
|
|
|||
|
|
@ -56,7 +56,6 @@ public:
|
|||
camera.setPerspective(60.0f, (float)width / (float)height, 0.1f, 256.0f);
|
||||
camera.setRotation(glm::vec3(0.0f, -90.0f, 0.0f));
|
||||
camera.setTranslation(glm::vec3(2.5f, 2.5f, -7.5f));
|
||||
settings.overlay = true;
|
||||
}
|
||||
|
||||
~VulkanExample()
|
||||
|
|
|
|||
|
|
@ -103,7 +103,6 @@ public:
|
|||
camera.setRotation(glm::vec3(0.0f));
|
||||
camera.setRotationSpeed(0.5f);
|
||||
camera.setPerspective(60.0f, (float)width / (float)height, 0.1f, 256.0f);
|
||||
settings.overlay = true;
|
||||
// Get number of max. concurrent threads
|
||||
numThreads = std::thread::hardware_concurrency();
|
||||
assert(numThreads > 0);
|
||||
|
|
|
|||
|
|
@ -63,7 +63,6 @@ public:
|
|||
camera.setRotation(glm::vec3(0.0f, 90.0f, 0.0f));
|
||||
camera.setTranslation(glm::vec3(7.0f, 3.2f, 0.0f));
|
||||
camera.movementSpeed = 5.0f;
|
||||
settings.overlay = true;
|
||||
|
||||
// Enable extension required for multiview
|
||||
enabledDeviceExtensions.push_back(VK_KHR_MULTIVIEW_EXTENSION_NAME);
|
||||
|
|
|
|||
|
|
@ -52,7 +52,6 @@ public:
|
|||
VulkanExample() : VulkanExampleBase(ENABLE_VALIDATION)
|
||||
{
|
||||
title = "Negative Viewport height";
|
||||
settings.overlay = true;
|
||||
// [POI] VK_KHR_MAINTENANCE1 is required for using negative viewport heights
|
||||
// Note: This is core as of Vulkan 1.1. So if you target 1.1 you don't have to explicitly enable this
|
||||
enabledDeviceExtensions.push_back(VK_KHR_MAINTENANCE1_EXTENSION_NAME);
|
||||
|
|
|
|||
|
|
@ -67,7 +67,6 @@ public:
|
|||
camera.setRotation(glm::vec3(0.0f, -123.75f, 0.0f));
|
||||
camera.setRotationSpeed(0.5f);
|
||||
camera.setPerspective(60.0f, (float)width / (float)height, 1.0f, 256.0f);
|
||||
settings.overlay = true;
|
||||
}
|
||||
|
||||
~VulkanExample()
|
||||
|
|
|
|||
|
|
@ -88,7 +88,6 @@ public:
|
|||
camera.setRotation(glm::vec3(-2.5f, 0.0f, 0.0f));
|
||||
camera.setRotationSpeed(0.5f);
|
||||
camera.setPerspective(60.0f, (float)width / (float)height, 0.1f, 256.0f);
|
||||
settings.overlay = true;
|
||||
// The scene shader uses a clipping plane, so this feature has to be enabled
|
||||
enabledFeatures.shaderClipDistance = VK_TRUE;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -83,7 +83,6 @@ public:
|
|||
camera.setPosition(glm::vec3(0.0f, 0.0f, -6.0f));
|
||||
camera.setRotation(glm::vec3(0.0f, 0.0f, 0.0f));
|
||||
camera.setPerspective(60.0f, (float) width / (float) height, 0.1f, 256.0f);
|
||||
settings.overlay = true;
|
||||
}
|
||||
|
||||
~VulkanExample()
|
||||
|
|
|
|||
|
|
@ -70,7 +70,6 @@ public:
|
|||
camera.setPosition(glm::vec3(0.0f, 1.25f, -1.5f));
|
||||
camera.setRotation(glm::vec3(-45.0f, 0.0f, 0.0f));
|
||||
camera.setPerspective(60.0f, (float)width / (float)height, 0.1f, 256.0f);
|
||||
settings.overlay = true;
|
||||
}
|
||||
|
||||
~VulkanExample()
|
||||
|
|
|
|||
|
|
@ -104,7 +104,6 @@ public:
|
|||
camera.setPosition(glm::vec3(0.0f, 0.0f, -75.0f));
|
||||
camera.setRotation(glm::vec3(-15.0f, 45.0f, 0.0f));
|
||||
camera.setPerspective(60.0f, (float)width / (float)height, 1.0f, 256.0f);
|
||||
settings.overlay = true;
|
||||
timerSpeed *= 8.0f;
|
||||
rndEngine.seed(benchmark.active ? 0 : (unsigned)time(nullptr));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -81,7 +81,6 @@ public:
|
|||
camera.rotationSpeed = 0.25f;
|
||||
paused = true;
|
||||
timerSpeed *= 0.25f;
|
||||
settings.overlay = true;
|
||||
|
||||
// Setup some default materials (source: https://seblagarde.wordpress.com/2011/08/17/feeding-a-physical-based-lighting-mode/)
|
||||
materials.push_back(Material("Gold", glm::vec3(1.0f, 0.765557f, 0.336057f), 0.1f, 1.0f));
|
||||
|
|
|
|||
|
|
@ -118,8 +118,6 @@ public:
|
|||
materials.push_back(Material("Red", glm::vec3(1.0f, 0.0f, 0.0f)));
|
||||
materials.push_back(Material("Blue", glm::vec3(0.0f, 0.0f, 1.0f)));
|
||||
|
||||
settings.overlay = true;
|
||||
|
||||
for (auto material : materials) {
|
||||
materialNames.push_back(material.name);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -82,8 +82,6 @@ public:
|
|||
|
||||
camera.setRotation({ -7.75f, 150.25f, 0.0f });
|
||||
camera.setPosition({ 0.7f, 0.1f, 1.7f });
|
||||
|
||||
settings.overlay = true;
|
||||
}
|
||||
|
||||
~VulkanExample()
|
||||
|
|
|
|||
|
|
@ -43,7 +43,6 @@ public:
|
|||
camera.setRotation(glm::vec3(-25.0f, 15.0f, 0.0f));
|
||||
camera.setRotationSpeed(0.5f);
|
||||
camera.setPerspective(60.0f, (float)(width / 3.0f) / (float)height, 0.1f, 256.0f);
|
||||
settings.overlay = true;
|
||||
}
|
||||
|
||||
~VulkanExample()
|
||||
|
|
|
|||
|
|
@ -60,7 +60,6 @@ public:
|
|||
camera.movementSpeed = 4.0f;
|
||||
camera.setPerspective(60.0f, (float)width / (float)height, 0.1f, 256.0f);
|
||||
camera.rotationSpeed = 0.25f;
|
||||
settings.overlay = true;
|
||||
}
|
||||
|
||||
~VulkanExample()
|
||||
|
|
|
|||
|
|
@ -57,7 +57,6 @@ public:
|
|||
camera.setRotation(glm::vec3(0.0, 0.0f, 0.0f));
|
||||
camera.setPerspective(60.0f, (float) width / (float) height, 0.1f, 256.0f);
|
||||
camera.setRotationSpeed(0.5f);
|
||||
settings.overlay = true;
|
||||
}
|
||||
|
||||
~VulkanExample()
|
||||
|
|
|
|||
|
|
@ -52,7 +52,6 @@ public:
|
|||
VulkanExample() : VulkanExampleBase(ENABLE_VALIDATION)
|
||||
{
|
||||
title = "Push descriptors";
|
||||
settings.overlay = true;
|
||||
camera.type = Camera::CameraType::lookat;
|
||||
camera.setPerspective(60.0f, (float)width / (float)height, 0.1f, 512.0f);
|
||||
camera.setRotation(glm::vec3(0.0f, 0.0f, 0.0f));
|
||||
|
|
|
|||
|
|
@ -89,7 +89,6 @@ public:
|
|||
camera.setRotation(glm::vec3(-16.25f, -28.75f, 0.0f));
|
||||
camera.setPerspective(45.0f, (float)width / (float)height, 1.0f, 256.0f);
|
||||
timerSpeed *= 0.5f;
|
||||
settings.overlay = true;
|
||||
}
|
||||
|
||||
~VulkanExample()
|
||||
|
|
|
|||
|
|
@ -46,8 +46,8 @@ public:
|
|||
camera.setPerspective(60.0f, (float)width / (float)height, 0.1f, 512.0f);
|
||||
camera.setRotation(glm::vec3(0.0f, 0.0f, 0.0f));
|
||||
camera.setTranslation(glm::vec3(0.0f, 3.0f, -10.0f));
|
||||
settings.overlay = true;
|
||||
enableExtensions(true);
|
||||
rayQueryOnly = true;
|
||||
enableExtensions();
|
||||
enabledDeviceExtensions.push_back(VK_KHR_RAY_QUERY_EXTENSION_NAME);
|
||||
}
|
||||
|
||||
|
|
@ -271,7 +271,7 @@ public:
|
|||
vkCmdBindPipeline(drawCmdBuffers[i], VK_PIPELINE_BIND_POINT_GRAPHICS, pipeline);
|
||||
scene.draw(drawCmdBuffers[i]);
|
||||
|
||||
drawUI(drawCmdBuffers[i]);
|
||||
VulkanExampleBase::drawUI(drawCmdBuffers[i]);
|
||||
|
||||
vkCmdEndRenderPass(drawCmdBuffers[i]);
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
/*
|
||||
* Vulkan Example - Hardware accelerated ray tracing callable shaders example
|
||||
*
|
||||
* Dynamically calls different shaders based on the geoemtry id in the closest hit shader
|
||||
* Dynamically calls different shaders based on the geometry id in the closest hit shader
|
||||
*
|
||||
* Relevant code parts are marked with [POI]
|
||||
*
|
||||
|
|
@ -47,7 +47,6 @@ public:
|
|||
VulkanExample() : VulkanRaytracingSample()
|
||||
{
|
||||
title = "Ray tracing callable shaders";
|
||||
settings.overlay = false;
|
||||
timerSpeed *= 0.25f;
|
||||
camera.type = Camera::CameraType::lookat;
|
||||
camera.setPerspective(60.0f, (float)width / (float)height, 0.1f, 512.0f);
|
||||
|
|
@ -581,6 +580,8 @@ public:
|
|||
VK_IMAGE_LAYOUT_GENERAL,
|
||||
subresourceRange);
|
||||
|
||||
drawUI(drawCmdBuffers[i], frameBuffers[i]);
|
||||
|
||||
VK_CHECK_RESULT(vkEndCommandBuffer(drawCmdBuffers[i]));
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -43,7 +43,6 @@ public:
|
|||
VulkanExample() : VulkanRaytracingSample()
|
||||
{
|
||||
title = "Ray tracing reflections";
|
||||
settings.overlay = false;
|
||||
timerSpeed *= 0.5f;
|
||||
camera.rotationSpeed *= 0.25f;
|
||||
camera.type = Camera::CameraType::firstperson;
|
||||
|
|
@ -519,10 +518,7 @@ public:
|
|||
VK_IMAGE_LAYOUT_GENERAL,
|
||||
subresourceRange);
|
||||
|
||||
//@todo: Default render pass setup will overwrite contents
|
||||
//vkCmdBeginRenderPass(drawCmdBuffers[i], &renderPassBeginInfo, VK_SUBPASS_CONTENTS_INLINE);
|
||||
//drawUI(drawCmdBuffers[i]);
|
||||
//vkCmdEndRenderPass(drawCmdBuffers[i]);
|
||||
drawUI(drawCmdBuffers[i], frameBuffers[i]);
|
||||
|
||||
VK_CHECK_RESULT(vkEndCommandBuffer(drawCmdBuffers[i]));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -43,7 +43,6 @@ public:
|
|||
VulkanExample() : VulkanRaytracingSample()
|
||||
{
|
||||
title = "Ray traced shadows";
|
||||
settings.overlay = false;
|
||||
timerSpeed *= 0.25f;
|
||||
camera.type = Camera::CameraType::lookat;
|
||||
camera.setPerspective(60.0f, (float)width / (float)height, 0.1f, 512.0f);
|
||||
|
|
@ -514,6 +513,8 @@ public:
|
|||
VK_IMAGE_LAYOUT_GENERAL,
|
||||
subresourceRange);
|
||||
|
||||
drawUI(drawCmdBuffers[i], frameBuffers[i]);
|
||||
|
||||
VK_CHECK_RESULT(vkEndCommandBuffer(drawCmdBuffers[i]));
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -34,8 +34,6 @@ public:
|
|||
VulkanExample() : VulkanExampleBase(ENABLE_VALIDATION)
|
||||
{
|
||||
title = "Saving framebuffer to screenshot";
|
||||
settings.overlay = true;
|
||||
|
||||
camera.type = Camera::CameraType::lookat;
|
||||
camera.setPerspective(60.0f, (float)width / (float)height, 0.1f, 512.0f);
|
||||
camera.setRotation(glm::vec3(-25.0f, 23.75f, 0.0f));
|
||||
|
|
|
|||
|
|
@ -102,7 +102,6 @@ public:
|
|||
camera.setRotation(glm::vec3(-15.0f, -390.0f, 0.0f));
|
||||
camera.setPerspective(60.0f, (float)width / (float)height, 1.0f, 256.0f);
|
||||
timerSpeed *= 0.5f;
|
||||
settings.overlay = true;
|
||||
}
|
||||
|
||||
~VulkanExample()
|
||||
|
|
|
|||
|
|
@ -141,7 +141,6 @@ public:
|
|||
camera.setPerspective(45.0f, (float)width / (float)height, zNear, zFar);
|
||||
camera.setPosition(glm::vec3(-0.12f, 1.14f, -2.25f));
|
||||
camera.setRotation(glm::vec3(-17.0f, 7.0f, 0.0f));
|
||||
settings.overlay = true;
|
||||
timer = 0.2f;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -93,7 +93,6 @@ public:
|
|||
VulkanExample() : VulkanExampleBase(ENABLE_VALIDATION)
|
||||
{
|
||||
title = "Point light shadows (cubemap)";
|
||||
settings.overlay = true;
|
||||
camera.type = Camera::CameraType::lookat;
|
||||
camera.setPerspective(45.0f, (float)width / (float)height, zNear, zFar);
|
||||
camera.setRotation(glm::vec3(-20.5f, -673.0f, 0.0f));
|
||||
|
|
|
|||
|
|
@ -44,7 +44,6 @@ public:
|
|||
camera.setPerspective(60.0f, ((float)width / 3.0f) / (float)height, 0.1f, 512.0f);
|
||||
camera.setRotation(glm::vec3(-40.0f, -90.0f, 0.0f));
|
||||
camera.setTranslation(glm::vec3(0.0f, 0.0f, -2.0f));
|
||||
settings.overlay = true;
|
||||
}
|
||||
|
||||
~VulkanExample()
|
||||
|
|
|
|||
|
|
@ -44,7 +44,6 @@ public:
|
|||
camera.setRotation(glm::vec3(-25.0f, 23.75f, 0.0f));
|
||||
camera.setRotationSpeed(0.75f);
|
||||
camera.setPerspective(60.0f, (float)width / (float)height, 0.1f, 256.0f);
|
||||
settings.overlay = true;
|
||||
}
|
||||
|
||||
~VulkanExample()
|
||||
|
|
|
|||
|
|
@ -124,7 +124,6 @@ public:
|
|||
VulkanExample() : VulkanExampleBase(ENABLE_VALIDATION)
|
||||
{
|
||||
title = "Screen space ambient occlusion";
|
||||
settings.overlay = true;
|
||||
camera.type = Camera::CameraType::firstperson;
|
||||
#ifndef __ANDROID__
|
||||
camera.rotationSpeed = 0.25f;
|
||||
|
|
|
|||
|
|
@ -43,7 +43,6 @@ public:
|
|||
camera.setPerspective(60.0f, (float)width / (float)height, 0.1f, 512.0f);
|
||||
camera.setRotation(glm::vec3(2.5f, -35.0f, 0.0f));
|
||||
camera.setTranslation(glm::vec3(0.0f, 0.0f, -2.0f));
|
||||
settings.overlay = true;
|
||||
}
|
||||
|
||||
~VulkanExample()
|
||||
|
|
|
|||
|
|
@ -105,7 +105,6 @@ public:
|
|||
camera.setPosition(glm::vec3(-3.2f, 1.0f, 5.9f));
|
||||
camera.setRotation(glm::vec3(0.5f, 210.05f, 0.0f));
|
||||
camera.setPerspective(60.0f, (float)width / (float)height, 0.1f, 256.0f);
|
||||
settings.overlay = true;
|
||||
UIOverlay.subpass = 2;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -106,7 +106,6 @@ public:
|
|||
camera.setRotation(glm::vec3(-12.0f, 159.0f, 0.0f));
|
||||
camera.setTranslation(glm::vec3(18.0f, 22.5f, 57.5f));
|
||||
camera.movementSpeed = 7.5f;
|
||||
settings.overlay = true;
|
||||
}
|
||||
|
||||
~VulkanExample()
|
||||
|
|
|
|||
|
|
@ -54,7 +54,6 @@ public:
|
|||
camera.setPosition(glm::vec3(0.0f, 0.0f, -4.0f));
|
||||
camera.setRotation(glm::vec3(-350.0f, 60.0f, 0.0f));
|
||||
camera.setPerspective(45.0f, (float)(width * ((splitScreen) ? 0.5f : 1.0f)) / (float)height, 0.1f, 256.0f);
|
||||
settings.overlay = true;
|
||||
}
|
||||
|
||||
~VulkanExample()
|
||||
|
|
|
|||
|
|
@ -69,7 +69,6 @@ public:
|
|||
camera.setPosition(glm::vec3(0.0f, 0.0f, -2.5f));
|
||||
camera.setRotation(glm::vec3(0.0f, 15.0f, 0.0f));
|
||||
camera.setPerspective(60.0f, (float)width / (float)height, 0.1f, 256.0f);
|
||||
settings.overlay = true;
|
||||
}
|
||||
|
||||
~VulkanExample()
|
||||
|
|
|
|||
|
|
@ -175,7 +175,6 @@ public:
|
|||
camera.setPosition(glm::vec3(0.0f, 0.0f, -2.5f));
|
||||
camera.setRotation(glm::vec3(0.0f, 15.0f, 0.0f));
|
||||
camera.setPerspective(60.0f, (float)width / (float)height, 0.1f, 256.0f);
|
||||
settings.overlay = true;
|
||||
srand((unsigned int)time(NULL));
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -59,7 +59,6 @@ public:
|
|||
VulkanExample() : VulkanExampleBase(ENABLE_VALIDATION)
|
||||
{
|
||||
title = "Texture arrays";
|
||||
settings.overlay = true;
|
||||
camera.type = Camera::CameraType::lookat;
|
||||
camera.setPosition(glm::vec3(0.0f, 0.0f, -7.5f));
|
||||
camera.setRotation(glm::vec3(-35.0f, 0.0f, 0.0f));
|
||||
|
|
|
|||
|
|
@ -61,7 +61,6 @@ public:
|
|||
camera.setRotation(glm::vec3(0.0f));
|
||||
camera.setRotationSpeed(0.25f);
|
||||
camera.setPerspective(60.0f, (float)width / (float)height, 0.1f, 256.0f);
|
||||
settings.overlay = true;
|
||||
}
|
||||
|
||||
~VulkanExample()
|
||||
|
|
|
|||
|
|
@ -61,7 +61,6 @@ public:
|
|||
camera.setPosition(glm::vec3(0.0f, 0.0f, -4.0f));
|
||||
camera.setRotationSpeed(0.25f);
|
||||
camera.setPerspective(60.0f, (float)width / (float)height, 0.1f, 256.0f);
|
||||
settings.overlay = true;
|
||||
}
|
||||
|
||||
~VulkanExample()
|
||||
|
|
|
|||
|
|
@ -55,7 +55,6 @@ public:
|
|||
camera.setTranslation(glm::vec3(40.75f, 0.0f, 0.0f));
|
||||
camera.movementSpeed = 2.5f;
|
||||
camera.rotationSpeed = 0.5f;
|
||||
settings.overlay = true;
|
||||
timerSpeed *= 0.05f;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -141,7 +141,6 @@ VulkanExample::VulkanExample() : VulkanExampleBase(ENABLE_VALIDATION)
|
|||
camera.setPosition(glm::vec3(0.0f, 0.0f, -12.0f));
|
||||
camera.setRotation(glm::vec3(-90.0f, 0.0f, 0.0f));
|
||||
camera.setPerspective(60.0f, (float)width / (float)height, 0.1f, 256.0f);
|
||||
settings.overlay = true;
|
||||
}
|
||||
|
||||
VulkanExample::~VulkanExample()
|
||||
|
|
|
|||
|
|
@ -18,7 +18,6 @@ VulkanExample::VulkanExample() : VulkanExampleBase(ENABLE_VALIDATION)
|
|||
camera.setRotation(glm::vec3(0.0f, -90.0f, 0.0f));
|
||||
camera.setPerspective(60.0f, (float)width / (float)height, 0.1f, 256.0f);
|
||||
camera.setRotationSpeed(0.25f);
|
||||
settings.overlay = true;
|
||||
enabledInstanceExtensions.push_back(VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME);
|
||||
enabledDeviceExtensions.push_back(VK_NV_SHADING_RATE_IMAGE_EXTENSION_NAME);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -43,7 +43,6 @@ public:
|
|||
camera.setRotation(glm::vec3(0.0f, 90.0f, 0.0f));
|
||||
camera.setTranslation(glm::vec3(7.0f, 3.2f, 0.0f));
|
||||
camera.setMovementSpeed(5.0f);
|
||||
settings.overlay = true;
|
||||
}
|
||||
|
||||
~VulkanExample()
|
||||
|
|
|
|||
|
|
@ -63,7 +63,6 @@ public:
|
|||
camera.setRotation(glm::vec3(15.0f, 0.0f, 0.0f));
|
||||
camera.setRotationSpeed(0.5f);
|
||||
camera.setPerspective(60.0f, (float)width / (float)height, 0.1f, 256.0f);
|
||||
settings.overlay = true;
|
||||
}
|
||||
|
||||
~VulkanExample()
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue