peet/Gruppe-01-fin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Aufgabe 13

Browse Source 
edited class BattleState in order to implement the 2D map feature
edited class GameSound to add the Missile launch sound
edited class MapViewSynchronizer in order to implement the 2D map feature
edited class ImpactEffectManager removed unused import
edited class SeaSynchronizer removed unused code
edited class Shell in order to implement the 2D map feature
edited class ShellControl in order to implement the 2D map feature
edited Sound added Missile launch enum
edited FloatMath to improve the animation for the 2D projectile
added missileLaunch.wav
This commit is contained in:
Lukas Bauer
2024-10-11 14:23:49 +02:00
parent 6100e95e76
commit bf16a18b71
11 changed files with 176 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Projekte/battleship/client/src/main/java/pp/battleship/client/GameSound.java
View File

@@ -34,6 +34,7 @@ public class GameSound extends AbstractAppState implements GameEventListener {
private AudioNode splashSound;
private AudioNode shipDestroyedSound;
private AudioNode explosionSound;
private AudioNode missileLaunch;
/**
* Checks if sound is enabled in the preferences.
@@ -78,6 +79,7 @@ public void initialize(AppStateManager stateManager, Application app) {
shipDestroyedSound = loadSound(app, "Sound/Effects/sunken.wav"); //NON-NLS
splashSound = loadSound(app, "Sound/Effects/splash.wav"); //NON-NLS
explosionSound = loadSound(app, "Sound/Effects/explosion.wav"); //NON-NLS
missileLaunch = loadSound(app, "Sound/Effects/missileLaunch.wav");
}
/**
@@ -93,13 +95,16 @@ private AudioNode loadSound(Application app, String name) {
sound.setLooping(false);
sound.setPositional(false);
return sound;
}
catch (AssetLoadException | AssetNotFoundException ex) {
} catch (AssetLoadException | AssetNotFoundException ex) {
LOGGER.log(Level.ERROR, ex.getMessage(), ex);
}
return null;
}
public void missileLaunch() {
missileLaunch.playInstance();
}
/**
* Plays the splash sound effect.
*/
@@ -126,6 +131,7 @@ public void shipDestroyed() {
/**
* Checks the according case for the soundeffect
*
* @param event the received event
*/
@Override
@@ -134,6 +140,7 @@ public void receivedEvent(SoundEvent event) {
case EXPLOSION -> explosion();
case SPLASH -> splash();
case DESTROYED_SHIP -> shipDestroyed();
case MISSILE_LAUNCH -> missileLaunch();
}
}
}

16
Projekte/battleship/client/src/main/java/pp/battleship/client/gui/ImpactEffectManager.java
View File

