Camera setup, terrain texture transitions

This commit is contained in:
saschawillems 2016-06-25 21:23:12 +02:00
parent cc5ade69f1
commit 04150b812e
3 changed files with 7 additions and 6 deletions

View file

@ -20,10 +20,10 @@ vec3 sampleTerrainLayer()
// Define some layer ranges for sampling depending on terrain height // Define some layer ranges for sampling depending on terrain height
vec2 layers[6]; vec2 layers[6];
layers[0] = vec2(-10.0, 10.0); layers[0] = vec2(-10.0, 10.0);
layers[1] = vec2(5.0, 35.0); layers[1] = vec2(5.0, 45.0);
layers[2] = vec2(30.0, 70.0); layers[2] = vec2(45.0, 80.0);
layers[3] = vec2(60.0, 95.0); layers[3] = vec2(75.0, 100.0);
layers[4] = vec2(85.0, 140.0); layers[4] = vec2(95.0, 140.0);
layers[5] = vec2(140.0, 190.0); layers[5] = vec2(140.0, 190.0);
vec3 color = vec3(0.0); vec3 color = vec3(0.0);

View file

@ -118,8 +118,9 @@ public:
title = "Vulkan Example - Dynamic terrain tessellation"; title = "Vulkan Example - Dynamic terrain tessellation";
camera.type = Camera::CameraType::firstperson; camera.type = Camera::CameraType::firstperson;
camera.setPerspective(60.0f, (float)width / (float)height, 0.1f, 512.0f); camera.setPerspective(60.0f, (float)width / (float)height, 0.1f, 512.0f);
camera.setRotation(glm::vec3(-11.0f, 56.0f, 0.0f)); camera.setRotation(glm::vec3(-12.0f, 159.0f, 0.0f));
camera.setTranslation(glm::vec3(60.0f, 20.5f, -44.0f)); camera.setTranslation(glm::vec3(18.0f, 22.5f, 57.5f));
camera.movementSpeed = 7.5f; camera.movementSpeed = 7.5f;
// Support for tessellation shaders is optional, so check first // Support for tessellation shaders is optional, so check first
//if (!deviceFeatures.tessellationShader) //if (!deviceFeatures.tessellationShader)