diff options
Diffstat (limited to 'src/vk/graphics_pipeline_3d_skeletal.cpp')
| -rw-r--r-- | src/vk/graphics_pipeline_3d_skeletal.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/vk/graphics_pipeline_3d_skeletal.cpp b/src/vk/graphics_pipeline_3d_skeletal.cpp index 3e1db66..43f21d6 100644 --- a/src/vk/graphics_pipeline_3d_skeletal.cpp +++ b/src/vk/graphics_pipeline_3d_skeletal.cpp @@ -38,7 +38,7 @@ load_world_vert_uniform_buffer(void *obj) self->ub_world_vert.reserve(cg_core.vk_swapchain->images_count); for(auto i{0}; i < cg_core.vk_swapchain->images_count; i++) self->ub_world_vert.emplace_back( - cg_core.vk_device_with_swapchain, sizeof(VK::ODOWorld3D_Vert)); + cg_core.vk_device_with_swapchain, sizeof(VK::UDOWorld3D_Vert)); } catch(const std::exception& e) { @@ -64,7 +64,7 @@ load_world_frag_uniform_buffer(void *obj) self->ub_world_frag.reserve(cg_core.vk_swapchain->images_count); for(auto i{0}; i < cg_core.vk_swapchain->images_count; i++) self->ub_world_frag.emplace_back( - cg_core.vk_device_with_swapchain, sizeof(VK::ODOWorld3D_Frag)); + cg_core.vk_device_with_swapchain, sizeof(VK::UDOWorld3D_Frag)); } catch(const std::exception& e) { @@ -148,12 +148,12 @@ load_resources_to_descriptor_sets(void *obj) VkDescriptorBufferInfo world_vert_info{}; world_vert_info.buffer = self->ub_world_vert[i].buffer; world_vert_info.offset = 0; - world_vert_info.range = sizeof(VK::ODOWorld3D_Vert); + world_vert_info.range = sizeof(VK::UDOWorld3D_Vert); VkDescriptorBufferInfo world_frag_info{}; world_frag_info.buffer = self->ub_world_frag[i].buffer; world_frag_info.offset = 0; - world_frag_info.range = sizeof(VK::ODOWorld3D_Frag); + world_frag_info.range = sizeof(VK::UDOWorld3D_Frag); std::array<VkWriteDescriptorSet, 2> write_descriptors{}; write_descriptors[0].sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET; @@ -606,18 +606,18 @@ GraphicsPipeline3DSkeletal::draw( vkCmdDrawIndexed( draw_command_buffer, skeletal_mesh->index_count, 1, 0, 0, 0); - VK::ODOSkeletalModel odo_skeletal_model{}; + VK::UDOSkeletalModel udo_skeletal_model{}; instance->tick(cg_core.delta_time); - odo_skeletal_model.base_matrix = base_matrix; + udo_skeletal_model.base_matrix = base_matrix; std::copy(instance->bone_transforms.begin(), instance->bone_transforms.end(), - odo_skeletal_model.bone_matrices); - instance->uniform_buffers[image_index].copy_data(&odo_skeletal_model); + udo_skeletal_model.bone_matrices); + instance->uniform_buffers[image_index].copy_data(&udo_skeletal_model); } } { // Update view uniform buffers - VK::ODOView3D ubo_view_3d{}; + VK::UDOView3D ubo_view_3d{}; // View matrix. ubo_view_3d.view = glm::mat4{1.0f}; @@ -642,11 +642,11 @@ GraphicsPipeline3DSkeletal::draw( // TODO: Do not update this for each view. All views use the same data. { // Update world uniform buffer - ODOWorld3D_Vert ubo_world_3d_vert{}; + UDOWorld3D_Vert ubo_world_3d_vert{}; ubo_world_3d_vert.ambient_light_color = glm::vec4{0.25, 0.25, 0.25, 1.0}; this->ub_world_vert[image_index].copy_data(&ubo_world_3d_vert); - ODOWorld3D_Frag ubo_world_3d_frag{}; + UDOWorld3D_Frag ubo_world_3d_frag{}; ubo_world_3d_frag.directional_light_direction = glm::vec3{-0.57735, 0.57735, -0.57735}; ubo_world_3d_frag.directional_light_color = glm::vec4{0.8, 0.8, 0.8, 1.0}; |