refa Remove View2DHEADmaster

View2D is almost useless and add too much complexity for the engine,
so I am removing it.

1 files changed, 118 insertions, 45 deletions

diff --git a/src/blu_cat/gra/renderer.cpp b/src/blu_cat/gra/renderer.cpp
index d13f814..36b9925 100644
--- a/src/blu_cat/gra/renderer.cpp
+++ b/src/blu_cat/gra/renderer.cpp
@@ -25,15 +25,39 @@ namespace
 {
 
 void
+load_2d_uniform_buffer(void *obj)
+{
+  auto self = static_cast<BluCat::GRA::Renderer*>(obj);
+
+  try
+  {
+    self->ub_2d.reserve(BluCat::INT::core.vk_swapchain->images_count);
+    for(auto i{0}; i < BluCat::INT::core.vk_swapchain->images_count; i++)
+      self->ub_2d.emplace_back(
+				BluCat::INT::core.vk_device_with_swapchain,
+				sizeof(BluCat::GRA::UDOView2D));
+  }
+  catch(const std::exception& e)
+  {
+    throw CommandError{e.what()};
+  }
+}
+
+void
+unload_2d_uniform_buffer(void *obj)
+{
+  auto self = static_cast<BluCat::GRA::Renderer*>(obj);
+
+  self->ub_2d.clear();
+}
+
+void
 load_descriptor_pool(void *obj)
 {
   auto self = static_cast<BluCat::GRA::Renderer*>(obj);
 
-  uint32_t uniform_buffer_count = 0;
-  for(auto &view : self->views_3d)
-    uniform_buffer_count += (view->ub_3d.size() + view->ub_2d.size());
-  for(auto &view : self->views_2d)
-    uniform_buffer_count += (view->ub_2d.size());
+  uint32_t uniform_buffer_count = self->ub_2d.size();
+  for(auto &view : self->views) uniform_buffer_count += view->ub_3d.size();
 
   VkDescriptorPoolSize descriptor_pool_size{};
   descriptor_pool_size.type = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER;
@@ -52,9 +76,7 @@ load_descriptor_pool(void *obj)
        &self->descriptor_pool) != VK_SUCCESS)
     throw CommandError{"Failed to create a Vulkan descriptor pool."};
 
-  for(auto &view : self->views_3d)
-    view->load_descriptor_sets(self->descriptor_pool);
-  for(auto &view : self->views_2d)
+  for(auto &view : self->views)
     view->load_descriptor_sets(self->descriptor_pool);
 }
 
