refa Move BluCan initialization to BluCat folderHEADmaster

1 files changed, 14 insertions, 14 deletions

diff --git a/src/blucat/light.cpp b/src/blucat/light.cpp
index 5efc6ec..43611a1 100644
--- a/src/blucat/light.cpp
+++ b/src/blucat/light.cpp
@@ -18,7 +18,7 @@
 
 #include <array>
 
-#include "../core.hpp"
+#include "core.hpp"
 #include "uniform_data_object.hpp"
 
 namespace
@@ -31,10 +31,10 @@ load_world_vert_uniform_buffer(void *obj)
 
   try
   {
-    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.reserve(BluCat::core.vk_swapchain->images_count);
+    for(auto i{0}; i < BluCat::core.vk_swapchain->images_count; i++)
       self->ub_world_vert.emplace_back(
-	cg_core.vk_device_with_swapchain, sizeof(BluCat::UDOWorld3D_Vert));
+	BluCat::core.vk_device_with_swapchain, sizeof(BluCat::UDOWorld3D_Vert));
   }
   catch(const std::exception& e)
   {
@@ -57,10 +57,10 @@ load_world_frag_uniform_buffer(void *obj)
 
   try
   {
-    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.reserve(BluCat::core.vk_swapchain->images_count);
+    for(auto i{0}; i < BluCat::core.vk_swapchain->images_count; i++)
       self->ub_world_frag.emplace_back(
-	cg_core.vk_device_with_swapchain, sizeof(BluCat::UDOWorld3D_Frag));
+	BluCat::core.vk_device_with_swapchain, sizeof(BluCat::UDOWorld3D_Frag));
   }
   catch(const std::exception& e)
   {
@@ -97,7 +97,7 @@ load_descriptor_pool(void *obj)
   pool_info.pPoolSizes = &descriptor_pool_size;
 
   if(vkCreateDescriptorPool(
-       cg_core.vk_device_with_swapchain->device, &pool_info, nullptr,
+       BluCat::core.vk_device_with_swapchain->device, &pool_info, nullptr,
        &self->descriptor_pool) != VK_SUCCESS)
     throw CommandError{"Failed to create a Vulkan descriptor pool."};
 }
@@ -108,7 +108,7 @@ unload_descriptor_pool(void *obj)
   auto self = static_cast<BluCat::Light*>(obj);
 
   vkDestroyDescriptorPool(
-    cg_core.vk_device_with_swapchain->device, self->descriptor_pool,
+    BluCat::core.vk_device_with_swapchain->device, self->descriptor_pool,
     nullptr);
 }
 
@@ -118,8 +118,8 @@ load_descriptor_sets_world(void *obj)
   auto self = static_cast<BluCat::Light*>(obj);
 
   std::vector<VkDescriptorSetLayout> layouts(
-    cg_core.vk_swapchain->images_count,
-    cg_core.vk_descriptor_set_layout->world);
+    BluCat::core.vk_swapchain->images_count,
+    BluCat::core.vk_descriptor_set_layout->world);
 
   VkDescriptorSetAllocateInfo alloc_info{};
   alloc_info.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOCATE_INFO;
@@ -129,7 +129,7 @@ load_descriptor_sets_world(void *obj)
 
   self->descriptor_sets_world.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_world.data()) != VK_SUCCESS)
     throw CommandError{"Failed to create Vulkan world descriptor set."};
 }
@@ -139,7 +139,7 @@ load_resources_to_descriptor_sets(void *obj)
 {
   auto self = static_cast<BluCat::Light*>(obj);
 
-  for(auto i{0}; i < cg_core.vk_swapchain->images_count; i++)
+  for(auto i{0}; i < BluCat::core.vk_swapchain->images_count; i++)
   {
     VkDescriptorBufferInfo world_vert_info{};
     world_vert_info.buffer = self->ub_world_vert[i].buffer;
@@ -173,7 +173,7 @@ load_resources_to_descriptor_sets(void *obj)
     write_descriptors[1].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);
   }
 }