Noratrieb/Java2DGame
1
0
Fork 0
mirror of https://github.com/Noratrieb/Java2DGame.git synced 2026-01-14 22:15:01 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

big update, stonks

Browse source
This commit is contained in:
nora 2020-12-18 18:40:59 +01:00
parent 9f460d499a
commit 8e15ad3ac8
26 changed files with 200 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/main/java/objects/ships/Turret.java
View file

@ -81,8 +81,8 @@ public class Turret extends GameObject {
Point msLoc = master.getMouseLocation();
Vector2D mouseRel = Coords.getMapCoordsFromWorld(Vector2D.fromPoint(msLoc)); //100 correct
Vector2D center = battleShip.getMapCoords(getCenterPosition());
double targetRotation = -Math.atan2(center.x - mouseRel.x, center.y - mouseRel.y);
Vector2D centerMap = battleShip.getMapCoords(getCenterPosition());
double targetRotation = -Math.atan2(centerMap.x - mouseRel.x, centerMap.y - mouseRel.y);
rotation = ExMath.angleLerp(rotation, targetRotation, ROTATION_SPEED);
@ -98,14 +98,13 @@ public class Turret extends GameObject {
lastShot = System.currentTimeMillis();
Vector2D shellVel = Vector2D.getUnitVector(rotation).negative().multiply(SHELL_SPEED);
master.debugPos(battleShip.getMapCoords(center));
master.debugPos(center);
//master.debugPos(centerMap);
Vector2D pos = Vector2D.rotateAround(
battleShip.getMapCoords(center),
centerMap,
spawnPosNR,
rotation);
master.debugPos(pos);
//master.debugPos(pos);
master.create(new Shell(pos, new Vector2D(SHELL_SIZE, SHELL_SIZE), shellVel));
}
}