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

general parenting

Browse source
This commit is contained in:
nora 2020-12-25 12:14:18 +01:00
parent a332f3488c
commit e82b5fe02f
8 changed files with 121 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -40,7 +40,7 @@ public class Turret extends GameObject {
@Override
public void draw(Graphics2D g2d) {
g2d.setPaint(mainColor);
Vector2D abs = parent.getWorldCoordsFromLocal(position);
Vector2D abs = getWorldCoordsFromLocal(position);
int sizeAbs = (int) Coordinates.getWorldCoordinates(size).x;
int xCenterAbs = (int) (abs.x + sizeAbs / 2);
int yCenterAbs = (int) (abs.y + sizeAbs / 2);
@ -77,7 +77,7 @@ public class Turret extends GameObject {
Point msLoc = master.getMouseLocation();
Vector2D mouseRel = Coordinates.getMapCoordinatesFromWorld(Vector2D.fromPoint(msLoc)); //100 correct
Vector2D centerMap = parent.getMapCoords(getCenterPosition());
Vector2D centerMap = getMapCoords(getCenterPosition());
double targetRotation = -Math.atan2(centerMap.x - mouseRel.x, centerMap.y - mouseRel.y);
rotation = ExMath.angleLerp(rotation, targetRotation, ROTATION_SPEED);
@ -88,7 +88,7 @@ public class Turret extends GameObject {
int barrelX = (int) (position.x + (i + 1) * barrelSpacing);
int frontPosY = (int) (position.y - size.x / 2);
Vector2D spawnPosNR = parent.getMapCoords(new Vector2D(barrelX, frontPosY));
Vector2D spawnPosNR = getMapCoords(new Vector2D(barrelX, frontPosY));
if (Input.isMousePressed()) {
lastShot = System.currentTimeMillis();