Skip to content
Snippets Groups Projects
Commit 8e204918 authored by jez04's avatar jez04
Browse files

feat: lab03 assignment

parent 8b6d5942
Branches master
No related merge requests found
Pipeline #2536 failed with stages
Hide whitespace changes
Inline Side-by-side
Showing
with 91 additions and 425 deletions
java2-lab02-common-v3/.gitignore deleted 100644 → 0
+ 0
− 16
View file @ 8b6d5942
# Eclipse
.classpath
.project
.settings/
# Intellij
.idea/
*.iml
*.iws
# Mac
.DS_Store
# Maven
log/
target/
java2-lab02-common-v3/pom.xml deleted 100644 → 0
+ 0
− 79
View file @ 8b6d5942
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>cz.vsb.fei.java2</groupId>
<artifactId>java2-lab02-common-v3</artifactId>
<version>0.0.1-SNAPSHOT</version>
<name>java2-lab02-common-v3</name>
<packaging>jar</packaging>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.release>21</maven.compiler.release>
<JUnit.version>5.11.0</JUnit.version>
<log4j.version>2.23.1</log4j.version>
<lombok.version>1.18.34</lombok.version>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.junit</groupId>
<artifactId>junit-bom</artifactId>
<version>${JUnit.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>${log4j.version}</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>${log4j.version}</version>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>${lombok.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.13.0</version>
<configuration>
<annotationProcessorPaths>
<path>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>${lombok.version}</version>
</path>
</annotationProcessorPaths>
</configuration>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.5.0</version>
</plugin>
</plugins>
</build>
</project>
java2-lab02-common-v3/src/main/java/module-info.java deleted 100644 → 0
+ 0
− 5
View file @ 8b6d5942
module cz.vsb.fei.java2.lab02.common_module {
requires static lombok;
requires org.apache.logging.log4j;
exports cz.vsb.fei.java2.lab02.common;
}
\ No newline at end of file
java2-lab02-common-v3/src/test/java/cz/vsb/fei/java2/lab01/AppTest.java deleted 100644 → 0
+ 0
− 19
View file @ 8b6d5942
package cz.vsb.fei.java2.lab01;
import static org.junit.jupiter.api.Assertions.assertTrue;
import org.junit.jupiter.api.Test;
/**
* Unit test for simple App.
*/
class AppTest {
/**
* Rigorous Test :-)
*/
@Test
void shouldAnswerWithTrue() {
assertTrue(true);
}
}
java2-lab02-db-v3/.gitignore deleted 100644 → 0
+ 0
− 16
View file @ 8b6d5942
# Eclipse
.classpath
.project
.settings/
# Intellij
.idea/
*.iml
*.iws
# Mac
.DS_Store
# Maven
log/
target/
java2-lab02-db-v3/pom.xml deleted 100644 → 0
+ 0
− 90
View file @ 8b6d5942
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>cz.vsb.fei.java2</groupId>
<artifactId>java2-lab02-db-v3</artifactId>
<version>0.0.1-SNAPSHOT</version>
<name>java2-lab02-db-v3</name>
<packaging>jar</packaging>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.release>21</maven.compiler.release>
<JUnit.version>5.11.0</JUnit.version>
<log4j.version>2.23.1</log4j.version>
<lombok.version>1.18.34</lombok.version>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.junit</groupId>
<artifactId>junit-bom</artifactId>
<version>${JUnit.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<dependency>
<groupId>cz.vsb.fei.java2</groupId>
<artifactId>java2-lab02-common-v3</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<version>2.3.232</version>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>${log4j.version}</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>${log4j.version}</version>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>${lombok.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.13.0</version>
<configuration>
<annotationProcessorPaths>
<path>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>${lombok.version}</version>
</path>
</annotationProcessorPaths>
</configuration>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.5.0</version>
</plugin>
</plugins>
</build>
</project>
java2-lab02-db-v3/src/main/java/module-info.java deleted 100644 → 0
+ 0
− 11
View file @ 8b6d5942
import cz.vsb.fei.java2.lab02.common.ScoreStorageInterface;
import cz.vsb.fei.java2.lab02.db.DbConnector;
module cz.vsb.fei.java2.lab02.db_module {
requires static lombok;
requires org.apache.logging.log4j;
requires transitive cz.vsb.fei.java2.lab02.common_module;
requires java.sql;
exports cz.vsb.fei.java2.lab02.db;
provides ScoreStorageInterface with cz.vsb.fei.java2.lab02.db.DbConnector;
}
\ No newline at end of file
java2-lab02-db-v3/src/main/resources/log4j2.xml deleted 100644 → 0
+ 0
− 13
View file @ 8b6d5942
<Configuration>
<Appenders>
<Console name="Console">
<PatternLayout
pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n" />
</Console>
</Appenders>
<Loggers>
<Root level="info">
<AppenderRef ref="Console"></AppenderRef>
</Root>
</Loggers>
</Configuration>
java2-lab02-file-v3/.gitignore deleted 100644 → 0
+ 0
− 16
View file @ 8b6d5942
# Eclipse
.classpath
.project
.settings/
# Intellij
.idea/
*.iml
*.iws
# Mac
.DS_Store
# Maven
log/
target/
java2-lab02-file-v3/pom.xml deleted 100644 → 0
+ 0
− 84
View file @ 8b6d5942
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>cz.vsb.fei.java2</groupId>
<artifactId>java2-lab02-file-v3</artifactId>
<version>1.0-SNAPSHOT</version>
<name>java2-lab02-file-v3</name>
<packaging>jar</packaging>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.release>21</maven.compiler.release>
<JUnit.version>5.11.0</JUnit.version>
<log4j.version>2.23.1</log4j.version>
<lombok.version>1.18.34</lombok.version>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.junit</groupId>
<artifactId>junit-bom</artifactId>
<version>${JUnit.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<dependency>
<groupId>cz.vsb.fei.java2</groupId>
<artifactId>java2-lab02-common-v3</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>${log4j.version}</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>${log4j.version}</version>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>${lombok.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.13.0</version>
<configuration>
<annotationProcessorPaths>
<path>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>${lombok.version}</version>
</path>
</annotationProcessorPaths>
</configuration>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.5.0</version>
</plugin>
</plugins>
</build>
</project>
java2-lab02-file-v3/src/main/java/module-info.java deleted 100644 → 0
+ 0
− 9
View file @ 8b6d5942
import cz.vsb.fei.java2.lab02.common.ScoreStorageInterface;
module cz.vsb.fei.file_module {
requires static lombok;
requires org.apache.logging.log4j;
requires transitive cz.vsb.fei.java2.lab02.common_module;
exports cz.vsb.fei.file;
provides ScoreStorageInterface with cz.vsb.fei.file.FileStorage;
}
\ No newline at end of file
java2-lab02-v3/.gitignore deleted 100644 → 0
+ 0
− 1
View file @ 8b6d5942
/target/
java2-lab02-v3/scores.csv deleted 100644 → 0
+ 0
− 3
View file @ 8b6d5942
RobotRanger;280
PixelPioneer;82
DigitalDynamo;58
java2-lab02-v3/src/main/java/lab/ScoreStorageFactory.java deleted 100644 → 0
+ 0
− 39
View file @ 8b6d5942
package lab;
import java.util.ArrayList;
import java.util.List;
import java.util.NoSuchElementException;
import java.util.Random;
import java.util.ServiceLoader;
import cz.vsb.fei.java2.lab02.common.ScoreStorageInterface;
import javafx.scene.control.Alert;
import javafx.scene.control.ButtonType;
import javafx.stage.Modality;
import javafx.scene.control.Alert.AlertType;
public class ScoreStorageFactory {
private static ScoreStorageInterface instance;
private ScoreStorageFactory() {
/* hide public one constructor */
}
public static ScoreStorageInterface getInstance() {
if (instance == null) {
List<ScoreStorageInterface> availableImplementations = new ArrayList<>();
ServiceLoader.load(ScoreStorageInterface.class).forEach(availableImplementations::add);
if (availableImplementations.isEmpty()) {
throw new NoSuchElementException(
"Service loader did not find any implementation of interface ScoreStorageInterface.");
}
instance = availableImplementations.get(new Random().nextInt(availableImplementations.size()));
Alert info = new Alert(AlertType.INFORMATION,
String.format("Storage %s selected.", instance.getClass().getName()), ButtonType.OK);
info.initModality(Modality.WINDOW_MODAL);
info.showAndWait();
}
return instance;
}
}
java2-lab02-v3/pom.xml → pom.xml
+ 6
− 15
View file @ 8e204918
......@@ -3,10 +3,10 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>cz.vsb.fei.java2</groupId>
<artifactId>java2-lab02-v3</artifactId>
<artifactId>java2-lab03-v3</artifactId>
<version>0.0.1-SNAPHOST</version>
<packaging>jar</packaging>
<name>java2-lab02-v3</name>
<name>java2-lab03-v3</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>21</maven.compiler.source>
......@@ -14,19 +14,10 @@
</properties>
<dependencies>
<dependency>
<groupId>cz.vsb.fei.java2</groupId>
<artifactId>java2-lab02-common-v3</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>cz.vsb.fei.java2</groupId>
<artifactId>java2-lab02-db-v3</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>cz.vsb.fei.java2</groupId>
<artifactId>java2-lab02-file-v3</artifactId>
<version>1.0-SNAPSHOT</version>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<version>2.3.232</version>
<scope>runtime</scope>
</dependency>
<dependency>
......
src/main/java/lab/Setup.java 0 → 100644
+ 69
− 0
View file @ 8e204918
package lab;
import lab.storage.DbConnector;
import lab.storage.ScoreStorageInterface;
public class Setup {
private static Setup instance;
private ScoreStorageInterface scoreStorageInterface = new DbConnector();
private double lochnessMinXPopsition = 0.5;
private double lochnessMinYPopsition = 0.5;
private double lochnessMinSpeed = 50;
private double lochnessMaxSpeed = 150;
private int lochnessMultiplier = 1;
private double boatCollisionHeight = 0.25;
private double boatHitPulseX = 20;
private double boatHitPulseYMin = 50;
private double boatHitPulseYMax = 100;
public static void configure(Setup setting) {
instance = setting;
}
public static Setup getInstance() {
return instance;
}
public ScoreStorageInterface getScoreStorageInterface() {
return scoreStorageInterface;
}
public double getBoatCollisionHeight() {
return boatCollisionHeight;
}
public double getBoatHitPulseX() {
return boatHitPulseX;
}
public double getBoatHitPulseYMin() {
return boatHitPulseYMin;
}
public double getBoatHitPulseYMax() {
return boatHitPulseYMax;
}
public int getLochnessMultiplier() {
return lochnessMultiplier;
}
public double getLochnessMinXPopsition() {
return lochnessMinXPopsition;
}
public double getLochnessMinYPopsition() {
return lochnessMinYPopsition;
}
public double getLochnessMinSpeed() {
return lochnessMinSpeed;
}
public double getLochnessMaxSpeed() {
return lochnessMaxSpeed;
}
}
java2-lab02-common-v3/src/main/java/cz/vsb/fei/java2/lab02/common/Score.java → src/main/java/lab/data/Score.java
+ 1
− 1
View file @ 8e204918
package cz.vsb.fei.java2.lab02.common;
package lab.data;
import java.util.Random;
......
java2-lab02-v3/src/main/java/lab/game/Boat.java → src/main/java/lab/game/Boat.java
+ 15
− 8
View file @ 8e204918
......@@ -6,6 +6,7 @@ import javafx.geometry.Point2D;
import javafx.geometry.Rectangle2D;
import javafx.scene.canvas.GraphicsContext;
import javafx.scene.image.Image;
import lab.Setup;
public class Boat extends WorldEntity implements Collisionable {
......@@ -22,7 +23,8 @@ public class Boat extends WorldEntity implements Collisionable {
@Override
public void drawInternal(GraphicsContext gc) {
gc.drawImage(image, position.getX(), position.getY());
gc.strokeRect(position.getX(), position.getY(), image.getWidth(), image.getHeight());
Rectangle2D rec = getBoundingBox();
gc.strokeRect(rec.getMinX(), rec.getMinY(), rec.getWidth(), rec.getHeight());
}
@Override
......@@ -33,7 +35,9 @@ public class Boat extends WorldEntity implements Collisionable {
@Override
public Rectangle2D getBoundingBox() {
return new Rectangle2D(position.getX(), position.getY(), image.getWidth(), image.getHeight());
return new Rectangle2D(position.getX(),
position.getY() + image.getHeight() * (1 - Setup.getInstance().getBoatCollisionHeight()),
image.getWidth(), image.getHeight() * Setup.getInstance().getBoatCollisionHeight());
}
@Override
......@@ -43,16 +47,19 @@ public class Boat extends WorldEntity implements Collisionable {
@Override
public void hitBy(Collisionable another) {
if(another instanceof LochNess lochNess) {
int direction = RANDOM.nextBoolean()?-1:1;
speed = new Point2D(-20, direction * RANDOM.nextDouble(50, 100));
if (another instanceof LochNess lochNess) {
int direction = RANDOM.nextBoolean() ? -1 : 1;
speed = new Point2D(-Setup.getInstance().getBoatHitPulseX(),
direction * RANDOM.nextDouble(Setup.getInstance().getBoatHitPulseYMin(),
Setup.getInstance().getBoatHitPulseYMax()));
}
}
public void setPosInPercentage(double doubleValue) {
position = new Point2D(
position.getX(),
scene.getSize().getHeight()*doubleValue/100);
double colisionHeight = getBoundingBox().getHeight();
double posFromBottom = (scene.getSize().getHeight()-colisionHeight)*doubleValue/100;
position = new Point2D(position.getX(),
(scene.getSize().getHeight()-image.getHeight() -posFromBottom));
}
}
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment