From e841bb41887abd7d10335ff5861404c004f5e90b Mon Sep 17 00:00:00 2001 From: Nilstrieb Date: Sun, 13 Dec 2020 12:13:27 +0100 Subject: [PATCH] fixed size scaling --- src/main/java/core/Coords.java | 2 +- src/main/java/core/Master.java | 2 +- src/main/java/objects/ships/BattleShip.java | 7 +++---- src/main/java/objects/ships/Submarine.java | 2 +- src/main/java/objects/ships/Turret.java | 8 ++++---- src/main/java/objects/world/Grid.java | 2 +- src/main/java/objects/world/Wall.java | 2 +- target/classes/core/Master.class | Bin 6149 -> 6149 bytes target/classes/objects/ships/BattleShip.class | Bin 2342 -> 2333 bytes target/classes/objects/ships/Turret.class | Bin 3653 -> 3653 bytes target/classes/objects/world/Grid.class | Bin 1128 -> 1153 bytes 11 files changed, 12 insertions(+), 13 deletions(-) diff --git a/src/main/java/core/Coords.java b/src/main/java/core/Coords.java index 6d77a44..57aaa50 100644 --- a/src/main/java/core/Coords.java +++ b/src/main/java/core/Coords.java @@ -42,7 +42,7 @@ public class Coords { public static Vector2D getWorldCoordsSize(Vector2D value) { //TODO h not w - double x = (value.x / Master.SCREEN_Y_COORDINATES * master.getW()); + double x = (value.x / Master.SCREEN_Y_COORDINATES * master.getH()); double y = (value.y / Master.SCREEN_Y_COORDINATES * master.getH()); return new Vector2D(x, y); } diff --git a/src/main/java/core/Master.java b/src/main/java/core/Master.java index 22203db..19b0fc2 100644 --- a/src/main/java/core/Master.java +++ b/src/main/java/core/Master.java @@ -79,7 +79,7 @@ public class Master extends JPanel { BattleShip battleShip = new BattleShip(Color.DARK_GRAY); - BattleShip bs = new BattleShip(70, 10, 5, 80, Color.GREEN); + BattleShip bs = new BattleShip(140, 10, 10, 80, Color.GREEN); /*for (int i = 0; i < 10; i++) { bs.addTurret(new Turret(bs, 25, 10 * i + 1, 50, i % 5)); }*/ diff --git a/src/main/java/objects/ships/BattleShip.java b/src/main/java/objects/ships/BattleShip.java index 55328d4..a936191 100644 --- a/src/main/java/objects/ships/BattleShip.java +++ b/src/main/java/objects/ships/BattleShip.java @@ -11,12 +11,11 @@ import java.util.ArrayList; */ public class BattleShip extends GameObject { - private ArrayList turrets; + private final ArrayList turrets; public BattleShip(Color mainColor) { - 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)); + this(20, 20, 10, 40, mainColor); + turrets.add(new Turret(this, 25, 25, 50, 3)); //turrets.add(new Turret(this, 25, 10, 50, 2)); //turrets.add(new Turret(this, 25, 70, 50, 2)); } diff --git a/src/main/java/objects/ships/Submarine.java b/src/main/java/objects/ships/Submarine.java index 80215a0..985c8e5 100644 --- a/src/main/java/objects/ships/Submarine.java +++ b/src/main/java/objects/ships/Submarine.java @@ -12,7 +12,7 @@ import java.awt.*; public class Submarine extends GameObject implements Collidable { - private RectHitBox hitbox; + private final RectHitBox hitbox; public Submarine(Vector2D position, Vector2D size) { super(position, size); diff --git a/src/main/java/objects/ships/Turret.java b/src/main/java/objects/ships/Turret.java index acd4d1c..6fe83b1 100644 --- a/src/main/java/objects/ships/Turret.java +++ b/src/main/java/objects/ships/Turret.java @@ -22,7 +22,7 @@ public class Turret extends GameObject { private double rotation; - private Color mainColor; + private final Color mainColor; private long lastShot = 0; @@ -50,7 +50,7 @@ public class Turret extends GameObject { int xCenterAbs = (int) (abs.x + sizeAbs / 2); int yCenterAbs = (int) (abs.y + sizeAbs / 2); - g2d.fillOval((int) abs.x, (int) abs.y, (int) sizeAbs, (int) sizeAbs); + g2d.fillOval((int) abs.x, (int) abs.y, sizeAbs, sizeAbs); g2d.setStroke(new BasicStroke((int) battleShip.getWorldCoordsFromLocalSize(new Vector2D(10, 0)).x, BasicStroke.CAP_BUTT, BasicStroke.JOIN_BEVEL)); @@ -58,7 +58,7 @@ public class Turret extends GameObject { //BARRELS--------------------------------------- g2d.setPaint(Color.BLACK); - int barrelSpacing = (int) (sizeAbs / (barrelAmount + 1)); + int barrelSpacing = sizeAbs / (barrelAmount + 1); g2d.rotate(rotation, xCenterAbs, yCenterAbs); for (int i = 0; i < barrelAmount; i++) { @@ -91,7 +91,7 @@ public class Turret extends GameObject { rotation = ExMath.angleLerp(rotation, targetRotation, ROTATION_SPEED); - int barrelSpacing = (int) (sizeAbs / (barrelAmount + 1)); + int barrelSpacing = sizeAbs / (barrelAmount + 1); for (int i = 0; i < barrelAmount; i++) { int barrelX = (int) (abs.x + (i + 1) * barrelSpacing); diff --git a/src/main/java/objects/world/Grid.java b/src/main/java/objects/world/Grid.java index 744a8bc..83a555e 100644 --- a/src/main/java/objects/world/Grid.java +++ b/src/main/java/objects/world/Grid.java @@ -10,7 +10,7 @@ import java.awt.*; */ public class Grid extends GameObject { - private int gridSpacing = 50; + private final int gridSpacing = 50; public Grid() { super(0, 0, 0, 0); diff --git a/src/main/java/objects/world/Wall.java b/src/main/java/objects/world/Wall.java index fb0818f..ee0dbe6 100644 --- a/src/main/java/objects/world/Wall.java +++ b/src/main/java/objects/world/Wall.java @@ -11,7 +11,7 @@ import java.awt.*; public class Wall extends GameObject implements Collidable { - private RectHitBox hitbox; + private final RectHitBox hitbox; public Wall(double x, double y, double xSize, double ySize) { super(x, y, xSize, ySize); diff --git a/target/classes/core/Master.class b/target/classes/core/Master.class index efeaa03c74dc6d001a557cf20aab246daa08a427..49e3fdf93bdff03c7e8da9cd262b4345fa8bc9b7 100644 GIT binary patch delta 240 zcmZoQXf@dIgfS?wfdK^A98^FQ0|T2w2!z4Opv_>#!(h#z&&a^)9^~rk$Hkz*V9Ue6 z%3#OHAgGdMd{&Oc=m`%|T_N*rJICMc5>G7`PcEC*D@$mS&J)XOQJ# zkYkXa%)@BLt;nFn&Y%pER+;R}s3;-Lpa$ZoGcqu1Xohhza4=}{FlaGoPi|vWX4BHBLk0TUS4XEb53G$acVI;Lmnf8>f}ULS?*#LpZxsn(gJpdg30=9 z`ihDS3=E76LJa&20t}1{_6!URObiYTYz&MH+zgHkj0{eb>)EvHg+&-d*|sx?Z)1=O z-w0OY%)r3F$H2_Mz#zyV$RNa^%^=F)!oa{F#=ykDz@Wq6%HReLQyoxXFffA6;{ln+ zz`)SLz{$YHz`!7*rLHN#D#5;;K|yObgLLF}2Gy+$yjqf+TNyMEwg@q>)H5(JNHB0Q zNHT~rNHIt=NQ14iV_*Xr0=G(r!JWZ_fe|d`$>0HYoD72(g9igESj?NjgMl5)(qhnN z;ACI~g)-Dhc?@g}EDQ_`a$4FlG6GyVAiRx1M{5fMueOYC{VoOr28L}6CJ0wS{I0;j z$Dqg{%b)~ykQT%UxP#;vd>DMe4w7T=WAF!uj2uG%Lm&e)10yJ!pq5)RFo9L^f~?!c zV1Z^87ehTLOw|~87}UY`fWnc1ffs5IBSSDl2-GAe1}3mATp*LQQDch>EThH1$)F83 z1rk$SP*WHfxEMki!Wb9@xIifiYF+>X3&>CP3>>;z(mLB1tPueKN+JvlieRH49_Iji z7ZmFpVDExrf&=Vbkn=gf#xpZ8Gem+DP!vNnG`YkuFf$}Gq%veMKv&i^qKykNemhEWx4-Y!03f1{Z@M zgA@+~H-q%VOKRM*407xY@;nR*42qMP8O^wr8C2LAR6){elU*1UC1e>iKpag*24)S- zFir*z25lY&9R}UWwT#Ma`aBE<42F}JF&eQM^Dvk&m`=XO7{DRRV9vu}!C*PrjLDGA z8YFHrIhRR|&5nn`p21=BOeQuazIZN%1cpR*h9n+_WQLT@Ygt$r8Pg`qGm0C9@v|{x za4~Q&Wb!aXGDHb5gz>X7BpO1Q-|@92poGm>8TG*cccYxEY)o7#Un9m$7Nri;6Ia zvu$UP+{Pdiz7ed(m4ShQkAazifkBW#kU^M1n?a1hje&tdjDd-PfkB7CoxuYfhB}}S zU|^K<)9|kW5R*t?+E=Kvee%)rbL4NfaD46)FZ5y!yHkjjwGki`IDWiwcsy>X diff --git a/target/classes/objects/ships/Turret.class b/target/classes/objects/ships/Turret.class index 54be3db3c1a4504b5c3b7e59bc98f0b4075bd5a5..e77ea7d1a9182effae529876955c83b869399e7d 100644 GIT binary patch delta 14 WcmX>qb5v%-Yz{`D&2uqb5v%-Yz{`I&2uff$?3=9lb47MA&Y#D`lo%8dGOA_-+!V+^zQ<)hU7>qW%GO9323o&pr z@Gvkks4*}wFfphzFf%YRurg>cFfwRPu3=KJ)?#2_;9~%35Mbb7;AP-r5MW6%fbVPIekVqj(9U|?XVn|z%~nOndp$Bad53xkY+(PU2MP)4oE z@yyco8Vs@wh79ry)(i>^?hJ|yfei8t;S4Gai43X?Sqy3n+#EK>$E z2IhPQ4TdlVa|Rv;76wBGUj_>X9tKthO9lo8AqJLz3?__>jK3I^{xC3sCff$?3=9lb4AvXDY#BGlFe)($Gcj;8@GvkiFf%YRurjDIFfyo5p2?(O zt--*+z{kMMz`!8Dz`?-Fz{eoSpvl0%z{9}Ez`(%Ipv9ogz`(%Bpu?aG(!;>O7{DT6PA83PXkD}y-$1A`C)%RdGSMn=Y83`&0(m_QT*BZCDb qs2CWa!N9=4xRHT@fr$a+M>en(dSJIg!iy2)22e0FGFXC@Spfj6=_uL&