diff options
Diffstat (limited to 'src/blucat/view_2d.cpp')
| -rw-r--r-- | src/blucat/view_2d.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/blucat/view_2d.cpp b/src/blucat/view_2d.cpp index f27b4c4..de764ce 100644 --- a/src/blucat/view_2d.cpp +++ b/src/blucat/view_2d.cpp @@ -18,7 +18,7 @@ #include <array> -#include "../core.hpp" +#include "core.hpp" #include "uniform_data_object.hpp" namespace @@ -31,10 +31,10 @@ load_2d_uniform_buffer(void *obj) try { - self->ub_2d.reserve(cg_core.vk_swapchain->images_count); - for(auto i{0}; i < cg_core.vk_swapchain->images_count; i++) + self->ub_2d.reserve(BluCat::core.vk_swapchain->images_count); + for(auto i{0}; i < BluCat::core.vk_swapchain->images_count; i++) self->ub_2d.emplace_back( - cg_core.vk_device_with_swapchain, sizeof(BluCat::UDOView2D)); + BluCat::core.vk_device_with_swapchain, sizeof(BluCat::UDOView2D)); } catch(const std::exception& e) { @@ -56,8 +56,8 @@ load_descriptor_sets_2d(void *obj) auto self = static_cast<BluCat::View2D*>(obj); std::vector<VkDescriptorSetLayout> layouts( - cg_core.vk_swapchain->images_count, - cg_core.vk_descriptor_set_layout->view); + BluCat::core.vk_swapchain->images_count, + BluCat::core.vk_descriptor_set_layout->view); VkDescriptorSetAllocateInfo alloc_info{}; alloc_info.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOCATE_INFO; @@ -67,7 +67,7 @@ load_descriptor_sets_2d(void *obj) self->descriptor_sets_2d.resize(layouts.size()); if(vkAllocateDescriptorSets( - cg_core.vk_device_with_swapchain->device, &alloc_info, + BluCat::core.vk_device_with_swapchain->device, &alloc_info, self->descriptor_sets_2d.data()) != VK_SUCCESS) throw CommandError{"Failed to create Vulkan descriptor sets for view."}; } @@ -96,7 +96,7 @@ load_resources_to_descriptor_sets_2d(void *obj) write_descriptors[0].pTexelBufferView = nullptr; vkUpdateDescriptorSets( - cg_core.vk_device_with_swapchain->device, write_descriptors.size(), + BluCat::core.vk_device_with_swapchain->device, write_descriptors.size(), write_descriptors.data(), 0, nullptr); BluCat::UDOView2D ubo_view_2d; @@ -128,8 +128,8 @@ View2D::View2D( projection_height{projection_height}, region{region}, descriptor_pool{VK_NULL_HANDLE}, - rectangles_to_draw{cg_core.vk_swapchain->images_count}, - sprites_to_draw{cg_core.vk_swapchain->images_count} + rectangles_to_draw{BluCat::core.vk_swapchain->images_count}, + sprites_to_draw{BluCat::core.vk_swapchain->images_count} { loader.execute(this); } |