stef_buwalda/pism
1
0
Fork 0
mirror of https://github.com/2OOP/pism.git synced 2026-02-04 02:44:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove: addCanvas

Browse Source
This commit is contained in:
ramollia
2025-10-04 16:30:50 +02:00
parent ba4173f029
commit 4daa379011
3 changed files with 6 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/org/toop/app/canvas/TicTacToeCanvas.java
View File

@@ -1,15 +1,15 @@
package org.toop.app.canvas; package org.toop.app.canvas;
import javafx.scene.paint.Color;
import org.toop.app.App;
import org.toop.game.Game; import org.toop.game.Game;
import org.toop.game.tictactoe.TicTacToe; import org.toop.game.tictactoe.TicTacToe;
import javafx.scene.paint.Color;
public class TicTacToeCanvas extends GameCanvas { public class TicTacToeCanvas extends GameCanvas {
private final TicTacToe game; private final TicTacToe game;
public TicTacToeCanvas() { public TicTacToeCanvas(int width, int height) {
super(App.getHeight(), App.getHeight(), 3, 3, 10); super(width, height, 3, 3, 10);
game = new TicTacToe(); game = new TicTacToe();
graphics.setFill(Color.CYAN); graphics.setFill(Color.CYAN);

25
app/src/main/java/org/toop/app/layer/Layer.java
View File

@@ -1,7 +1,6 @@
package org.toop.app.layer; package org.toop.app.layer;
import org.toop.app.App; import org.toop.app.App;
import org.toop.app.canvas.GameCanvas;
import org.toop.framework.asset.ResourceManager; import org.toop.framework.asset.ResourceManager;
import org.toop.framework.asset.resources.CssAsset; import org.toop.framework.asset.resources.CssAsset;
@@ -53,30 +52,6 @@ public abstract class Layer {
layer.getChildren().addLast(container.getContainer()); layer.getChildren().addLast(container.getContainer());
} }
protected void addCanvas(GameCanvas canvas, Pos position, int xOffset, int yOffset, int widthPercent, int heightPercent) {
StackPane.setAlignment(canvas.getCanvas(), position);
final double widthUnit = App.getWidth() / 100.0;
final double heightUnit = App.getHeight() / 100.0;
if (widthPercent > 0) {
canvas.getCanvas().setWidth(widthPercent * widthUnit);
} else {
canvas.getCanvas().setWidth(Region.USE_PREF_SIZE);
}
if (heightPercent > 0) {
canvas.getCanvas().setHeight(heightPercent * heightUnit);
} else {
canvas.getCanvas().setHeight(Region.USE_PREF_SIZE);
}
canvas.getCanvas().setTranslateX(xOffset * widthUnit);
canvas.getCanvas().setTranslateY(yOffset * heightUnit);
layer.getChildren().addLast(canvas.getCanvas());
}
protected void pop() { protected void pop() {
if (layer.getChildren().size() <= 1) { if (layer.getChildren().size() <= 1) {
return; return;

5
app/src/main/java/org/toop/app/layer/layers/GameLayer.java
View File

@@ -1,12 +1,12 @@
package org.toop.app.layer.layers; package org.toop.app.layer.layers;
import javafx.geometry.Pos;
import org.toop.app.App; import org.toop.app.App;
import org.toop.app.canvas.TicTacToeCanvas;
import org.toop.app.layer.Container; import org.toop.app.layer.Container;
import org.toop.app.layer.Layer; import org.toop.app.layer.Layer;
import org.toop.app.layer.containers.VerticalContainer; import org.toop.app.layer.containers.VerticalContainer;
import javafx.geometry.Pos;
public class GameLayer extends Layer { public class GameLayer extends Layer {
public GameLayer() { public GameLayer() {
super("game.css"); super("game.css");
@@ -23,7 +23,6 @@ public class GameLayer extends Layer {
App.activate(new MainLayer()); App.activate(new MainLayer());
}); });
addCanvas(new TicTacToeCanvas(), Pos.CENTER, 0, 0, 100, 100);
addContainer(controlContainer, Pos.BOTTOM_LEFT, 2, -2, 0, 0); addContainer(controlContainer, Pos.BOTTOM_LEFT, 2, -2, 0, 0);
} }
} }