update

btinet · Apr 6, 2023 · a7f4532 · a7f4532
1 parent 71b27f1
commit a7f4532
Show file tree

Hide file tree

Showing 61 changed files with 1,073 additions and 101 deletions.
diff --git a/README.md b/README.md
@@ -34,17 +34,20 @@ den Förderverein des Treptow-Kollegs.*
 - 🚧 Responsive Content Layout (RCL)
 - 🚧 Videointegration
 - 🚧 Audioplayer
-- 🚧 Game Engine
 - ❌ Reactable-Mode (Max MSP)
 
 ### Ready
 
 - ✅ Feedback-Indikator (Präsentationsfolien)
 - ✅ Feedback-Beamer Output
-- ✅ Basic Game Engine
+- ✅ Game Engine
 - ✅ Keyboard User Input
 - ✅ ReacTIVision User Input
 
+### Games
+
+- ✅ Pong React
+
 ## Systemvoraussetzungen
 
 - Windows-, Mac- oder Linux-basiertes Betriebssystem

diff --git a/audio/bgm.LSO b/audio/bgm.LSO
diff --git a/audio/sfx.LSO b/audio/sfx.LSO
diff --git a/audio/sfx.bak/sfx.00.LSO b/audio/sfx.bak/sfx.00.LSO
diff --git a/pom.xml b/pom.xml
@@ -2,73 +2,75 @@
 <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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
+    <modelVersion>4.0.0</modelVersion>
 
-  <groupId>com.ivision</groupId>
-  <artifactId>GameReact</artifactId>
-  <version>1.0-SNAPSHOT</version>
-  <name>GameReact</name>
+    <groupId>com.ivision</groupId>
+    <artifactId>GameReact</artifactId>
+    <version>1.0-SNAPSHOT</version>
+    <name>GameReact</name>
 
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <junit.version>5.9.1</junit.version>      </properties>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <junit.version>5.9.1</junit.version>
+    </properties>
 
-  <dependencies>
-    <dependency>
-      <groupId>org.openjfx</groupId>
-      <artifactId>javafx-controls</artifactId>
-      <version>17.0.2</version>
-    </dependency>
-    <dependency>
-      <groupId>org.openjfx</groupId>
-      <artifactId>javafx-fxml</artifactId>
-      <version>17.0.2</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-api</artifactId>
-      <version>${junit.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-engine</artifactId>
-      <version>${junit.version}</version>
-      <scope>test</scope>
-    </dependency>              </dependencies>
+    <dependencies>
+        <dependency>
+            <groupId>org.openjfx</groupId>
+            <artifactId>javafx-controls</artifactId>
+            <version>17.0.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.openjfx</groupId>
+            <artifactId>javafx-fxml</artifactId>
+            <version>17.0.2</version>
+        </dependency>
 
-  <build>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <version>${junit.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <version>${junit.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
         <plugins>
             <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.10.1</version>
-        <configuration>
-          <source>11</source>
-          <target>11</target>
-        </configuration>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.10.1</version>
+                <configuration>
+                    <source>11</source>
+                    <target>11</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.openjfx</groupId>
+                <artifactId>javafx-maven-plugin</artifactId>
+                <version>0.0.8</version>
+                <executions>
+                    <execution>
+                        <!-- Default configuration for running with: mvn clean javafx:run -->
+                        <id>default-cli</id>
+                        <configuration>
+                            <mainClass>com.ivision.gamereact/com.ivision.gamereact.ReactApplication</mainClass>
+                            <launcher>app</launcher>
+                            <jlinkZipName>app</jlinkZipName>
+                            <jlinkImageName>app</jlinkImageName>
+                            <noManPages>true</noManPages>
+                            <stripDebug>true</stripDebug>
+                            <noHeaderFiles>true</noHeaderFiles>
+                        </configuration>
+                    </execution>
+                </executions>
             </plugin>
-      <plugin>
-        <groupId>org.openjfx</groupId>
-        <artifactId>javafx-maven-plugin</artifactId>
-        <version>0.0.8</version>
-        <executions>
-          <execution>
-            <!-- Default configuration for running with: mvn clean javafx:run -->
-            <id>default-cli</id>
-            <configuration>
-              <mainClass>com.ivision.gamereact/com.ivision.gamereact.HelloApplication</mainClass>
-              <launcher>app</launcher>
-              <jlinkZipName>app</jlinkZipName>
-              <jlinkImageName>app</jlinkImageName>
-              <noManPages>true</noManPages>
-              <stripDebug>true</stripDebug>
-              <noHeaderFiles>true</noHeaderFiles>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-          </plugins>
-  </build>
+        </plugins>
+    </build>
 </project>
diff --git a/src/main/java/com/ivision/engine/ButtonConfig.java b/src/main/java/com/ivision/engine/ButtonConfig.java
@@ -1,4 +1,4 @@
-package ivisionfx.interaction;
+package com.ivision.engine;
 
 import javafx.scene.input.KeyCode;
 

diff --git a/src/main/java/com/ivision/engine/GameLoopTimer.java b/src/main/java/com/ivision/engine/GameLoopTimer.java
@@ -1,6 +1,4 @@
-package com.ivision.gamereact.model;
-
-
+package com.ivision.engine;
 
 import javafx.animation.AnimationTimer;
 import javafx.beans.property.DoubleProperty;

diff --git a/src/main/java/com/ivision/engine/KeyPolling.java b/src/main/java/com/ivision/engine/KeyPolling.java
@@ -1,4 +1,4 @@
-package ivisionfx.interaction;
+package com.ivision.engine;
 
 import javafx.scene.Scene;
 import javafx.scene.input.KeyCode;

diff --git a/src/main/java/com/ivision/gamereact/ReactApplication.java b/src/main/java/com/ivision/gamereact/ReactApplication.java
@@ -1,22 +1,60 @@
 package com.ivision.gamereact;
 
+import com.ivision.engine.KeyPolling;
 import javafx.application.Application;
+import javafx.application.Platform;
+import javafx.event.EventHandler;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Scene;
 import javafx.stage.Stage;
+import javafx.stage.WindowEvent;
 
 import java.io.IOException;
 
-public class HelloApplication extends Application {
+public class ReactApplication extends Application {
+
+    // Attribute
+    public static Stage stage;
+    public static boolean fullscreen = false;
+    public static boolean resizable = false;
+    public static int width = 1400;
+    public static int height = 860;
+    public static String title = "GameReact";
+
     @Override
     public void start(Stage stage) throws IOException {
-        FXMLLoader fxmlLoader = new FXMLLoader(HelloApplication.class.getResource("hello-view.fxml"));
-        Scene scene = new Scene(fxmlLoader.load(), 320, 240);
-        stage.setTitle("Hello!");
+
+        setStage(stage);
+
+        FXMLLoader fxmlLoader = new FXMLLoader(ReactApplication.class.getResource("react-main-view.fxml"));
+        Scene scene = new Scene(fxmlLoader.load(), width, height);
+        KeyPolling.getInstance().pollScene(scene);
+
+        stage.setOnCloseRequest(new EventHandler<WindowEvent>() {
+            @Override
+            public void handle(WindowEvent event) {
+                Platform.exit();
+                System.exit(0);
+            }
+        });
+
+        stage.setTitle(title);
         stage.setScene(scene);
+        stage.setResizable(resizable);
+        stage.setFullScreen(fullscreen);
         stage.show();
     }
 
+
+
+    public static Stage getStage() {
+        return stage;
+    }
+
+    public static void setStage(Stage currentStage) {
+        stage = currentStage;
+    }
+
     public static void main(String[] args) {
         launch();
     }