BLUGA: Fix compile

Author: kw4ntiq

libs/B-luga-physics/include/B-luga-physics/ECSCustomTypes.hpp

@@ -28,8 +28,10 @@ namespace Types {
     struct CollisionRect {
             int width;
             int height;
+            int offsetX;
+            int offsetY;
 
-            NLOHMANN_DEFINE_TYPE_INTRUSIVE(CollisionRect, width, height);
+            NLOHMANN_DEFINE_TYPE_INTRUSIVE(CollisionRect, width, height, offsetX, offsetY);
     };
 
     struct Position {
@@ -121,23 +123,6 @@ namespace Types {
                     initBounce(jsonObject, originPos);
                 }
             }
-            void addPhysic(std::string type)
-            {
-                auto it = physicsTypeMap.find(type);
-                if (it == physicsTypeMap.end()) {
-                    Logger::error("Physics type not found");
-                    return;
-                }
-                addPhysic(it->second);
-            }
-            std::optional<std::size_t> getClock(PhysicsType type) const
-            {
-                if (_physicsMap.find(type) == _physicsMap.end()) {
-                    Logger::error("Physics not found");
-                    throw std::runtime_error("Get clock: Physics of type " + std::to_string(type) + " not found");
-                }
-                return _physicsMap.at(type);
-            }
             std::vector<PhysicsType> getPhysics() const
             {
                 std::vector<PhysicsType> physics;
@@ -167,15 +152,6 @@ namespace Types {
             {
                 _physicsMap.clear();
             }
-            std::size_t getClockId(PhysicsType type) const
-            {
-                auto it = _physicsMap.find(type);
-                if (it == _physicsMap.end()) {
-                    Logger::error("Get clock id: Physics not found");
-                    throw std::runtime_error("Physics of type " + std::to_string(type) + " not found in getClockId");
-                }
-                return it->second.value();
-            }
         private:
             void initBounce(nlohmann::json & /*unused*/, const Types::Position &originPos)
             {

libs/B-luga-physics/include/B-luga-physics/ECSSystems.hpp

@@ -278,21 +278,27 @@ namespace Systems {
             Registry::getInstance().getComponents<Types::Position>();
 
         for (std::size_t id : ids) {
-            std::size_t clockId = physicComps[id].getClockId(Types::PhysicsType::ZIGZAG);
+            const Types::Zigzag &zigzagData = physicComps[id].getPhysicData<Types::Zigzag>(Types::ZIGZAG);
             std::size_t elapsedTimeInMs =
-                Registry::getInstance().getClock().elapsedMillisecondsSince(clockId);
+                Registry::getInstance().getClock().elapsedMillisecondsSince(zigzagData.clockId);
             if (elapsedTimeInMs == static_cast<std::size_t>(-1)) {
-                Registry::getInstance().getClock().restart(clockId);
+                Registry::getInstance().getClock().restart(zigzagData.clockId);
                 elapsedTimeInMs = 0;
             }
-            // Height of the wave = 10% of the screen
-            float amplitude = 10.0F;
-            // Time for the complete zigzag cycle 400ms
-            float period = 400.0F;
+            int maxY = Maths::floatToIntConservingDecimals(zigzagData.maxScreenY);
+            int minY = Maths::floatToIntConservingDecimals(zigzagData.minScreenY);
+            // Height of the wave = ?% of the screen
+            float amplitude = zigzagData.amplitude / 2;
+            // Time for the complete zigzag cycle
+            float period = zigzagData.period;
             float WavePosY =
                 amplitude * std::sin(2.0F * static_cast<float>(M_PI) * elapsedTimeInMs / period);
-            positionComp[id].y =
-                physicComps[id].getOriginPos().y + Maths::floatToIntConservingDecimals(WavePosY);
+            positionComp[id].y = zigzagData.originPos.y + Maths::floatToIntConservingDecimals(WavePosY);
+            if (positionComp[id].y < minY) {
+                positionComp[id].y = minY;
+            } else if (positionComp[id].y > maxY) {
+                positionComp[id].y = maxY;
+            }
             velocities[id].speedY = 0;
         }
     }