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

coordinates change

Browse source
This commit is contained in:
nora 2020-12-12 12:37:13 +01:00
parent 843d30eb47
commit 47ec2337a4
9 changed files with 108 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/main/java/objects/ships/BattleShip.java
View file

@ -11,16 +11,14 @@ import java.util.ArrayList;
*/
public class BattleShip extends GameObject {
private Color mainColor;
private ArrayList<Turret> turrets;
public BattleShip(Color mainColor) {
super(20, 20, 5, 40);
turrets = new ArrayList<>();
turrets.add(new Turret(this, 25, 25, 50, 3));
this(20, 20, 5, 40, mainColor);
//TODO child x coords 100 not 100*16/9
turrets.add(new Turret(this, 100*16/9d/4, 25, 50, 3));
//turrets.add(new Turret(this, 25, 10, 50, 2));
//turrets.add(new Turret(this, 25, 70, 50, 2));
this.mainColor = mainColor;
}
public BattleShip(double x, double y, double xSize, double ySize, Color mainColor) {
@ -31,15 +29,8 @@ public class BattleShip extends GameObject {
@Override
public void draw(Graphics2D g2d, int w, Master master) {
this.w = w;
h = w/16*9;
g2d.setPaint(mainColor);
int xAbs = (int) getWorldCoords(position.x, true);
int yAbs = (int) getWorldCoords(position.y, false);
int sizeXAbs = (int) getWorldCoords(size.x, true);
int sizeYAbs = (int) getWorldCoords(size.y, false);
g2d.fillRoundRect(xAbs, yAbs, sizeXAbs, sizeYAbs, w/10, w/10);
drawRoundRect(g2d, w, w/10, w/10);
turrets.forEach((turret -> turret.draw(g2d, w, master)));
}

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

@ -43,7 +43,6 @@ public class Turret extends GameObject {
@Override
public void draw(Graphics2D g2d, int w, Master master) {
//TODO draw should be draw only for better everything
h = w / 16 * 9;
g2d.setPaint(mainColor);
int xAbs = battleShip.getWorldCoordsFromLocal(position.x, true);
@ -75,6 +74,8 @@ public class Turret extends GameObject {
}
}
g2d.rotate(-rotation, xCenterAbs, yCenterAbs);
g2d.setStroke(new BasicStroke());
}
@Override