diff --git a/core/assets/sprites/testBackground.png b/core/assets/sprites/testBackground.png deleted file mode 100644 index 530f19f..0000000 Binary files a/core/assets/sprites/testBackground.png and /dev/null differ diff --git a/core/assets/sprites/wall.png b/core/assets/sprites/wall.png index 92b00bf..af1ad34 100644 Binary files a/core/assets/sprites/wall.png and b/core/assets/sprites/wall.png differ diff --git a/core/src/com/saltosion/gladiator/level/TestLevel.java b/core/src/com/saltosion/gladiator/level/TestLevel.java index e0e6f54..6735ca6 100644 --- a/core/src/com/saltosion/gladiator/level/TestLevel.java +++ b/core/src/com/saltosion/gladiator/level/TestLevel.java @@ -17,7 +17,6 @@ public class TestLevel implements Level { public void generate() { // Audience Entity audience = new Entity(); - Sprite audienceSprite0 = SpriteLoader.loadSprite(Name.AUDIENCEIMG, 0, 0, 768, 576); Sprite audienceSprite1 = SpriteLoader.loadSprite(Name.AUDIENCEIMG, 1, 0, 768, 576); CRenderedObject audienceRO = new CRenderedObject(); @@ -26,10 +25,19 @@ public class TestLevel implements Level { audienceRO.playAnimation("Default-Animation"); audience.add(audienceRO); CPhysics audiencePO = new CPhysics().setMovable(false).setGravityApplied(false) - .setProcessCollisions(false).setPosition(0, 10).setZParallax(9); + .setProcessCollisions(false).setGhost(true).setPosition(0, 10).setZParallax(9); audience.add(audiencePO); AppUtil.engine.addEntity(audience); + // Wall + Entity wall = new Entity(); + CRenderedObject wallRO = new CRenderedObject(SpriteLoader.loadSprite(Name.WALLIMG)); + wall.add(wallRO); + CPhysics wallPO = new CPhysics().setMovable(false).setGravityApplied(false) + .setProcessCollisions(false).setGhost(true).setPosition(0, 2).setZParallax(1.5f); + wall.add(wallPO); + AppUtil.engine.addEntity(wall); + // Ground Entity ground = new Entity(); Sprite groundSprite = SpriteLoader.loadSprite(Name.GROUNDIMG); diff --git a/core/src/com/saltosion/gladiator/systems/PhysicsSystem.java b/core/src/com/saltosion/gladiator/systems/PhysicsSystem.java index 8f53737..402f2af 100644 --- a/core/src/com/saltosion/gladiator/systems/PhysicsSystem.java +++ b/core/src/com/saltosion/gladiator/systems/PhysicsSystem.java @@ -12,7 +12,7 @@ import com.saltosion.gladiator.util.Direction; public class PhysicsSystem extends EntitySystem { - private static final float MAX_VEL = 1.75f, COLLISION_PRECISION = 12f, UPDATES_PER_SECOND = 120f; + private static final float MAX_VEL = 1.75f, COLLISION_PRECISION = 12f, UPDATES_PER_SECOND = 240f; private static final ComponentMapper pm = ComponentMapper.getFor(CPhysics.class); private static final ComponentMapper cm = ComponentMapper.getFor(CCombat.class);