@@ -63,8 +85,7 @@ unload_descriptor_pool(void *obj)
 {
   auto self = static_cast<BluCat::GRA::Renderer*>(obj);
 
-  for(auto &view : self->views_3d) view->unload_descriptor_sets();
-  for(auto &view : self->views_2d) view->unload_descriptor_sets();
+  for(auto &view : self->views) view->unload_descriptor_sets();
 
   vkDestroyDescriptorPool(
     BluCat::INT::core.vk_device_with_swapchain->device, self->descriptor_pool,
@@ -72,6 +93,64 @@ unload_descriptor_pool(void *obj)
 }
 
 void
+load_descriptor_sets_2d(void *obj)
+{
+  auto self = static_cast<BluCat::GRA::Renderer*>(obj);
+
+  std::vector<VkDescriptorSetLayout> layouts(
+    BluCat::INT::core.vk_swapchain->images_count,
+    BluCat::INT::core.vk_descriptor_set_layout->view);
+
+  VkDescriptorSetAllocateInfo alloc_info{};
+  alloc_info.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOCATE_INFO;
+  alloc_info.descriptorPool = self->descriptor_pool;
+  alloc_info.descriptorSetCount = layouts.size();
+  alloc_info.pSetLayouts = layouts.data();
+
+  self->descriptor_sets_2d.resize(layouts.size());
+  if(vkAllocateDescriptorSets(
+       BluCat::INT::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."};
+}
+
+void
+load_resources_to_descriptor_sets_2d(void *obj)
+{
+  auto self = static_cast<BluCat::GRA::Renderer*>(obj);
+
+  for(auto i{0}; i < self->ub_2d.size(); i++)
+  {
+    VkDescriptorBufferInfo view_2d_info{};
+    view_2d_info.buffer = self->ub_2d[i].buffer;
+    view_2d_info.offset = 0;
+    view_2d_info.range = sizeof(BluCat::GRA::UDOView2D);
+
+    std::array<VkWriteDescriptorSet, 1> write_descriptors{};
+    write_descriptors[0].sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET;
+    write_descriptors[0].dstSet = self->descriptor_sets_2d[i];
+    write_descriptors[0].dstBinding = 0;
+    write_descriptors[0].dstArrayElement = 0;
+    write_descriptors[0].descriptorCount = 1;
+    write_descriptors[0].descriptorType = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER;
+    write_descriptors[0].pBufferInfo = &view_2d_info;
+    write_descriptors[0].pImageInfo = nullptr;
+    write_descriptors[0].pTexelBufferView = nullptr;
+
+    vkUpdateDescriptorSets(
+      BluCat::INT::core.vk_device_with_swapchain->device, write_descriptors.size(),
+      write_descriptors.data(), 0, nullptr);
+
+    BluCat::GRA::UDOView2D ubo_view_2d;
+    ubo_view_2d.proj = glm::ortho(
+      0.0f, self->projection_width,
+      0.0f, self->projection_height,
+      0.0f, 100.0f);
+    self->ub_2d[i].copy_data(&ubo_view_2d);
+  }
+}
+
+void
 load_queue_family(void *obj)
 {
   auto self = static_cast<BluCat::GRA::Renderer*>(obj);
@@ -128,7 +207,10 @@ load_draw_command_buffer(void *obj)
 }
 
 const CommandChain loader{
+	{&load_2d_uniform_buffer, &unload_2d_uniform_buffer},
   {&load_descriptor_pool, &unload_descriptor_pool},
+	{&load_descriptor_sets_2d, nullptr},
+	{&load_resources_to_descriptor_sets_2d, nullptr},
   {&load_queue_family, nullptr},
   {&load_command_pool, &unload_command_pool},
   {&load_draw_command_buffer, nullptr}
@@ -139,21 +221,25 @@ const CommandChain loader{
 namespace BluCat::GRA
 {
 
-Renderer::Renderer(std::vector<std::shared_ptr<View2D>> views_2d,
-		   std::vector<std::shared_ptr<View3D>> views_3d):
+Renderer::Renderer(
+	std::vector<std::shared_ptr<View>> views, F32 width, F32 height):
   skeletal_models_to_draw{BluCat::INT::core.vk_swapchain->images_count},
   static_models_to_draw{BluCat::INT::core.vk_swapchain->images_count},
   sprites_3d_to_draw{BluCat::INT::core.vk_swapchain->images_count},
+	rectangles_to_draw{BluCat::INT::core.vk_swapchain->images_count},
+	sprites_to_draw{BluCat::INT::core.vk_swapchain->images_count},
+  projection_width{width},
+	projection_height{height},
 	clear_screen_color{0.0f, 0.0f, 0.0f, 1.0f},
-  views_2d{views_2d},
-  views_3d{views_3d}
+  views{views}
 {
   loader.execute(this);
 }
 
-Renderer::Renderer(std::initializer_list<std::shared_ptr<View2D>> views_2d,
-		   std::initializer_list<std::shared_ptr<View3D>> views_3d):
-  Renderer(std::vector(views_2d), std::vector(views_3d))
+Renderer::Renderer(
+	std::initializer_list<std::shared_ptr<View>> views,
+	F32 width, F32 height):
+  Renderer(std::vector(views), width, height)
 {
 }
 
@@ -251,7 +337,7 @@ Renderer::draw()
 	draw_command_buffer, &render_pass_begin, VK_SUBPASS_CONTENTS_INLINE);
     }
 
-		for(auto &view: this->views_3d)
+		for(auto &view: this->views)
 		{
 			{ // Set viewport
 				VkViewport vk_viewport{};
@@ -272,16 +358,17 @@ Renderer::draw()
 			}
 
 			BluCat::INT::core.vk_graphics_pipeline_3d->draw(
-				view, draw_command_buffer, BluCat::INT::core.vk_swapchain->current_frame,
+				view, draw_command_buffer,
+				BluCat::INT::core.vk_swapchain->current_frame,
 				image_index);
 
 			BluCat::INT::core.vk_graphics_pipeline_sprite_3d->draw(
-				view, draw_command_buffer, BluCat::INT::core.vk_swapchain->current_frame,
-				image_index);
+				view, draw_command_buffer,
+				BluCat::INT::core.vk_swapchain->current_frame, image_index);
 
 			BluCat::INT::core.vk_graphics_pipeline_3d_skeletal->draw(
-				view, draw_command_buffer, BluCat::INT::core.vk_swapchain->current_frame,
-				image_index);
+				view, draw_command_buffer,
+				BluCat::INT::core.vk_swapchain->current_frame, image_index);
 
 			{ // Update view uniform buffers
 				BluCat::GRA::UDOView3D ubo_view_3d{};
@@ -325,27 +412,15 @@ Renderer::draw()
     }
 
     { // 2D solid drawing
-      for(auto &view: this->views_2d)
-	BluCat::INT::core.vk_graphics_pipeline_2d_solid->draw(
-	  view, draw_command_buffer, BluCat::INT::core.vk_swapchain->current_frame,
-	  next_frame, image_index);
-
-      for(auto &view: this->views_3d)
-	BluCat::INT::core.vk_graphics_pipeline_2d_solid->draw(
-	  view, draw_command_buffer, BluCat::INT::core.vk_swapchain->current_frame,
-	  next_frame, image_index);
+			BluCat::INT::core.vk_graphics_pipeline_2d_solid->draw(
+				draw_command_buffer, BluCat::INT::core.vk_swapchain->current_frame,
+				next_frame, image_index);
     }
 
     { // 2D wired drawing
-      for(auto &view: this->views_2d)
-	BluCat::INT::core.vk_graphics_pipeline_2d_wired->draw(
-	  view, draw_command_buffer, BluCat::INT::core.vk_swapchain->current_frame,
-	  next_frame, image_index);
-
-      for(auto &view: this->views_3d)
-	BluCat::INT::core.vk_graphics_pipeline_2d_wired->draw(
-	  view, draw_command_buffer, BluCat::INT::core.vk_swapchain->current_frame,
-	  next_frame, image_index);
+			BluCat::INT::core.vk_graphics_pipeline_2d_wired->draw(
+				draw_command_buffer, BluCat::INT::core.vk_swapchain->current_frame,
+				next_frame, image_index);
     }
 
     vkCmdEndRenderPass(draw_command_buffer);
@@ -415,10 +490,8 @@ Renderer::draw()
 			BluCat::INT::core.vk_swapchain->current_frame].clear();
     this->sprites_3d_to_draw[
 			BluCat::INT::core.vk_swapchain->current_frame].clear();
-    for(auto &view: this->views_2d)
-      view->sprites_to_draw[BluCat::INT::core.vk_swapchain->current_frame].clear();
-    for(auto &view: this->views_3d)
-      view->sprites_to_draw[BluCat::INT::core.vk_swapchain->current_frame].clear();
+		this->sprites_to_draw[
+			BluCat::INT::core.vk_swapchain->current_frame].clear();
   }
 }