diff --git a/Projekte/.run/MdgaApp.run.xml b/Projekte/.run/MdgaApp.run.xml new file mode 100644 index 00000000..a33a2cd3 --- /dev/null +++ b/Projekte/.run/MdgaApp.run.xml @@ -0,0 +1,18 @@ + + + + diff --git a/Projekte/mdga/client/Screenshot 2024-11-12 184708.png b/Projekte/mdga/client/Screenshot 2024-11-12 184708.png new file mode 100644 index 00000000..fd8abaf3 Binary files /dev/null and b/Projekte/mdga/client/Screenshot 2024-11-12 184708.png differ diff --git a/Projekte/mdga/client/build.gradle b/Projekte/mdga/client/build.gradle new file mode 100644 index 00000000..06605dff --- /dev/null +++ b/Projekte/mdga/client/build.gradle @@ -0,0 +1,22 @@ +plugins { + id 'buildlogic.jme-application-conventions' +} + +description = 'mdga client' + +dependencies { + implementation project(":jme-common") + implementation project(":mdga:model") + + implementation libs.jme3.desktop + + runtimeOnly libs.jme3.awt.dialogs + runtimeOnly libs.jme3.plugins + runtimeOnly libs.jme3.jogg + runtimeOnly libs.jme3.testdata +} + +application { + mainClass = 'pp.mdga.client.MdgaApp' + applicationName = 'MDGA' +} diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/Animation/Animation.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/Animation/Animation.java new file mode 100644 index 00000000..0ca7adcb --- /dev/null +++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/Animation/Animation.java @@ -0,0 +1,7 @@ +package pp.mdga.client.Animation; + +abstract class Animation { + abstract void play(); + abstract void stop(); + abstract boolean isOver(); +} diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/Animation/AnimationHandler.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/Animation/AnimationHandler.java new file mode 100644 index 00000000..7047fff5 --- /dev/null +++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/Animation/AnimationHandler.java @@ -0,0 +1,29 @@ +package pp.mdga.client.Animation; + +import pp.mdga.client.MdgaApp; + +public class AnimationHandler { + private MdgaApp app; + + private Animation animation = null; + + public AnimationHandler(MdgaApp app) { + this.app = app; + } + + public void playAnimation(AnimationType type) { + + } + + public void update() { + if(null == animation) { + return; + } + + if(animation.isOver()) { + animation = null; + + //trigger next state + } + } +} diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/Animation/AnimationType.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/Animation/AnimationType.java new file mode 100644 index 00000000..5d2d0233 --- /dev/null +++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/Animation/AnimationType.java @@ -0,0 +1,4 @@ +package pp.mdga.client.Animation; + +public enum AnimationType { +} diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/Animation/EmptyAnimation.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/Animation/EmptyAnimation.java new file mode 100644 index 00000000..bd83c19f --- /dev/null +++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/Animation/EmptyAnimation.java @@ -0,0 +1,18 @@ +package pp.mdga.client.Animation; + +class EmptyAnimation extends Animation { + @Override + void play() { + //nothing + } + + @Override + void stop() { + //nothing + } + + @Override + boolean isOver() { + return true; + } +} diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/Asset.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/Asset.java new file mode 100644 index 00000000..25ac35f3 --- /dev/null +++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/Asset.java @@ -0,0 +1,63 @@ +package pp.mdga.client; + +public enum Asset { + bigTent, + cardStack, + cir, + heer, + jet, + lw, + marine, + node_home_blue("./node_home/node_home.j3o", "./node_home/node_home_blue.png"), + node_home_black("./node_home/node_home.j3o", "./node_home/node_home_black.png"), + node_home_green("./node_home/node_home.j3o", "./node_home/node_home_green.png"), + node_home_yellow("./node_home/node_home.j3o", "./node_home/node_home_yellow.png"), + node_normal, + node_start("./node_normal/node_normal.j3o", "./node_normal/node_normal_start.png"), + node_bonus("./node_normal/node_normal.j3o", "./node_normal/node_normal_bonus.png"), + radar, + shieldCard, + ship, + smallTent, + swapCard, + tank, + turboCard, + world(1.1f); + + private final String modelPath; + private final String diffPath; + private final float size; + + Asset(){ + String folderFileName = "./" + name() + "/" + name(); + this.modelPath = folderFileName + ".j3o"; + this.diffPath = folderFileName + "_diff.png"; + this.size = 1f; + } + + Asset(String modelPath, String diffPath){ + this.modelPath = modelPath; + this.diffPath = diffPath; + this.size = 1f; + } + + Asset(float size){ + String folderFileName = "./" + name() + "/" + name(); + this.modelPath = folderFileName + ".j3o"; + this.diffPath = folderFileName + "_diff.png"; + this.size = size; + } + + public String getModelPath() { + return modelPath; + } + + public String getDiffPath() { + return diffPath; + } + + public float getSize(){ + return size; + } + +} diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/Board/BoardView.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/Board/BoardView.java new file mode 100644 index 00000000..7bbd1f1e --- /dev/null +++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/Board/BoardView.java @@ -0,0 +1,30 @@ +package pp.mdga.client.Board; + +import com.jme3.math.Vector3f; + +import java.util.ArrayList; + +public class BoardView { + private static final float GRID_SIZE = 10.0f; + private static final float GRID_ELEVATION = 0.0f; + private static final int GRID_EXTEND = 5; + + private PileControl drawPile = new PileControl(); + private PileControl discardPile = new PileControl(); + + private ArrayList infield = new ArrayList(40); + private ArrayList pieces; + + BoardView(int playerCount) { + assert(2 <= playerCount && playerCount <= 4); + + pieces = new ArrayList(4 * playerCount); + } + + private static Vector3f gridToWorld(int x, int y) { + assert(-GRID_EXTEND <= x && x <= GRID_EXTEND); + assert(-GRID_EXTEND <= y && y < GRID_EXTEND); + + return new Vector3f(GRID_SIZE * x, GRID_ELEVATION, GRID_SIZE * y); + } +} diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/Board/NodeControl.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/Board/NodeControl.java new file mode 100644 index 00000000..6e8ecfa1 --- /dev/null +++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/Board/NodeControl.java @@ -0,0 +1,5 @@ +package pp.mdga.client.Board; + +public class NodeControl { + +} diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/Board/PieceControl.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/Board/PieceControl.java new file mode 100644 index 00000000..4ef15526 --- /dev/null +++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/Board/PieceControl.java @@ -0,0 +1,5 @@ +package pp.mdga.client.Board; + +public class PieceControl { + +} diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/Board/PileControl.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/Board/PileControl.java new file mode 100644 index 00000000..4cdc7db1 --- /dev/null +++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/Board/PileControl.java @@ -0,0 +1,5 @@ +package pp.mdga.client.Board; + +public class PileControl { + +} diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/Dialog/Dialog.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/Dialog/Dialog.java new file mode 100644 index 00000000..b518a463 --- /dev/null +++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/Dialog/Dialog.java @@ -0,0 +1,5 @@ +package pp.mdga.client.Dialog; + +public class Dialog { + +} diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/Dialog/DialogView.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/Dialog/DialogView.java new file mode 100644 index 00000000..462da741 --- /dev/null +++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/Dialog/DialogView.java @@ -0,0 +1,5 @@ +package pp.mdga.client.Dialog; + +public class DialogView { + +} diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/Dialog/MenuDialog.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/Dialog/MenuDialog.java new file mode 100644 index 00000000..0ec98ab0 --- /dev/null +++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/Dialog/MenuDialog.java @@ -0,0 +1,5 @@ +package pp.mdga.client.Dialog; + +public class MenuDialog { + +} diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/Dialog/NetworkDialog.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/Dialog/NetworkDialog.java new file mode 100644 index 00000000..020d69dc --- /dev/null +++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/Dialog/NetworkDialog.java @@ -0,0 +1,5 @@ +package pp.mdga.client.Dialog; + +public class NetworkDialog { + +} diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/Dialog/SoundDialog.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/Dialog/SoundDialog.java new file mode 100644 index 00000000..e35b5667 --- /dev/null +++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/Dialog/SoundDialog.java @@ -0,0 +1,5 @@ +package pp.mdga.client.Dialog; + +public class SoundDialog { + +} diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/Dialog/StartDialog.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/Dialog/StartDialog.java new file mode 100644 index 00000000..76a8c0fc --- /dev/null +++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/Dialog/StartDialog.java @@ -0,0 +1,5 @@ +package pp.mdga.client.Dialog; + +public class StartDialog { + +} diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/Dialog/VideoDialog.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/Dialog/VideoDialog.java new file mode 100644 index 00000000..ea6556f1 --- /dev/null +++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/Dialog/VideoDialog.java @@ -0,0 +1,5 @@ +package pp.mdga.client.Dialog; + +public class VideoDialog { + +} diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/Gui/GuiView.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/Gui/GuiView.java new file mode 100644 index 00000000..529225e8 --- /dev/null +++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/Gui/GuiView.java @@ -0,0 +1,5 @@ +package pp.mdga.client.Gui; + +public class GuiView { + +} diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/MdgaApp.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/MdgaApp.java new file mode 100644 index 00000000..1567ee4f --- /dev/null +++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/MdgaApp.java @@ -0,0 +1,91 @@ +package pp.mdga.client; + +import com.jme3.app.SimpleApplication; +import com.jme3.renderer.RenderManager; +import pp.mdga.client.Animation.AnimationHandler; +import com.jme3.light.AmbientLight; +import com.jme3.light.DirectionalLight; +import com.jme3.material.Material; +import com.jme3.math.ColorRGBA; +import com.jme3.math.Vector3f; +import com.jme3.renderer.RenderManager; +import com.jme3.renderer.queue.RenderQueue; +import com.jme3.scene.Spatial; +import com.jme3.shadow.DirectionalLightShadowRenderer; +import com.jme3.system.AppSettings; + +public class MdgaApp extends SimpleApplication { + private AnimationHandler animationHandler; + + public static void main(String[] args) { + MdgaApp app = new MdgaApp(); + AppSettings settings = new AppSettings(true); + settings.setSamples(128); + settings.setCenterWindow(true); + settings.setWidth(1300); + settings.setHeight(1000); + app.setSettings(settings); + app.setShowSettings(false); + app.start(); + } + + @Override + public void simpleInitApp() { + animationHandler = new AnimationHandler(this); + + flyCam.setEnabled(true); + int zoom = 20; + cam.setLocation(new Vector3f(zoom,0,zoom)); + cam.lookAt(new Vector3f(0,0,0), new Vector3f(0,0,1)); + + DirectionalLight sun = new DirectionalLight(); + sun.setColor(ColorRGBA.White); + sun.setDirection(new Vector3f(-1,0,-1)); + rootNode.addLight(sun); + AmbientLight ambient = new AmbientLight(); + ambient.setColor(new ColorRGBA(0.3f,0.3f,0.3f,1)); + rootNode.addLight(ambient); + + final int SHADOWMAP_SIZE=1024*8; + DirectionalLightShadowRenderer dlsr = new DirectionalLightShadowRenderer(assetManager, SHADOWMAP_SIZE, 4); + dlsr.setLight(sun); + viewPort.addProcessor(dlsr); + + createModel(Asset.lw).setLocalTranslation(new Vector3f(0,-10,0)); + createModel(Asset.cir).setLocalTranslation(new Vector3f(0,-8,0)); + createModel(Asset.marine).setLocalTranslation(new Vector3f(0,-6,0)); + createModel(Asset.heer).setLocalTranslation(new Vector3f(0,-4,0)); + createModel(Asset.node_normal).setLocalTranslation(new Vector3f(0,-2.5f,0)); + createModel(Asset.node_home_blue).setLocalTranslation(new Vector3f(0,-1,0)); + createModel(Asset.smallTent).setLocalTranslation(new Vector3f(0,1,0)); + createModel(Asset.tank).setLocalTranslation(new Vector3f(0,5,0)); + createModel(Asset.jet).setLocalTranslation(new Vector3f(0,12,0)); + createModel(Asset.ship).setLocalTranslation(new Vector3f(0,17,0)); + createModel(Asset.radar).setLocalTranslation(new Vector3f(0,20,0)); + + createModel(Asset.world); + + //System.out.println(Asset.node_normal.getModelPath()); + //System.out.println(Asset.node_normal.getDiffPath()); + } + + + private Spatial createModel(Asset asset){ + String modelName = asset.getModelPath(); + String texName = asset.getDiffPath(); + Spatial model = assetManager.loadModel(modelName); + model.scale(asset.getSize()); + model.rotate((float) Math.toRadians(0), 0, (float) Math.toRadians(90)); + model.setShadowMode(RenderQueue.ShadowMode.CastAndReceive); + Material mat = new Material(assetManager, "Common/MatDefs/Light/Lighting.j3md"); + mat.setTexture("DiffuseMap", assetManager.loadTexture(texName)); + model.setMaterial(mat); + rootNode.attachChild(model); + return model; + } + + @Override + public void simpleUpdate(float tpf) { + //this method will be called every game tick and can be used to make updates + } +} diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/NotificationSynchronizer.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/NotificationSynchronizer.java new file mode 100644 index 00000000..8c3e5135 --- /dev/null +++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/NotificationSynchronizer.java @@ -0,0 +1,5 @@ +package pp.mdga.client; + +public class NotificationSynchronizer { + +} diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/State/CeremonyState.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/State/CeremonyState.java new file mode 100644 index 00000000..47b40346 --- /dev/null +++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/State/CeremonyState.java @@ -0,0 +1,5 @@ +package pp.mdga.client.State; + +public class CeremonyState { + +} diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/State/GameState.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/State/GameState.java new file mode 100644 index 00000000..deddeb1d --- /dev/null +++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/State/GameState.java @@ -0,0 +1,5 @@ +package pp.mdga.client.State; + +public class GameState { + +} diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/State/LobbyState.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/State/LobbyState.java new file mode 100644 index 00000000..58777b55 --- /dev/null +++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/State/LobbyState.java @@ -0,0 +1,5 @@ +package pp.mdga.client.State; + +public class LobbyState { + +} diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/State/MdgaState.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/State/MdgaState.java new file mode 100644 index 00000000..8476a7af --- /dev/null +++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/State/MdgaState.java @@ -0,0 +1,5 @@ +package pp.mdga.client.State; + +public class MdgaState { + +} diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/State/MusicState.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/State/MusicState.java new file mode 100644 index 00000000..b1e5484d --- /dev/null +++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/State/MusicState.java @@ -0,0 +1,5 @@ +package pp.mdga.client.State; + +public class MusicState { + +} diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/State/SoundState.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/State/SoundState.java new file mode 100644 index 00000000..f3184745 --- /dev/null +++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/State/SoundState.java @@ -0,0 +1,5 @@ +package pp.mdga.client.State; + +public class SoundState { + +} diff --git a/Projekte/mdga/client/src/main/resources/bigTent/bigTent.j3o b/Projekte/mdga/client/src/main/resources/bigTent/bigTent.j3o new file mode 100644 index 00000000..c198720f Binary files /dev/null and b/Projekte/mdga/client/src/main/resources/bigTent/bigTent.j3o differ diff --git a/Projekte/mdga/client/src/main/resources/bigTent/bigTent_diff.png b/Projekte/mdga/client/src/main/resources/bigTent/bigTent_diff.png new file mode 100644 index 00000000..bd81c5d0 Binary files /dev/null and b/Projekte/mdga/client/src/main/resources/bigTent/bigTent_diff.png differ diff --git a/Projekte/mdga/client/src/main/resources/cardStack/cardStack.j3o b/Projekte/mdga/client/src/main/resources/cardStack/cardStack.j3o new file mode 100644 index 00000000..c630107e Binary files /dev/null and b/Projekte/mdga/client/src/main/resources/cardStack/cardStack.j3o differ diff --git a/Projekte/mdga/client/src/main/resources/cardStack/cardStack_diff.png b/Projekte/mdga/client/src/main/resources/cardStack/cardStack_diff.png new file mode 100644 index 00000000..69865447 Binary files /dev/null and b/Projekte/mdga/client/src/main/resources/cardStack/cardStack_diff.png differ diff --git a/Projekte/mdga/client/src/main/resources/cir/cir.j3o b/Projekte/mdga/client/src/main/resources/cir/cir.j3o new file mode 100644 index 00000000..f82bcda2 Binary files /dev/null and b/Projekte/mdga/client/src/main/resources/cir/cir.j3o differ diff --git a/Projekte/mdga/client/src/main/resources/cir/cir_diff.png b/Projekte/mdga/client/src/main/resources/cir/cir_diff.png new file mode 100644 index 00000000..0f74c0d5 Binary files /dev/null and b/Projekte/mdga/client/src/main/resources/cir/cir_diff.png differ diff --git a/Projekte/mdga/client/src/main/resources/heer/heer.j3o b/Projekte/mdga/client/src/main/resources/heer/heer.j3o new file mode 100644 index 00000000..30773da6 Binary files /dev/null and b/Projekte/mdga/client/src/main/resources/heer/heer.j3o differ diff --git a/Projekte/mdga/client/src/main/resources/heer/heer_diff.png b/Projekte/mdga/client/src/main/resources/heer/heer_diff.png new file mode 100644 index 00000000..ae3c3ade Binary files /dev/null and b/Projekte/mdga/client/src/main/resources/heer/heer_diff.png differ diff --git a/Projekte/mdga/client/src/main/resources/jet/jet.j3o b/Projekte/mdga/client/src/main/resources/jet/jet.j3o new file mode 100644 index 00000000..162b937c Binary files /dev/null and b/Projekte/mdga/client/src/main/resources/jet/jet.j3o differ diff --git a/Projekte/mdga/client/src/main/resources/jet/jet_diff.png b/Projekte/mdga/client/src/main/resources/jet/jet_diff.png new file mode 100644 index 00000000..525a8452 Binary files /dev/null and b/Projekte/mdga/client/src/main/resources/jet/jet_diff.png differ diff --git a/Projekte/mdga/client/src/main/resources/lw/lw.j3o b/Projekte/mdga/client/src/main/resources/lw/lw.j3o new file mode 100644 index 00000000..dce37b62 Binary files /dev/null and b/Projekte/mdga/client/src/main/resources/lw/lw.j3o differ diff --git a/Projekte/mdga/client/src/main/resources/lw/lw_diff.png b/Projekte/mdga/client/src/main/resources/lw/lw_diff.png new file mode 100644 index 00000000..5363a231 Binary files /dev/null and b/Projekte/mdga/client/src/main/resources/lw/lw_diff.png differ diff --git a/Projekte/mdga/client/src/main/resources/marine/marine.j3o b/Projekte/mdga/client/src/main/resources/marine/marine.j3o new file mode 100644 index 00000000..9f32d72f Binary files /dev/null and b/Projekte/mdga/client/src/main/resources/marine/marine.j3o differ diff --git a/Projekte/mdga/client/src/main/resources/marine/marine_diff.png b/Projekte/mdga/client/src/main/resources/marine/marine_diff.png new file mode 100644 index 00000000..015b7b37 Binary files /dev/null and b/Projekte/mdga/client/src/main/resources/marine/marine_diff.png differ diff --git a/Projekte/mdga/client/src/main/resources/node_home/node_home.j3o b/Projekte/mdga/client/src/main/resources/node_home/node_home.j3o new file mode 100644 index 00000000..0c35652a Binary files /dev/null and b/Projekte/mdga/client/src/main/resources/node_home/node_home.j3o differ diff --git a/Projekte/mdga/client/src/main/resources/node_home/node_home_black_diff.png b/Projekte/mdga/client/src/main/resources/node_home/node_home_black_diff.png new file mode 100644 index 00000000..534203e7 Binary files /dev/null and b/Projekte/mdga/client/src/main/resources/node_home/node_home_black_diff.png differ diff --git a/Projekte/mdga/client/src/main/resources/node_home/node_home_blue.png b/Projekte/mdga/client/src/main/resources/node_home/node_home_blue.png new file mode 100644 index 00000000..a228bb76 Binary files /dev/null and b/Projekte/mdga/client/src/main/resources/node_home/node_home_blue.png differ diff --git a/Projekte/mdga/client/src/main/resources/node_home/node_home_green_diff.png b/Projekte/mdga/client/src/main/resources/node_home/node_home_green_diff.png new file mode 100644 index 00000000..d79c8768 Binary files /dev/null and b/Projekte/mdga/client/src/main/resources/node_home/node_home_green_diff.png differ diff --git a/Projekte/mdga/client/src/main/resources/node_home/node_home_yellow_diff.png b/Projekte/mdga/client/src/main/resources/node_home/node_home_yellow_diff.png new file mode 100644 index 00000000..cbd14eca Binary files /dev/null and b/Projekte/mdga/client/src/main/resources/node_home/node_home_yellow_diff.png differ diff --git a/Projekte/mdga/client/src/main/resources/node_normal/node_bonus_diff.png b/Projekte/mdga/client/src/main/resources/node_normal/node_bonus_diff.png new file mode 100644 index 00000000..da9c5d9f Binary files /dev/null and b/Projekte/mdga/client/src/main/resources/node_normal/node_bonus_diff.png differ diff --git a/Projekte/mdga/client/src/main/resources/node_normal/node_normal.j3o b/Projekte/mdga/client/src/main/resources/node_normal/node_normal.j3o new file mode 100644 index 00000000..20dd17a4 Binary files /dev/null and b/Projekte/mdga/client/src/main/resources/node_normal/node_normal.j3o differ diff --git a/Projekte/mdga/client/src/main/resources/node_normal/node_normal_diff.png b/Projekte/mdga/client/src/main/resources/node_normal/node_normal_diff.png new file mode 100644 index 00000000..633560c9 Binary files /dev/null and b/Projekte/mdga/client/src/main/resources/node_normal/node_normal_diff.png differ diff --git a/Projekte/mdga/client/src/main/resources/node_normal/node_start_diff.png b/Projekte/mdga/client/src/main/resources/node_normal/node_start_diff.png new file mode 100644 index 00000000..749e7ded Binary files /dev/null and b/Projekte/mdga/client/src/main/resources/node_normal/node_start_diff.png differ diff --git a/Projekte/mdga/client/src/main/resources/radar/radar.j3o b/Projekte/mdga/client/src/main/resources/radar/radar.j3o new file mode 100644 index 00000000..a79bb7fd Binary files /dev/null and b/Projekte/mdga/client/src/main/resources/radar/radar.j3o differ diff --git a/Projekte/mdga/client/src/main/resources/radar/radar_diff.png b/Projekte/mdga/client/src/main/resources/radar/radar_diff.png new file mode 100644 index 00000000..b7ffdb4e Binary files /dev/null and b/Projekte/mdga/client/src/main/resources/radar/radar_diff.png differ diff --git a/Projekte/mdga/client/src/main/resources/shieldCard/shieldCard.j3o b/Projekte/mdga/client/src/main/resources/shieldCard/shieldCard.j3o new file mode 100644 index 00000000..e27250cf Binary files /dev/null and b/Projekte/mdga/client/src/main/resources/shieldCard/shieldCard.j3o differ diff --git a/Projekte/mdga/client/src/main/resources/shieldCard/shieldCard_diff.png b/Projekte/mdga/client/src/main/resources/shieldCard/shieldCard_diff.png new file mode 100644 index 00000000..678d04f1 Binary files /dev/null and b/Projekte/mdga/client/src/main/resources/shieldCard/shieldCard_diff.png differ diff --git a/Projekte/mdga/client/src/main/resources/ship/ship.j3o b/Projekte/mdga/client/src/main/resources/ship/ship.j3o new file mode 100644 index 00000000..dfc26431 Binary files /dev/null and b/Projekte/mdga/client/src/main/resources/ship/ship.j3o differ diff --git a/Projekte/mdga/client/src/main/resources/ship/ship_diff.png b/Projekte/mdga/client/src/main/resources/ship/ship_diff.png new file mode 100644 index 00000000..b454b6d5 Binary files /dev/null and b/Projekte/mdga/client/src/main/resources/ship/ship_diff.png differ diff --git a/Projekte/mdga/client/src/main/resources/smallTent/smallTent.j3o b/Projekte/mdga/client/src/main/resources/smallTent/smallTent.j3o new file mode 100644 index 00000000..61c4a41d Binary files /dev/null and b/Projekte/mdga/client/src/main/resources/smallTent/smallTent.j3o differ diff --git a/Projekte/mdga/client/src/main/resources/smallTent/smallTent_diff.png b/Projekte/mdga/client/src/main/resources/smallTent/smallTent_diff.png new file mode 100644 index 00000000..70ed8a75 Binary files /dev/null and b/Projekte/mdga/client/src/main/resources/smallTent/smallTent_diff.png differ diff --git a/Projekte/mdga/client/src/main/resources/swapCard/swapCard.j3o b/Projekte/mdga/client/src/main/resources/swapCard/swapCard.j3o new file mode 100644 index 00000000..a829dfa2 Binary files /dev/null and b/Projekte/mdga/client/src/main/resources/swapCard/swapCard.j3o differ diff --git a/Projekte/mdga/client/src/main/resources/swapCard/swapCard_diff.png b/Projekte/mdga/client/src/main/resources/swapCard/swapCard_diff.png new file mode 100644 index 00000000..ac448059 Binary files /dev/null and b/Projekte/mdga/client/src/main/resources/swapCard/swapCard_diff.png differ diff --git a/Projekte/mdga/client/src/main/resources/tank/tank.j3o b/Projekte/mdga/client/src/main/resources/tank/tank.j3o new file mode 100644 index 00000000..bcb37cab Binary files /dev/null and b/Projekte/mdga/client/src/main/resources/tank/tank.j3o differ diff --git a/Projekte/mdga/client/src/main/resources/tank/tank_diff.png b/Projekte/mdga/client/src/main/resources/tank/tank_diff.png new file mode 100644 index 00000000..083de2d7 Binary files /dev/null and b/Projekte/mdga/client/src/main/resources/tank/tank_diff.png differ diff --git a/Projekte/mdga/client/src/main/resources/turboCard/turboCard.j3o b/Projekte/mdga/client/src/main/resources/turboCard/turboCard.j3o new file mode 100644 index 00000000..61d897da Binary files /dev/null and b/Projekte/mdga/client/src/main/resources/turboCard/turboCard.j3o differ diff --git a/Projekte/mdga/client/src/main/resources/turboCard/turboCard_diff.png b/Projekte/mdga/client/src/main/resources/turboCard/turboCard_diff.png new file mode 100644 index 00000000..31c73694 Binary files /dev/null and b/Projekte/mdga/client/src/main/resources/turboCard/turboCard_diff.png differ diff --git a/Projekte/mdga/client/src/main/resources/world/world.j3o b/Projekte/mdga/client/src/main/resources/world/world.j3o new file mode 100644 index 00000000..422656cc Binary files /dev/null and b/Projekte/mdga/client/src/main/resources/world/world.j3o differ diff --git a/Projekte/mdga/client/src/main/resources/world/world_diff.png b/Projekte/mdga/client/src/main/resources/world/world_diff.png new file mode 100644 index 00000000..cde901b6 Binary files /dev/null and b/Projekte/mdga/client/src/main/resources/world/world_diff.png differ diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/notification/ActivePlayerNotification.java b/Projekte/mdga/model/src/main/java/pp.mdga/notification/ActivePlayerNotification.java new file mode 100644 index 00000000..8a2e0339 --- /dev/null +++ b/Projekte/mdga/model/src/main/java/pp.mdga/notification/ActivePlayerNotification.java @@ -0,0 +1,9 @@ +package pp.mdga.notification; + +import pp.mdga.game.Color; + +public class ActivePlayerNotification extends Notification { + ActivePlayerNotification(Color color) { + + } +} diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/notification/DrawCardNotification.java b/Projekte/mdga/model/src/main/java/pp.mdga/notification/DrawCardNotification.java new file mode 100644 index 00000000..b9a91cf9 --- /dev/null +++ b/Projekte/mdga/model/src/main/java/pp.mdga/notification/DrawCardNotification.java @@ -0,0 +1,10 @@ +package pp.mdga.notification; + +import pp.mdga.game.Card; +import pp.mdga.game.Color; + +public class DrawCardNotification extends Notification { + DrawCardNotification(Color color, Card card) { + + } +} diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/notification/InterruptNotification.java b/Projekte/mdga/model/src/main/java/pp.mdga/notification/InterruptNotification.java new file mode 100644 index 00000000..f9459c55 --- /dev/null +++ b/Projekte/mdga/model/src/main/java/pp.mdga/notification/InterruptNotification.java @@ -0,0 +1,9 @@ +package pp.mdga.notification; + +import pp.mdga.game.Color; + +public class InterruptNotification extends Notification { + InterruptNotification(Color color) { + + } +} diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/notification/MovePieceNotification.java b/Projekte/mdga/model/src/main/java/pp.mdga/notification/MovePieceNotification.java new file mode 100644 index 00000000..b35918cc --- /dev/null +++ b/Projekte/mdga/model/src/main/java/pp.mdga/notification/MovePieceNotification.java @@ -0,0 +1,9 @@ +package pp.mdga.notification; + +import pp.mdga.game.Color; + +public class MovePieceNotification extends Notification { + MovePieceNotification(Color color, int nodeIndex) { + + } +} diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/notification/Notification.java b/Projekte/mdga/model/src/main/java/pp.mdga/notification/Notification.java new file mode 100644 index 00000000..3f8be5da --- /dev/null +++ b/Projekte/mdga/model/src/main/java/pp.mdga/notification/Notification.java @@ -0,0 +1,4 @@ +package pp.mdga.notification; + +public abstract class Notification { +} diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/notification/PieceInGameNotification.java b/Projekte/mdga/model/src/main/java/pp.mdga/notification/PieceInGameNotification.java new file mode 100644 index 00000000..5e0585fd --- /dev/null +++ b/Projekte/mdga/model/src/main/java/pp.mdga/notification/PieceInGameNotification.java @@ -0,0 +1,11 @@ +package pp.mdga.notification; + +import pp.mdga.game.Color; + +import java.util.UUID; + +public class PieceInGameNotification extends Notification{ + PieceInGameNotification(Color color, UUID id) { + + } +} diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/notification/PlayCardNotification.java b/Projekte/mdga/model/src/main/java/pp.mdga/notification/PlayCardNotification.java new file mode 100644 index 00000000..2aaafae7 --- /dev/null +++ b/Projekte/mdga/model/src/main/java/pp.mdga/notification/PlayCardNotification.java @@ -0,0 +1,10 @@ +package pp.mdga.notification; + +import pp.mdga.game.Card; +import pp.mdga.game.Color; + +public class PlayCardNotification extends Notification { + PlayCardNotification(Color color, Card card) { + + } +} diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/notification/PlayerInGameNotification.java b/Projekte/mdga/model/src/main/java/pp.mdga/notification/PlayerInGameNotification.java new file mode 100644 index 00000000..c1c77cc9 --- /dev/null +++ b/Projekte/mdga/model/src/main/java/pp.mdga/notification/PlayerInGameNotification.java @@ -0,0 +1,9 @@ +package pp.mdga.notification; + +import pp.mdga.game.Color; + +public class PlayerInGameNotification extends Notification { + PlayerInGameNotification(Color color, String name) { + + } +} diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/notification/ResumeNotification.java b/Projekte/mdga/model/src/main/java/pp.mdga/notification/ResumeNotification.java new file mode 100644 index 00000000..6a28137d --- /dev/null +++ b/Projekte/mdga/model/src/main/java/pp.mdga/notification/ResumeNotification.java @@ -0,0 +1,9 @@ +package pp.mdga.notification; + +import pp.mdga.game.Color; + +public class ResumeNotification extends Notification { + ResumeNotification(Color color) { + + } +} diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/notification/RollDiceNotification.java b/Projekte/mdga/model/src/main/java/pp.mdga/notification/RollDiceNotification.java new file mode 100644 index 00000000..48ca8192 --- /dev/null +++ b/Projekte/mdga/model/src/main/java/pp.mdga/notification/RollDiceNotification.java @@ -0,0 +1,9 @@ +package pp.mdga.notification; + +import pp.mdga.game.Color; + +public class RollDiceNotification extends Notification{ + RollDiceNotification(Color color, int eyes, int moveNumber) { + + } +} diff --git a/Projekte/mdga/model/src/main/java/pp.mdga/notification/SwapPieceNotification.java b/Projekte/mdga/model/src/main/java/pp.mdga/notification/SwapPieceNotification.java new file mode 100644 index 00000000..b287e403 --- /dev/null +++ b/Projekte/mdga/model/src/main/java/pp.mdga/notification/SwapPieceNotification.java @@ -0,0 +1,9 @@ +package pp.mdga.notification; + +import java.util.UUID; + +public class SwapPieceNotification extends Notification { + SwapPieceNotification(UUID a, UUID b) { + assert(!a.equals(b)); + } +} diff --git a/Projekte/settings.gradle b/Projekte/settings.gradle index 34558071..532a4d06 100644 --- a/Projekte/settings.gradle +++ b/Projekte/settings.gradle @@ -7,7 +7,7 @@ dependencyResolutionManagement { versionCatalogs { libs { - version('jme', '3.6.1-stable') + version('jme', '3.7.0-stable') library('jme3-core', 'org.jmonkeyengine', 'jme3-core').versionRef('jme') library('jme3-desktop', 'org.jmonkeyengine', 'jme3-desktop').versionRef('jme') @@ -32,3 +32,8 @@ } } } +include 'mdga:client' +findProject(':mdga:client')?.name = 'client' +include 'mdga:client' +findProject(':mdga:client')?.name = 'client' +