test conflict

This commit is contained in:
Laureηt 2021-04-13 20:50:28 +02:00
parent 41a997b1d0
commit 16d8631635

View file

@ -32,8 +32,7 @@ public class Arrow extends BaseActor {
*/ */
Arrow(float angle, float power, Player shooter) { Arrow(float angle, float power, Player shooter) {
super(); super();
this.setPosition(shooter.getX() + shooter.getWidth() * MathUtils.cosDeg(shooter.getRotation()), // TODO: possible to not do trigonometry ? this.setPosition(shooter.getX(), shooter.getY());
shooter.getY() + shooter.getWidth() * MathUtils.sinDeg(shooter.getRotation()));
this.velocity = new Vector2(power, 0).setAngleDeg(angle); this.velocity = new Vector2(power, 0).setAngleDeg(angle);
this.acceleration = new Vector2(); this.acceleration = new Vector2();
this.setOrigin(80, 2); this.setOrigin(80, 2);