bags refactor

engine/inc/renderer/3d/pipeline/dynamic/bag/dynpip_bag.hpp

@@ -11,9 +11,10 @@
 #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 "./dynpip_color_bag.hpp"
+#include "./dynpip_lighting_bag.hpp"
 #include "./dynpip_texture_bag.hpp"
 #include "renderer/core/texture/models/texture.hpp"
 
@@ -35,17 +36,27 @@ class DynPipBag {
   /** Mandatory. Object color(s). */
   DynPipColorBag* color;
 
-  /** Mandatory. Vertex count. */
+  /** Mandatory. Vertex count per frame. */
   u32 count;
 
-  /** Mandatory. Vertices. */
-  Vec4* vertices;
+  /** Mandatory. From (frame) vertices */
+  Vec4* verticesFrom;
+
+  /** Mandatory. To (frame) vertices */
+  Vec4* verticesTo;
+
+  /**
+   * Mandatory.
+   * State of animation interpolation
+   * (between from and to)
+   */
+  float interpolation;
 
   /** Optional. Texture coordinates and image. */
   DynPipTextureBag* texture;
 
   /** Optional. Object lighting. */
-  PipelineLightingBag* lighting;
+  DynPipLightingBag* lighting;
 
   void print() const;
   void print(const char* name) const;

engine/inc/renderer/3d/pipeline/dynamic/bag/dynpip_color_bag.hpp

@@ -23,10 +23,12 @@ class DynPipColorBag {
   ~DynPipColorBag();
 
   /** Optional. Single color for all vertices. */
-  Color* single;
+  Color* singleFrom;
+  Color* singleTo;
 
   /** Optional. Color per vertex. */
-  Color* many;
+  Color* manyFrom;
+  Color* manyTo;
 };
 
 }  // namespace Tyra

engine/inc/renderer/3d/pipeline/dynamic/bag/dynpip_lighting_bag.hpp

@@ -0,0 +1,34 @@
+/*
+# ______       ____   ___
+#   |     \/   ____| |___|
+#   |     |   |   \  |   |
+#-----------------------------------------------------------------------
+# 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 DynPipLightingBag {
+ public:
+  DynPipLightingBag();
+  ~DynPipLightingBag();
+
+  /** Mandatory. Model matrix for lights. */
+  M4x4* lightMatrix;
+
+  /** Mandatory. Lighting normals per vertex. */
+  Vec4* normalsFrom;
+  Vec4* normalsTo;
+
+  /** Mandatory. Directional lights */
+  PipelineDirLightsBag* dirLights;
+};
+
+}  // namespace Tyra

engine/inc/renderer/3d/pipeline/dynamic/bag/dynpip_texture_bag.hpp

@@ -21,7 +21,8 @@ class DynPipTextureBag {
   ~DynPipTextureBag();
 
   /** Mandatory. Texture coordinates per vertex. */
-  Vec4* coordinates;
+  Vec4* coordinatesFrom;
+  Vec4* coordinatesTo;
 
   /** Mandatory. Texture image. */
   Texture* texture;

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

@@ -27,10 +27,6 @@ class DynamicPipeline : public Renderer3DPipeline {
 
   void onUse();
 
-  /**
-   * Render 3D data via "meshes".
-   * This render() method is a bridge to core.render() method.
-   */
   void render(DynamicMesh* mesh, const DynPipOptions* options = nullptr);
 };