From 0f8bed9fde28227f9fc05016d70f82ffc01d1d52 Mon Sep 17 00:00:00 2001 From: saschawillems Date: Sun, 19 Feb 2017 15:03:16 +0100 Subject: [PATCH] Continued work on PBR example --- data/shaders/pbr/pbr.frag | 146 +++++++++++++++++++++++++++++++ data/shaders/pbr/pbr.frag.spv | Bin 0 -> 8560 bytes data/shaders/pbr/pbr.vert | 38 ++++++++ data/shaders/pbr/pbr.vert.spv | Bin 0 -> 2596 bytes data/shaders/pbr/skybox.frag | 12 +++ data/shaders/pbr/skybox.frag.spv | Bin 0 -> 564 bytes data/shaders/pbr/skybox.vert | 27 ++++++ data/shaders/pbr/skybox.vert.spv | Bin 0 -> 1360 bytes pbr/pbr.cpp | 68 ++++++++------ 9 files changed, 263 insertions(+), 28 deletions(-) create mode 100644 data/shaders/pbr/pbr.frag create mode 100644 data/shaders/pbr/pbr.frag.spv create mode 100644 data/shaders/pbr/pbr.vert create mode 100644 data/shaders/pbr/pbr.vert.spv create mode 100644 data/shaders/pbr/skybox.frag create mode 100644 data/shaders/pbr/skybox.frag.spv create mode 100644 data/shaders/pbr/skybox.vert create mode 100644 data/shaders/pbr/skybox.vert.spv diff --git a/data/shaders/pbr/pbr.frag b/data/shaders/pbr/pbr.frag new file mode 100644 index 00000000..b102a5c8 --- /dev/null +++ b/data/shaders/pbr/pbr.frag @@ -0,0 +1,146 @@ +#version 450 + +layout (binding = 1) uniform samplerCube envmap; +layout (binding = 2) uniform samplerCube envmapibldiff; +layout (binding = 3) uniform samplerCube envmapiblrefl; + +layout (location = 0) in vec3 inWorldPos; +layout (location = 1) in vec3 inNormal; +layout (location = 2) in vec2 inUV; + +layout (binding = 0) uniform UBO +{ + mat4 projection; + mat4 model; + mat4 view; + vec3 camPos; +} ubo; + +layout (location = 0) out vec4 outColor; + +layout(push_constant) uniform PushConsts { + layout(offset = 12) float roughness; + layout(offset = 16) float metallic; + layout(offset = 20) float r; + layout(offset = 24) float g; + layout(offset = 28) float b; +} material; + +const float PI = 3.14159265359; + +//#define ROUGHNESS_PATTERN 1 + +// Fresnel ------------------------------------------------------------------------ + +float fresnelSchlick(float ct, float F0) +{ + return F0 + (1.0 - F0) * pow(1.0 - ct, 5.0); +} + +// Normal distribution functions --------------------------------------------------- + +float NDF_blinnPhong(float dotNH, float alphaSqr) +{ + return 1.0 / (PI * alphaSqr) * pow(dotNH, 2.0 / alphaSqr - 2.0); +} + +float NDF_beckmann(float dotNH, float alphaSqr) +{ + float dotNH2 = dotNH * dotNH; + return 1.0 / (PI * alphaSqr * dotNH2 * dotNH2) * exp((dotNH2 - 1.0) / (alphaSqr * dotNH2)); +} + +float NDF_GGX(float dotNH, float alphaSqr) +{ + return alphaSqr / (PI * pow(dotNH * dotNH * (alphaSqr - 1.0) + 1.0, 2.0)); +} + +// Geometry visibility functions --------------------------------------------------- + +float GEOM_SchlickSmith(float dotNL, float dotNV, float alpha) +{ + //float k = alpha * sqrt(2.0 / PI); + float k = pow(0.8 + 0.5 * alpha, 2.0) / 2.0; + float GL = 1.0 / (dotNL * (1.0 - k) + k); + float GV = 1.0 / (dotNV * (1.0 - k) + k); + return GL * GV; + +} + +float PBR_Shade(vec3 N, vec3 V, vec3 L, float roughness, float F0) +{ + float alpha = roughness * roughness; + float alphaSqr = alpha * alpha; + + vec3 H = normalize (V + L); + + float dotNL = clamp(dot(N, L), 0.0, 1.0); + float dotNV = clamp(dot(N, V), 0.0, 1.0); + float dotNH = clamp(dot(N, H), 0.0, 1.0); + float dotLH = clamp(dot(L, H), 0.0, 1.0); + + // Normal distribution + float Di = NDF_GGX(dotNH, alphaSqr); + // Fresnel + float Fs = fresnelSchlick(dotNV, F0); + // Visibility term + float Vs = GEOM_SchlickSmith(dotNL, dotNV, alpha); + + return dotNL * Di * Fs * Vs; +} + +// ---------------------------------------------------------------------------- +void main() +{ + // Partially based on https://www.shadertoy.com/view/XsfXWX by Alexander Alekseev (https://github.com/tdmaav) + + // One fixed light source + vec3 lightPos = vec3(-10.0f, -10.0f, 10.0f); + // Take light color from environment map + vec3 lightColor = texture(envmapiblrefl, vec3(0.5)).xyz; + + vec3 N = normalize(inNormal); + vec3 V = normalize(ubo.camPos - inWorldPos); + vec3 L = normalize(lightPos - inWorldPos); + vec3 R = reflect(-V, N); + + // Store material values for quick testing/changing inside the shader + float roughness = material.roughness; + float metallic = material.metallic; + + // Add striped pattern to roughness based on vertex position +#ifdef ROUGHNESS_PATTERN + roughness = max(roughness, step(fract(inWorldPos.y * 2.02), 0.5)); +#endif + + // Get IBL components from cube maps + vec3 IBLdiffuse = texture(envmapibldiff, inNormal).rgb; + vec3 IBLreflection = texture(envmapiblrefl, inNormal).rgb; + + // Fresnel part + float fresnel = pow(max(1.0 - dot(N, V), 0.0), 1.5); + + // Reflection part + + // Select mip level based on roughness + ivec2 dim = textureSize(envmap, 0); + float nummips = log2(max(dim.s, dim.y)); + vec3 reflection = texture(envmap, R).xyz; + reflection = textureLod(envmap, R, max(roughness * nummips, textureQueryLod(envmap, R).y)).rgb; + reflection = mix(reflection, IBLreflection, (1.0-fresnel) * roughness); + reflection = mix(reflection, IBLreflection, roughness); + + // Specular part + // F0 based on metallic factor of material + vec3 F0 = vec3(0.04); + F0 = mix(F0, lightColor, material.metallic); + vec3 spec = lightColor * PBR_Shade(N, V, L, roughness, 0.2); + reflection -= spec; + + // Diffuse part + vec3 matColor = vec3(material.r, material.g, material.b); + vec3 diffuse = mix(IBLdiffuse * matColor, reflection, fresnel); + + // Final output mixes based on material metalness + outColor.rgb = mix(diffuse, reflection, metallic) + spec; +} \ No newline at end of file diff --git a/data/shaders/pbr/pbr.frag.spv b/data/shaders/pbr/pbr.frag.spv new file mode 100644 index 0000000000000000000000000000000000000000..84480b3cfedbaf4a9e0a46180e442d808b8f18ef GIT binary patch literal 8560 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 F`+sM)12_Nx literal 0 HcmV?d00001 diff --git a/data/shaders/pbr/pbr.vert b/data/shaders/pbr/pbr.vert new file mode 100644 index 00000000..bc741abd --- /dev/null +++ b/data/shaders/pbr/pbr.vert @@ -0,0 +1,38 @@ +#version 450 + +#extension GL_ARB_separate_shader_objects : enable +#extension GL_ARB_shading_language_420pack : enable + +layout (location = 0) in vec3 inPos; +layout (location = 1) in vec3 inNormal; +layout (location = 2) in vec2 inUV; + +layout (binding = 0) uniform UBO +{ + mat4 projection; + mat4 model; + mat4 view; + vec3 camPos; +} ubo; + +layout (location = 0) out vec3 outWorldPos; +layout (location = 1) out vec3 outNormal; +layout (location = 2) out vec2 outUV; + +layout(push_constant) uniform PushConsts { + vec3 objPos; +} pushConsts; + +out gl_PerVertex +{ + vec4 gl_Position; +}; + +void main() +{ + vec3 locPos = vec3(ubo.model * vec4(inPos, 1.0)); + outWorldPos = locPos + pushConsts.objPos; + outNormal = mat3(ubo.model) * inNormal; + outUV = inUV; + gl_Position = ubo.projection * ubo.view * vec4(outWorldPos, 1.0); +} diff --git a/data/shaders/pbr/pbr.vert.spv b/data/shaders/pbr/pbr.vert.spv new file mode 100644 index 0000000000000000000000000000000000000000..a9abfe393c951c34bb6018d9fe4de06bce79c9f6 GIT binary patch literal 2596 zcmZ9N*-}$M5QYaxqPTz??ji&gS40KGU5FY~)PRECrH*h4q9KP$f_jOMpigA^RNh$S z|IL|>M~CXu(|<41%S`C$9@*hsm;QFTcP?G~UAJWCcDsV-<@wk1W3Be;*u>;G7JaVA z8)DP%_V|5H-;Jo&Ko}4eMVCeQMJ3T=(Nj^6{<_6~$~otHU3tDbvp8FA#hXzxYRA>q zdbAohtI7Kh@k+b(uZ>i-##*%=HP*JGwYWNQeS9-o`RMYBlszB0S7+3dl}e%*d7Vj? zOS7+3Q6XgP+-5W3lv<*!3$nt7nl_TvxGruO`F^U!pT#;D9axDrI`R7?Z@o`^F4SLZ zc$MV5??tlJew#GwtDsH!K3$84DtzNCf&E>e+j=xA0n&RxyC9Rro5ItmmtU1M| zSFF5fPG6HpJo+!D3+DEDyVQ>!XZ?`zdnmG4VE_9uhpZnme%m7R1N-Zj=EbbA`ynca zyMSF;buhQ0h-LC{Dteh&4rXL*P3BCS8Sz=f2ebIh3VZ4yK6A>-r68Lj`WM}hR zfDZpD-7oN*hz0&jNM4*++!gD?j8JBFK*XGxf>K_tWZ6n%)(GTv)1rc{?RAe?61O8Pu^y88UKX76e17C-$3qNdZ77w)NEplf#@1Y3W6z}o> zOH(X;r%$Bgtud#PII_*@nf84mn>Ba;xd_~BUTBXEZ;l+Wc_{+_t{jkGiSPrrJS*B4 zMRt!DvL#Qq literal 0 HcmV?d00001 diff --git a/data/shaders/pbr/skybox.frag b/data/shaders/pbr/skybox.frag new file mode 100644 index 00000000..9bdf6f20 --- /dev/null +++ b/data/shaders/pbr/skybox.frag @@ -0,0 +1,12 @@ +#version 450 + +layout (binding = 1) uniform samplerCube samplerEnv; + +layout (location = 0) in vec3 inUVW; + +layout (location = 0) out vec4 outFragColor; + +void main() +{ + outFragColor = texture(samplerEnv, inUVW); +} \ No newline at end of file diff --git a/data/shaders/pbr/skybox.frag.spv b/data/shaders/pbr/skybox.frag.spv new file mode 100644 index 0000000000000000000000000000000000000000..f01311db10a0c1ae962cd31f72c21a1701d65ff4 GIT binary patch literal 564 zcmYk2OG`pg6oq%*u3DClj3R>2nu~*qAZilj#95SMp$Nf8T&*A2uWAzXeOIOSW#4_) zI%~g9QaCF`Z19z1KbF>r0yv@)#XR=0{39WATs;-|lAPSq4Ox#x8L_oV<@;v-|1iGS}Lp>C^Lo z*rSrUC%7gy=QKxuxD9q*@6BK9n@r_g?R>(>&j*}~a4q~0z4MEmxy8Rs^abRvSJ)Zk zj+kbfsDAlM99Cw3?U48&m8YqWKRfP&dLLAzg^df=)O1QM##tLo|Z)7_Xm%IWz z5>Leq692dMN@b(T%s=zb%+7f0wa#T@F6p;mc1?MfO-5Sd|KrHa}-L_aX5+6@jM#G;lcC$S#)}CnyPfMFPPqTUJQm`jf-=SB<)+36mIG6 z#*8OnKhB16R>a>0Jolve+X& zYA;Ds2OqV;ylH%E!pqWugj%~5UXjh&6ke64R$06JF8C1YuSqi_`=dUX{oy0NQQ7c) z{X4RKKkofNV$6?s@E^(IZuF!cv$Aja%=$!{9AE!w6~hl7%=du*Qm+6Wcjr*|k377M zH}bO2YZ7+(R#A2iJ`{s{Z%UYjeZXgi+Y~}}P8(=Qx2E+TS IPOl{Y0D7rc=l}o! literal 0 HcmV?d00001 diff --git a/pbr/pbr.cpp b/pbr/pbr.cpp index cd7a95dd..edbbac87 100644 --- a/pbr/pbr.cpp +++ b/pbr/pbr.cpp @@ -33,8 +33,7 @@ struct Material { float roughness; float metallic; - float ao; - float rim = 0.15f; + float r,g,b; // Color components as single floats because we use push constants }; class VulkanExample : public VulkanExampleBase @@ -43,7 +42,8 @@ public: bool displaySkybox = true; vks::TextureCubeMap envmap; - vks::TextureCubeMap irradiancemap; + vks::TextureCubeMap envmapiblDiff; + vks::TextureCubeMap envmapiblRefl; // Vertex layout for the models vks::VertexLayout vertexLayout = vks::VertexLayout({ @@ -88,8 +88,8 @@ public: title = "Vulkan Example - Physical based rendering"; enableTextOverlay = true; camera.type = Camera::CameraType::firstperson; - camera.setPosition(glm::vec3(-15.0f, 4.0f, -4.0f)); - camera.setRotation(glm::vec3(-15.0f, -70.0f, 0.0f)); + camera.setPosition(glm::vec3(8.0f, 7.25f, -13.0f)); + camera.setRotation(glm::vec3(-31.0f, 24.0f, 0.0f)); camera.movementSpeed = 4.0f; camera.setPerspective(60.0f, (float)width / (float)height, 0.1f, 256.0f); camera.rotationSpeed = 0.25f; @@ -113,7 +113,8 @@ public: uniformBuffers.object.destroy(); uniformBuffers.skybox.destroy(); envmap.destroy(); - irradiancemap.destroy(); + envmapiblDiff.destroy(); + envmapiblRefl.destroy(); } void reBuildCommandBuffers() @@ -177,7 +178,19 @@ public: vkCmdBindPipeline(drawCmdBuffers[i], VK_PIPELINE_BIND_POINT_GRAPHICS, pipelines.pbr); Material mat; - mat.ao = 1.0f; + mat.r = 1.0f; + mat.g = 0.0f; + mat.b = 0.0f; + +//#define SINGLE_MESH 1 +#ifdef SINGLE_MESH + mat.metallic = 0.1; + mat.roughness = 1.0; + glm::vec3 pos = glm::vec3(0.0f); + vkCmdPushConstants(drawCmdBuffers[i], pipelineLayout, VK_SHADER_STAGE_VERTEX_BIT, 0, sizeof(glm::vec3), &pos); + vkCmdPushConstants(drawCmdBuffers[i], pipelineLayout, VK_SHADER_STAGE_FRAGMENT_BIT, sizeof(glm::vec3), sizeof(Material), &mat); + vkCmdDrawIndexed(drawCmdBuffers[i], models.objects[models.objectIndex].indexCount, 1, 0, 0, 0); +#else for (uint32_t y = 0; y < GRID_DIM; y++) { for (uint32_t x = 0; x < GRID_DIM; x++) { glm::vec3 pos = glm::vec3(float(x - (GRID_DIM / 2.0f)) * 2.5f, 0.0f, float(y - (GRID_DIM / 2.0f)) * 2.5f); @@ -188,7 +201,7 @@ public: vkCmdDrawIndexed(drawCmdBuffers[i], models.objects[models.objectIndex].indexCount, 1, 0, 0, 0); } } - +#endif vkCmdEndRenderPass(drawCmdBuffers[i]); VK_CHECK_RESULT(vkEndCommandBuffer(drawCmdBuffers[i])); @@ -200,14 +213,16 @@ public: // Skybox models.skybox.loadFromFile(getAssetPath() + "models/cube.obj", vertexLayout, 1.0f, vulkanDevice, queue); // Objects - std::vector filenames = { "sphere.obj", "teapot.dae", "torusknot.obj", "venus.fbx" }; + std::vector filenames = { "geosphere.obj", "teapot.dae", "torusknot.obj", "suzanne.obj" }; for (auto file : filenames) { vks::Model model; - model.loadFromFile(getAssetPath() + "models/" + file, vertexLayout, OBJ_DIM * (file == "venus.fbx" ? 3.0f : 1.0f) , vulkanDevice, queue); + model.loadFromFile(getAssetPath() + "models/" + file, vertexLayout, OBJ_DIM * (file == "suzanne.obj" ? 2.0f : 1.0f), vulkanDevice, queue); models.objects.push_back(model); } - envmap.loadFromFile(getAssetPath() + "textures/cube_env_01_bc3.ktx", VK_FORMAT_BC3_UNORM_BLOCK, vulkanDevice, queue); - irradiancemap.loadFromFile(getAssetPath() + "textures/cube_env_01_irradiance_rgba8.ktx", VK_FORMAT_R8G8B8A8_UNORM, vulkanDevice, queue); + // Example uses three different cubemaps (environment, diffuse for IBL (irradiance) and reflective for IBL) + envmap.loadFromFile(getAssetPath() + "textures/cubemap_uffizi_env.dds", VK_FORMAT_BC3_UNORM_BLOCK, vulkanDevice, queue); + envmapiblDiff.loadFromFile(getAssetPath() + "textures/cubemap_uffizi_ibl_diff.dds", VK_FORMAT_R8G8B8A8_UNORM, vulkanDevice, queue); + envmapiblRefl.loadFromFile(getAssetPath() + "textures/cubemap_uffizi_ibl_refl.dds", VK_FORMAT_R8G8B8A8_UNORM, vulkanDevice, queue); } void setupDescriptorSetLayout() @@ -216,19 +231,16 @@ public: vks::initializers::descriptorSetLayoutBinding(VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, VK_SHADER_STAGE_VERTEX_BIT | VK_SHADER_STAGE_FRAGMENT_BIT, 0), vks::initializers::descriptorSetLayoutBinding(VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, VK_SHADER_STAGE_FRAGMENT_BIT, 1), vks::initializers::descriptorSetLayoutBinding(VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, VK_SHADER_STAGE_FRAGMENT_BIT, 2), + vks::initializers::descriptorSetLayoutBinding(VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, VK_SHADER_STAGE_FRAGMENT_BIT, 3), }; VkDescriptorSetLayoutCreateInfo descriptorLayout = - vks::initializers::descriptorSetLayoutCreateInfo( - setLayoutBindings.data(), - setLayoutBindings.size()); + vks::initializers::descriptorSetLayoutCreateInfo(setLayoutBindings); VK_CHECK_RESULT(vkCreateDescriptorSetLayout(device, &descriptorLayout, nullptr, &descriptorSetLayout)); VkPipelineLayoutCreateInfo pipelineLayoutCreateInfo = - vks::initializers::pipelineLayoutCreateInfo( - &descriptorSetLayout, - 1); + vks::initializers::pipelineLayoutCreateInfo(&descriptorSetLayout, 1); std::vector pushConstantRanges = { vks::initializers::pushConstantRange(VK_SHADER_STAGE_VERTEX_BIT, sizeof(glm::vec3), 0), @@ -246,11 +258,11 @@ public: // Descriptor Pool std::vector poolSizes = { vks::initializers::descriptorPoolSize(VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, 2), - vks::initializers::descriptorPoolSize(VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, 4) + vks::initializers::descriptorPoolSize(VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, 6) }; VkDescriptorPoolCreateInfo descriptorPoolInfo = - vks::initializers::descriptorPoolCreateInfo(poolSizes.size(), poolSizes.data(), 2); + vks::initializers::descriptorPoolCreateInfo(poolSizes, 2); VK_CHECK_RESULT(vkCreateDescriptorPool(device, &descriptorPoolInfo, nullptr, &descriptorPool)); @@ -265,19 +277,19 @@ public: std::vector writeDescriptorSets = { vks::initializers::writeDescriptorSet(descriptorSets.object, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, 0, &uniformBuffers.object.descriptor), vks::initializers::writeDescriptorSet(descriptorSets.object, VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, 1, &envmap.descriptor), - vks::initializers::writeDescriptorSet(descriptorSets.object, VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, 2, &irradiancemap.descriptor), + vks::initializers::writeDescriptorSet(descriptorSets.object, VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, 2, &envmapiblDiff.descriptor), + vks::initializers::writeDescriptorSet(descriptorSets.object, VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, 3, &envmapiblRefl.descriptor), }; - vkUpdateDescriptorSets(device, writeDescriptorSets.size(), writeDescriptorSets.data(), 0, NULL); + vkUpdateDescriptorSets(device, static_cast(writeDescriptorSets.size()), writeDescriptorSets.data(), 0, NULL); // Sky box descriptor set VK_CHECK_RESULT(vkAllocateDescriptorSets(device, &allocInfo, &descriptorSets.skybox)); writeDescriptorSets = { vks::initializers::writeDescriptorSet(descriptorSets.skybox, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, 0, &uniformBuffers.skybox.descriptor), - vks::initializers::writeDescriptorSet(descriptorSets.skybox, VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, 1, &envmap.descriptor), - vks::initializers::writeDescriptorSet(descriptorSets.skybox, VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, 2, &irradiancemap.descriptor), + vks::initializers::writeDescriptorSet(descriptorSets.skybox, VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, 1, &envmapiblRefl.descriptor), }; - vkUpdateDescriptorSets(device, writeDescriptorSets.size(), writeDescriptorSets.data(), 0, NULL); + vkUpdateDescriptorSets(device, static_cast(writeDescriptorSets.size()), writeDescriptorSets.data(), 0, NULL); } void preparePipelines() @@ -308,7 +320,7 @@ public: VK_DYNAMIC_STATE_SCISSOR }; VkPipelineDynamicStateCreateInfo dynamicState = - vks::initializers::pipelineDynamicStateCreateInfo(dynamicStateEnables.data(), dynamicStateEnables.size()); + vks::initializers::pipelineDynamicStateCreateInfo(dynamicStateEnables); VkGraphicsPipelineCreateInfo pipelineCreateInfo = vks::initializers::pipelineCreateInfo(pipelineLayout, renderPass); @@ -322,7 +334,7 @@ public: pipelineCreateInfo.pViewportState = &viewportState; pipelineCreateInfo.pDepthStencilState = &depthStencilState; pipelineCreateInfo.pDynamicState = &dynamicState; - pipelineCreateInfo.stageCount = shaderStages.size(); + pipelineCreateInfo.stageCount = static_cast(shaderStages.size()); pipelineCreateInfo.pStages = shaderStages.data(); // Vertex bindings an attributes @@ -391,7 +403,7 @@ public: // 3D object uboVS.projection = camera.matrices.perspective; uboVS.view = camera.matrices.view; - uboVS.model = glm::rotate(glm::mat4(), glm::radians(45.0f), glm::vec3(0.0f, 1.0f, 0.0f)); + uboVS.model = glm::rotate(glm::mat4(), glm::radians(-45.0f), glm::vec3(0.0f, 1.0f, 0.0f)); uboVS.camPos = camera.position * -1.0f; memcpy(uniformBuffers.object.mapped, &uboVS, sizeof(uboVS));