mirrors/riiablo
1
0
Fork 0
mirror of https://github.com/collinsmith/riiablo.git synced 2025-02-21 20:18:14 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added interactor and pathfind support to D2GS

Browse Source 
Added interactor and pathfind support to D2GS
Removed some special case code from pathfinder -- was forcing reliance on client code in what should be server-only code
This commit is contained in:
Collin Smith 2019-12-20 13:59:43 -08:00
parent 3cd621c4bf
commit 866cdc0504
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
core/src/com/riiablo/engine/server/Pathfinder.java
View File

@ -4,14 +4,11 @@ import com.artemis.ComponentMapper;
import com.artemis.annotations.All;
import com.artemis.annotations.Wire;
import com.artemis.systems.IteratingSystem;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.ai.utils.Collision;
import com.badlogic.gdx.ai.utils.Ray;
import com.badlogic.gdx.math.MathUtils;
import com.badlogic.gdx.math.Vector2;
import com.badlogic.gdx.utils.Pools;
import com.riiablo.Riiablo;
import com.riiablo.camera.IsometricCamera;
import com.riiablo.engine.server.component.Angle;
import com.riiablo.engine.server.component.Pathfind;
import com.riiablo.engine.server.component.Position;
@ -36,9 +33,6 @@ public class Pathfinder extends IteratingSystem {
@Wire(name = "map")
protected Map map;
@Wire(name = "iso")
protected IsometricCamera iso;
private final Vector2 tmpVec2 = new Vector2();
private final Ray<Vector2> ray = new Ray<>(new Vector2(), new Vector2());
private final Collision<Vector2> collision = new Collision<>(new Vector2(), new Vector2());
@ -77,13 +71,14 @@ public class Pathfinder extends IteratingSystem {
}
}
// FIXME: removes much of the jitter for player -- maybe there's a better solution though
if (entityId == Riiablo.game.player && pathfind.path.getCount() <= 1) {
iso.agg(tmpVec2.set(Gdx.input.getX(), Gdx.input.getY())).unproject().toWorld();
}
Angle angle = mAngle.get(entityId);
angle.target.set(tmpVec2.sub(position0)).nor();
/**
* FIXME: there is a lot of jitter here in the direction for shorter movements because of
* repathing every frame-- need to create some kind of target component which is a target
* entity or target point and if it's down to the last remaining waypoint, set angle to
* the actual point or entity.
*/
tmpVec2.sub(position0);
mAngle.get(entityId).target.set(tmpVec2).nor();
velocity.velocity.set(tmpVec2).setLength(speed);
}

7
server/d2gs/src/com/riiablo/server/d2gs/D2GS.java
View File

@ -32,9 +32,13 @@ import com.riiablo.engine.Engine;
import com.riiablo.engine.EntityFactory;
import com.riiablo.engine.server.AnimDataResolver;
import com.riiablo.engine.server.CofManager;
import com.riiablo.engine.server.ItemInteractor;
import com.riiablo.engine.server.ObjectInitializer;
import com.riiablo.engine.server.ObjectInteractor;
import com.riiablo.engine.server.Pathfinder;
import com.riiablo.engine.server.ServerEntityFactory;
import com.riiablo.engine.server.ServerNetworkIdManager;
import com.riiablo.engine.server.WarpInteractor;
import com.riiablo.engine.server.component.Networked;
import com.riiablo.map.DS1;
import com.riiablo.map.DS1Loader;
@ -219,6 +223,9 @@ public class D2GS extends ApplicationAdapter {
.with(new ServerNetworkIdManager())
.with(new CofManager())
.with(new ObjectInitializer())
.with(new ObjectInteractor(), new WarpInteractor(), new ItemInteractor())
.with(new Pathfinder())
.with(factory)
.with(sync)