tutorial 04

engine/inc/loaders/3d/md2_loader/md2_loader.hpp

@@ -13,6 +13,7 @@
 #include "../../loader.hpp"
 #include "../builder/mesh_builder_data.hpp"
 #include <string>
+#include <memory>
 
 namespace Tyra {
 
@@ -24,13 +25,12 @@ struct MD2LoaderOptions {
 /** Class responsible for loading & parsing Quake's II ".md2" 3D files */
 class MD2Loader : public Loader {
  public:
-  MD2Loader();
-  ~MD2Loader();
-
-  MeshBuilderData* load(const char* fullpath);
-  MeshBuilderData* load(const char* fullpath, MD2LoaderOptions options);
-  MeshBuilderData* load(const std::string& fullpath);
-  MeshBuilderData* load(const std::string& fullpath, MD2LoaderOptions options);
+  static std::unique_ptr<MeshBuilderData> load(const char* fullpath);
+  static std::unique_ptr<MeshBuilderData> load(const char* fullpath,
+                                               MD2LoaderOptions options);
+  static std::unique_ptr<MeshBuilderData> load(const std::string& fullpath);
+  static std::unique_ptr<MeshBuilderData> load(const std::string& fullpath,
+                                               MD2LoaderOptions options);
 };
 
 }  // namespace Tyra

engine/inc/loaders/3d/obj_loader/obj_loader.hpp

@@ -38,32 +38,30 @@ struct MaterialVertexCount {
 /** Class responsible for loading & parsing obj files */
 class ObjLoader : public Loader {
  public:
-  ObjLoader();
-  ~ObjLoader();
-
-  std::unique_ptr<MeshBuilderData> load(const char* fullpath);
-  std::unique_ptr<MeshBuilderData> load(const char* fullpath,
-                                        const ObjLoaderOptions& options);
-  std::unique_ptr<MeshBuilderData> load(const std::string& fullpath);
-  std::unique_ptr<MeshBuilderData> load(const std::string& fullpath,
-                                        const ObjLoaderOptions& options);
+  static std::unique_ptr<MeshBuilderData> load(const char* fullpath);
+  static std::unique_ptr<MeshBuilderData> load(const char* fullpath,
+                                               const ObjLoaderOptions& options);
+  static std::unique_ptr<MeshBuilderData> load(const std::string& fullpath);
+  static std::unique_ptr<MeshBuilderData> load(const std::string& fullpath,
+                                               const ObjLoaderOptions& options);
 
  private:
-  void addOutputMaterialsAndFrames(
+  static void addOutputMaterialsAndFrames(
       MeshBuilderData* output, const tinyobj::attrib_t& attrib,
       const std::vector<tinyobj::shape_t>& shapes,
       const std::vector<tinyobj::material_t>& materials, const u16& framesCount,
       std::vector<MaterialVertexCount>& materialVertexCounts);
 
-  std::vector<MaterialVertexCount> scan(
+  static std::vector<MaterialVertexCount> scan(
       const std::vector<tinyobj::shape_t>& shapes,
       const std::vector<tinyobj::material_t>& materials);
 
-  void importFrame(MeshBuilderData* output, const tinyobj::attrib_t& attrib,
-                   const std::vector<tinyobj::shape_t>& shapes,
-                   const std::vector<tinyobj::material_t>& materials,
-                   const u16& frameIndex, const float& scale,
-                   const bool& invertY, const u16& count);
+  static void importFrame(MeshBuilderData* output,
+                          const tinyobj::attrib_t& attrib,
+                          const std::vector<tinyobj::shape_t>& shapes,
+                          const std::vector<tinyobj::material_t>& materials,
+                          const u16& frameIndex, const float& scale,
+                          const bool& invertY, const u16& count);
 };
 
 }  // namespace Tyra

engine/inc/loaders/loader.hpp

@@ -16,10 +16,10 @@ namespace Tyra {
 
 class Loader {
  protected:
-  std::string getFilenameFromPath(const std::string& path);
-  std::string getPathFromFilename(const std::string& path);
-  std::string getFilenameWithoutExtension(const std::string& filename);
-  std::string getExtensionOfFilename(const std::string& filename);
+  static std::string getFilenameFromPath(const std::string& path);
+  static std::string getPathFromFilename(const std::string& path);
+  static std::string getFilenameWithoutExtension(const std::string& filename);
+  static std::string getExtensionOfFilename(const std::string& filename);
 };
 
 }  // namespace Tyra

engine/inc/renderer/3d/pipeline/dynamic/dynamic_pipeline.hpp

@@ -39,13 +39,16 @@ class DynamicPipeline : public Renderer3DPipeline {
 
   void onUse();
 
+  void onFrameEnd();
+
   void onUseEnd();
 
   /**
    * Render dynamic model.
    * This render() method is a bridge to core.render() method.
    */
-  void render(const DynamicMesh& mesh, const DynPipOptions* options = nullptr);
+  void render(const DynamicMesh* mesh);
+  void render(const DynamicMesh* mesh, const DynPipOptions& options);
   void render(const DynamicMesh* mesh, const DynPipOptions* options = nullptr);
 
  private:

engine/inc/renderer/3d/pipeline/minecraft/minecraft_pipeline.hpp

@@ -33,6 +33,7 @@ class MinecraftPipeline : public Renderer3DPipeline {
 
   void onUse();
   void onUseEnd();
+  void onFrameEnd();
 
   /**
    * @brief Render voxels

engine/inc/renderer/3d/pipeline/renderer_3d_pipeline.hpp

@@ -21,6 +21,7 @@ class Renderer3DPipeline {
 
   virtual void setRenderer(RendererCore* core) = 0;
   virtual void onUse() = 0;
+  virtual void onFrameEnd() = 0;
   virtual void onUseEnd() = 0;
   std::function<void(Renderer3DPipeline*)> onDestroy;
 };

engine/inc/renderer/3d/pipeline/static/core/stapip_core.hpp

@@ -28,7 +28,8 @@ class StaPipCore {
   void init(RendererCore* t_core);
 
   /** Render 3D via "bags" */
-  void render(StaPipBag* bag, StaPipBagPackagesBBox* bbox = nullptr);
+  void render(StaPipBag* bag, StaPipBagPackagesBBox* bbox,
+              const u32& maxVertCount);
 
   /** Get max vert count of VU1 qbuffer (for optimizations) */
   u32 getMaxVertCountByParams(const bool& isSingleColor,

engine/inc/renderer/3d/pipeline/static/stapip_bag_bboxes_cacher.hpp

@@ -0,0 +1,48 @@
+/*
+# _____        ____   ___
+#   |     \/   ____| |___|
+#   |     |   |   \  |   |
+#-----------------------------------------------------------------------
+# Copyright 2022, tyra - https://github.com/h4570/tyra
+# Licensed under Apache License 2.0
+# Sandro Sobczyński <sandro.sobczynski@gmail.com>
+*/
+
+#pragma once
+
+#include <tamtypes.h>
+#include "core/bag/packaging/stapip_bag_packages_bbox.hpp"
+#include "renderer/3d/mesh/mesh.hpp"
+#include <memory>
+#include <vector>
+
+namespace Tyra {
+
+struct StapipBagBBoxesCacheItem {
+  u32 vu1MaxVertCount;
+  u32 frameId;
+  std::unique_ptr<StaPipBagPackagesBBox> bboxes;
+  int framesLeftToDestroy;
+};
+
+class StapipBagBBoxesCacher {
+ public:
+  StapipBagBBoxesCacher();
+  ~StapipBagBBoxesCacher();
+
+  const int cacheFramesCount = 50;
+  const int cacheSecondsCount = 5;
+
+  void onFrameEnd();
+
+  StaPipBagPackagesBBox* getBBoxesByMesh(const MeshMaterialFrame* frame,
+                                         const u32& maxVertCount);
+
+ private:
+  StapipBagBBoxesCacheItem* getCache(const u32& maxVertCount,
+                                     const u32& frameId);
+
+  std::vector<StapipBagBBoxesCacheItem> storage;
+};
+
+}  // namespace Tyra

engine/inc/renderer/3d/pipeline/static/static_pipeline.hpp

@@ -17,6 +17,7 @@
 #include "renderer/3d/mesh/static/static_mesh.hpp"
 #include "./core/stapip_core.hpp"
 #include "./stapip_options.hpp"
+#include "./stapip_bag_bboxes_cacher.hpp"
 
 namespace Tyra {
 
@@ -38,17 +39,19 @@ class StaticPipeline : public Renderer3DPipeline {
   void setRenderer(RendererCore* core);
 
   void onUse();
-
   void onUseEnd();
+  void onFrameEnd();
 
   /**
    * Render static model
    * This render() method is a bridge to core.render() method.
    */
-  void render(const StaticMesh& mesh, const StaPipOptions* options = nullptr);
+  void render(const StaticMesh* mesh);
+  void render(const StaticMesh* mesh, const StaPipOptions& options);
   void render(const StaticMesh* mesh, const StaPipOptions* options = nullptr);
 
  private:
+  StapipBagBBoxesCacher cacher;
   RendererCore* rendererCore;
   Vec4* colorsCache;
 
@@ -65,6 +68,7 @@ class StaticPipeline : public Renderer3DPipeline {
                                   const MeshMaterialFrame* materialFrame);
 
   StaPipLightingBag* getLightingBag(const MeshMaterialFrame* materialFrame,
+                                    PipelineDirLightsBag* dirLightsBag,
                                     M4x4* model,
                                     const StaPipOptions* options) const;
 

engine/inc/renderer/3d/renderer_3d.hpp

@@ -23,12 +23,16 @@ class Renderer3D {
 
   Renderer3DUtility utility;
 
-  void init(RendererCore* core);
-
   /** Deinitialize previous pipeline and initialize new pipeline */
   void usePipeline(Renderer3DPipeline* pipeline);
   void usePipeline(Renderer3DPipeline& pipeline);
 
+  /** Called by engine */
+  void init(RendererCore* core);
+
+  /** Called by engine */
+  void onFrameEnd();
+
  private:
   Renderer3DPipeline* currentPipeline;
   void onDestroy(Renderer3DPipeline* pipeline);

engine/inc/renderer/renderer_settings.hpp

@@ -22,8 +22,8 @@ class RendererSettings {
         height(448.0F),
         interlacedHeightF(height / 2),
         near(0.1F),
-        far(4096.0F),
-        projectionScale(4096.0F),
+        far(8192.0F),
+        projectionScale(8192.0F),
         aspectRatio(width / height),
         interlacedHeightUI(static_cast<unsigned int>(interlacedHeightF)) {}
   ~RendererSettings();

engine/src/loaders/3d/md2_loader/md2_loader.cpp

@@ -70,25 +70,21 @@ typedef struct {
   s16 t;
 } texCoord_t;
 
-MD2Loader::MD2Loader() {}
-
-MD2Loader::~MD2Loader() {}
-
-MeshBuilderData* MD2Loader::load(const char* fullpath) {
+std::unique_ptr<MeshBuilderData> MD2Loader::load(const char* fullpath) {
   return load(fullpath, MD2LoaderOptions());
 }
 
-MeshBuilderData* MD2Loader::load(const std::string& fullpath) {
+std::unique_ptr<MeshBuilderData> MD2Loader::load(const std::string& fullpath) {
   return load(fullpath.c_str(), MD2LoaderOptions());
 }
 
-MeshBuilderData* MD2Loader::load(const std::string& fullpath,
-                                 MD2LoaderOptions options) {
+std::unique_ptr<MeshBuilderData> MD2Loader::load(const std::string& fullpath,
+                                                 MD2LoaderOptions options) {
   return load(fullpath.c_str(), options);
 }
 
-MeshBuilderData* MD2Loader::load(const char* fullpath,
-                                 MD2LoaderOptions options) {
+std::unique_ptr<MeshBuilderData> MD2Loader::load(const char* fullpath,
+                                                 MD2LoaderOptions options) {
   std::string path = fullpath;
   TYRA_ASSERT(!path.empty(), "Provided path is empty!");
 
@@ -123,7 +119,7 @@ MeshBuilderData* MD2Loader::load(const char* fullpath,
 
   fclose(file);
 
-  auto result = new MeshBuilderData();
+  auto result = std::make_unique<MeshBuilderData>();
 
   auto* material = new MeshBuilderMaterialData();
   material->name = getFilenameWithoutExtension(filename);

engine/src/loaders/3d/obj_loader/obj_loader.cpp

@@ -24,10 +24,6 @@
 
 namespace Tyra {
 
-ObjLoader::ObjLoader() {}
-
-ObjLoader::~ObjLoader() {}
-
 std::unique_ptr<MeshBuilderData> ObjLoader::load(const char* fullpath) {
   return load(fullpath, ObjLoaderOptions());
 }

engine/src/renderer/3d/pipeline/dynamic/dynamic_pipeline.cpp

@@ -51,9 +51,13 @@ void DynamicPipeline::onUseEnd() {
   core.deallocateOnUse();
 }
 
-void DynamicPipeline::render(const DynamicMesh& mesh,
-                             const DynPipOptions* options) {
-  render(&mesh, options);
+void DynamicPipeline::onFrameEnd() {}
+
+void DynamicPipeline::render(const DynamicMesh* mesh) { render(mesh, nullptr); }
+
+void DynamicPipeline::render(const DynamicMesh* mesh,
+                             const DynPipOptions& options) {
+  render(mesh, &options);
 }
 
 void DynamicPipeline::render(const DynamicMesh* mesh,

engine/src/renderer/3d/pipeline/minecraft/minecraft_pipeline.cpp

@@ -78,6 +78,8 @@ void MinecraftPipeline::onUseEnd() {
   manager.deallocateOnUse();
 }
 
+void MinecraftPipeline::onFrameEnd() {}
+
 void MinecraftPipeline::initBBox() {
   const auto& block = manager.getBlockData();
   bbox = new RenderBBox(block.vertices, block.count);

engine/src/renderer/3d/pipeline/static/core/stapip_core.cpp

@@ -72,7 +72,8 @@ u32 StaPipCore::getMaxVertCountByParams(const bool& isSingleColor,
       ->getMaxVertCount(isSingleColor, qbufferRenderer.getBufferSize());
 }
 
-void StaPipCore::render(StaPipBag* bag, StaPipBagPackagesBBox* bbox) {
+void StaPipCore::render(StaPipBag* bag, StaPipBagPackagesBBox* bbox,
+                        const u32& maxVertCount) {
   if (bag->count <= 0) return;
 
   bool frustumCull =
@@ -105,32 +106,20 @@ void StaPipCore::render(StaPipBag* bag, StaPipBagPackagesBBox* bbox) {
   TYRA_ASSERT(!(!frustumCull && bag->info->fullClipChecks == true),
               "Full clip checks are not supported with frustum culling = off!");
 
-  u32 maxVertCount = getMaxVertCountByBag(bag);
   setMaxVertCount(maxVertCount);
 
-  StaPipBagPackagesBBox* renderBbox = nullptr;
-
   CoreBBoxFrustum frustumCheck = OUTSIDE_FRUSTUM;
 
   if (frustumCull) {
-    if (!bbox)
-      renderBbox =
-          new StaPipBagPackagesBBox(bag->vertices, bag->count, maxVertCount);
-    else
-      renderBbox = bbox;
-
-    frustumCheck = renderBbox->getMainBBox()->clipFrustumCheck(
+    frustumCheck = bbox->getMainBBox()->clipFrustumCheck(
         rendererCore->renderer3D.frustumPlanes.getAll(), *bag->info->model);
 
     if (frustumCheck == OUTSIDE_FRUSTUM) {
-      if (!bbox) {
-        delete renderBbox;
-      }
       return;
     }
   }
 
-  packager.setRenderBBox(renderBbox);
+  packager.setRenderBBox(bbox);
 
   M4x4 mvp;
 
@@ -199,10 +188,6 @@ void StaPipCore::render(StaPipBag* bag, StaPipBagPackagesBBox* bbox) {
     }
   }
 
-  if (frustumCull && !bbox) {
-    delete renderBbox;
-  }
-
   if (texBuffers) delete texBuffers;
 
   qbufferRenderer.flushBuffers();

engine/src/renderer/3d/pipeline/static/stapip_bag_bboxes_cacher.cpp

@@ -0,0 +1,64 @@
+/*
+# _____        ____   ___
+#   |     \/   ____| |___|
+#   |     |   |   \  |   |
+#-----------------------------------------------------------------------
+# Copyright 2022, tyra - https://github.com/h4570/tyra
+# Licensed under Apache License 2.0
+# Sandro Sobczyński <sandro.sobczynski@gmail.com>
+*/
+
+#include "renderer/3d/pipeline/static/stapip_bag_bboxes_cacher.hpp"
+#include <algorithm>
+
+namespace Tyra {
+
+StapipBagBBoxesCacher::StapipBagBBoxesCacher() {}
+
+StapipBagBBoxesCacher::~StapipBagBBoxesCacher() {}
+
+void StapipBagBBoxesCacher::onFrameEnd() {
+  for (auto& item : storage) {
+    if (item.framesLeftToDestroy > 0) {
+      item.framesLeftToDestroy--;
+    }
+  }
+
+  storage.erase(std::remove_if(storage.begin(), storage.end(),
+                               [](const StapipBagBBoxesCacheItem& item) {
+                                 return item.framesLeftToDestroy <= 0;
+                               }),
+                storage.end());
+}
+
+StaPipBagPackagesBBox* StapipBagBBoxesCacher::getBBoxesByMesh(
+    const MeshMaterialFrame* frame, const u32& maxVertCount) {
+  auto* cache = getCache(maxVertCount, frame->id);
+
+  if (cache) {
+    cache->framesLeftToDestroy = cacheFramesCount * cacheSecondsCount;
+    return cache->bboxes.get();
+  }
+
+  auto bboxes = std::make_unique<StaPipBagPackagesBBox>(
+      frame->vertices, frame->count, maxVertCount);
+
+  storage.push_back(
+      StapipBagBBoxesCacheItem{maxVertCount, frame->id, std::move(bboxes),
+                               cacheFramesCount * cacheSecondsCount});
+
+  return storage.back().bboxes.get();
+}
+
+StapipBagBBoxesCacheItem* StapipBagBBoxesCacher::getCache(
+    const u32& maxVertCount, const u32& frameId) {
+  for (auto& item : storage) {
+    if (item.vu1MaxVertCount == maxVertCount && item.frameId == frameId) {
+      return &item;
+    }
+  }
+
+  return nullptr;
+}
+
+}  // namespace Tyra

engine/src/renderer/3d/pipeline/static/static_pipeline.cpp

@@ -11,7 +11,7 @@
 #include "renderer/3d/pipeline/static/static_pipeline.hpp"
 #include "debug/debug.hpp"
 #include "renderer/3d/pipeline/static/core/bag/stapip_info_bag.hpp"
-
+#include <memory>
 namespace Tyra {
 
 StaticPipeline::StaticPipeline() {}
@@ -39,9 +39,13 @@ void StaticPipeline::onUseEnd() {
   core.deallocateOnUse();
 }
 
-void StaticPipeline::render(const StaticMesh& mesh,
-                            const StaPipOptions* options) {
-  render(&mesh, options);
+void StaticPipeline::onFrameEnd() { cacher.onFrameEnd(); }
+
+void StaticPipeline::render(const StaticMesh* mesh) { render(mesh, nullptr); }
+
+void StaticPipeline::render(const StaticMesh* mesh,
+                            const StaPipOptions& options) {
+  render(mesh, &options);
 }
 
 void StaticPipeline::render(const StaticMesh* mesh,
@@ -55,6 +59,7 @@ void StaticPipeline::render(const StaticMesh* mesh,
 
   auto model = mesh->getModelMatrix();
   auto* infoBag = getInfoBag(mesh, options, &model);
+  auto dirLightsBag = std::make_unique<PipelineDirLightsBag>(true);
 
   TYRA_ASSERT(
       !(options->frustumCulling != PipelineFrustumCulling_Precise &&
@@ -85,11 +90,21 @@ void StaticPipeline::render(const StaticMesh* mesh,
     bag.info = infoBag;
     bag.color = getColorBag(material, materialFrame);
     bag.texture = getTextureBag(material, materialFrame);
-    bag.lighting = getLightingBag(materialFrame, &model, options);
-    core.render(&bag);
+    bag.lighting =
+        getLightingBag(materialFrame, dirLightsBag.get(), &model, options);
+
+    u32 maxVertCount = core.getMaxVertCountByBag(&bag);
+
+    StaPipBagPackagesBBox* bbox = nullptr;
+    if (bag.info->frustumCulling == PipelineFrustumCulling_Precise) {
+      bbox = cacher.getBBoxesByMesh(materialFrame, maxVertCount);
+    }
+
+    core.render(&bag, bbox, maxVertCount);
 
     deallocDrawBags(&bag, material);
   }
+
   delete infoBag;
 
   if (optionsManuallyAllocated) delete options;
@@ -156,18 +171,15 @@ StaPipTextureBag* StaticPipeline::getTextureBag(
 }
 
 StaPipLightingBag* StaticPipeline::getLightingBag(
-    const MeshMaterialFrame* materialFrame, M4x4* model,
-    const StaPipOptions* options) const {
+    const MeshMaterialFrame* materialFrame, PipelineDirLightsBag* dirLightsBag,
+    M4x4* model, const StaPipOptions* options) const {
   if (!materialFrame->normals || options == nullptr ||
       options->lighting == nullptr)
     return nullptr;
 
   auto* result = new StaPipLightingBag();
 
-  // TODO: Make it once per rendering, very redundant
-  auto* dirLightsBag = new PipelineDirLightsBag(true);
   result->dirLights = dirLightsBag;
-
   result->lightMatrix = model;
 
   result->dirLights->setLightsManually(
@@ -194,7 +206,6 @@ void StaticPipeline::deallocDrawBags(StaPipBag* bag,
   }
 
   if (bag->lighting) {
-    delete bag->lighting->dirLights;  // TODO
     delete bag->lighting;
   }
 

engine/src/renderer/3d/renderer_3d.cpp

@@ -19,6 +19,12 @@ Renderer3D::~Renderer3D() {}
 
 void Renderer3D::init(RendererCore* core) { utility.init(core); }
 
+void Renderer3D::onFrameEnd() {
+  if (currentPipeline != nullptr) {
+    currentPipeline->onFrameEnd();
+  }
+}
+
 void Renderer3D::usePipeline(Renderer3DPipeline& pipeline) {
   usePipeline(&pipeline);
 }

engine/src/renderer/renderer.cpp

@@ -27,6 +27,9 @@ void Renderer::beginFrame(const CameraInfo3D& cameraInfo) {
   core.beginFrame(cameraInfo);
 }
 
-void Renderer::endFrame() { core.endFrame(); }
+void Renderer::endFrame() {
+  core.endFrame();
+  renderer3D.onFrameEnd();
+}
 
 }  // namespace Tyra