level solid; basic collision/gravity

1 files changed, 36 insertions, 5 deletions

diff --git a/main.cpp b/main.cpp
index 09b55f4..c137cc1 100644
--- a/main.cpp
+++ b/main.cpp
@@ -1,10 +1,12 @@
 #include "components/point.hpp"
 #include "components/player.hpp"
+#include "components/solid.hpp"
 #include "components/texture.hpp"
 #include "components/velocity.hpp"
 #include "window.hpp"
 
 #include <chrono>
+#include <iostream>
 #include <thread>
 
 #include <entt/entt.hpp>
@@ -21,11 +23,20 @@ int main()
 
     entt::registry registry;
 
-    const auto ent = registry.create();
-    registry.emplace<Player>(ent);
-    registry.emplace<Point>(ent, 0.f, WINDOW_HEIGHT - 100.f);
-    registry.emplace<Velocity>(ent, 0.f, 0.f);
-    registry.emplace<Texture>(ent, "img/player.png");
+    {
+        const auto ent = registry.create();
+        registry.emplace<Player>(ent);
+        registry.emplace<Point>(ent, 0.f, WINDOW_HEIGHT - 200.f);
+        registry.emplace<Velocity>(ent, 0.f, 0.f);
+        registry.emplace<Texture>(ent, "img/player.png");
+    }
+
+    {
+        const auto ent = registry.create();
+        registry.emplace<Point>(ent, 0.f, 0.f);
+        registry.emplace<Texture>(ent, "img/level.png");
+        registry.emplace<Solid>(ent, "img/level.png");
+    }
 
     do {
         const auto now = std::chrono::high_resolution_clock::now();
@@ -36,6 +47,23 @@ int main()
 
         registry.view<Velocity, Point>().each([](auto& v, auto& p) { p += v; });
 
+        registry.view<Solid, Point>().each(
+            [&registry](auto& s, auto& p) {
+                registry.view<Player, Point, Velocity, Texture>().each(
+                    [&s, &p](auto& _, auto& pp, auto& pv, auto& t) {
+                        const auto c = s.collision(pp + t.dim());
+
+                        if (c) {
+                            if (std::abs(c) > 1.f)
+                                pv.y = c * 0.5f;
+                            else
+                                pv.y = 0.f;
+                        } else {
+                            pv.y += 0.1f;
+                        }
+                    });
+            });
+
         std::this_thread::sleep_until(now + FRAME_TIME);
     } while (handleInputs(registry));
 }
@@ -57,6 +85,9 @@ bool handleInputs(entt::registry& registry)
             case SDLK_a:
                 view.each([](Player& p, Velocity& v) { v.x -= 1.5f; });
                 break;
+            case SDLK_SPACE:
+                view.each([](Player& p, Velocity& v) { if (v.y <= 0.f) v.y -= 3.f; });
+                break;
             }
         } else if (e.type == SDL_KEYUP && !e.key.repeat) {
             auto view = registry.view<Player, Velocity>();