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

shooting works

Browse source
This commit is contained in:
nora 2020-12-11 20:29:03 +01:00
parent 0d5397dbe3
commit e2483b30ff
8 changed files with 45 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/main/java/core/Master.java
View file

@ -3,6 +3,7 @@ package core;
import objects.DebugPos;
import objects.ships.BattleShip;
import objects.GameObject;
import objects.ships.Turret;
import objects.world.Grid;
import javax.swing.*;
@ -38,9 +39,9 @@ public class Master extends JPanel {
BattleShip battleShip = new BattleShip(Color.DARK_GRAY);
BattleShip bs = new BattleShip(70, 10, 5, 80, Color.GREEN);
/*for (int i = 0; i < 10; i++) {
for (int i = 0; i < 10; i++) {
bs.addTurret(new Turret(bs, 25, 10 * i + 1, 50, i % 5));
}*/
}
objects.add(bs);
objects.add(battleShip);
}

16
src/main/java/core/Vector2D.java
View file

@ -1,5 +1,6 @@
package core;
/**
* A 2-dimensional Vector that can be used to store position or velocity
*/
@ -45,7 +46,7 @@ public class Vector2D {
}
/**
* Mulitply this vector with a simple scalar, modifies this object
* Multiply this vector with a simple scalar, modifies this object
*
* @param a The scalar
* @return this after the multiplication
@ -111,6 +112,9 @@ public class Vector2D {
/**
* Rotate a point around another point
*
* This method can now be trusted
*
* @param center The center of the rotation
* @param value The point to be rotated, absolut to the center
* @param rotation The rotation angle in radians
@ -121,12 +125,18 @@ public class Vector2D {
Vector2D dif = Vector2D.subtract(value, center);
double rotatedX = Math.cos(rotation * rotationDirection) * dif.x;
double rotatedY = Math.sin(rotation * rotationDirection) * dif.x;
rotation = rotationDirection * rotation;
double rotatedX = dif.x * Math.cos(rotation) - dif.y * Math.sin(rotation);
double rotatedY = dif.x * Math.sin(rotation) + dif.y * Math.cos(rotation);
return new Vector2D(rotatedX + center.x, rotatedY + center.y);
}
/**
* Copy this object
* @return A copy of this object
*/
public Vector2D copy(){
return new Vector2D(x, y);
}