bags refactor

engine/inc/renderer/3d/pipeline/static/core/bag/stapip_bag.hpp

@@ -11,9 +11,9 @@
 #pragma once
 
 #include "math/vec4.hpp"
-#include "renderer/3d/pipeline/shared/bag/pipeline_lighting_bag.hpp"
 #include "renderer/3d/pipeline/shared/bag/pipeline_info_bag.hpp"
 #include "./stapip_color_bag.hpp"
+#include "./stapip_lighting_bag.hpp"
 #include "./stapip_texture_bag.hpp"
 #include "renderer/core/texture/models/texture.hpp"
 #include "./packaging/stapip_bag_packages_bbox.hpp"
@@ -46,7 +46,7 @@ class StaPipBag {
   StaPipTextureBag* texture;
 
   /** Optional. Object lighting. */
-  PipelineLightingBag* lighting;
+  StaPipLightingBag* lighting;
 
   /**
    * @param maxVertCount This parameter is available in renderer API.

engine/inc/renderer/3d/pipeline/static/core/bag/stapip_lighting_bag.hpp

@@ -0,0 +1,33 @@
+/*
+# ______       ____   ___
+#   |     \/   ____| |___|
+#   |     |   |   \  |   |
+#-----------------------------------------------------------------------
+# Copyright 2022, tyra - https://github.com/h4570/tyra
+# Licenced under Apache License 2.0
+# Sandro Sobczyński <sandro.sobczynski@gmail.com>
+*/
+
+#pragma once
+
+#include "math/vec4.hpp"
+#include "renderer/3d/pipeline/shared/bag/pipeline_dir_lights_bag.hpp"
+
+namespace Tyra {
+
+class StaPipLightingBag {
+ public:
+  StaPipLightingBag();
+  ~StaPipLightingBag();
+
+  /** Mandatory. Model matrix for lights. */
+  M4x4* lightMatrix;
+
+  /** Mandatory. Lighting normals per vertex. */
+  Vec4* normals;
+
+  /** Mandatory. Directional lights */
+  PipelineDirLightsBag* dirLights;
+};
+
+}  // namespace Tyra

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

@@ -29,7 +29,7 @@ class StaticPipeline : public Renderer3DPipeline {
   void onUse();
 
   /**
-   * Render 3D data via "meshes".
+   * Render 3D via "meshes".
    * This render() method is a bridge to core.render() method.
    */
   void render(DynamicMesh* mesh, const StaPipOptions* options = nullptr);
@@ -47,10 +47,10 @@ class StaticPipeline : public Renderer3DPipeline {
                               MeshFrame* frameFrom, MeshFrame* frameTo) const;
   StaPipTextureBag* getTextureBag(DynamicMesh* mesh, MeshMaterial* material,
                                   MeshFrame* frameFrom, MeshFrame* frameTo);
-  PipelineLightingBag* getLightingBag(DynamicMesh* mesh, MeshMaterial* material,
-                                      M4x4* model, MeshFrame* frameFrom,
-                                      MeshFrame* frameTo,
-                                      const StaPipOptions* options) const;
+  StaPipLightingBag* getLightingBag(DynamicMesh* mesh, MeshMaterial* material,
+                                    M4x4* model, MeshFrame* frameFrom,
+                                    MeshFrame* frameTo,
+                                    const StaPipOptions* options) const;
   void deallocDrawBags(StaPipBag* bag, MeshMaterial* material) const;
 
   void setLightingColorsCache(StaPipLightingOptions* lightingOptions);