Merge pull request #323 from sjfricke/master

Updated tessellation text interface
This commit is contained in:
Sascha Willems 2017-04-22 13:44:28 +02:00 committed by GitHub
commit 9b7d688922

View file

@ -580,11 +580,14 @@ public:
textOverlay->addText("Tessellation level: " + ss.str() + " (Buttons L1/R1 to change)", 5.0f, 85.0f, VulkanTextOverlay::alignLeft); textOverlay->addText("Tessellation level: " + ss.str() + " (Buttons L1/R1 to change)", 5.0f, 85.0f, VulkanTextOverlay::alignLeft);
if (deviceFeatures.fillModeNonSolid) { if (deviceFeatures.fillModeNonSolid) {
textOverlay->addText("Press \"Button X\" to toggle splitscreen", 5.0f, 100.0f, VulkanTextOverlay::alignLeft); textOverlay->addText("Press \"Button X\" to toggle splitscreen", 5.0f, 100.0f, VulkanTextOverlay::alignLeft);
textOverlay->addText("Press \"Button A\" to toggle wireframe", 5.0f, 115.0f, VulkanTextOverlay::alignLeft);
} }
#else #else
textOverlay->addText("Tessellation level: " + ss.str() + " (NUMPAD +/- to change)", 5.0f, 85.0f, VulkanTextOverlay::alignLeft); textOverlay->addText("Tessellation level: " + ss.str() + " (NUMPAD +/- to change)", 5.0f, 85.0f, VulkanTextOverlay::alignLeft);
if (deviceFeatures.fillModeNonSolid) { if (deviceFeatures.fillModeNonSolid) {
textOverlay->addText("Press \"s\" to toggle splitscreen", 5.0f, 100.0f, VulkanTextOverlay::alignLeft); textOverlay->addText("Press \"s\" to toggle splitscreen", 5.0f, 100.0f, VulkanTextOverlay::alignLeft);
textOverlay->addText("Press \"w\" to toggle wireframe", 5.0f, 115.0f, VulkanTextOverlay::alignLeft);
} }
#endif #endif
} }
@ -622,4 +625,4 @@ public:
}; };
VULKAN_EXAMPLE_MAIN() VULKAN_EXAMPLE_MAIN()