1 files changed, 14 insertions, 14 deletions

diff --git a/src/blucat/graphics_pipeline_sprite_3d.cpp b/src/blucat/graphics_pipeline_sprite_3d.cpp
index a71e8bc..f87b7e1 100644
--- a/src/blucat/graphics_pipeline_sprite_3d.cpp
+++ b/src/blucat/graphics_pipeline_sprite_3d.cpp
@@ -18,7 +18,6 @@
 
 #include <array>
 
-#include "../core.hpp"
 #include "core.hpp"
 #include "sprite.hpp"
 #include "uniform_data_object.hpp"
@@ -56,7 +55,7 @@ load_pipeline(void *obj)
   vert_shader_stage_info.flags = 0;
   vert_shader_stage_info.stage = VK_SHADER_STAGE_VERTEX_BIT;
   vert_shader_stage_info.module =
-    cg_core.vk_device_with_swapchain->vert_sprite_3d_shader_module;
+    BluCat::core.vk_device_with_swapchain->vert_sprite_3d_shader_module;
   vert_shader_stage_info.pName = "main";
   vert_shader_stage_info.pSpecializationInfo = nullptr;
 
@@ -67,7 +66,7 @@ load_pipeline(void *obj)
   frag_shader_stage_info.flags = 0;
   frag_shader_stage_info.stage = VK_SHADER_STAGE_FRAGMENT_BIT;
   frag_shader_stage_info.module =
-    cg_core.vk_device_with_swapchain->frag_sprite_3d_shader_module;
+    BluCat::core.vk_device_with_swapchain->frag_sprite_3d_shader_module;
   frag_shader_stage_info.pName = "main";
   frag_shader_stage_info.pSpecializationInfo = nullptr;
 
@@ -110,14 +109,14 @@ load_pipeline(void *obj)
   VkViewport viewport = {};
   viewport.x = 0;
   viewport.y = 0;
-  viewport.width = cg_core.display_width;
-  viewport.height = cg_core.display_height;
+  viewport.width = BluCat::core.display_width;
+  viewport.height = BluCat::core.display_height;
   viewport.minDepth = 0.0f;
   viewport.maxDepth = 1.0f;
 
   VkRect2D scissor = {};
   scissor.offset = {0, 0};
-  scissor.extent = {cg_core.display_width, cg_core.display_height};
+  scissor.extent = {BluCat::core.display_width, BluCat::core.display_height};
 
   VkPipelineViewportStateCreateInfo viewport_state = {};
   viewport_state.sType =
@@ -222,14 +221,14 @@ load_pipeline(void *obj)
   pipeline_info.pDepthStencilState = &depth_stencil;
   pipeline_info.pColorBlendState = &color_blending;
   pipeline_info.pDynamicState = &dynamic_state_info;
-  pipeline_info.layout = cg_core.vk_graphics_pipeline_3d_layout->pipeline;
-  pipeline_info.renderPass = cg_core.vk_render_pass->pipeline_3d;
+  pipeline_info.layout = BluCat::core.vk_graphics_pipeline_3d_layout->pipeline;
+  pipeline_info.renderPass = BluCat::core.vk_render_pass->pipeline_3d;
   pipeline_info.subpass = 0;
   pipeline_info.basePipelineHandle = VK_NULL_HANDLE;
   pipeline_info.basePipelineIndex = -1;
 
   if(vkCreateGraphicsPipelines(
-       cg_core.vk_device_with_swapchain->device, VK_NULL_HANDLE, 1,
+       BluCat::core.vk_device_with_swapchain->device, VK_NULL_HANDLE, 1,
        &pipeline_info, nullptr, &self->graphic_pipeline)
      != VK_SUCCESS)
     throw CommandError{"Failed to create graphics pipeline sprite 3d."};
@@ -241,7 +240,8 @@ unload_pipeline(void *obj)
   auto self = static_cast<BluCat::GraphicsPipelineSprite3D*>(obj);
 
   vkDestroyPipeline(
-    cg_core.vk_device_with_swapchain->device, self->graphic_pipeline, nullptr);
+    BluCat::core.vk_device_with_swapchain->device, self->graphic_pipeline,
+		nullptr);
 }
 
 const CommandChain loader{
@@ -275,10 +275,10 @@ GraphicsPipelineSprite3D::draw(
   std::vector<Sprite3DOrder> sprite_3d_order;
   { // Sort sprites 3D
     sprite_3d_order.reserve(
-      cg_core.vk_renderer->sprites_3d_to_draw[current_frame].size());
+      core.vk_renderer->sprites_3d_to_draw[current_frame].size());
 
     for(std::shared_ptr<BluCat::Sprite3D> sprite:
-	  cg_core.vk_renderer->sprites_3d_to_draw[current_frame])
+	  core.vk_renderer->sprites_3d_to_draw[current_frame])
       sprite_3d_order.emplace_back(
 	sprite, glm::distance(*view->camera_position, *sprite->position));
 
@@ -289,7 +289,7 @@ GraphicsPipelineSprite3D::draw(
   for(auto& sprite: sprite_3d_order)
   {
     std::array<VkDescriptorSet, 4> vk_descriptor_sets{
-      cg_core.vk_light->descriptor_sets_world[image_index],
+      core.vk_light->descriptor_sets_world[image_index],
       view->descriptor_sets_3d[image_index],
       sprite.sprite_3d->descriptor_sets[image_index],
       sprite.sprite_3d->sprite->texture->descriptor_sets[image_index]};
@@ -300,7 +300,7 @@ GraphicsPipelineSprite3D::draw(
       &sprite.sprite_3d->sprite->vertex_buffer->buffer, offsets);
     vkCmdBindDescriptorSets(
       draw_command_buffer, VK_PIPELINE_BIND_POINT_GRAPHICS,
-      cg_core.vk_graphics_pipeline_3d_layout->pipeline, 0,
+      core.vk_graphics_pipeline_3d_layout->pipeline, 0,
       vk_descriptor_sets.size(), vk_descriptor_sets.data(), 0, nullptr);
 
     UDOSprite3D ubo_sprite_3d{};