From 04150b812e417eda72e0977b22de8ab920cbf04a Mon Sep 17 00:00:00 2001 From: saschawillems Date: Sat, 25 Jun 2016 21:23:12 +0200 Subject: [PATCH] Camera setup, terrain texture transitions --- data/shaders/terraintessellation/terrain.frag | 8 ++++---- .../terraintessellation/terrain.frag.spv | Bin 4716 -> 4700 bytes terraintessellation/terraintessellation.cpp | 5 +++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/data/shaders/terraintessellation/terrain.frag b/data/shaders/terraintessellation/terrain.frag index 9273a742..54ec5d57 100644 --- a/data/shaders/terraintessellation/terrain.frag +++ b/data/shaders/terraintessellation/terrain.frag @@ -20,10 +20,10 @@ vec3 sampleTerrainLayer() // Define some layer ranges for sampling depending on terrain height vec2 layers[6]; layers[0] = vec2(-10.0, 10.0); - layers[1] = vec2(5.0, 35.0); - layers[2] = vec2(30.0, 70.0); - layers[3] = vec2(60.0, 95.0); - layers[4] = vec2(85.0, 140.0); + layers[1] = vec2(5.0, 45.0); + layers[2] = vec2(45.0, 80.0); + layers[3] = vec2(75.0, 100.0); + layers[4] = vec2(95.0, 140.0); layers[5] = vec2(140.0, 190.0); vec3 color = vec3(0.0); diff --git a/data/shaders/terraintessellation/terrain.frag.spv b/data/shaders/terraintessellation/terrain.frag.spv index 4822b129af54686b4ccc919890cc7403c07a84f0..471431f6fe4d23c31e60ccc501356cc7d45f80d1 100644 GIT binary patch literal 4700 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 Xz8n~{4*0to@8S0nH_m4y_Zj^cR!gD8 diff --git a/terraintessellation/terraintessellation.cpp b/terraintessellation/terraintessellation.cpp index 5f0f6c9e..9d68a559 100644 --- a/terraintessellation/terraintessellation.cpp +++ b/terraintessellation/terraintessellation.cpp @@ -118,8 +118,9 @@ public: title = "Vulkan Example - Dynamic terrain tessellation"; camera.type = Camera::CameraType::firstperson; camera.setPerspective(60.0f, (float)width / (float)height, 0.1f, 512.0f); - camera.setRotation(glm::vec3(-11.0f, 56.0f, 0.0f)); - camera.setTranslation(glm::vec3(60.0f, 20.5f, -44.0f)); + camera.setRotation(glm::vec3(-12.0f, 159.0f, 0.0f)); + camera.setTranslation(glm::vec3(18.0f, 22.5f, 57.5f)); + camera.movementSpeed = 7.5f; // Support for tessellation shaders is optional, so check first //if (!deviceFeatures.tessellationShader)