X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fworld%2FWorld.cpp;fp=src%2Fworld%2FWorld.cpp;h=088712acae45ac2720322954a7f68eac3216fc25;hb=7cf057b5b3a28c3896af27cb725fbf0b4f1459c2;hp=aa17319cd8dfca6cd9e91d1fcddd7b66ce0e064c;hpb=03b142b877e19a2355e1a79e279e024922d44655;p=orbi.git diff --git a/src/world/World.cpp b/src/world/World.cpp index aa17319..088712a 100644 --- a/src/world/World.cpp +++ b/src/world/World.cpp @@ -24,8 +24,12 @@ World::World(Vector size) void World::Update(float dt) { for (Entity &e : entities) { - e.Update(dt, gravity, terminal); - e.onGround = false; + if (e.onGround) { + e.Update(dt, Vector(), terminal); + e.onGround = false; + } else { + e.Update(dt, gravity, terminal); + } BoundsCollision(e, dt); TileCollision(e, dt); @@ -145,12 +149,6 @@ void World::EntityCollision() { } -const AABB &World::TileShapeAt(Vector pos) const { - tileShape = AABB(pos, Vector(1, 1)); - return tileShape; -} - - Entity &World::AddEntity(const Entity &e) { entities.emplace_back(e); return entities.back();