From 4104d6a201af7984cbe4166c312dd9471a404b06 Mon Sep 17 00:00:00 2001 From: saschawillems Date: Mon, 20 Jun 2016 20:04:28 +0200 Subject: [PATCH] Keys for tessellation and wireframe --- terraintessellation/terraintessellation.cpp | 19 ++++++++++--------- vulkanExamples.sln | 6 ------ 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/terraintessellation/terraintessellation.cpp b/terraintessellation/terraintessellation.cpp index 4e3e00ac..8ec3c45b 100644 --- a/terraintessellation/terraintessellation.cpp +++ b/terraintessellation/terraintessellation.cpp @@ -786,13 +786,14 @@ public: case GAMEPAD_BUTTON_L1: changeTessellationFactor(-0.05f); break; - case 0x20: - case GAMEPAD_BUTTON_X: + case 0x46: + case GAMEPAD_BUTTON_A: toggleWireframe(); break; - //case VK_RETURN: - // toggleTessellation(); - // break; + case 0x54: + case GAMEPAD_BUTTON_X: + toggleTessellation(); + break; } } @@ -803,12 +804,12 @@ public: #if defined(__ANDROID__) textOverlay->addText("Tessellation factor: " + ss.str() + " (Buttons L1/R1)", 5.0f, 85.0f, VulkanTextOverlay::alignLeft); -// textOverlay->addText("Press \"Button A\" to toggle displacement", 5.0f, 100.0f, VulkanTextOverlay::alignLeft); -// textOverlay->addText("Press \"Button X\" to toggle splitscreen", 5.0f, 115.0f, VulkanTextOverlay::alignLeft); + textOverlay->addText("Press \"Button A\" to toggle wireframe", 5.0f, 100.0f, VulkanTextOverlay::alignLeft); + textOverlay->addText("Press \"Button X\" to toggle tessellation", 5.0f, 115.0f, VulkanTextOverlay::alignLeft); #else textOverlay->addText("Tessellation factor: " + ss.str() + " (numpad +/-)", 5.0f, 85.0f, VulkanTextOverlay::alignLeft); - //textOverlay->addText("Press \"d\" to toggle displacement", 5.0f, 100.0f, VulkanTextOverlay::alignLeft); - //textOverlay->addText("Press \"s\" to toggle splitscreen", 5.0f, 115.0f, VulkanTextOverlay::alignLeft); + textOverlay->addText("Press \"f\" to toggle wireframe", 5.0f, 100.0f, VulkanTextOverlay::alignLeft); + textOverlay->addText("Press \"t\" to toggle tessellation", 5.0f, 115.0f, VulkanTextOverlay::alignLeft); #endif } }; diff --git a/vulkanExamples.sln b/vulkanExamples.sln index 43b07762..25f4eea8 100644 --- a/vulkanExamples.sln +++ b/vulkanExamples.sln @@ -69,8 +69,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "debugmarker", "debugmarker\ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scenerendering", "scenerendering\scenerendering.vcxproj", "{D928DFBB-DB07-411E-A650-6D3CE697D7D0}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "descriptorsets", "descriptorsets\descriptorsets.vcxproj", "{0A613401-3099-4657-9F83-EE54FDD29849}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "terraintessellation", "terraintessellation\terraintessellation.vcxproj", "{6C6E48B1-5946-4754-9E31-E1C989EC25FE}" EndProject Global @@ -211,10 +209,6 @@ Global {D928DFBB-DB07-411E-A650-6D3CE697D7D0}.Debug|x64.Build.0 = Debug|x64 {D928DFBB-DB07-411E-A650-6D3CE697D7D0}.Release|x64.ActiveCfg = Release|x64 {D928DFBB-DB07-411E-A650-6D3CE697D7D0}.Release|x64.Build.0 = Release|x64 - {0A613401-3099-4657-9F83-EE54FDD29849}.Debug|x64.ActiveCfg = Debug|x64 - {0A613401-3099-4657-9F83-EE54FDD29849}.Debug|x64.Build.0 = Debug|x64 - {0A613401-3099-4657-9F83-EE54FDD29849}.Release|x64.ActiveCfg = Release|x64 - {0A613401-3099-4657-9F83-EE54FDD29849}.Release|x64.Build.0 = Release|x64 {6C6E48B1-5946-4754-9E31-E1C989EC25FE}.Debug|x64.ActiveCfg = Debug|x64 {6C6E48B1-5946-4754-9E31-E1C989EC25FE}.Debug|x64.Build.0 = Debug|x64 {6C6E48B1-5946-4754-9E31-E1C989EC25FE}.Release|x64.ActiveCfg = Release|x64