diff --git a/MavenChess/.idea/misc.xml b/MavenChess/.idea/misc.xml
index 0a5c3589fb9cb8a9a86a4d002a6d654e1b26c97c..abcc7fdbf4f41962418209acb3e25fd65eea731e 100644
--- a/MavenChess/.idea/misc.xml
+++ b/MavenChess/.idea/misc.xml
@@ -8,7 +8,7 @@
</list>
</option>
</component>
- <component name="ProjectRootManager" version="2" languageLevel="JDK_X" default="true" project-jdk-name="openjdk-20" project-jdk-type="JavaSDK">
+ <component name="ProjectRootManager" version="2" languageLevel="JDK_20" default="true" project-jdk-name="openjdk-20" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" />
</component>
</project>
\ No newline at end of file
diff --git a/MavenChess/MavenChess/src/main/java/controller/Main.java b/MavenChess/MavenChess/src/main/java/controller/Main.java
index c55ee5a8a73a8f711fffd1861c47618603c75a33..b7f59a6aed8c234c0b40c1014dad5db855847ae4 100644
--- a/MavenChess/MavenChess/src/main/java/controller/Main.java
+++ b/MavenChess/MavenChess/src/main/java/controller/Main.java
@@ -4,6 +4,7 @@ import javafx.application.Application;
import javafx.scene.*;
import javafx.scene.input.KeyEvent;
import javafx.scene.input.MouseEvent;
+import javafx.scene.input.ScrollEvent;
import javafx.stage.Stage;
import model.Board;
import model.Position;
@@ -22,7 +23,7 @@ public class Main extends Application {
stage.setTitle("Chess3D - Tuna Acikbas & Olivier Pillods"); // title
// init - camera
- CustomCamera camera = new CustomCamera(1, 1000, 70); // create a camera and some settings
+ CustomCamera camera = new CustomCamera(1, 600, 70); // create a camera and some settings
// init - scene, main container
Group group = new Group(); // will contain all the elements "to show" on scene
@@ -51,15 +52,12 @@ public class Main extends Application {
// event --------------------------------------------------------------
- // event - camera movement with mouse
+ // event - camera rotation (mouse dragging)
camera.initMouseControl(scene.get()); // allow user to move camera with mouse, with some constraints
- // event - camera manual zoom (Z and S)
- stage.addEventHandler(KeyEvent.KEY_PRESSED, event -> {
- switch (event.getCode()) {
- case Z -> camera.getCamera().translateZProperty().set(camera.getCamera().getTranslateZ() + 10);
- case S -> camera.getCamera().translateZProperty().set(camera.getCamera().getTranslateZ() - 10);
- }
+ // event - camera zoom (mouse scroll)
+ stage.addEventHandler(ScrollEvent.SCROLL, event -> {
+ camera.scrollCamera(event.getDeltaY());
});
// event - click on (visual) pieces to show (visually) available movements. (asked from model rules)
diff --git a/MavenChess/MavenChess/src/main/java/model/Board.java b/MavenChess/MavenChess/src/main/java/model/Board.java
index bb1022756838b5ef8ab56cbc984259a61c521138..c935d12bbaf66b1aeb8da83bceeb2d5545b41dab 100644
--- a/MavenChess/MavenChess/src/main/java/model/Board.java
+++ b/MavenChess/MavenChess/src/main/java/model/Board.java
@@ -89,4 +89,8 @@ public class Board {
public boolean isKing(Position p) {
return (!isFree(p) && pieces[p.getID()].getClass() == King.class);
}
+
+ public boolean isPawn(Position p) {
+ return (!isFree(p) && pieces[p.getID()].getClass() == Pawn.class);
+ }
}
diff --git a/MavenChess/MavenChess/src/main/java/view/BoardView.java b/MavenChess/MavenChess/src/main/java/view/BoardView.java
index 8eba05b1861f50e9449ba6c17ddcfae60a241042..2f5def44276b33dacab6bd120bd5214491999e6d 100644
--- a/MavenChess/MavenChess/src/main/java/view/BoardView.java
+++ b/MavenChess/MavenChess/src/main/java/view/BoardView.java
@@ -3,6 +3,7 @@ package view;
import javafx.scene.Group;
import javafx.scene.shape.*;
import model.Board;
+import model.Pawn;
import model.Piece;
import model.Position;
@@ -15,6 +16,7 @@ public class BoardView {
private TileView[] tiles; // contains all the squares/tiles of the board (visual)
private PieceView[] pieces; // contains all the 3d pieces (visual)
private int black_death_count, white_death_count; // graveyard counter
+
public BoardView(Custom3dModel model, CustomMaterial material) {
// creates the board squares, and position them properly
tiles = new TileView[64];
@@ -33,14 +35,12 @@ public class BoardView {
int y;
for(int color = Piece.WHITE; color == Piece.WHITE || color == Piece.BLACK ; color++) {
// placement of pawns
- if(color == Piece.WHITE) { y = 2; }
- else { y = 7; }
+ if(color == Piece.WHITE) { y = 2; } else { y = 7; }
for(int x = Position.a ; x <= Position.h ; x++) {
createPiece(x, y, model.get(Custom3dModel.PAWN), color, material);
}
// placement of rook, knight, bishop, queen, king
- if(color == Piece.WHITE) { y = 1; }
- else { y = 8; }
+ if(color == Piece.WHITE) { y = 1; } else { y = 8; }
createPiece(Position.a, y, model.get(Custom3dModel.ROOK), color, material);
createPiece(Position.b, y, model.get(Custom3dModel.KNIGHT), color, material);
createPiece(Position.c, y, model.get(Custom3dModel.BISHOP), color, material);
@@ -66,8 +66,8 @@ public class BoardView {
public void updatePiece(Position position) { // updates the piece(i, j), visually, to the right position
int id = position.getID();
if(getPiece(id) != null) {
- getPieceObj(id).translateXProperty().set((float) ((position.getX()-1) * BOARD_SIZE + CENTERED_ORIGIN));
- getPieceObj(id).translateZProperty().set((float) ((position.getY()-1) * BOARD_SIZE + CENTERED_ORIGIN));
+ getPieceObj(id).setTranslateX((position.getX()-1) * BOARD_SIZE + CENTERED_ORIGIN);
+ getPieceObj(id).setTranslateZ((position.getY()-1) * BOARD_SIZE + CENTERED_ORIGIN);
}
}
@@ -75,23 +75,22 @@ public class BoardView {
int x = piece.getPosition().getX();
int y = piece.getPosition().getY();
if(x == Position.WHITE_GRAVEYARD) {
- piece.getObj().translateXProperty().set((float) (-2 * BOARD_SIZE + CENTERED_ORIGIN));
- piece.getObj().translateZProperty().set((float) (y * BOARD_SIZE*0.65f - BOARD_SIZE*4));
- }
- else { // x == Position.BLACK_GRAVEYARD
- piece.getObj().translateXProperty().set((float) (9 * BOARD_SIZE + CENTERED_ORIGIN));
- piece.getObj().translateZProperty().set((float) (-y * BOARD_SIZE*0.65f + BOARD_SIZE*4));
+ piece.getObj().setTranslateX(-2 * BOARD_SIZE + CENTERED_ORIGIN);
+ piece.getObj().setTranslateZ(y * BOARD_SIZE*0.65f - BOARD_SIZE*4);
+ } else { // x == Position.BLACK_GRAVEYARD
+ piece.getObj().setTranslateX(9 * BOARD_SIZE + CENTERED_ORIGIN);
+ piece.getObj().setTranslateZ(-y * BOARD_SIZE*0.65f + BOARD_SIZE*4);
}
- piece.getObj().translateYProperty().set((float)-8);
+ piece.getObj().setTranslateY(-1); // place at right height (Y axis) on table
}
public void createTile(int x, int y) {
// creates a tile and inits the right size and position
Box box = new Box(BOARD_SIZE, BOARD_SIZE / 2, BOARD_SIZE);
- box.translateXProperty().set((x-1) * BOARD_SIZE + CENTERED_ORIGIN);
- box.translateZProperty().set((y-1) * BOARD_SIZE + CENTERED_ORIGIN);
+ box.setTranslateX((x-1) * BOARD_SIZE + CENTERED_ORIGIN);
+ box.setTranslateZ((y-1) * BOARD_SIZE + CENTERED_ORIGIN);
// sets the tile on the list
- setTile(new Position(x, y).getID(), new TileView(box, new Position(x, y)));
+ setTile(new TileView(box, new Position(x, y)));
}
private void createPiece(int x, int y, TriangleMesh mesh, int color, CustomMaterial material) {
@@ -105,8 +104,13 @@ public class BoardView {
int scale = 16; // scales the 3d models to a wanted size, to fit a board tile
obj.setScaleX(scale);
obj.setScaleY(-scale); // Y axis is down (not up) in javaFX, so we need to reverse object
- obj.setScaleZ(scale);
- obj.translateYProperty().set((float)-12); // place at right height (Y axis)
+ obj.setScaleZ(-scale); // we reverse Z axis too, "to keep the orientation of the 3-axis vectors", (reversing Y and Z is equivalent of 180° rotation of X axis)
+ obj.setTranslateY(-5); // place at right height (Y axis) on board
+ // if color is black we rotate
+ if(color == Piece.BLACK) {
+ obj.setScaleX(-obj.getScaleX());
+ obj.setScaleZ(-obj.getScaleZ());
+ }
// sets the piece on the list
Position position = new Position(x, y);
setPiece(new PieceView(obj, position, color));
@@ -121,22 +125,27 @@ public class BoardView {
public TileView getTile(int id) {
return tiles[id];
}
+
public Box getTileObj(int id) {
return tiles[id].getObj();
}
- public void setTile(int id, TileView tile) {
- tiles[id] = tile;
+
+ public void setTile(TileView tile) {
+ tiles[tile.getPosition().getID()] = tile;
}
public PieceView[] getPieces() {
return pieces;
}
+
public PieceView getPiece(int id) {
return pieces[id];
}
+
public MeshView getPieceObj(int id) {
return pieces[id].getObj();
}
+
public void setPiece(PieceView piece) {
pieces[piece.getPosition().getID()] = piece;
}
@@ -148,8 +157,7 @@ public class BoardView {
if((i + j) % 2 == 0) {
getTileObj(n).setMaterial(material.get(CustomMaterial.BOARDBLACK));
getTile(n).setState(TileView.NORMAL);
- }
- else {
+ } else {
getTileObj(n).setMaterial(material.get(CustomMaterial.BOARDWHITE));
getTile(n).setState(TileView.NORMAL);
}
@@ -167,9 +175,6 @@ public class BoardView {
default -> getTile(position.getID()).setState(TileView.NORMAL);
}
}
- public void setColor(CustomMaterial material, int id, int type) {
- getTileObj(id).setMaterial(material.get(type));
- }
public void clickPiece(CustomMaterial material, PieceView clickedPiece, Board board) {
Position position = clickedPiece.getPosition();
@@ -180,11 +185,13 @@ public class BoardView {
for (Position move : moves) {
if(board.isFree(move)) {
setColor(material, move, CustomMaterial.MOVABLE);
- }
- else if(board.isEnnemy(move, position)) {
+ } else if(board.isEnnemy(move, position)) {
setColor(material, move, CustomMaterial.ATTACK);
+ } else {
+ setColor(material, move, CustomMaterial.SPECIAL);
}
- else {
+ // promotion
+ if(board.isPawn(position) && (move.getY() == 8 || move.getY() == 1)) {
setColor(material, move, CustomMaterial.SPECIAL);
}
}
@@ -199,6 +206,10 @@ public class BoardView {
killPiece(getPiece(arrival.getID()));
}
if(state == TileView.SPECIAL) {
+ // promotion can be done while attacking too
+ if(!board.isFree(arrival)) {
+ killPiece(getPiece(arrival.getID()));
+ }
// promotion + rook , to implement
}
board.movePiece(selected, arrival); // move piece (on model)
@@ -219,8 +230,7 @@ public class BoardView {
if(piece.getColor() == Piece.WHITE){
white_death_count++;
piece.setPosition(new Position(Position.WHITE_GRAVEYARD, white_death_count));
- }
- else {
+ } else {
black_death_count++;
piece.setPosition(new Position(Position.BLACK_GRAVEYARD, black_death_count));
}
diff --git a/MavenChess/MavenChess/src/main/java/view/Custom3dModel.java b/MavenChess/MavenChess/src/main/java/view/Custom3dModel.java
index 04b46c3e45f1b191414d6bdcfa83eff7fcd680ac..7ec0d344779259008b17cf46775ff7e956c927e8 100644
--- a/MavenChess/MavenChess/src/main/java/view/Custom3dModel.java
+++ b/MavenChess/MavenChess/src/main/java/view/Custom3dModel.java
@@ -5,6 +5,7 @@ import javafx.scene.shape.TriangleMesh;
import java.io.File;
import java.io.FileNotFoundException;
import java.net.URL;
+import java.util.ArrayList;
import java.util.Scanner;
public class Custom3dModel {
@@ -12,21 +13,21 @@ public class Custom3dModel {
private TriangleMesh[] model;
public static final int PAWN = 0, ROOK = 1, KNIGHT = 2, BISHOP = 3, QUEEN = 4, KING = 5;
+
public Custom3dModel() {
model = new TriangleMesh[6];
model[PAWN] = objImport("/pawn.obj");
model[ROOK] = objImport("/rook.obj");
model[KNIGHT] = objImport("/knight.obj");
- //model[BISHOP] = objImport("/bishop.obj");
+ model[BISHOP] = objImport("/bishop.obj");
model[QUEEN] = objImport("/queen.obj");
- //model[KING] = objImport("/king.obj");
+ model[KING] = objImport("/king.obj");
}
public TriangleMesh get(int id) {
- if(id > 2)
- id = 0;
return model[id];
}
+
private TriangleMesh objImport(String filename) {
// (o_o) #olivier
// yes, I had to write my own "Import 3d model" function, because javaFX doesn't have any
@@ -36,6 +37,8 @@ public class Custom3dModel {
TriangleMesh mesh = new TriangleMesh();
mesh.getTexCoords().addAll(0,0,0,0); // setup empty texture UV , we import without texture
mesh.getPoints().addAll(0,0,0); // adds a vertex 0 (because files .obj start from vertex 1)
+ float min = 0, max = 0, y;
+ ArrayList<Float> vdata = new ArrayList<Float>();
try {
URL url = this.getClass().getResource(filename);
File myObj = new File(url.getPath().replaceAll("%20", " "));
@@ -43,13 +46,15 @@ public class Custom3dModel {
while (myReader.hasNextLine()) {
String[] data = myReader.nextLine().split(" ");
if(data[0].equals("v")) {
- mesh.getPoints().addAll(
- Float.parseFloat(data[1]+"f"),
- Float.parseFloat(data[2]+"f"),
- Float.parseFloat(data[3]+"f")
- );
- }
- else if(data[0].equals("f")) {
+ y = Float.parseFloat(data[2]+"f");
+ //mesh.getPoints().addAll(Float.parseFloat(data[1]+"f"), y, Float.parseFloat(data[3]+"f"));
+ if(y > max) {
+ max = y;
+ }
+ vdata.add(Float.parseFloat(data[1]+"f"));
+ vdata.add(y);
+ vdata.add(Float.parseFloat(data[3]+"f"));
+ } else if(data[0].equals("f")) {
mesh.getFaces().addAll(
Integer.parseInt(data[1].split("/")[0]), 0,
Integer.parseInt(data[2].split("/")[0]), 0,
@@ -62,6 +67,16 @@ public class Custom3dModel {
System.out.println("Error while importing .obj file");
e.printStackTrace();
}
+ int n = 0;
+ for(float v : vdata) {
+ if(n == 1) {
+ mesh.getPoints().addAll(v+max);
+ }
+ else {
+ mesh.getPoints().addAll(v);
+ }
+ n = (n + 1) % 3;
+ }
return mesh;
}
}
diff --git a/MavenChess/MavenChess/src/main/java/view/CustomCamera.java b/MavenChess/MavenChess/src/main/java/view/CustomCamera.java
index 19772896c4417739937816ca36ba1a568e200ad1..a273cfe4375a65a02208d517ef52233cc6c712c3 100644
--- a/MavenChess/MavenChess/src/main/java/view/CustomCamera.java
+++ b/MavenChess/MavenChess/src/main/java/view/CustomCamera.java
@@ -6,23 +6,24 @@ import javafx.scene.Group;
import javafx.scene.PerspectiveCamera;
import javafx.scene.Scene;
import javafx.scene.transform.Rotate;
+import javafx.scene.transform.Translate;
public class CustomCamera {
private PerspectiveCamera camera;
private Group group; // used to rotate camera from 0,0,0 and not from camera x,y,z
private double anchorX, anchorY, anchorAngleX, anchorAngleY;
+
+ private final static double SCROLL_SPEED = 10;
private DoubleProperty angleX, angleY;
public CustomCamera(int nearClip, int farClip, int fov) {
camera = new PerspectiveCamera(true);
camera.setFieldOfView(fov);
- camera.translateXProperty().set(0);
- camera.translateYProperty().set(0);
- camera.translateZProperty().set((float)-130);
+ camera.getTransforms().add(new Translate(0,0,-130));
camera.setNearClip(nearClip);
camera.setFarClip(farClip);
group = new Group(camera);
- group.translateYProperty().set(20);
+ group.setTranslateY(20);
// camera controls for user (with mouse)
angleX = new SimpleDoubleProperty(-45);
angleY = new SimpleDoubleProperty(8);
@@ -55,7 +56,7 @@ public class CustomCamera {
});
int min = -90;
- int max = -20;
+ int max = -18;
scene.setOnMouseDragged(event -> {
angleX.set(anchorAngleX + (anchorY - event.getSceneY()));
@@ -72,4 +73,16 @@ public class CustomCamera {
}
});
}
+
+ public void scrollCamera(double deltaY) {
+ double z = camera.getTranslateZ();
+ if(deltaY > 0) {
+ if(z < -100)
+ camera.setTranslateZ(z + SCROLL_SPEED);
+ }
+ else {
+ if(z >