Adding animations n stuff.

3 files changed, 12 insertions, 64 deletions

diff --git a/core/src/test/java/coffee/liz/ecs/common/components/physics/BoundingBoxTest.java b/core/src/test/java/coffee/liz/dyl/components/physics/BoundingBoxTest.java
index 2372456..c89df37 100644
--- a/core/src/test/java/coffee/liz/ecs/common/components/physics/BoundingBoxTest.java
+++ b/core/src/test/java/coffee/liz/dyl/components/physics/BoundingBoxTest.java
@@ -1,4 +1,4 @@
-package coffee.liz.ecs.common.components.physics;
+package coffee.liz.dyl.components.physics;
 
 import coffee.liz.ecs.math.Vec2f;
 import org.junit.jupiter.api.Test;
diff --git a/core/src/test/java/coffee/liz/ecs/common/systems/physics/PhysicsSystemsTest.java b/core/src/test/java/coffee/liz/dyl/systems/physics/PhysicsSystemsTest.java
index 13a4a1c..4c285fb 100644
--- a/core/src/test/java/coffee/liz/ecs/common/systems/physics/PhysicsSystemsTest.java
+++ b/core/src/test/java/coffee/liz/dyl/systems/physics/PhysicsSystemsTest.java
@@ -1,15 +1,14 @@
-package coffee.liz.ecs.common.systems.physics;
+package coffee.liz.dyl.systems.physics;
 
 import coffee.liz.ecs.DAGWorld;
-import coffee.liz.ecs.common.components.physics.BoundingBox;
-import coffee.liz.ecs.common.components.physics.Collidable;
-import coffee.liz.ecs.common.components.physics.Force;
-import coffee.liz.ecs.common.components.physics.Forces;
-import coffee.liz.ecs.common.components.physics.Gravity;
-import coffee.liz.ecs.common.components.physics.Jump;
-import coffee.liz.ecs.common.components.physics.Mass;
-import coffee.liz.ecs.common.components.physics.TopCollidable;
-import coffee.liz.ecs.common.components.physics.Velocity;
+import coffee.liz.dyl.components.physics.BoundingBox;
+import coffee.liz.dyl.components.physics.Force;
+import coffee.liz.dyl.components.physics.Forces;
+import coffee.liz.dyl.components.physics.Gravity;
+import coffee.liz.dyl.components.physics.Jump;
+import coffee.liz.dyl.components.physics.Mass;
+import coffee.liz.dyl.components.physics.Solid;
+import coffee.liz.dyl.components.physics.Velocity;
 import coffee.liz.ecs.math.Vec2f;
 import coffee.liz.ecs.model.Entity;
 import org.junit.jupiter.api.Test;
@@ -54,7 +53,7 @@ class PhysicsSystemsTest {
     @Test
     public void entityLandsOnPlatformAndStops() {
         final DAGWorld world = new DAGWorld(
-            new ForceReductionSystem(GRAVITY), new IntegrationSystem(), new CollisionSystem(GRAVITY, 32f));
+            new ForceReductionSystem(GRAVITY), new IntegrationSystem(), new CollisionSystem());
 
         final Entity player = world.createEntity();
         player.add(new Mass(1f));
@@ -63,11 +62,10 @@ class PhysicsSystemsTest {
         player.add(new Gravity(100f));
         player.add(new Jump(false, 0L));
         player.add(new BoundingBox(new Vec2f(0f, 1.1f), new Vec2f(1f, 1f)));
-        player.add(new Collidable());
 
         final Entity floor = world.createEntity();
         floor.add(new BoundingBox(new Vec2f(-5f, 0f), new Vec2f(10f, 1f)));
-        floor.add(new TopCollidable());
+        floor.add(new Solid());
 
         world.update(0.1f);
 
diff --git a/core/src/test/java/coffee/liz/ecs/common/systems/physics/CollisionGridTest.java b/core/src/test/java/coffee/liz/ecs/common/systems/physics/CollisionGridTest.java
deleted file mode 100644
index d5670aa..0000000
--- a/core/src/test/java/coffee/liz/ecs/common/systems/physics/CollisionGridTest.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package coffee.liz.ecs.common.systems.physics;
-
-import coffee.liz.ecs.common.components.physics.BoundingBox;
-import coffee.liz.ecs.math.Vec2f;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-class CollisionGridTest {
-    private final CollisionGrid grid = new CollisionGrid();
-
-    @BeforeEach
-    public void setup() {
-        grid.setOrigin(new Vec2f(0f, 0f));
-        grid.setCellSize(new Vec2f(32f, 32f));
-    }
-
-    @Test
-    public void insertedEntityIsFoundAsNeighbor() {
-        final BoundingBox bb = new BoundingBox(new Vec2f(0f, 0f), new Vec2f(1f, 1f));
-        grid.insert(1, bb);
-        assertTrue(grid.getNeighborIds(bb).contains(1));
-    }
-
-    @Test
-    public void entityInDifferentCellIsNotNeighbor() {
-        final BoundingBox a = new BoundingBox(new Vec2f(0f, 0f), new Vec2f(1f, 1f));
-        final BoundingBox b = new BoundingBox(new Vec2f(100f, 100f), new Vec2f(1f, 1f));
-        grid.insert(1, a);
-        assertFalse(grid.getNeighborIds(b).contains(1));
-    }
-
-    @Test
-    public void clearRemovesAllEntities() {
-        final BoundingBox bb = new BoundingBox(new Vec2f(0f, 0f), new Vec2f(1f, 1f));
-        grid.insert(1, bb);
-        grid.clear();
-        assertTrue(grid.getNeighborIds(bb).isEmpty());
-    }
-
-    @Test
-    public void largeEntitySpanningMultipleCellsFoundByNeighborInAnyCell() {
-        final BoundingBox large = new BoundingBox(new Vec2f(0f, 0f), new Vec2f(64f, 64f));
-        final BoundingBox corner = new BoundingBox(new Vec2f(50f, 50f), new Vec2f(1f, 1f));
-        grid.insert(1, large);
-        assertTrue(grid.getNeighborIds(corner).contains(1));
-    }
-}