small refactoring
This commit is contained in:
parent
dc94998fd9
commit
7268c2a28a
@ -51,7 +51,7 @@ public class FormAirFighter extends Application {
|
|||||||
}
|
}
|
||||||
if (strategy == null)
|
if (strategy == null)
|
||||||
return;
|
return;
|
||||||
strategy.setData(new MoveableFighter(drawningWarPlane), (int) canvasAirFighter.getWidth(), (int) canvasAirFighter.getHeight());
|
strategy.setData(new MoveablePlane(drawningWarPlane), (int) canvasAirFighter.getWidth(), (int) canvasAirFighter.getHeight());
|
||||||
}
|
}
|
||||||
if (strategy == null)
|
if (strategy == null)
|
||||||
return;
|
return;
|
||||||
@ -132,9 +132,10 @@ public class FormAirFighter extends Application {
|
|||||||
|
|
||||||
@FXML
|
@FXML
|
||||||
@Override
|
@Override
|
||||||
|
@SuppressWarnings("unchecked")
|
||||||
public void start(Stage primaryStage) throws IOException {
|
public void start(Stage primaryStage) throws IOException {
|
||||||
FXMLLoader loader = new FXMLLoader();
|
FXMLLoader loader = new FXMLLoader();
|
||||||
loader.setLocation(FormAirFighter.class.getResource("Form.fxml"));
|
loader.setLocation(FormAirFighter.class.getResource("FormAirFighter.fxml"));
|
||||||
Parent root = loader.load();
|
Parent root = loader.load();
|
||||||
canvasAirFighter = (Canvas) loader.getNamespace().get("canvasAirFighter");
|
canvasAirFighter = (Canvas) loader.getNamespace().get("canvasAirFighter");
|
||||||
comboBoxStrategy = (ComboBox<String>) loader.getNamespace().get("comboBoxStrategy");
|
comboBoxStrategy = (ComboBox<String>) loader.getNamespace().get("comboBoxStrategy");
|
||||||
|
@ -7,13 +7,13 @@ import javafx.scene.paint.Color;
|
|||||||
import java.util.Random;
|
import java.util.Random;
|
||||||
|
|
||||||
public class DrawningAirFighter extends DrawningWarPlane {
|
public class DrawningAirFighter extends DrawningWarPlane {
|
||||||
private final DrawableExtras engineDrawing;
|
private final IDrawableExtras engineDrawing;
|
||||||
|
|
||||||
public DrawningAirFighter(int speed, double weight, Color bodyColor, Color
|
public DrawningAirFighter(int speed, double weight, Color bodyColor, Color
|
||||||
additionalColor, boolean bodyRockets, boolean additionalWings) {
|
additionalColor, boolean bodyRockets, boolean additionalWings) {
|
||||||
super(speed, weight, bodyColor);
|
super(speed, weight, bodyColor);
|
||||||
entityWarPlane = new EntityAirFighter(speed, weight, bodyColor, additionalColor, bodyRockets, additionalWings);
|
entityWarPlane = new EntityAirFighter(speed, weight, bodyColor, additionalColor, bodyRockets, additionalWings);
|
||||||
DrawableExtras[] engineDrawings = {
|
IDrawableExtras[] engineDrawings = {
|
||||||
new EllipticalEngineDrawing(),
|
new EllipticalEngineDrawing(),
|
||||||
new TriangleEngineDrawing(),
|
new TriangleEngineDrawing(),
|
||||||
new RectangleEngineDrawing()
|
new RectangleEngineDrawing()
|
||||||
|
@ -3,7 +3,7 @@ package com.projectairfighter.drawnings;
|
|||||||
import com.projectairfighter.entities.EntityAirFighter;
|
import com.projectairfighter.entities.EntityAirFighter;
|
||||||
import javafx.scene.canvas.GraphicsContext;
|
import javafx.scene.canvas.GraphicsContext;
|
||||||
|
|
||||||
public class EllipticalEngineDrawing implements DrawableExtras{
|
public class EllipticalEngineDrawing implements IDrawableExtras {
|
||||||
private EngineCount engineCount;
|
private EngineCount engineCount;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -3,7 +3,7 @@ package com.projectairfighter.drawnings;
|
|||||||
import com.projectairfighter.entities.EntityAirFighter;
|
import com.projectairfighter.entities.EntityAirFighter;
|
||||||
import javafx.scene.canvas.GraphicsContext;
|
import javafx.scene.canvas.GraphicsContext;
|
||||||
|
|
||||||
public interface DrawableExtras {
|
public interface IDrawableExtras {
|
||||||
void setCountEngines(int countEngines);
|
void setCountEngines(int countEngines);
|
||||||
void drawEngine(GraphicsContext gc, EntityAirFighter entityAirFighter, int startPosX, int startPosY);
|
void drawEngine(GraphicsContext gc, EntityAirFighter entityAirFighter, int startPosX, int startPosY);
|
||||||
}
|
}
|
@ -3,7 +3,7 @@ package com.projectairfighter.drawnings;
|
|||||||
import com.projectairfighter.entities.EntityAirFighter;
|
import com.projectairfighter.entities.EntityAirFighter;
|
||||||
import javafx.scene.canvas.GraphicsContext;
|
import javafx.scene.canvas.GraphicsContext;
|
||||||
|
|
||||||
public class RectangleEngineDrawing implements DrawableExtras {
|
public class RectangleEngineDrawing implements IDrawableExtras {
|
||||||
private EngineCount engineCount;
|
private EngineCount engineCount;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -3,7 +3,7 @@ package com.projectairfighter.drawnings;
|
|||||||
import com.projectairfighter.entities.EntityAirFighter;
|
import com.projectairfighter.entities.EntityAirFighter;
|
||||||
import javafx.scene.canvas.GraphicsContext;
|
import javafx.scene.canvas.GraphicsContext;
|
||||||
|
|
||||||
public class TriangleEngineDrawing implements DrawableExtras {
|
public class TriangleEngineDrawing implements IDrawableExtras {
|
||||||
private EngineCount engineCount;
|
private EngineCount engineCount;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
Loading…
x
Reference in New Issue
Block a user