Paint Passes

Engine/CMakeLists.txt

@@ -123,6 +123,7 @@ target_include_directories(
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/Popcorn/Graphics>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/Popcorn/Graphics/Materials>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/Popcorn/Graphics/PaintPasses>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/Popcorn/Graphics/Animation>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/Popcorn/Scene>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/Popcorn/Platform/OpenGL>
@@ -141,6 +142,7 @@ target_include_directories(
   INTERFACE $<INSTALL_INTERFACE:include>
             $<INSTALL_INTERFACE:include/Popcorn/Graphics>
             $<INSTALL_INTERFACE:include/Popcorn/Graphics/Materials>
+            $<INSTALL_INTERFACE:include/Popcorn/Graphics/PaintPasses>
             $<INSTALL_INTERFACE:include/Popcorn/Graphics/Animation>
             $<INSTALL_INTERFACE:include/Popcorn/Scene>
             $<INSTALL_INTERFACE:include/Popcorn/Platform/OpenGL>

Engine/include/Popcorn.h

@@ -11,6 +11,7 @@
 #include "Scene.h"
 #include "SplineFactory.h"
 #include <iostream>
+#include <vector>
 
 ENGINE_NAMESPACE_BEGIN
 CTX_NAMESPACE_BEGIN
@@ -42,19 +43,70 @@ static void UnregisterScene(Scene &scene) { s_renderer->RemoveScene(&scene); };
 
 static void StartGame() {
   // TODO: Move the ownership of commandbuffers to Renderflow base class
-  s_renderer->CreateRenderFlows();
+  //
+  // NEW: --- Make your own renderflows ---
+  //
+  // const std::vector<PaintPass> paintPasses{};
+  // s_renderer->ProcessPaintPasses(paintPasses);
+
+  s_renderer->CreateRenderFlows();  // 1. Each renderflow takes in
+                                    //      a. Attachments (and Info)
+                                    //      b. RenderInfo
+                                    //      c. PipelineInfo
+                                    //
   s_renderer->PrepareRenderFlows(); // Creates attachments, renderflows,
                                     // framebuffers, and command buffers
+                                    //
   s_renderer->AssignSceneObjectsToRenderFlows(); // Sorts submeshes material
                                                  // wise & adds to renderflows
+                                                 // 1. Calculates offsets +
+                                                 //    alignment and stuff
   s_renderer->CreateRenderFlowResources(); // Renderflow submeshes converted and
                                            // copied to vulkan memory objects
+                                           // 1. Alloc Memory
+                                           // 2. Create Samplers
+                                           // 3. Alloc Shaders
+                                           // 4. Alloc DSets Global
+                                           // 5. Update DSets Global
+                                           // 6. Loops renderflows -
+                                           //       a. Alloc DSets Local
+                                           //       b. Update DSets Local
+                                           //       c. Create Pipelines
+                                           // 7. Free Shaders
 #ifdef PC_DEBUG
   // s_renderer->PrintScenes();
   // s_renderer->DebugPreGameLoop();
 #endif
 
-  s_application->StartGameLoop(); // Starts game loop
+  s_application
+      ->StartGameLoop(); // Starts game loop
+                         // 1. Update Layers - Update transforms etc. for render
+                         // 2. Render Layers -
+                         //     a. Copy Dynamic UBOs to memory
+                         //     b. Begin command buffer
+                         //     c. Begin Renderpass/rendering
+                         //     d. Set viewport & scissor
+                         //     e. Bind VBO
+                         //     f. Bind IBO
+                         //     g. Bind basicMat pipeline
+                         //     h. Bind D-Sets (global - camera stuff)
+                         //     i. Loop over material (basicMat) buckets -
+                         //         i1. Bind D-Sets (local - basic mat)
+                         //         i2. Loop over submeshes -
+                         //             i1a. Bind D-Sets (local - submesh)
+                         //             i2a. DRAW indexed
+                         //     j. Bind pbrMat pipeline
+                         //     k. Bind D-Sets (global - camera stuff)
+                         //     l. Loop over material (pbrMat) buckets -
+                         //         l1. Bind D-Sets (local - pbr mat)
+                         //         l2. Loop over submeshes -
+                         //             l1a. Bind D-Sets (local - submesh)
+                         //             l2a. DRAW indexed
+                         //     m. End Renderpass/rendering
+                         //     n. Barrier transition stuff
+                         //     o. End command buffer
+                         //
+                         //
 };
 
 static SplineFactory *GetSplineFactory() { return ContextGfx::AppSplines(); }
@@ -86,18 +138,6 @@ static void EndContext() {
 //   return *s_application;
 // };
 
-static void FillNamedLookUpMap(Scene &scene, GameObject *node) {
-  if (node == nullptr) {
-    PC_WARN("node is nullptr")
-    return;
-  }
-  scene.AddGameObjectToNamedLookUp(node->GetName(), node);
-
-  for (GameObject *child : node->GetChildren()) {
-    FillNamedLookUpMap(scene, child);
-  }
-}
-
 static void ConvertGltfToScene(const std::string &filename, Scene &scene) {
   tinygltf::Model model;
   GltfLoader::LoadFromFile(filename, model);
@@ -110,10 +150,6 @@ static void ConvertGltfToScene(const std::string &filename, Scene &scene) {
   scene.SetAnimationTracks(animationTracks);
 
   PC_WARN("ANIMATION TRACK SIZE AFTER: " << animationTracks.size())
-
-  for (GameObject *gameObj : scene.GetGameObjects()) {
-    FillNamedLookUpMap(scene, gameObj);
-  }
 };
 
 CTX_NAMESPACE_END

Engine/include/Popcorn/Core/Buffer.h

@@ -32,8 +32,8 @@ struct HasPrint<
 
 class Buffer {
 public:
-  Buffer() { 
-      // PC_PRINT("CREATED(DEFAULT)", TagType::Constr, "BUFFER") 
+  Buffer() {
+    // PC_PRINT("CREATED(DEFAULT)", TagType::Constr, "BUFFER")
   };
   ~Buffer() {
     FreeBytes();
@@ -64,13 +64,13 @@ class Buffer {
     m_size = size;
   };
 
-  [[nodiscard]] inline byte_t *GetData() const {
-    return static_cast<byte_t *>(m_data);
+  [[nodiscard]] inline PC_Byte_t *GetData() const {
+    return static_cast<PC_Byte_t *>(m_data);
   };
 
   void WriteBytes(const void *data, uint64_t size, uint64_t offset = 0) {
     PC_ASSERT(offset + size <= m_size, "WriteBytes out of bounds!");
-    memcpy(static_cast<byte_t *>(m_data) + offset, data, size);
+    memcpy(static_cast<PC_Byte_t *>(m_data) + offset, data, size);
   }
 
   //
@@ -183,13 +183,13 @@ class Buffer {
   void AllocBytes(uint64_t size) {
     FreeBytes();
 
-    m_data = new byte_t[size];
+    m_data = new PC_Byte_t[size];
     m_size = size;
   };
 
   void FreeBytes() {
     if (m_data)
-      delete[] static_cast<byte_t *>(m_data);
+      delete[] static_cast<PC_Byte_t *>(m_data);
     m_data = nullptr;
     m_size = 0;
   };

Engine/include/Popcorn/Core/Helpers.h

@@ -4,6 +4,7 @@
 #include <algorithm>
 #include <cstddef>
 #include <cstdint>
+#include <cstring>
 
 #ifdef PC_DEBUG
 #include <iostream>
@@ -12,37 +13,62 @@
 #endif
 
 ENGINE_NAMESPACE_BEGIN
-constexpr std::size_t shift_l(std::size_t n) { return 1 << n; }
+
+// --- TYPES & VALUES ------------------------------------------------------
+// --- TYPES & VALUES ------------------------------------------------------
+// --- TYPES & VALUES ------------------------------------------------------
+using PC_Byte_t = uint8_t;
+
+extern int PC_PRINT_LEVEL;
 
 enum TagType { Constr, Destr, Print };
 
-using byte_t = uint8_t;
+// --- BITWISE HELPERS -----------------------------------------------------
+// --- BITWISE HELPERS -----------------------------------------------------
+// --- BITWISE HELPERS -----------------------------------------------------
+constexpr std::size_t PC_ShiftLeft(std::size_t n) { return 1 << n; }
+
+// --- STRING HELPERS ------------------------------------------------------
+// --- STRING HELPERS ------------------------------------------------------
+// --- STRING HELPERS ------------------------------------------------------
+[[nodiscard]] static bool PC_StrEndsWith(const char *s, const char *suffix) {
+  if (!s || !suffix)
+    return false;
 
-extern int PC_print_lvl;
+  size_t sLen = strlen(s);
+  size_t suffixLen = strlen(suffix);
 
+  if (sLen < suffixLen)
+    return false;
+
+  return strcmp(s + sLen - suffixLen, suffix) == 0;
+}
+
+// --- LOGGING HELPERS -----------------------------------------------------
+// --- LOGGING HELPERS -----------------------------------------------------
+// --- LOGGING HELPERS -----------------------------------------------------
 static void PC_Print(const std::string &msg, const TagType tag,
                      const std::string &className) {
-
-  if (PC_print_lvl < 0) {
+  if (PC_PRINT_LEVEL < 0) {
     std::cout << "MISSING CONSTRUCTOR MESSAGE" << '\n';
     return;
   };
 
   if (tag == TagType::Constr) {
-    PC_print_lvl++;
+    PC_PRINT_LEVEL++;
   } else if (tag == TagType::Destr)
-    PC_print_lvl--;
+    PC_PRINT_LEVEL--;
 
   std::stringstream ss;
-  auto lvl = PC_print_lvl < 10 ? " " + std::to_string(PC_print_lvl)
-                               : std::to_string(PC_print_lvl);
+  auto lvl = PC_PRINT_LEVEL < 10 ? " " + std::to_string(PC_PRINT_LEVEL)
+                                 : std::to_string(PC_PRINT_LEVEL);
   if (tag == TagType::Print) {
     lvl = "  ";
   };
 
   ss << lvl << " ";
 
-  for (int i = 0; i < std::min(PC_print_lvl, 10); ++i) {
+  for (int i = 0; i < std::min(PC_PRINT_LEVEL, 10); ++i) {
     ss << "| ";
   }
 

Engine/include/Popcorn/Core/Layer.h

@@ -9,6 +9,9 @@ class Layer {
 public:
   virtual ~Layer() = default;
 
+  Layer(const Layer &) = delete;
+  Layer &operator=(const Layer &) = delete;
+
   virtual void OnAttach();
   virtual void OnDetach();
 

Engine/include/Popcorn/Core/LayerStack.h

@@ -26,27 +26,27 @@ class LayerStack {
     //   cb(it);
     // }
 
-    for (auto it = m_layer_stack.rbegin(); it != m_layer_stack.rend(); ++it) {
+    for (auto it = m_layerStack.rbegin(); it != m_layerStack.rend(); ++it) {
       cb(it);
     }
   };
 
   // TODO: Refactor when dealing with time
   void UpdateLayers(TimeEvent &e) {
-    for (Layer *l : m_layer_stack) {
+    for (Layer *l : m_layerStack) {
       l->OnUpdate(e);
     }
   };
 
   void RenderLayers() {
-    for (Layer *l : m_layer_stack) {
+    for (Layer *l : m_layerStack) {
       l->OnRender();
     }
   };
 
 private:
-  std::vector<Layer *> m_layer_stack;
-  uint32_t m_separator_index = 0;
+  std::vector<Layer *> m_layerStack;
+  uint32_t m_separatorIndex = 0;
 };
 
 ENGINE_NAMESPACE_END

Engine/include/Popcorn/Events/Event.h

@@ -38,12 +38,12 @@ enum class EventType {
 
 enum class EventCategory {
   None = 0,
-  ApplicationEvent = shift_l(1),
-  WindowEvent = shift_l(2),
-  KeyboardEvent = shift_l(3),
-  MouseEvent = shift_l(4),
-  TimeEvent = shift_l(5),
-  VulkanEvent = shift_l(6)
+  ApplicationEvent = PC_ShiftLeft(1),
+  WindowEvent = PC_ShiftLeft(2),
+  KeyboardEvent = PC_ShiftLeft(3),
+  MouseEvent = PC_ShiftLeft(4),
+  TimeEvent = PC_ShiftLeft(5),
+  VulkanEvent = PC_ShiftLeft(6)
 };
 
 // HASH DEFINE START ----------------------------------------------------------

Engine/include/Popcorn/Graphics/BufferObjects.h

@@ -131,7 +131,7 @@ class VertexBuffer {
     return m_layout;
   }
 
-  [[nodiscard]] inline byte_t *GetBufferData() const {
+  [[nodiscard]] inline PC_Byte_t *GetBufferData() const {
     return m_buffer.GetData();
   }
 
@@ -230,7 +230,7 @@ template <Is_Uint16_Or_Uint32_t T> class IndexBuffer {
     m_buffer.WriteBytes(data, size, offset);
   }
 
-  [[nodiscard]] inline byte_t *GetBufferData() const {
+  [[nodiscard]] inline PC_Byte_t *GetBufferData() const {
     return m_buffer.GetData();
   }
 

Engine/include/Popcorn/Graphics/Materials/Material.h

@@ -15,12 +15,8 @@ class Mesh;
 
 template <MaterialTypes T> class Material {
 public:
-  Material() { 
-      // PC_PRINT("CREATED", TagType::Constr, "Material.h"); 
-  }
-  virtual ~Material() { 
-      // PC_PRINT("DESTROYED", TagType::Destr, "Material.h"); 
-  }
+  Material() = default;
+  virtual ~Material() {}
 
   static constexpr MaterialTypes type_value = T;
 

Engine/include/Popcorn/Graphics/PaintPasses/BloomExtractPass.h

@@ -0,0 +1,10 @@
+
+#pragma once
+
+#include "GlobalMacros.h"
+
+ENGINE_NAMESPACE_BEGIN
+GFX_NAMESPACE_BEGIN
+
+GFX_NAMESPACE_END
+ENGINE_NAMESPACE_END

Engine/include/Popcorn/Graphics/PaintPasses/CustomPaintPass.h

@@ -0,0 +1,10 @@
+
+#pragma once
+
+#include "GlobalMacros.h"
+
+ENGINE_NAMESPACE_BEGIN
+GFX_NAMESPACE_BEGIN
+
+GFX_NAMESPACE_END
+ENGINE_NAMESPACE_END