feat: make it nice again

developer239 · Dec 24, 2023 · b8e9384 · b8e9384
1 parent a2c432f
commit b8e9384
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 8 deletions.
diff --git a/src/apps/day14/src/strategies/ECSStrategy.h b/src/apps/day14/src/strategies/ECSStrategy.h
@@ -24,7 +24,7 @@ std::string filePath = "assets/input.txt";
 
 class MinimalLoopStrategy : public Core::IStrategy {
  public:
-  float scale = 20.0f;
+  float scale = 50.0f;
   int numRows = 0;
   int numCols = 0;
 
@@ -135,7 +135,7 @@ class MinimalLoopStrategy : public Core::IStrategy {
 
       ECS::Registry::Instance().AddComponent<TextComponent>(
           cubeShapedRockEntity,
-          "",
+          "#",
           SDL_Color{0, 0, 255, 255},
           6
       );
@@ -173,7 +173,7 @@ class MinimalLoopStrategy : public Core::IStrategy {
 
       ECS::Registry::Instance().AddComponent<TextComponent>(
           cubeShapedRockEntity,
-          "",
+          "O",
           SDL_Color{0, 0, 255, 255},
           6
       );

diff --git a/src/apps/day14/src/systems/CollisionSystem.h b/src/apps/day14/src/systems/CollisionSystem.h
@@ -105,6 +105,16 @@ class CollisionSystem : public ECS::System {
           rigidBodyA.velocity.y = 0;
           rigidBodyB.velocity.x = 0;
           rigidBodyB.velocity.y = 0;
+
+          // fix position and round to step scale (px)
+          rigidBodyA.position.x =
+              std::round(rigidBodyA.position.x / scale) * scale;
+          rigidBodyA.position.y =
+              std::round(rigidBodyA.position.y / scale) * scale;
+          rigidBodyB.position.x =
+              std::round(rigidBodyB.position.x / scale) * scale;
+          rigidBodyB.position.y =
+              std::round(rigidBodyB.position.y / scale) * scale;
         }
       }
     }

diff --git a/src/apps/day14/src/systems/PuzzleSolverSystem.h b/src/apps/day14/src/systems/PuzzleSolverSystem.h
@@ -87,9 +87,6 @@ class PuzzleSolverSystem : public ECS::System {
     //    including the row the rock is on. (Cube-shaped rocks (#) don't
     //    contribute to load.) So, the amount of load caused by each rock in
     //    each row is as follows:
-    if(*simulationStarted) {
-      return;
-    }
 
     const float SCALE = scale;
     int HEIGHT = numRows + 1;
@@ -117,7 +114,7 @@ class PuzzleSolverSystem : public ECS::System {
 
       totalLoad += totalRoundedDiff;
 
-//      textComponent.text = std::string("O ") + std::to_string(totalRoundedDiff);
+      textComponent.text = std::string("O ") + std::to_string(totalRoundedDiff);
     }
 
     auto& tiltTrackerTextComponent =
@@ -156,7 +153,7 @@ class PuzzleSolverSystem : public ECS::System {
     for (auto entity : entities) {
       auto& rigidBody =
           ECS::Registry::Instance().GetComponent<RigidBodyComponent>(entity);
-      rigidBody.velocity.y = -0.5;
+      rigidBody.velocity.y = -5;
     }
   }