@@ -166,8 +166,8 @@ void Application::cleanup() {
166166 m_device.destroy (m_vertexBuffer);
167167 m_device.free (m_vertexBufferMemory);
168168
169- m_device.destroy (textureSampler );
170- m_device.destroy (textureImageView );
169+ m_device.destroy (m_textureSampler );
170+ m_device.destroy (m_textureImageView );
171171
172172 m_device.free (m_textureImageMemory);
173173 m_device.destroy (m_textureImage);
@@ -333,9 +333,9 @@ void Application::recreateSwapChain() {
333333void Application::cleanupSwapChain () {
334334 // Depth resources freed out of creation order because it needs to be
335335 // freed at swap chain recreation
336- m_device.destroy (depthImageView );
337- m_device.destroy (depthImage );
338- m_device.free (depthImageMemory );
336+ m_device.destroy (m_depthImageView );
337+ m_device.destroy (m_depthImage );
338+ m_device.free (m_depthImageMemory );
339339
340340 for (const auto & frameBuffer : m_swapChainFrameBuffers) {
341341 m_device.destroy (frameBuffer);
@@ -593,19 +593,20 @@ void Application::createDepthResources() {
593593 vk::ImageTiling::eOptimal,
594594 vk::ImageUsageFlagBits::eDepthStencilAttachment,
595595 vk::MemoryPropertyFlagBits::eDeviceLocal,
596- depthImage ,
597- depthImageMemory
596+ m_depthImage ,
597+ m_depthImageMemory
598598 );
599599
600- depthImageView =
601- createImageView (depthImage, depthFormat, vk::ImageAspectFlagBits::eDepth);
600+ m_depthImageView = createImageView (
601+ m_depthImage, depthFormat, vk::ImageAspectFlagBits::eDepth
602+ );
602603}
603604
604605void Application::createFrameBuffers () {
605606 m_swapChainFrameBuffers.resize (m_swapChainImageViews.size ());
606607
607608 for (size_t i = 0 ; i < m_swapChainImageViews.size (); ++i) {
608- std::array attachments = {m_swapChainImageViews[i], depthImageView };
609+ std::array attachments = {m_swapChainImageViews[i], m_depthImageView };
609610
610611 const auto framebufferInfo =
611612 vk::FramebufferCreateInfo ()
@@ -691,7 +692,7 @@ void Application::createTextureImage() {
691692}
692693
693694void Application::createTextureImageView () {
694- textureImageView = createImageView (
695+ m_textureImageView = createImageView (
695696 m_textureImage, vk::Format::eR8G8B8A8Srgb, vk::ImageAspectFlagBits::eColor
696697 );
697698}
@@ -713,15 +714,15 @@ void Application::createTextureSampler() {
713714 samplerInfo.compareOp = vk::CompareOp::eAlways;
714715 samplerInfo.mipmapMode = vk::SamplerMipmapMode::eLinear;
715716
716- textureSampler = m_device.createSampler (samplerInfo);
717+ m_textureSampler = m_device.createSampler (samplerInfo);
717718}
718719
719720void Application::loadModel () {
720- ModelLoader::loadObj (" res/models/viking_room.obj" , vertices, indices );
721+ ModelLoader::loadObj (" res/models/viking_room.obj" , m_vertices, m_indices );
721722}
722723
723724void Application::createVertexBuffer () {
724- size_t bufferSize = sizeof (vertices [0 ]) * vertices .size ();
725+ size_t bufferSize = sizeof (m_vertices [0 ]) * m_vertices .size ();
725726
726727 vk::Buffer stagingBuffer;
727728 vk::DeviceMemory stagingBufferMemory;
@@ -736,7 +737,7 @@ void Application::createVertexBuffer() {
736737 );
737738
738739 void * data = m_device.mapMemory (stagingBufferMemory, 0 , bufferSize);
739- memcpy (data, vertices .data (), static_cast <size_t >(bufferSize));
740+ memcpy (data, m_vertices .data (), static_cast <size_t >(bufferSize));
740741 m_device.unmapMemory (stagingBufferMemory);
741742
742743 createBuffer (
@@ -755,7 +756,7 @@ void Application::createVertexBuffer() {
755756}
756757
757758void Application::createIndexBuffer () {
758- vk::DeviceSize bufferSize = sizeof (indices [0 ]) * indices .size ();
759+ vk::DeviceSize bufferSize = sizeof (m_indices [0 ]) * m_indices .size ();
759760
760761 vk::Buffer stagingBuffer;
761762 vk::DeviceMemory stagingBufferMemory;
@@ -770,7 +771,7 @@ void Application::createIndexBuffer() {
770771 );
771772
772773 void * data = m_device.mapMemory (stagingBufferMemory, 0 , bufferSize, {});
773- memcpy (data, indices .data (), static_cast <size_t >(bufferSize));
774+ memcpy (data, m_indices .data (), static_cast <size_t >(bufferSize));
774775 m_device.unmapMemory (stagingBufferMemory);
775776
776777 createBuffer (
@@ -851,8 +852,8 @@ void Application::createDescriptorSets() {
851852
852853 vk::DescriptorImageInfo imageInfo;
853854 imageInfo.imageLayout = vk::ImageLayout::eShaderReadOnlyOptimal;
854- imageInfo.imageView = textureImageView ;
855- imageInfo.sampler = textureSampler ;
855+ imageInfo.imageView = m_textureImageView ;
856+ imageInfo.sampler = m_textureSampler ;
856857
857858 const std::array descriptorWrites{
858859 vk::WriteDescriptorSet ()
@@ -1059,7 +1060,9 @@ void Application::recordCommandBuffer(
10591060 m_descriptorSets[m_currentFrame],
10601061 {}
10611062 );
1062- commandBuffer.drawIndexed (static_cast <uint32_t >(indices.size ()), 1 , 0 , 0 , 0 );
1063+ commandBuffer.drawIndexed (
1064+ static_cast <uint32_t >(m_indices.size ()), 1 , 0 , 0 , 0
1065+ );
10631066 commandBuffer.endRenderPass ();
10641067 commandBuffer.end ();
10651068}
0 commit comments