Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Implemented inefficient pathfinding

Browse Source
This commit is contained in:
Anuken
2018-04-21 14:26:05 -04:00
parent 95f10aeb06
commit 5012313dc4
12 changed files with 107 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/src/io/anuke/mindustry/entities/units/BaseUnit.java
View File

@@ -1,6 +1,10 @@
package io.anuke.mindustry.entities.units;
import io.anuke.mindustry.entities.*;
import io.anuke.mindustry.ai.OptimizedPathFinder;
import io.anuke.mindustry.ai.SmoothGraphPath;
import io.anuke.mindustry.entities.Bullet;
import io.anuke.mindustry.entities.BulletType;
import io.anuke.mindustry.entities.Unit;
import io.anuke.mindustry.game.Team;
import io.anuke.ucore.entities.Entity;
import io.anuke.ucore.util.Mathf;
@@ -19,6 +23,10 @@ public class BaseUnit extends Unit{
public float walkTime = 0f;
public Entity target;
protected OptimizedPathFinder finder;
protected SmoothGraphPath path;
protected int node = -2;
public BaseUnit(UnitType type, Team team){
this.type = type;
this.team = team;
@@ -97,6 +105,11 @@ public class BaseUnit extends Unit{
hitbox.setSize(type.hitsize);
hitboxTile.setSize(type.hitsizeTile);
if(!isFlying()){
finder = new OptimizedPathFinder();
path = new SmoothGraphPath();
}
heal();
}

35
core/src/io/anuke/mindustry/entities/units/GroundUnitType.java
View File

@@ -15,19 +15,23 @@ import io.anuke.ucore.util.Mathf;
import io.anuke.ucore.util.Translator;
import static io.anuke.mindustry.Vars.state;
import static io.anuke.mindustry.Vars.world;
public abstract class GroundUnitType extends UnitType{
private static final int nodeStateNone = -2;
private static final int nodeStateCalculating = -1;
//only use for drawing!
protected Translator tr1 = new Translator();
//only use for updating!
protected Translator tr2 = new Translator();
protected float stopDistance = 30f;
protected float jumpDistance = 4f;
public GroundUnitType(String name) {
super(name);
maxVelocity = 1.1f;
speed = 0.05f;
speed = 0.1f;
drag = 0.4f;
}
@@ -103,16 +107,29 @@ public abstract class GroundUnitType extends UnitType{
@Override
public void behavior(BaseUnit unit) {
//TODO actually pathfind
tr2.set(unit.target.x, unit.target.y).sub(unit.x, unit.y);
if(unit.node == nodeStateNone){
world.pathfinder().findPath(world.tileWorld(unit.x, unit.y), world.tileWorld(unit.target.x, unit.target.y), unit.path, unit.finder, () -> {
unit.node = 0;
});
if(tr2.len() > stopDistance){
tr2.limit(speed);
unit.walkTime += Timers.delta();
unit.velocity.add(tr2);
unit.node = nodeStateCalculating;
}
if(!(unit.node >= 0 && unit.node < unit.path.nodes.size)) return;
Tile nodeTarget = unit.path.get(unit.node);
tr2.set(nodeTarget.worldx(), nodeTarget.worldy()).sub(unit.x, unit.y);
if(tr2.len() < jumpDistance){
unit.node ++;
}
tr2.limit(speed);
unit.walkTime += Timers.delta();
unit.velocity.add(tr2);
if(unit.timer.get(timerReload, reload)){
//shoot(unit, BulletType.shot, tr2.angle(), 4f);
}