@@ -1,6 +1,5 @@
package pp.battleship.client.gui;
import com.jme3.app.Application;
import com.jme3.asset.AssetManager;
import com.jme3.effect.ParticleEmitter;
import com.jme3.effect.ParticleMesh.Type;
@@ -105,29 +104,16 @@ private ParticleEmitter createParticleEmitter(String name, int count, ColorRGBA
private static class EffectCleanupControl extends AbstractControl {
private final ParticleEmitter emitter;
// private final Node attachedNode;
private float currentTime = 0;
private final float duration = 3.5f;
/**
* Constructor for managing cleanup when a particle emitter is attached to a specific node.
*
* @param emitter The particle emitter to manage.
* @param attachedNode The node to which the emitter is attached.
*/
// public EffectCleanupControl(ParticleEmitter emitter, Node attachedNode) {
// this.emitter = emitter;
// this.attachedNode = attachedNode;
// }
/**
* Constructor for managing cleanup of a standalone particle emitter.
*
* @param emitter The particle emitter to manage.
*/
public EffectCleanupControl(ParticleEmitter emitter) {
// this(emitter, null);
this.emitter = emitter;
}
@@ -140,10 +126,8 @@ public EffectCleanupControl(ParticleEmitter emitter) {
protected void controlUpdate(float tpf) {
currentTime += tpf;
if (currentTime <= duration) {
}
if (currentTime >= 1f && currentTime <= 1.1) {
//Start
emitter.setNumParticles(50);
emitter.setParticlesPerSec(50);

21
Projekte/battleship/client/src/main/java/pp/battleship/client/gui/MapViewSynchronizer.java
View File

@@ -12,9 +12,13 @@
import com.jme3.scene.Node;
import com.jme3.scene.Spatial;
import pp.battleship.model.Battleship;
import pp.battleship.model.IntPoint;
import pp.battleship.model.Shell;
import pp.battleship.model.Shot;
import pp.util.FloatMath;
import pp.util.FloatPoint;
import pp.util.Position;
import java.lang.System.Logger;
/**
* Synchronizes the visual representation of the ship map with the game model.
@@ -28,6 +32,8 @@ class MapViewSynchronizer extends ShipMapSynchronizer {
private static final float SHIP_DEPTH = 0f;
private static final float INDENT = 4f;
private static final float SHELL_DEPTH = 8f;
// Colors used for different visual elements
private static final ColorRGBA HIT_COLOR = ColorRGBA.Red;
private static final ColorRGBA MISS_COLOR = ColorRGBA.Blue;
@@ -110,9 +116,22 @@ public Spatial visit(Battleship ship) {
return shipNode;
}
/**
*
* @param shell
* @return
*/
@Override
public Spatial visit(Shell shell) {
return null;
LOGGER.log(Logger.Level.DEBUG, "Visiting {0}", shell);
final Node shellNode = new Node("shell");
final Position startPosition = view.modelToView(shell.getCurrentPosition().x,shell.getCurrentPosition().z);
shellNode.attachChild(view.getApp().getDraw().makeRectangle(startPosition.getX(),startPosition.getY(), SHELL_DEPTH, 30, 30, ColorRGBA.Black));
shellNode.addControl(new ShellControl(shell, this.view, shell.getLogic()));
return shellNode;
}
/**

8
Projekte/battleship/client/src/main/java/pp/battleship/client/gui/SeaSynchronizer.java
View File

@@ -109,7 +109,7 @@ private Geometry createCylinder(Shot shot) {
geometry.setMaterial(createColoredMaterial(color));
geometry.rotate(HALF_PI, 0f, 0f);
// compute the center of the shot in world coordinates
geometry.setLocalTranslation(shot.getY() + 0.5f, 0f, shot.getX() + 0.5f);
return geometry;
@@ -140,14 +140,14 @@ public Spatial visit(Shell shell) {
final Spatial bombModel = app.getAssetManager().loadModel(BOMB);
// Apply transformations to the bomb model (scale, rotate, etc. if needed)
bombModel.scale(0.05f); // Adjust the scale based on your model size
bombModel.rotate(-HALF_PI, 0f, 0f); // Rotate the model if necessary
bombModel.scale(0.05f);
bombModel.rotate(-HALF_PI, 0f, 0f);
// Set the position of the bomb at the shell's current position
bombModel.setLocalTranslation(shell.getCurrentPosition());
// Add a control to animate the bomb's movement (similar to the previous cylinder animation)
bombModel.addControl(new ShellControl(shell));
bombModel.addControl(new ShellControl(shell,shell.getLogic()));
return bombModel;
}

68
Projekte/battleship/client/src/main/java/pp/battleship/client/gui/ShellControl.java
View File

@@ -12,8 +12,13 @@
import com.jme3.renderer.RenderManager;
import com.jme3.renderer.ViewPort;
import com.jme3.scene.control.AbstractControl;
import pp.battleship.game.client.ClientGameLogic;
import pp.battleship.message.server.EffectMessage;
import pp.battleship.model.Battleship;
import pp.battleship.model.Shell;
import pp.battleship.notification.Sound;
import pp.util.FloatPoint;
import pp.util.Position;
import java.lang.System.Logger;
import java.lang.System.Logger.Level;
@@ -28,21 +33,6 @@
* The ship oscillates to simulate a realistic movement on water, based on its orientation and length.
*/
class ShellControl extends AbstractControl {
/**
* The axis of rotation for the ship's pitch (tilting forward and backward).
*/
private final Vector3f axis;
/**
* The duration of one complete oscillation cycle in seconds.
*/
private final float cycle;
/**
* The amplitude of the pitch oscillation in radians, determining how much the ship tilts.
*/
private final float amplitude;
/**
* A quaternion representing the ship's current pitch rotation.
*/
@@ -54,6 +44,10 @@ class ShellControl extends AbstractControl {
private float time;
private Shell shell;
private MapView view;
private ClientGameLogic logic;
private EffectMessage msg;
private boolean hasPlayedSound = false;
/**
* Logger for logging messages related to ShipControl operations.
*/
@@ -66,14 +60,22 @@ class ShellControl extends AbstractControl {
*
* @param shell the Battleship object to control
*/
public ShellControl(Shell shell) {
public ShellControl(Shell shell, ClientGameLogic clientGameLogic) {
this.shell = shell;
// Determine the axis of rotation based on the ship's orientation
axis = Vector3f.UNIT_X;
this.logic = clientGameLogic;
this.msg = shell.getMsg();
}
// Set the cycle duration and amplitude based on the ship's length
cycle = 1 * 2f;
amplitude = 5f * DEG_TO_RAD / 1;
/**
* @param shell
* @param view
* @param clientGameLogic
*/
public ShellControl(Shell shell, MapView view, ClientGameLogic clientGameLogic) {
this.shell = shell;
this.view = view;
this.logic = clientGameLogic;
this.msg = shell.getMsg();
}
/**
@@ -85,11 +87,25 @@ public ShellControl(Shell shell) {
@Override
protected void controlUpdate(float tpf) {
// If spatial is null, do nothing
if (spatial == null) return;
shell.updatePosition(tpf);
spatial.setLocalTranslation(shell.getCurrentPosition());
if (spatial == null)
return;
if (shell.isFinished() && !hasPlayedSound) {
if (!msg.getShot().isHit())
logic.playSound(Sound.SPLASH);
else if (msg.getDestroyedShip() == null)
logic.playSound(Sound.EXPLOSION);
else
logic.playSound(Sound.DESTROYED_SHIP);
hasPlayedSound = true;
}
if (view == null) {
shell.updatePosition(tpf);
spatial.setLocalTranslation(shell.getCurrentPosition());
} else {
shell.updatePosition(tpf);
Position pos2d = view.modelToView(shell.getCurrentPosition().x - 0.3f, shell.getCurrentPosition().z - 0.3f);
spatial.setLocalTranslation(pos2d.getY(), pos2d.getX(), 0);
}
}
/**

BIN
Projekte/battleship/client/src/main/resources/Sound/Effects/missileLaunch.wav Normal file
View File

Binary file not shown.