Fixed bug in calculating sprite offset for collectables

TODO.md

@@ -2,6 +2,7 @@
 
 ## Next
 
+- Physics
 - Damage other players on contact
 
 ## Bugs
@@ -10,7 +11,6 @@
 
 ## High priority
 
-- Physics
 - Players-join-screen before the game starts
 
 - Short input delay when a new identity connects, to avoid accidental inputs at beginning

src/coordinates/translated_coordinates.cpp

@@ -46,6 +46,11 @@ void TranslatedCoordinates::move(WorldCoordinates deltaWorldCoordinates)
     this->worldCoordinates = this->worldCoordinates + deltaWorldCoordinates;
 }
 
+void TranslatedCoordinates::move(IsometricCoordinates deltaIsometricCoordinates)
+{
+    move(CoordinateTransformer::isometricToWorld(deltaIsometricCoordinates));
+}
+
 TranslatedCoordinates::TranslatedCoordinates(WorldCoordinates worldCoordinates)
         : worldCoordinates(worldCoordinates)
 {
@@ -53,7 +58,7 @@ TranslatedCoordinates::TranslatedCoordinates(WorldCoordinates worldCoordinates)
 
 void TranslatedCoordinates::move(sf::Vector2f deltaWorldCoordinates)
 {
-    move({deltaWorldCoordinates.x, deltaWorldCoordinates.y, 0});
+    move(WorldCoordinates {deltaWorldCoordinates.x, deltaWorldCoordinates.y, 0});
 }
 
 void TranslatedCoordinates::setParent(std::shared_ptr<TranslatedCoordinates> parent, WorldCoordinates offset)

src/coordinates/translated_coordinates.h

@@ -40,10 +40,13 @@ public:
 
     void setScreenOffset(IsometricCoordinates offset);
 
+    void move(IsometricCoordinates deltaIsometricCoordinates);
+
 private:
     WorldCoordinates worldCoordinates{};
 
     std::shared_ptr<TranslatedCoordinates> parent = nullptr;
+
 };
 
 

src/game/collectables/collectable.cpp

@@ -27,5 +27,5 @@ void Collectable::setSprite(const std::string &spriteName)
     addChildScreenOffset(sprite, IsometricCoordinates(-size / 2.f));
 
     // Set half size offset of coordinates
-    coordinates->move(WorldCoordinates(0, 0, sizeWidth / 2.f));
+    coordinates->move(IsometricCoordinates(0, -sizeWidth / 2.f, 0));
 }

src/game/collectables/collection/collectables_collection.cpp

@@ -57,8 +57,15 @@ void CollectablesCollection::update()
         for (auto &collectable: collectables)
         {
             int newDepth = std::floor(collectable->getDepth());
-            if (newDepth != depth && newDepth < depthCollections.size())
+            if (newDepth != depth)
             {
+                if (newDepth < 0 || newDepth >= (int) depthCollections.size())
+                {
+                    LOG(ERROR) << "Collectable " << collectable->getId() << " has invalid depth " << newDepth
+                               << "! Keeping it at previous depth " << depth << " ...";
+                    continue;
+                }
+
                 depthCollection->remove(collectable);
                 depthCollections[newDepth]->add(collectable);
             }

src/game/level/level_loader.cpp

@@ -61,14 +61,6 @@ void LevelLoader::loadLevel(const LevelConfig &levelConfig)
     }
 
 
-    for (int i = 0; i <= 25; i++)
-    {
-        auto debugImage = SpriteFactory::createSingleSprite("edge");
-        debugImage->coordinates->setWorld({0, 0, (float) i});
-        levelRenderer->addDetachedChild(debugImage);
-    }
-
-
     LOG(INFO) << "Finished loading level '" << levelConfig.name << "'.";
 }
 

src/game/physics/holes/collectable_simulation.cpp

@@ -20,7 +20,7 @@ void CollectableSimulation::physicsUpdate()
 {
     updateGroundHole();
 
-    world->Step(FRAME_TIME.asSeconds(), COLLECTABLES_SIM_VELOCITY_ITERATIONS, COLLECTABLES_SIM_POSITION_ITERATIONS);
+//    world->Step(FRAME_TIME.asSeconds(), COLLECTABLES_SIM_VELOCITY_ITERATIONS, COLLECTABLES_SIM_POSITION_ITERATIONS);
 
     updateCollectable();
 }

src/game/physics/holes/collectable_simulation.hpp

@@ -13,7 +13,7 @@ public:
 
     void physicsUpdate() override;
 
-    std::shared_ptr<Collectable> getCollectable() const;
+    [[nodiscard]] std::shared_ptr<Collectable> getCollectable() const;
 
 private:
     std::shared_ptr<b2World> world;

src/game/physics/holes/holes_simulation.cpp

@@ -29,7 +29,7 @@ void HolesSimulation::addCollectable(const std::shared_ptr<Collectable> &collect
 {
     // Create new collectable simulation
     auto collectableSim = std::make_shared<CollectableSimulation>(collectable);
-    addChild(collectableSim);
+    addDetachedChild(collectableSim);
 }
 
 void HolesSimulation::lateUpdate()

src/levels.hpp

@@ -12,7 +12,7 @@ std::map<std::string, LevelConfig> const all_levels = {
                                             {18, 18},
                                             {0,  18},
                                             {18, 0}}, {
-                                        CollectableInLevel("box", {5, 5})
+                                        CollectableInLevel("box", {0, 0})
                                 },
                                 {
                                         // Blues