Special constructor added to Algorithms class and general code editing.

Author: nomoregeek

engine/main/objects/creation/scene/generators/reduction/CustomReduction.cpp

@@ -6,10 +6,10 @@
 
 std::shared_ptr<Material::Algorithms>
 Creation::RD::loadAlgorithms(const IniUtil::Analyzer::IniBlock &data, Creation::Pools::SourcePool &pool) {
-    //collision
-    std::pair<float, float> collisionParams(std::stof(data.at("COLLISION_ANALYSIS_STEP")),
-                                            std::stof(data.at("COLLISION_ANALYSIS_STEP")));
-    return std::make_shared<Material::Algorithms>(pool.getAlgpool()->loadCollision(collisionParams));
+    return std::make_shared<Material::Algorithms>(pool.getAlgPool()->loadCollision(
+            std::make_pair<float, float>(std::stof(data.at("COLLISION_ANALYSIS_STEP")),
+                                         std::stof(data.at("COLLISION_ANALYSIS_STEP")))
+    ));
 }
 
 std::shared_ptr<sf::Music>

engine/main/objects/creation/scene/pools/AlgorithmsPool.h

@@ -20,7 +20,7 @@ namespace Creation {
         class AlgorithmsPool {
         public:
             /**
-             * @brief Method loads collsion.
+             * @brief Method loads collision.
              * @return Collision.
              */
             std::shared_ptr<Material::Collision> loadCollision(const std::pair<float, float> &params) noexcept;

engine/main/objects/creation/scene/pools/SourcePool.cpp

@@ -46,7 +46,7 @@ void Creation::Pools::SourcePool::setVariable(const std::string &name, const std
     m_variables[name] = value;
 }
 
-Creation::Pools::AlgorithmsPool *Creation::Pools::SourcePool::getAlgpool() noexcept {
+Creation::Pools::AlgorithmsPool *Creation::Pools::SourcePool::getAlgPool() noexcept {
     return &m_algpool;
 }
 

engine/main/objects/creation/scene/pools/SourcePool.h

@@ -69,7 +69,7 @@ namespace Creation {
              * @brief Method returns algorithms pool.
              * @return Algorithms pool.
              */
-            Creation::Pools::AlgorithmsPool *getAlgpool() noexcept;
+            Creation::Pools::AlgorithmsPool *getAlgPool() noexcept;
 
             /**
              * @brief Method returns data manager.

engine/main/objects/material/common/algorithms/Algorithms.cpp

@@ -4,7 +4,10 @@
 
 #include "Algorithms.h"
 
-Material::Algorithms::Algorithms(const std::shared_ptr<Collision> &collision) : m_collision(collision) {}
+Material::Algorithms::Algorithms(const Material::AlgorithmsParams &params)
+        : m_collision(std::make_shared<Material::Collision>(params.analysisStepX, params.analysisStepY)) {}
+
+Material::Algorithms::Algorithms(const std::shared_ptr<Material::Collision> &collision) : m_collision(collision) {}
 
 const Material::Collision &Material::Algorithms::getCollision() const {
     return *m_collision;

engine/main/objects/material/common/algorithms/Algorithms.h

@@ -5,6 +5,7 @@
 #ifndef FLASH_ALGORITHMS_H
 #define FLASH_ALGORITHMS_H
 
+#include "params/AlgorithmsParams.h"
 #include "../collision/Collision.h"
 
 namespace Material {
@@ -15,8 +16,18 @@ namespace Material {
      *
      * This class defines Algorithms realization.
     */
-    class Algorithms {
+    class Algorithms final {
     public:
+        /**
+         * @brief Special constructor.
+         * @param params General algorithms params.
+         */
+        explicit Algorithms(const AlgorithmsParams &params);
+
+        /**
+         * @brief Default constructor.
+         * @param collision Collision algorithms facade.
+         */
         explicit Algorithms(const std::shared_ptr<Material::Collision> &collision);
 
         /**

engine/main/objects/material/common/algorithms/params/AlgorithmsParams.h

@@ -0,0 +1,29 @@
+//
+// Created by roman on 09.12.2020.
+//
+
+#ifndef PRIMARYWINDOW_H_ALGORITHMSPARAMS_H
+#define PRIMARYWINDOW_H_ALGORITHMSPARAMS_H
+
+namespace Material {
+
+    /**
+     * @brief Struct contains all algorithms numeric params.
+     */
+    struct AlgorithmsParams {
+        explicit AlgorithmsParams(float analysisStepX, float analysisStepY)
+                : analysisStepX(analysisStepX), analysisStepY(analysisStepY) {}
+
+        /**
+         * @brief Collision "X" analysis step.
+         */
+        float analysisStepX;
+
+        /**
+         * @brief Collision "Y" analysis step.
+         */
+        float analysisStepY;
+    };
+}
+
+#endif //PRIMARYWINDOW_H_ALGORITHMSPARAMS_H

engine/main/objects/material/common/collision/Collision.h

@@ -8,10 +8,6 @@
 #include "moving-collision/MovingCollision.h"
 #include "static-collision/StaticCollision.h"
 
-namespace Unite {
-    class Unifier;
-}
-
 namespace Material {
 
     /**
@@ -36,6 +32,4 @@ namespace Material {
     };
 }
 
-#include "../../../unifier/common/Unifier.h"
-
 #endif //FLASH_COLLISION_H

engine/main/objects/material/mobs/common/base/Mob.h

@@ -24,7 +24,7 @@ namespace Mobs {
                 public Possibilities::Peculiar<MobProperties> {
     public:
         /**
-         * @brief Main mob constructor.
+         * @brief Default mob constructor.
          * @param material_properties Material properties.
          * @param properties Mob properties object.
          * @param area Mob physical area.

engine/main/objects/material/mobs/custom/slime/splitter/SlimeSplitter.cpp

@@ -41,10 +41,8 @@ std::shared_ptr<Components::ISpriteBox> Mobs::SlimeSplitter::splitSlimeSprite(Mo
 std::shared_ptr<Material::Algorithms> Mobs::SlimeSplitter::splitSlimeAlgorithms(Mobs::Slime &slime) const noexcept {
     std::pair<float, float> step = slime.getAlgorithms()->getCollision().getMovingCollision().getAnalysisStep();
     float stepX = step.first / m_splittingCoefficient;
-    if (stepX < 1) stepX = 1;
     float stepY = step.second / m_splittingCoefficient;
-    if (stepY < 1) stepY = 1;
-    return std::make_shared<Material::Algorithms>(std::make_shared<Material::Collision>(stepX, stepY));
+    return std::make_shared<Material::Algorithms>(Material::AlgorithmsParams((stepX < 1) ? 1 : stepX, (stepY < 1) ? 1 : stepY));
 }
 
 Mobs::SlimeProperties Mobs::SlimeSplitter::splitSlimeProperties(const Mobs::SlimeProperties &properties) const noexcept {