From 4d074bee4af263925c4f805c6f06b56da7834d16 Mon Sep 17 00:00:00 2001 From: Jeasonfire Date: Sun, 17 May 2015 21:36:53 +0300 Subject: [PATCH] Added AI react distance debug rendering. --- .../saltosion/gladiator/level/EntityFactory.java | 12 ++++++++---- .../gladiator/level/premade/Round1Level.java | 2 +- .../gladiator/level/premade/Round2Level.java | 4 ++-- .../gladiator/systems/RenderingSystem.java | 15 +++++++++++++-- 4 files changed, 24 insertions(+), 9 deletions(-) diff --git a/core/src/com/saltosion/gladiator/level/EntityFactory.java b/core/src/com/saltosion/gladiator/level/EntityFactory.java index cb16790..ce38029 100644 --- a/core/src/com/saltosion/gladiator/level/EntityFactory.java +++ b/core/src/com/saltosion/gladiator/level/EntityFactory.java @@ -44,11 +44,15 @@ public class EntityFactory { return player; } - public Entity createDummy(Vector2 pos) { - return createDummy(pos, Direction.RIGHT); + public Entity createEnemy(Vector2 pos) { + return createEnemy(pos, Direction.RIGHT); } - public Entity createDummy(Vector2 pos, Direction initialDirection) { + public Entity createEnemy(Vector2 pos, Direction initialDirection) { + return createEnemy(pos, initialDirection, new CAI().setReactDistance(5).setAIListener(new DummyAI())); + } + + public Entity createEnemy(Vector2 pos, Direction initialDirection, CAI cai) { Entity dummy = new Entity(); dummy.flags |= Global.FLAG_ALIVE; @@ -61,7 +65,7 @@ public class EntityFactory { // Combat dummy.add(new CCombat().setBaseDamage(100).setHealth(1000).setSwingCD(.5f) .setCombatListener(new BasicDeathListener())); - dummy.add(new CAI().setReactDistance(5).setAIListener(new DummyAI())); + dummy.add(cai); AppUtil.engine.addEntity(dummy); diff --git a/core/src/com/saltosion/gladiator/level/premade/Round1Level.java b/core/src/com/saltosion/gladiator/level/premade/Round1Level.java index 19ba2f2..0ed9e37 100644 --- a/core/src/com/saltosion/gladiator/level/premade/Round1Level.java +++ b/core/src/com/saltosion/gladiator/level/premade/Round1Level.java @@ -37,7 +37,7 @@ public class Round1Level implements Level { public void generate() { AppUtil.levelFactory.createLevelBase(); player = AppUtil.entityFactory.createPlayer(new Vector2(-10, 2), Direction.RIGHT); - enemies.add(AppUtil.entityFactory.createDummy(new Vector2(10, 2), Direction.LEFT)); + enemies.add(AppUtil.entityFactory.createEnemy(new Vector2(10, 2), Direction.LEFT)); } } diff --git a/core/src/com/saltosion/gladiator/level/premade/Round2Level.java b/core/src/com/saltosion/gladiator/level/premade/Round2Level.java index d05a039..9e95f65 100644 --- a/core/src/com/saltosion/gladiator/level/premade/Round2Level.java +++ b/core/src/com/saltosion/gladiator/level/premade/Round2Level.java @@ -37,8 +37,8 @@ public class Round2Level implements Level { public void generate() { AppUtil.levelFactory.createLevelBase(); player = AppUtil.entityFactory.createPlayer(new Vector2(0, 2), Direction.RIGHT); - enemies.add(AppUtil.entityFactory.createDummy(new Vector2(10, 2), Direction.LEFT)); - enemies.add(AppUtil.entityFactory.createDummy(new Vector2(-10, 2), Direction.RIGHT)); + enemies.add(AppUtil.entityFactory.createEnemy(new Vector2(10, 2), Direction.LEFT)); + enemies.add(AppUtil.entityFactory.createEnemy(new Vector2(-10, 2), Direction.RIGHT)); } } diff --git a/core/src/com/saltosion/gladiator/systems/RenderingSystem.java b/core/src/com/saltosion/gladiator/systems/RenderingSystem.java index 3e78ae2..7bd1b94 100644 --- a/core/src/com/saltosion/gladiator/systems/RenderingSystem.java +++ b/core/src/com/saltosion/gladiator/systems/RenderingSystem.java @@ -18,6 +18,7 @@ import com.badlogic.gdx.graphics.g2d.SpriteBatch; import com.badlogic.gdx.graphics.glutils.ShapeRenderer; import com.badlogic.gdx.graphics.glutils.ShapeRenderer.ShapeType; import com.badlogic.gdx.math.Vector2; +import com.saltosion.gladiator.components.CAI; import com.saltosion.gladiator.components.CCombat; import com.saltosion.gladiator.components.CParticle; import com.saltosion.gladiator.components.CPhysics; @@ -28,7 +29,6 @@ import com.saltosion.gladiator.gui.nodes.TextNode; import com.saltosion.gladiator.gui.properties.TextProperty; import com.saltosion.gladiator.util.AppUtil; import com.saltosion.gladiator.util.Global; -import com.saltosion.gladiator.util.Log; import com.saltosion.gladiator.util.Name; import com.saltosion.gladiator.util.SpriteLoader; import com.saltosion.gladiator.util.SpriteSequence; @@ -40,6 +40,7 @@ public class RenderingSystem extends EntitySystem { private final ComponentMapper rom = ComponentMapper.getFor(CRenderedObject.class); private final ComponentMapper pm = ComponentMapper.getFor(CPhysics.class); private final ComponentMapper cm = ComponentMapper.getFor(CCombat.class); + private final ComponentMapper aim = ComponentMapper.getFor(CAI.class); private final ComponentMapper pam = ComponentMapper.getFor(CParticle.class); private ImmutableArray entities; @@ -53,7 +54,7 @@ public class RenderingSystem extends EntitySystem { public int screenWidth = 0; private boolean debug = false; - private final Color debugColor = new Color(0, 1, 0, 1); + private final Color debugColor = new Color(0, 1, 0, 1), debugAIColor = new Color(1, 0, 0, 1); private float deltaDelay = 0; private double deltaAvgSum; @@ -326,6 +327,16 @@ public class RenderingSystem extends EntitySystem { debugRenderer.line(x1, y0, x1, y1); debugRenderer.line(x1, y1, x0, y1); debugRenderer.line(x0, y1, x0, y0); + + CAI ai = aim.get(entities.get(i)); + if (ai == null) { + continue; + } + float x = physics.getPosition().x + getCameraOffset(playerPhys, physics).x; + float y = physics.getPosition().y + getCameraOffset(playerPhys, physics).y; + + debugRenderer.setColor(debugAIColor); + debugRenderer.circle(x, y, ai.getReactDistance()); } debugRenderer.end(); }