Compare commits
12 Commits
dev/model
...
b_Grigench
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5174b84a1b | ||
|
|
42b995a4e7 | ||
|
|
2c4e2fd92d | ||
|
|
08c5eeb63d | ||
|
|
9d5f3ac396 | ||
|
|
28ba183b84 | ||
|
|
a44cbf2a72 | ||
|
|
ec80dd40ce | ||
|
|
046707642f | ||
|
|
a3b5452fb9 | ||
|
|
eda4f06a75 | ||
|
|
0d2781dbe4 |
@@ -9,11 +9,13 @@ implementation project(":jme-common")
|
|||||||
implementation project(":battleship:model")
|
implementation project(":battleship:model")
|
||||||
|
|
||||||
implementation libs.jme3.desktop
|
implementation libs.jme3.desktop
|
||||||
|
implementation libs.jme3.effects
|
||||||
|
|
||||||
runtimeOnly libs.jme3.awt.dialogs
|
runtimeOnly libs.jme3.awt.dialogs
|
||||||
runtimeOnly libs.jme3.plugins
|
runtimeOnly libs.jme3.plugins
|
||||||
runtimeOnly libs.jme3.jogg
|
runtimeOnly libs.jme3.jogg
|
||||||
runtimeOnly libs.jme3.testdata
|
runtimeOnly libs.jme3.testdata
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
application {
|
application {
|
||||||
|
|||||||
@@ -29,7 +29,7 @@ robot.targets=2, 0,\
|
|||||||
2, 3
|
2, 3
|
||||||
#
|
#
|
||||||
# Delay in milliseconds between each shot fired by the RobotClient.
|
# Delay in milliseconds between each shot fired by the RobotClient.
|
||||||
robot.delay=500
|
robot.delay=2000
|
||||||
#
|
#
|
||||||
# The dimensions of the game map used in single mode.
|
# The dimensions of the game map used in single mode.
|
||||||
# 'map.width' defines the number of columns, and 'map.height' defines the number of rows.
|
# 'map.width' defines the number of columns, and 'map.height' defines the number of rows.
|
||||||
|
|||||||
@@ -0,0 +1,267 @@
|
|||||||
|
package pp.battleship.client;
|
||||||
|
|
||||||
|
import com.jme3.app.Application;
|
||||||
|
import com.jme3.app.state.AbstractAppState;
|
||||||
|
import com.jme3.app.state.AppStateManager;
|
||||||
|
import com.jme3.asset.AssetLoadException;
|
||||||
|
import com.jme3.asset.AssetNotFoundException;
|
||||||
|
import com.jme3.audio.AudioData.DataType;
|
||||||
|
import com.jme3.audio.AudioNode;
|
||||||
|
import pp.battleship.notification.GameEventListener;
|
||||||
|
import pp.battleship.notification.MusicEvent;
|
||||||
|
|
||||||
|
import java.lang.System.Logger;
|
||||||
|
import java.lang.System.Logger.Level;
|
||||||
|
import java.util.prefs.Preferences;
|
||||||
|
|
||||||
|
import static pp.util.PreferencesUtils.getPreferences;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The BackgroundMusic class represents the background music in the Battleship game application.
|
||||||
|
* It extends the AbstractAppState class and provides functionalities for playing the menu music,
|
||||||
|
* game music, victory music, and defeat music.
|
||||||
|
*/
|
||||||
|
public class BackgroundMusic extends AbstractAppState implements GameEventListener {
|
||||||
|
/**
|
||||||
|
* Logger for the BackgroundMusic class.
|
||||||
|
*/
|
||||||
|
private static final Logger LOGGER = System.getLogger(BackgroundMusic.class.getName());
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Preferences for storing music settings.
|
||||||
|
*/
|
||||||
|
private static final Preferences PREFERENCES = getPreferences(BackgroundMusic.class);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Preference key for enabling/disabling music.
|
||||||
|
*/
|
||||||
|
private static final String ENABLED_PREF = "enabled"; //NON-NLS
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Preference key for storing the volume level.
|
||||||
|
*/
|
||||||
|
private static final String VOLUME_PREF = "volume"; //NON-NLS
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Path to the menu music file.
|
||||||
|
*/
|
||||||
|
private static final String MENU_MUSIC_PATH = "Sound/Music/menu_music.ogg";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Path to the game music file.
|
||||||
|
*/
|
||||||
|
private static final String GAME_MUSIC_PATH = "Sound/Music/pirates.ogg";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Path to the victory music file.
|
||||||
|
*/
|
||||||
|
private static final String VICTORY_MUSIC_PATH = "Sound/Music/win_the_game.ogg";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Path to the defeat music file.
|
||||||
|
*/
|
||||||
|
private static final String DEFEAT_MUSIC_PATH = "Sound/Music/defeat.ogg";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* AudioNode for the menu music.
|
||||||
|
*/
|
||||||
|
private AudioNode menuMusic;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* AudioNode for the game music.
|
||||||
|
*/
|
||||||
|
private AudioNode gameMusic;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* AudioNode for the victory music.
|
||||||
|
*/
|
||||||
|
private AudioNode victoryMusic;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* AudioNode for the defeat music.
|
||||||
|
*/
|
||||||
|
private AudioNode defeatMusic;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The currently playing AudioNode.
|
||||||
|
*/
|
||||||
|
private AudioNode currentMusic;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The volume level for the background music.
|
||||||
|
*/
|
||||||
|
private float volume;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Checks if music is enabled in the preferences.
|
||||||
|
*
|
||||||
|
* @return {@code true} if music is enabled, {@code false} otherwise.
|
||||||
|
*/
|
||||||
|
public static boolean enabledInPreferences() {
|
||||||
|
return PREFERENCES.getBoolean(ENABLED_PREF, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sets the enabled state of this AppState.
|
||||||
|
* Overrides {@link com.jme3.app.state.AbstractAppState#setEnabled(boolean)}
|
||||||
|
*
|
||||||
|
* @param enabled {@code true} to enable the AppState, {@code false} to disable it.
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
public void setEnabled(boolean enabled) {
|
||||||
|
if (isEnabled() == enabled) return;
|
||||||
|
super.setEnabled(enabled);
|
||||||
|
LOGGER.log(Level.INFO, "Music enabled: {0}", enabled); //NON-NLS
|
||||||
|
PREFERENCES.putBoolean(ENABLED_PREF, enabled);
|
||||||
|
playCurrentMusic();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Initializes the music for the game.
|
||||||
|
* Overrides {@link AbstractAppState#initialize(AppStateManager, Application)}
|
||||||
|
*
|
||||||
|
* @param stateManager The state manager
|
||||||
|
* @param app The application
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
public void initialize(AppStateManager stateManager, Application app) {
|
||||||
|
LOGGER.log(Level.INFO, "Initializing background music"); //NON-NLS
|
||||||
|
super.initialize(stateManager, app);
|
||||||
|
menuMusic = loadMusic(app, MENU_MUSIC_PATH);
|
||||||
|
gameMusic = loadMusic(app, GAME_MUSIC_PATH);
|
||||||
|
victoryMusic = loadMusic(app, VICTORY_MUSIC_PATH);
|
||||||
|
defeatMusic = loadMusic(app, DEFEAT_MUSIC_PATH);
|
||||||
|
currentMusic = menuMusic;
|
||||||
|
playCurrentMusic();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Loads a music file and initializes an AudioNode with the specified settings.
|
||||||
|
*
|
||||||
|
* @param app The application instance.
|
||||||
|
* @param name The name of the music file to load.
|
||||||
|
* @return The initialized AudioNode, or {@code null} if the file could not be loaded.
|
||||||
|
*/
|
||||||
|
private AudioNode loadMusic(Application app, String name) {
|
||||||
|
try {
|
||||||
|
this.volume = PREFERENCES.getFloat(VOLUME_PREF, 0.5f);
|
||||||
|
final AudioNode music = new AudioNode(app.getAssetManager(), name, DataType.Stream);
|
||||||
|
music.setLooping(true);
|
||||||
|
music.setVolume(volume);
|
||||||
|
music.setPositional(false);
|
||||||
|
music.setDirectional(false);
|
||||||
|
return music;
|
||||||
|
} catch (AssetLoadException | AssetNotFoundException ex) {
|
||||||
|
LOGGER.log(Level.ERROR, ex.getMessage(), ex);
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Plays the current music if the music is enabled.
|
||||||
|
* Stops the current music if the music is disabled.
|
||||||
|
*/
|
||||||
|
private void playCurrentMusic() {
|
||||||
|
if (isEnabled()) {
|
||||||
|
if (currentMusic != null) {
|
||||||
|
LOGGER.log(Level.INFO, "Playing current music"); //NON-NLS
|
||||||
|
currentMusic.play();
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if (currentMusic != null) {
|
||||||
|
currentMusic.stop();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Plays the game music.
|
||||||
|
*/
|
||||||
|
private void gameMusic() {
|
||||||
|
if (isEnabled() && gameMusic != null) {
|
||||||
|
stopAll();
|
||||||
|
LOGGER.log(Level.INFO, "Playing game music"); //NON-NLS
|
||||||
|
PREFERENCES.putFloat(VOLUME_PREF, volume);
|
||||||
|
gameMusic.play();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Plays the victory music.
|
||||||
|
*/
|
||||||
|
private void victoryMusic() {
|
||||||
|
if (isEnabled() && victoryMusic != null) {
|
||||||
|
stopAll();
|
||||||
|
LOGGER.log(Level.INFO, "Playing victory music"); //NON-NLS
|
||||||
|
PREFERENCES.putFloat(VOLUME_PREF, volume);
|
||||||
|
victoryMusic.play();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Plays the defeat music.
|
||||||
|
*/
|
||||||
|
private void defeatMusic() {
|
||||||
|
if (isEnabled() && defeatMusic != null) {
|
||||||
|
stopAll();
|
||||||
|
LOGGER.log(Level.INFO, "Playing defeat music"); //NON-NLS
|
||||||
|
PREFERENCES.putFloat(VOLUME_PREF, volume);
|
||||||
|
defeatMusic.play();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Stops all music.
|
||||||
|
*/
|
||||||
|
private void stopAll() {
|
||||||
|
if (menuMusic != null) menuMusic.stop();
|
||||||
|
if (gameMusic != null) gameMusic.stop();
|
||||||
|
if (victoryMusic != null) victoryMusic.stop();
|
||||||
|
if (defeatMusic != null) defeatMusic.stop();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Handles the received music event and plays the corresponding music.
|
||||||
|
*
|
||||||
|
* @param event The music event to handle.
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
public void receivedEvent(MusicEvent event) {
|
||||||
|
switch (event.music()) {
|
||||||
|
case GAME_MUSIC -> {
|
||||||
|
gameMusic();
|
||||||
|
currentMusic = gameMusic;
|
||||||
|
}
|
||||||
|
case VICTORY_MUSIC -> {
|
||||||
|
victoryMusic();
|
||||||
|
currentMusic = victoryMusic;
|
||||||
|
}
|
||||||
|
case DEFEAT_MUSIC -> {
|
||||||
|
defeatMusic();
|
||||||
|
currentMusic = defeatMusic;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sets the volume for the background music and updates the preferences.
|
||||||
|
*
|
||||||
|
* @param volume The volume level to set.
|
||||||
|
*/
|
||||||
|
public void setVolume(float volume) {
|
||||||
|
LOGGER.log(Level.INFO, "Setting volume to {0}", volume); //NON-NLS
|
||||||
|
this.volume = volume;
|
||||||
|
currentMusic.setVolume(volume);
|
||||||
|
PREFERENCES.putFloat(VOLUME_PREF, volume);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns the volume level for the background music.
|
||||||
|
*
|
||||||
|
* @return The volume level as a float.
|
||||||
|
*/
|
||||||
|
public float getVolume() {
|
||||||
|
return volume;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -128,8 +128,7 @@ public class BattleshipApp extends SimpleApplication implements BattleshipClient
|
|||||||
try {
|
try {
|
||||||
manager.readConfiguration(new FileInputStream("logging.properties"));
|
manager.readConfiguration(new FileInputStream("logging.properties"));
|
||||||
LOGGER.log(Level.INFO, "Successfully read logging properties"); //NON-NLS
|
LOGGER.log(Level.INFO, "Successfully read logging properties"); //NON-NLS
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e) {
|
|
||||||
LOGGER.log(Level.INFO, e.getMessage());
|
LOGGER.log(Level.INFO, e.getMessage());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -267,6 +266,7 @@ private void setupStates() {
|
|||||||
stateManager.detach(stateManager.getState(DebugKeysAppState.class));
|
stateManager.detach(stateManager.getState(DebugKeysAppState.class));
|
||||||
|
|
||||||
attachGameSound();
|
attachGameSound();
|
||||||
|
attachBackgroundSound();
|
||||||
stateManager.attachAll(new EditorAppState(), new BattleAppState(), new SeaAppState());
|
stateManager.attachAll(new EditorAppState(), new BattleAppState(), new SeaAppState());
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -280,6 +280,19 @@ private void attachGameSound() {
|
|||||||
stateManager.attach(gameSound);
|
stateManager.attach(gameSound);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Attaches the background music state and sets its initial enabled state.
|
||||||
|
* The background music state is responsible for managing the background music
|
||||||
|
* playback in the game. It listens to the game logic for any changes in the
|
||||||
|
* background music settings.
|
||||||
|
*/
|
||||||
|
private void attachBackgroundSound() {
|
||||||
|
final BackgroundMusic backgroundMusic = new BackgroundMusic();
|
||||||
|
logic.addListener(backgroundMusic);
|
||||||
|
backgroundMusic.setEnabled(BackgroundMusic.enabledInPreferences());
|
||||||
|
stateManager.attach(backgroundMusic);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Updates the application state every frame.
|
* Updates the application state every frame.
|
||||||
* This method is called once per frame during the game loop.
|
* This method is called once per frame during the game loop.
|
||||||
@@ -405,12 +418,12 @@ public void stop(boolean waitFor) {
|
|||||||
*/
|
*/
|
||||||
void confirmDialog(String question, Runnable yesAction) {
|
void confirmDialog(String question, Runnable yesAction) {
|
||||||
DialogBuilder.simple(dialogManager)
|
DialogBuilder.simple(dialogManager)
|
||||||
.setTitle(lookup("dialog.question"))
|
.setTitle(lookup("dialog.question"))
|
||||||
.setText(question)
|
.setText(question)
|
||||||
.setOkButton(lookup("button.yes"), yesAction)
|
.setOkButton(lookup("button.yes"), yesAction)
|
||||||
.setNoButton(lookup("button.no"))
|
.setNoButton(lookup("button.no"))
|
||||||
.build()
|
.build()
|
||||||
.open();
|
.open();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -420,10 +433,10 @@ void confirmDialog(String question, Runnable yesAction) {
|
|||||||
*/
|
*/
|
||||||
void errorDialog(String errorMessage) {
|
void errorDialog(String errorMessage) {
|
||||||
DialogBuilder.simple(dialogManager)
|
DialogBuilder.simple(dialogManager)
|
||||||
.setTitle(lookup("dialog.error"))
|
.setTitle(lookup("dialog.error"))
|
||||||
.setText(errorMessage)
|
.setText(errorMessage)
|
||||||
.setOkButton(lookup("button.ok"))
|
.setOkButton(lookup("button.ok"))
|
||||||
.build()
|
.build()
|
||||||
.open();
|
.open();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,248 @@
|
|||||||
|
////////////////////////////////////////
|
||||||
|
// Programming project code
|
||||||
|
// UniBw M, 2022, 2023, 2024
|
||||||
|
// www.unibw.de/inf2
|
||||||
|
// (c) Mark Minas (mark.minas@unibw.de)
|
||||||
|
////////////////////////////////////////
|
||||||
|
|
||||||
|
package pp.battleship.client;
|
||||||
|
|
||||||
|
import com.jme3.network.ConnectionListener;
|
||||||
|
import com.jme3.network.HostedConnection;
|
||||||
|
import com.jme3.network.Message;
|
||||||
|
import com.jme3.network.MessageListener;
|
||||||
|
import com.jme3.network.Network;
|
||||||
|
import com.jme3.network.Server;
|
||||||
|
import com.jme3.network.serializing.Serializer;
|
||||||
|
import pp.battleship.BattleshipConfig;
|
||||||
|
import pp.battleship.game.server.Player;
|
||||||
|
import pp.battleship.game.server.ServerGameLogic;
|
||||||
|
import pp.battleship.game.server.ServerSender;
|
||||||
|
import pp.battleship.message.client.AnimationMessage;
|
||||||
|
import pp.battleship.message.client.ClientMessage;
|
||||||
|
import pp.battleship.message.client.MapMessage;
|
||||||
|
import pp.battleship.message.client.ShootMessage;
|
||||||
|
import pp.battleship.message.server.EffectMessage;
|
||||||
|
import pp.battleship.message.server.GameDetails;
|
||||||
|
import pp.battleship.message.server.ServerMessage;
|
||||||
|
import pp.battleship.message.server.StartBattleMessage;
|
||||||
|
import pp.battleship.model.Battleship;
|
||||||
|
import pp.battleship.model.IntPoint;
|
||||||
|
import pp.battleship.model.Shot;
|
||||||
|
|
||||||
|
import java.io.File;
|
||||||
|
import java.io.FileInputStream;
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.lang.System.Logger;
|
||||||
|
import java.lang.System.Logger.Level;
|
||||||
|
import java.util.concurrent.BlockingQueue;
|
||||||
|
import java.util.concurrent.LinkedBlockingQueue;
|
||||||
|
import java.util.logging.LogManager;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Server implementing the visitor pattern as MessageReceiver for ClientMessages
|
||||||
|
*/
|
||||||
|
public class BattleshipServer implements MessageListener<HostedConnection>, ConnectionListener, ServerSender {
|
||||||
|
/**
|
||||||
|
* Logger for the BattleshipServer class.
|
||||||
|
*/
|
||||||
|
private static final Logger LOGGER = System.getLogger(BattleshipServer.class.getName());
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Configuration file for the server.
|
||||||
|
*/
|
||||||
|
private static final File CONFIG_FILE = new File("server.properties");
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Port number for the server.
|
||||||
|
*/
|
||||||
|
private final int PORT_NUMBER;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Configuration settings for the Battleship server.
|
||||||
|
*/
|
||||||
|
private final BattleshipConfig config = new BattleshipConfig();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The server instance.
|
||||||
|
*/
|
||||||
|
private Server myServer;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Game logic for the server.
|
||||||
|
*/
|
||||||
|
private final ServerGameLogic logic;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Queue for pending messages to be processed by the server.
|
||||||
|
*/
|
||||||
|
private final BlockingQueue<ReceivedMessage> pendingMessages = new LinkedBlockingQueue<>();
|
||||||
|
|
||||||
|
static {
|
||||||
|
// Configure logging
|
||||||
|
LogManager manager = LogManager.getLogManager();
|
||||||
|
try {
|
||||||
|
manager.readConfiguration(new FileInputStream("logging.properties"));
|
||||||
|
LOGGER.log(Level.INFO, "Successfully read logging properties"); //NON-NLS
|
||||||
|
} catch (IOException e) {
|
||||||
|
LOGGER.log(Level.INFO, e.getMessage());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Creates the server.
|
||||||
|
*/
|
||||||
|
public BattleshipServer(int PORT_NUMBER) {
|
||||||
|
config.readFromIfExists(CONFIG_FILE);
|
||||||
|
this.PORT_NUMBER = PORT_NUMBER;
|
||||||
|
LOGGER.log(Level.INFO, "Configuration: {0}", config); //NON-NLS
|
||||||
|
logic = new ServerGameLogic(this, config);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Starts the server and processes incoming messages indefinitely.
|
||||||
|
*/
|
||||||
|
public void run() {
|
||||||
|
startServer();
|
||||||
|
while (true)
|
||||||
|
processNextMessage();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Starts the server and initializes necessary components.
|
||||||
|
* This method sets up the server, registers serializable classes,
|
||||||
|
* starts the server, and registers listeners for incoming connections and messages.
|
||||||
|
* If the server fails to start, it logs an error and exits the application.
|
||||||
|
*/
|
||||||
|
private void startServer() {
|
||||||
|
try {
|
||||||
|
LOGGER.log(Level.INFO, "Starting server..."); //NON-NLS
|
||||||
|
myServer = Network.createServer(PORT_NUMBER);
|
||||||
|
initializeSerializables();
|
||||||
|
myServer.start();
|
||||||
|
registerListeners();
|
||||||
|
LOGGER.log(Level.INFO, "Server started: {0}", myServer.isRunning()); //NON-NLS
|
||||||
|
} catch (IOException e) {
|
||||||
|
LOGGER.log(Level.ERROR, "Couldn't start server: {0}", e.getMessage()); //NON-NLS
|
||||||
|
exit(1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Processes the next message in the queue.
|
||||||
|
* This method blocks until a message is available, then processes it using the server logic.
|
||||||
|
* If interrupted while waiting, it logs the interruption and re-interrupts the thread.
|
||||||
|
*/
|
||||||
|
private void processNextMessage() {
|
||||||
|
try {
|
||||||
|
pendingMessages.take().process(logic);
|
||||||
|
} catch (InterruptedException ex) {
|
||||||
|
LOGGER.log(Level.INFO, "Interrupted while waiting for messages"); //NON-NLS
|
||||||
|
Thread.currentThread().interrupt();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Registers the serializable classes used by the server.
|
||||||
|
* This method ensures that the necessary classes are registered with the serializer
|
||||||
|
* so that they can be correctly transmitted over the network.
|
||||||
|
*/
|
||||||
|
private void initializeSerializables() {
|
||||||
|
Serializer.registerClass(GameDetails.class);
|
||||||
|
Serializer.registerClass(StartBattleMessage.class);
|
||||||
|
Serializer.registerClass(MapMessage.class);
|
||||||
|
Serializer.registerClass(ShootMessage.class);
|
||||||
|
Serializer.registerClass(AnimationMessage.class);
|
||||||
|
Serializer.registerClass(EffectMessage.class);
|
||||||
|
Serializer.registerClass(Battleship.class);
|
||||||
|
Serializer.registerClass(IntPoint.class);
|
||||||
|
Serializer.registerClass(Shot.class);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Registers listeners for incoming connections and messages.
|
||||||
|
* This method adds message listeners for `MapMessage` and `ShootMessage` classes,
|
||||||
|
* and a connection listener for handling connection events.
|
||||||
|
*/
|
||||||
|
private void registerListeners() {
|
||||||
|
myServer.addMessageListener(this, MapMessage.class);
|
||||||
|
myServer.addMessageListener(this, ShootMessage.class);
|
||||||
|
myServer.addMessageListener(this, AnimationMessage.class);
|
||||||
|
myServer.addConnectionListener(this);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Handles the reception of messages from clients.
|
||||||
|
*
|
||||||
|
* @param source the connection from which the message was received
|
||||||
|
* @param message the message received from the client
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
public void messageReceived(HostedConnection source, Message message) {
|
||||||
|
LOGGER.log(Level.INFO, "message received from {0}: {1}", source.getId(), message); //NON-NLS
|
||||||
|
if (message instanceof ClientMessage clientMessage)
|
||||||
|
pendingMessages.add(new ReceivedMessage(clientMessage, source.getId()));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Called when a new connection is added to the server.
|
||||||
|
*
|
||||||
|
* @param server the server to which the connection was added
|
||||||
|
* @param hostedConnection the connection that was added
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
public void connectionAdded(Server server, HostedConnection hostedConnection) {
|
||||||
|
LOGGER.log(Level.INFO, "new connection {0}", hostedConnection); //NON-NLS
|
||||||
|
logic.addPlayer(hostedConnection.getId());
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Called when a connection is removed from the server.
|
||||||
|
*
|
||||||
|
* @param server the server from which the connection was removed
|
||||||
|
* @param hostedConnection the connection that was removed
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
public void connectionRemoved(Server server, HostedConnection hostedConnection) {
|
||||||
|
LOGGER.log(Level.INFO, "connection closed: {0}", hostedConnection); //NON-NLS
|
||||||
|
final Player player = logic.getPlayerById(hostedConnection.getId());
|
||||||
|
if (player == null)
|
||||||
|
LOGGER.log(Level.INFO, "closed connection does not belong to an active player"); //NON-NLS
|
||||||
|
else { //NON-NLS
|
||||||
|
LOGGER.log(Level.INFO, "closed connection belongs to {0}", player); //NON-NLS
|
||||||
|
exit(0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Exits the application with the specified exit value.
|
||||||
|
* Closes all client connections and logs the close request.
|
||||||
|
*
|
||||||
|
* @param exitValue the exit value to be used when exiting the application
|
||||||
|
*/
|
||||||
|
private void exit(int exitValue) { //NON-NLS
|
||||||
|
LOGGER.log(Level.INFO, "close request"); //NON-NLS
|
||||||
|
if (myServer != null)
|
||||||
|
for (HostedConnection client : myServer.getConnections()) //NON-NLS
|
||||||
|
if (client != null) client.close("Game over"); //NON-NLS
|
||||||
|
System.exit(exitValue);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Send the specified message to the specified connection.
|
||||||
|
*
|
||||||
|
* @param id the connection id
|
||||||
|
* @param message the message
|
||||||
|
*/
|
||||||
|
public void send(int id, ServerMessage message) {
|
||||||
|
if (myServer == null || !myServer.isRunning()) {
|
||||||
|
LOGGER.log(Level.ERROR, "no server running when trying to send {0}", message); //NON-NLS
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
final HostedConnection connection = myServer.getConnection(id);
|
||||||
|
if (connection != null)
|
||||||
|
connection.send(message);
|
||||||
|
else
|
||||||
|
LOGGER.log(Level.ERROR, "there is no connection with id={0}", id); //NON-NLS
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -34,6 +34,7 @@ public class GameSound extends AbstractAppState implements GameEventListener {
|
|||||||
private AudioNode splashSound;
|
private AudioNode splashSound;
|
||||||
private AudioNode shipDestroyedSound;
|
private AudioNode shipDestroyedSound;
|
||||||
private AudioNode explosionSound;
|
private AudioNode explosionSound;
|
||||||
|
private AudioNode shellFiredSound;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Checks if sound is enabled in the preferences.
|
* 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
|
shipDestroyedSound = loadSound(app, "Sound/Effects/sunken.wav"); //NON-NLS
|
||||||
splashSound = loadSound(app, "Sound/Effects/splash.wav"); //NON-NLS
|
splashSound = loadSound(app, "Sound/Effects/splash.wav"); //NON-NLS
|
||||||
explosionSound = loadSound(app, "Sound/Effects/explosion.wav"); //NON-NLS
|
explosionSound = loadSound(app, "Sound/Effects/explosion.wav"); //NON-NLS
|
||||||
|
shellFiredSound = loadSound(app, "Sound/Effects/missle.wav"); //NON-NLS
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -93,8 +95,7 @@ private AudioNode loadSound(Application app, String name) {
|
|||||||
sound.setLooping(false);
|
sound.setLooping(false);
|
||||||
sound.setPositional(false);
|
sound.setPositional(false);
|
||||||
return sound;
|
return sound;
|
||||||
}
|
} catch (AssetLoadException | AssetNotFoundException ex) {
|
||||||
catch (AssetLoadException | AssetNotFoundException ex) {
|
|
||||||
LOGGER.log(Level.ERROR, ex.getMessage(), ex);
|
LOGGER.log(Level.ERROR, ex.getMessage(), ex);
|
||||||
}
|
}
|
||||||
return null;
|
return null;
|
||||||
@@ -124,12 +125,21 @@ public void shipDestroyed() {
|
|||||||
shipDestroyedSound.playInstance();
|
shipDestroyedSound.playInstance();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Plays sound effect when a shell has been fired.
|
||||||
|
*/
|
||||||
|
public void shellFired() {
|
||||||
|
if (isEnabled() && shellFiredSound != null)
|
||||||
|
shellFiredSound.playInstance();
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void receivedEvent(SoundEvent event) {
|
public void receivedEvent(SoundEvent event) {
|
||||||
switch (event.sound()) {
|
switch (event.sound()) {
|
||||||
case EXPLOSION -> explosion();
|
case EXPLOSION -> explosion();
|
||||||
case SPLASH -> splash();
|
case SPLASH -> splash();
|
||||||
case DESTROYED_SHIP -> shipDestroyed();
|
case DESTROYED_SHIP -> shipDestroyed();
|
||||||
|
case SHELL_FIRED -> shellFired();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,7 +9,10 @@
|
|||||||
|
|
||||||
import com.simsilica.lemur.Button;
|
import com.simsilica.lemur.Button;
|
||||||
import com.simsilica.lemur.Checkbox;
|
import com.simsilica.lemur.Checkbox;
|
||||||
|
import com.simsilica.lemur.DefaultRangedValueModel;
|
||||||
import com.simsilica.lemur.Label;
|
import com.simsilica.lemur.Label;
|
||||||
|
import com.simsilica.lemur.Slider;
|
||||||
|
import com.simsilica.lemur.core.VersionedReference;
|
||||||
import com.simsilica.lemur.style.ElementId;
|
import com.simsilica.lemur.style.ElementId;
|
||||||
import pp.dialog.Dialog;
|
import pp.dialog.Dialog;
|
||||||
import pp.dialog.StateCheckboxModel;
|
import pp.dialog.StateCheckboxModel;
|
||||||
@@ -19,6 +22,8 @@
|
|||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.util.prefs.Preferences;
|
import java.util.prefs.Preferences;
|
||||||
|
|
||||||
|
import java.lang.System.Logger;
|
||||||
|
|
||||||
import static pp.battleship.Resources.lookup;
|
import static pp.battleship.Resources.lookup;
|
||||||
import static pp.util.PreferencesUtils.getPreferences;
|
import static pp.util.PreferencesUtils.getPreferences;
|
||||||
|
|
||||||
@@ -28,11 +33,13 @@
|
|||||||
* returning to the game, and quitting the application.
|
* returning to the game, and quitting the application.
|
||||||
*/
|
*/
|
||||||
class Menu extends Dialog {
|
class Menu extends Dialog {
|
||||||
|
private static final Logger LOGGER = System.getLogger(Menu.class.getName());
|
||||||
private static final Preferences PREFERENCES = getPreferences(Menu.class);
|
private static final Preferences PREFERENCES = getPreferences(Menu.class);
|
||||||
private static final String LAST_PATH = "last.file.path";
|
private static final String LAST_PATH = "last.file.path";
|
||||||
private final BattleshipApp app;
|
private final BattleshipApp app;
|
||||||
private final Button loadButton = new Button(lookup("menu.map.load"));
|
private final Button loadButton = new Button(lookup("menu.map.load"));
|
||||||
private final Button saveButton = new Button(lookup("menu.map.save"));
|
private final Button saveButton = new Button(lookup("menu.map.save"));
|
||||||
|
private final VersionedReference<Double> volumeRef;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Constructs the Menu dialog for the Battleship application.
|
* Constructs the Menu dialog for the Battleship application.
|
||||||
@@ -43,8 +50,19 @@ public Menu(BattleshipApp app) {
|
|||||||
super(app.getDialogManager());
|
super(app.getDialogManager());
|
||||||
this.app = app;
|
this.app = app;
|
||||||
addChild(new Label(lookup("battleship.name"), new ElementId("header"))); //NON-NLS
|
addChild(new Label(lookup("battleship.name"), new ElementId("header"))); //NON-NLS
|
||||||
|
|
||||||
addChild(new Checkbox(lookup("menu.sound-enabled"),
|
addChild(new Checkbox(lookup("menu.sound-enabled"),
|
||||||
new StateCheckboxModel(app, GameSound.class)));
|
new StateCheckboxModel(app, GameSound.class)));
|
||||||
|
|
||||||
|
addChild(new Checkbox(lookup("menu.music-toggle"),
|
||||||
|
new StateCheckboxModel(app, BackgroundMusic.class)));
|
||||||
|
|
||||||
|
Slider volumeSlider = new Slider();
|
||||||
|
volumeSlider.setModel(new DefaultRangedValueModel(0.0, 2.0, app.getStateManager().getState(BackgroundMusic.class).getVolume()));
|
||||||
|
volumeSlider.setDelta(0.1f);
|
||||||
|
addChild(volumeSlider);
|
||||||
|
volumeRef = volumeSlider.getModel().createReference();
|
||||||
|
|
||||||
addChild(loadButton)
|
addChild(loadButton)
|
||||||
.addClickCommands(s -> ifTopDialog(this::loadDialog));
|
.addClickCommands(s -> ifTopDialog(this::loadDialog));
|
||||||
addChild(saveButton)
|
addChild(saveButton)
|
||||||
@@ -65,6 +83,28 @@ public void update() {
|
|||||||
saveButton.setEnabled(app.getGameLogic().maySaveMap());
|
saveButton.setEnabled(app.getGameLogic().maySaveMap());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Updates the menu state based on the time per frame (tpf).
|
||||||
|
* If the volume reference has been updated, adjusts the volume accordingly.
|
||||||
|
*
|
||||||
|
* @param tpf the time per frame
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
public void update(float tpf) {
|
||||||
|
if (volumeRef.update()) {
|
||||||
|
adjustVolume(volumeRef.get());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Adjusts the volume of the background music.
|
||||||
|
*
|
||||||
|
* @param volume the new volume level to set, as a double
|
||||||
|
*/
|
||||||
|
private void adjustVolume(double volume) {
|
||||||
|
app.getStateManager().getState(BackgroundMusic.class).setVolume((float) volume);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* As an escape action, this method closes the menu if it is the top dialog.
|
* As an escape action, this method closes the menu if it is the top dialog.
|
||||||
*/
|
*/
|
||||||
@@ -99,8 +139,7 @@ private void handle(FileAction fileAction, TextInputDialog dialog) {
|
|||||||
PREFERENCES.put(LAST_PATH, path);
|
PREFERENCES.put(LAST_PATH, path);
|
||||||
fileAction.run(new File(path));
|
fileAction.run(new File(path));
|
||||||
dialog.close();
|
dialog.close();
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e) {
|
|
||||||
app.errorDialog(e.getLocalizedMessage());
|
app.errorDialog(e.getLocalizedMessage());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -114,13 +153,13 @@ private void handle(FileAction fileAction, TextInputDialog dialog) {
|
|||||||
private void fileDialog(FileAction fileAction, String label) {
|
private void fileDialog(FileAction fileAction, String label) {
|
||||||
final TextInputDialog dialog =
|
final TextInputDialog dialog =
|
||||||
TextInputDialog.builder(app.getDialogManager())
|
TextInputDialog.builder(app.getDialogManager())
|
||||||
.setLabel(lookup("label.file"))
|
.setLabel(lookup("label.file"))
|
||||||
.setFocus(TextInputDialog::getInput)
|
.setFocus(TextInputDialog::getInput)
|
||||||
.setTitle(label)
|
.setTitle(label)
|
||||||
.setOkButton(lookup("button.ok"), d -> handle(fileAction, d))
|
.setOkButton(lookup("button.ok"), d -> handle(fileAction, d))
|
||||||
.setNoButton(lookup("button.cancel"))
|
.setNoButton(lookup("button.cancel"))
|
||||||
.setOkClose(false)
|
.setOkClose(false)
|
||||||
.build();
|
.build();
|
||||||
final String path = PREFERENCES.get(LAST_PATH, null);
|
final String path = PREFERENCES.get(LAST_PATH, null);
|
||||||
if (path != null)
|
if (path != null)
|
||||||
dialog.getInput().setText(path.trim());
|
dialog.getInput().setText(path.trim());
|
||||||
|
|||||||
@@ -7,6 +7,7 @@
|
|||||||
|
|
||||||
package pp.battleship.client;
|
package pp.battleship.client;
|
||||||
|
|
||||||
|
import com.simsilica.lemur.Checkbox;
|
||||||
import com.simsilica.lemur.Container;
|
import com.simsilica.lemur.Container;
|
||||||
import com.simsilica.lemur.Label;
|
import com.simsilica.lemur.Label;
|
||||||
import com.simsilica.lemur.TextField;
|
import com.simsilica.lemur.TextField;
|
||||||
@@ -30,6 +31,7 @@ class NetworkDialog extends SimpleDialog {
|
|||||||
private static final Logger LOGGER = System.getLogger(NetworkDialog.class.getName());
|
private static final Logger LOGGER = System.getLogger(NetworkDialog.class.getName());
|
||||||
private static final String LOCALHOST = "localhost"; //NON-NLS
|
private static final String LOCALHOST = "localhost"; //NON-NLS
|
||||||
private static final String DEFAULT_PORT = "1234"; //NON-NLS
|
private static final String DEFAULT_PORT = "1234"; //NON-NLS
|
||||||
|
private static final int START_SERVER_DELAY = 2000;
|
||||||
private final NetworkSupport network;
|
private final NetworkSupport network;
|
||||||
private final TextField host = new TextField(LOCALHOST);
|
private final TextField host = new TextField(LOCALHOST);
|
||||||
private final TextField port = new TextField(DEFAULT_PORT);
|
private final TextField port = new TextField(DEFAULT_PORT);
|
||||||
@@ -37,6 +39,7 @@ class NetworkDialog extends SimpleDialog {
|
|||||||
private int portNumber;
|
private int portNumber;
|
||||||
private Future<Object> connectionFuture;
|
private Future<Object> connectionFuture;
|
||||||
private Dialog progressDialog;
|
private Dialog progressDialog;
|
||||||
|
private boolean hostServer = false;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Constructs a new NetworkDialog.
|
* Constructs a new NetworkDialog.
|
||||||
@@ -50,21 +53,26 @@ class NetworkDialog extends SimpleDialog {
|
|||||||
host.setPreferredWidth(400f);
|
host.setPreferredWidth(400f);
|
||||||
port.setSingleLine(true);
|
port.setSingleLine(true);
|
||||||
|
|
||||||
|
Checkbox hostCheckbox = new Checkbox(lookup("host.own-server"));
|
||||||
|
hostCheckbox.setChecked(false);
|
||||||
|
hostCheckbox.addClickCommands(s -> hostServer = !hostServer);
|
||||||
|
|
||||||
final BattleshipApp app = network.getApp();
|
final BattleshipApp app = network.getApp();
|
||||||
final Container input = new Container(new SpringGridLayout());
|
final Container input = new Container(new SpringGridLayout());
|
||||||
input.addChild(new Label(lookup("host.name") + ": "));
|
input.addChild(new Label(lookup("host.name") + ": "));
|
||||||
input.addChild(host, 1);
|
input.addChild(host, 1);
|
||||||
input.addChild(new Label(lookup("port.number") + ": "));
|
input.addChild(new Label(lookup("port.number") + ": "));
|
||||||
input.addChild(port, 1);
|
input.addChild(port, 1);
|
||||||
|
input.addChild(hostCheckbox);
|
||||||
|
|
||||||
DialogBuilder.simple(app.getDialogManager())
|
DialogBuilder.simple(app.getDialogManager())
|
||||||
.setTitle(lookup("server.dialog"))
|
.setTitle(lookup("server.dialog"))
|
||||||
.setExtension(d -> d.addChild(input))
|
.setExtension(d -> d.addChild(input))
|
||||||
.setOkButton(lookup("button.connect"), d -> connect())
|
.setOkButton(lookup("button.connect"), d -> connectHostServer())
|
||||||
.setNoButton(lookup("button.cancel"), app::closeApp)
|
.setNoButton(lookup("button.cancel"), app::closeApp)
|
||||||
.setOkClose(false)
|
.setOkClose(false)
|
||||||
.setNoClose(false)
|
.setNoClose(false)
|
||||||
.build(this);
|
.build(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -78,19 +86,54 @@ private void connect() {
|
|||||||
portNumber = Integer.parseInt(port.getText());
|
portNumber = Integer.parseInt(port.getText());
|
||||||
openProgressDialog();
|
openProgressDialog();
|
||||||
connectionFuture = network.getApp().getExecutor().submit(this::initNetwork);
|
connectionFuture = network.getApp().getExecutor().submit(this::initNetwork);
|
||||||
}
|
} catch (NumberFormatException e) {
|
||||||
catch (NumberFormatException e) {
|
|
||||||
network.getApp().errorDialog(lookup("port.must.be.integer"));
|
network.getApp().errorDialog(lookup("port.must.be.integer"));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Connects to the host server. If the `hostServer` flag is set, it starts the server
|
||||||
|
* before attempting to connect. If the server fails to start, logs an error.
|
||||||
|
*/
|
||||||
|
private void connectHostServer() {
|
||||||
|
if (hostServer) {
|
||||||
|
startServer();
|
||||||
|
try {
|
||||||
|
Thread.sleep(START_SERVER_DELAY);
|
||||||
|
} catch (Exception e) {
|
||||||
|
LOGGER.log(Level.ERROR, "Server start failed", e); //NON-NLS
|
||||||
|
}
|
||||||
|
connect();
|
||||||
|
} else {
|
||||||
|
connect();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Starts the game server in a new thread.
|
||||||
|
* Logs an error if the server fails to start.
|
||||||
|
*/
|
||||||
|
private void startServer() {
|
||||||
|
LOGGER.log(Level.INFO, "start server"); //NON-NLS
|
||||||
|
new Thread(() -> {
|
||||||
|
try {
|
||||||
|
LOGGER.log(Level.INFO, "Starting server..."); //NON-NLS
|
||||||
|
BattleshipServer server = new BattleshipServer(Integer.parseInt(port.getText()));
|
||||||
|
LOGGER.log(Level.INFO, "Server started"); //NON-NLS
|
||||||
|
server.run();
|
||||||
|
} catch (Exception e) {
|
||||||
|
LOGGER.log(Level.ERROR, "Server start failed", e); //NON-NLS
|
||||||
|
}
|
||||||
|
}).start();
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Creates a dialog indicating that the connection is in progress.
|
* Creates a dialog indicating that the connection is in progress.
|
||||||
*/
|
*/
|
||||||
private void openProgressDialog() {
|
private void openProgressDialog() {
|
||||||
progressDialog = DialogBuilder.simple(network.getApp().getDialogManager())
|
progressDialog = DialogBuilder.simple(network.getApp().getDialogManager())
|
||||||
.setText(lookup("label.connecting"))
|
.setText(lookup("label.connecting"))
|
||||||
.build();
|
.build();
|
||||||
progressDialog.open();
|
progressDialog.open();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -103,8 +146,7 @@ private Object initNetwork() {
|
|||||||
try {
|
try {
|
||||||
network.initNetwork(hostname, portNumber);
|
network.initNetwork(hostname, portNumber);
|
||||||
return null;
|
return null;
|
||||||
}
|
} catch (Exception e) {
|
||||||
catch (Exception e) {
|
|
||||||
throw new RuntimeException(e);
|
throw new RuntimeException(e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -119,11 +161,9 @@ public void update(float delta) {
|
|||||||
try {
|
try {
|
||||||
connectionFuture.get();
|
connectionFuture.get();
|
||||||
success();
|
success();
|
||||||
}
|
} catch (ExecutionException e) {
|
||||||
catch (ExecutionException e) {
|
|
||||||
failure(e.getCause());
|
failure(e.getCause());
|
||||||
}
|
} catch (InterruptedException e) {
|
||||||
catch (InterruptedException e) {
|
|
||||||
LOGGER.log(Level.WARNING, "Interrupted!", e); //NON-NLS
|
LOGGER.log(Level.WARNING, "Interrupted!", e); //NON-NLS
|
||||||
Thread.currentThread().interrupt();
|
Thread.currentThread().interrupt();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,28 @@
|
|||||||
|
////////////////////////////////////////
|
||||||
|
// Programming project code
|
||||||
|
// UniBw M, 2022, 2023, 2024
|
||||||
|
// www.unibw.de/inf2
|
||||||
|
// (c) Mark Minas (mark.minas@unibw.de)
|
||||||
|
////////////////////////////////////////
|
||||||
|
|
||||||
|
package pp.battleship.client;
|
||||||
|
|
||||||
|
import pp.battleship.message.client.ClientInterpreter;
|
||||||
|
import pp.battleship.message.client.ClientMessage;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Represents a received message from a client.
|
||||||
|
*
|
||||||
|
* @param message the client message
|
||||||
|
* @param from the ID of the sender
|
||||||
|
*/
|
||||||
|
record ReceivedMessage(ClientMessage message, int from) {
|
||||||
|
/**
|
||||||
|
* Processes the received message using the specified interpreter.
|
||||||
|
*
|
||||||
|
* @param interpreter the client interpreter
|
||||||
|
*/
|
||||||
|
void process(ClientInterpreter interpreter) {
|
||||||
|
message.accept(interpreter, from);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -143,6 +143,10 @@ public float getHeight() {
|
|||||||
return FIELD_SIZE * map.getHeight();
|
return FIELD_SIZE * map.getHeight();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static float getFieldSize() {
|
||||||
|
return FIELD_SIZE;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Converts coordinates from view coordinates to model coordinates.
|
* Converts coordinates from view coordinates to model coordinates.
|
||||||
*
|
*
|
||||||
|
|||||||
@@ -7,14 +7,20 @@
|
|||||||
|
|
||||||
package pp.battleship.client.gui;
|
package pp.battleship.client.gui;
|
||||||
|
|
||||||
|
import com.jme3.material.Material;
|
||||||
|
import com.jme3.material.RenderState;
|
||||||
import com.jme3.math.ColorRGBA;
|
import com.jme3.math.ColorRGBA;
|
||||||
import com.jme3.scene.Geometry;
|
import com.jme3.scene.Geometry;
|
||||||
import com.jme3.scene.Node;
|
import com.jme3.scene.Node;
|
||||||
import com.jme3.scene.Spatial;
|
import com.jme3.scene.Spatial;
|
||||||
|
import com.jme3.scene.shape.Sphere;
|
||||||
import pp.battleship.model.Battleship;
|
import pp.battleship.model.Battleship;
|
||||||
|
import pp.battleship.model.Shell;
|
||||||
import pp.battleship.model.Shot;
|
import pp.battleship.model.Shot;
|
||||||
import pp.util.Position;
|
import pp.util.Position;
|
||||||
|
|
||||||
|
import static com.jme3.material.Materials.UNSHADED;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Synchronizes the visual representation of the ship map with the game model.
|
* Synchronizes the visual representation of the ship map with the game model.
|
||||||
* It handles the rendering of ships and shots on the map view, updating the view
|
* It handles the rendering of ships and shots on the map view, updating the view
|
||||||
@@ -65,9 +71,9 @@ public Spatial visit(Shot shot) {
|
|||||||
|
|
||||||
// Create and return a rectangle representing the shot
|
// Create and return a rectangle representing the shot
|
||||||
return view.getApp().getDraw().makeRectangle(p1.getX(), p1.getY(),
|
return view.getApp().getDraw().makeRectangle(p1.getX(), p1.getY(),
|
||||||
SHOT_DEPTH,
|
SHOT_DEPTH,
|
||||||
p2.getX() - p1.getX(), p2.getY() - p1.getY(),
|
p2.getX() - p1.getX(), p2.getY() - p1.getY(),
|
||||||
color);
|
color);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -109,6 +115,25 @@ public Spatial visit(Battleship ship) {
|
|||||||
return shipNode;
|
return shipNode;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Creates a visual representation of a shell on the map.
|
||||||
|
* The shell is represented as a black ellipse.
|
||||||
|
*
|
||||||
|
* @param shell the Shell object representing the shell in the model
|
||||||
|
* @return a Spatial representing the shell on the map
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
public Spatial visit(Shell shell) {
|
||||||
|
Geometry ellipse = new Geometry("ellipse", new Sphere(50, 50, MapView.getFieldSize() / 2 * 0.8f));
|
||||||
|
Material mat = new Material(view.getApp().getAssetManager(), UNSHADED); //NON-NLS
|
||||||
|
mat.getAdditionalRenderState().setBlendMode(RenderState.BlendMode.Alpha);
|
||||||
|
mat.getAdditionalRenderState().setFaceCullMode(RenderState.FaceCullMode.Off);
|
||||||
|
mat.setColor("Color", ColorRGBA.Black);
|
||||||
|
ellipse.setMaterial(mat);
|
||||||
|
ellipse.addControl(new ShellMapControl(view, shell));
|
||||||
|
return ellipse;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Creates a line geometry representing part of the ship's border.
|
* Creates a line geometry representing part of the ship's border.
|
||||||
*
|
*
|
||||||
|
|||||||
@@ -7,20 +7,20 @@
|
|||||||
|
|
||||||
package pp.battleship.client.gui;
|
package pp.battleship.client.gui;
|
||||||
|
|
||||||
|
import com.jme3.effect.ParticleEmitter;
|
||||||
|
import com.jme3.effect.ParticleMesh;
|
||||||
import com.jme3.material.Material;
|
import com.jme3.material.Material;
|
||||||
import com.jme3.material.RenderState.BlendMode;
|
import com.jme3.material.RenderState.BlendMode;
|
||||||
import com.jme3.math.ColorRGBA;
|
import com.jme3.math.ColorRGBA;
|
||||||
|
import com.jme3.math.Vector3f;
|
||||||
|
import com.jme3.renderer.queue.RenderQueue;
|
||||||
import com.jme3.renderer.queue.RenderQueue.ShadowMode;
|
import com.jme3.renderer.queue.RenderQueue.ShadowMode;
|
||||||
import com.jme3.scene.Geometry;
|
import com.jme3.scene.Geometry;
|
||||||
import com.jme3.scene.Node;
|
import com.jme3.scene.Node;
|
||||||
import com.jme3.scene.Spatial;
|
import com.jme3.scene.Spatial;
|
||||||
import com.jme3.scene.shape.Box;
|
import com.jme3.scene.shape.Box;
|
||||||
import com.jme3.scene.shape.Cylinder;
|
|
||||||
import pp.battleship.client.BattleshipApp;
|
import pp.battleship.client.BattleshipApp;
|
||||||
import pp.battleship.model.Battleship;
|
import pp.battleship.model.*;
|
||||||
import pp.battleship.model.Rotation;
|
|
||||||
import pp.battleship.model.ShipMap;
|
|
||||||
import pp.battleship.model.Shot;
|
|
||||||
|
|
||||||
import static java.util.Objects.requireNonNull;
|
import static java.util.Objects.requireNonNull;
|
||||||
import static pp.util.FloatMath.HALF_PI;
|
import static pp.util.FloatMath.HALF_PI;
|
||||||
@@ -35,12 +35,17 @@
|
|||||||
class SeaSynchronizer extends ShipMapSynchronizer {
|
class SeaSynchronizer extends ShipMapSynchronizer {
|
||||||
private static final String UNSHADED = "Common/MatDefs/Misc/Unshaded.j3md"; //NON-NLS
|
private static final String UNSHADED = "Common/MatDefs/Misc/Unshaded.j3md"; //NON-NLS
|
||||||
private static final String KING_GEORGE_V_MODEL = "Models/KingGeorgeV/KingGeorgeV.j3o"; //NON-NLS
|
private static final String KING_GEORGE_V_MODEL = "Models/KingGeorgeV/KingGeorgeV.j3o"; //NON-NLS
|
||||||
|
private static final String DESTROYER_MODEL = "Models/Destroyer/Destroyer.j3o"; //NON-NLS
|
||||||
|
private static final String DESTROYER_TEXTURE = "Models/Destroyer/BattleshipC.jpg"; //NON-NLS
|
||||||
|
private static final String TYPE_II_UBOAT_MODEL = "Models/TypeIIUboat/TypeIIUboat.j3o"; //NON-NLS
|
||||||
|
private static final String TYPE_II_UBOAT_TEXTURE = "Models/TypeIIUboat/Type_II_U-boat_diff.jpg"; //NON-NLS
|
||||||
|
private static final String ATLANTICA_MODEL = "Models/Atlantica/Atlantica.j3o"; //NON-NLS
|
||||||
|
private static final String ROCKET = "Models/Rocket/Rocket.j3o"; //NON-NLS
|
||||||
|
|
||||||
private static final String COLOR = "Color"; //NON-NLS
|
private static final String COLOR = "Color"; //NON-NLS
|
||||||
private static final String SHIP = "ship"; //NON-NLS
|
private static final String SHIP = "ship"; //NON-NLS
|
||||||
private static final String SHOT = "shot"; //NON-NLS
|
private static final String SHELL = "shell"; //NON-NLS
|
||||||
private static final ColorRGBA BOX_COLOR = ColorRGBA.Gray;
|
private static final ColorRGBA BOX_COLOR = ColorRGBA.Gray;
|
||||||
private static final ColorRGBA SPLASH_COLOR = new ColorRGBA(0f, 0f, 1f, 0.4f);
|
|
||||||
private static final ColorRGBA HIT_COLOR = new ColorRGBA(1f, 0f, 0f, 0.4f);
|
|
||||||
|
|
||||||
private final ShipMap map;
|
private final ShipMap map;
|
||||||
private final BattleshipApp app;
|
private final BattleshipApp app;
|
||||||
@@ -69,7 +74,7 @@ public SeaSynchronizer(BattleshipApp app, Node root, ShipMap map) {
|
|||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public Spatial visit(Shot shot) {
|
public Spatial visit(Shot shot) {
|
||||||
return shot.isHit() ? handleHit(shot) : createCylinder(shot);
|
return shot.isHit() ? handleHit(shot) : handleMiss(shot);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -84,33 +89,120 @@ private Spatial handleHit(Shot shot) {
|
|||||||
final Battleship ship = requireNonNull(map.findShipAt(shot), "Missing ship");
|
final Battleship ship = requireNonNull(map.findShipAt(shot), "Missing ship");
|
||||||
final Node shipNode = requireNonNull((Node) getSpatial(ship), "Missing ship node");
|
final Node shipNode = requireNonNull((Node) getSpatial(ship), "Missing ship node");
|
||||||
|
|
||||||
final Geometry representation = createCylinder(shot);
|
final ParticleEmitter debris = createDebrisEffect(shot);
|
||||||
representation.getLocalTranslation().subtractLocal(shipNode.getLocalTranslation());
|
shipNode.attachChild(debris);
|
||||||
shipNode.attachChild(representation);
|
|
||||||
|
final ParticleEmitter fire = createFireEffect(shot, shipNode);
|
||||||
|
shipNode.attachChild(fire);
|
||||||
|
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private Spatial handleMiss(Shot shot) {
|
||||||
|
return createMissEffect(shot);
|
||||||
|
}
|
||||||
|
|
||||||
|
private ParticleEmitter createMissEffect(Shot shot) {
|
||||||
|
final ParticleEmitter water = new ParticleEmitter("WaterEmitter", ParticleMesh.Type.Triangle, 20);
|
||||||
|
|
||||||
|
Material waterMaterial = new Material(app.getAssetManager(), "Common/MatDefs/Misc/Particle.j3md");
|
||||||
|
waterMaterial.setTexture("Texture", app.getAssetManager().loadTexture("Effects/Explosion/flame.png"));
|
||||||
|
water.setMaterial(waterMaterial);
|
||||||
|
|
||||||
|
water.setImagesX(2);
|
||||||
|
water.setImagesY(2);
|
||||||
|
water.setStartColor(ColorRGBA.Cyan);
|
||||||
|
water.setEndColor(ColorRGBA.Blue);
|
||||||
|
water.getParticleInfluencer().setInitialVelocity(new Vector3f(0.1f, 0.1f, 0.1f));
|
||||||
|
water.setStartSize(0.4f);
|
||||||
|
water.setEndSize(0.45f);
|
||||||
|
water.setGravity(0, -0.5f, 0);
|
||||||
|
water.setLowLife(1f);
|
||||||
|
water.setHighLife(1f);
|
||||||
|
water.setParticlesPerSec(0);
|
||||||
|
|
||||||
|
water.setLocalTranslation(shot.getY() + 0.5f, 0f, shot.getX() + 0.5f);
|
||||||
|
water.emitAllParticles();
|
||||||
|
return water;
|
||||||
|
}
|
||||||
|
|
||||||
|
private ParticleEmitter createDebrisEffect(Shot shot) {
|
||||||
|
final ParticleEmitter debris = new ParticleEmitter("DebrisEmitter", ParticleMesh.Type.Triangle, 2);
|
||||||
|
|
||||||
|
Material debrisMaterial = new Material(app.getAssetManager(), "Common/MatDefs/Misc/Particle.j3md");
|
||||||
|
debrisMaterial.setTexture("Texture", app.getAssetManager().loadTexture("Effects/Explosion/Debris.png"));
|
||||||
|
debris.setMaterial(debrisMaterial);
|
||||||
|
|
||||||
|
debris.setImagesX(2);
|
||||||
|
debris.setImagesY(2);
|
||||||
|
debris.setStartColor(ColorRGBA.White);
|
||||||
|
debris.setEndColor(ColorRGBA.White);
|
||||||
|
debris.getParticleInfluencer().setInitialVelocity(new Vector3f(0.1f, 2f, 0.1f));
|
||||||
|
debris.setStartSize(0.1f);
|
||||||
|
debris.setEndSize(0.5f);
|
||||||
|
debris.setGravity(0, 3f, 0);
|
||||||
|
debris.getParticleInfluencer().setVelocityVariation(.40f);
|
||||||
|
debris.setLowLife(1f);
|
||||||
|
debris.setHighLife(1.5f);
|
||||||
|
debris.setParticlesPerSec(0);
|
||||||
|
|
||||||
|
debris.setLocalTranslation(shot.getY() + 0.5f, 0f, shot.getX() + 0.5f);
|
||||||
|
debris.emitAllParticles();
|
||||||
|
return debris;
|
||||||
|
}
|
||||||
|
|
||||||
|
private ParticleEmitter createFireEffect(Shot shot, Node shipNode) {
|
||||||
|
ParticleEmitter fire = new ParticleEmitter("FireEmitter", ParticleMesh.Type.Triangle, 100);
|
||||||
|
|
||||||
|
Material fireMaterial = new Material(app.getAssetManager(), "Common/MatDefs/Misc/Particle.j3md");
|
||||||
|
fireMaterial.setTexture("Texture", app.getAssetManager().loadTexture("Effects/Explosion/flame.png"));
|
||||||
|
fire.setMaterial(fireMaterial);
|
||||||
|
|
||||||
|
fire.setImagesX(2);
|
||||||
|
fire.setImagesY(2);
|
||||||
|
fire.setStartColor(ColorRGBA.Orange);
|
||||||
|
fire.setEndColor(ColorRGBA.Red);
|
||||||
|
fire.getParticleInfluencer().setInitialVelocity(new Vector3f(0, 1.5f, 0));
|
||||||
|
fire.setStartSize(0.2f);
|
||||||
|
fire.setEndSize(0.05f);
|
||||||
|
fire.setLowLife(1f);
|
||||||
|
fire.setHighLife(2f);
|
||||||
|
fire.getParticleInfluencer().setVelocityVariation(0.2f);
|
||||||
|
|
||||||
|
fire.setLocalTranslation(shot.getY() + 0.5f, 0f, shot.getX() + 0.5f);
|
||||||
|
fire.getLocalTranslation().subtractLocal(shipNode.getLocalTranslation());
|
||||||
|
|
||||||
|
return fire;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Creates a cylinder geometry representing the specified shot.
|
* Visits a {@link Shell} and creates a graphical representation of it.
|
||||||
* The appearance of the cylinder depends on whether the shot is a hit or a miss.
|
* The shell is represented as a node with a model attached to it.
|
||||||
|
* The node is then positioned and controlled by a {@link ShellControl}.
|
||||||
*
|
*
|
||||||
* @param shot the shot to be represented
|
* @param shell the shell to be represented
|
||||||
* @return the geometry representing the shot
|
* @return the node containing the graphical representation of the shell
|
||||||
*/
|
*/
|
||||||
private Geometry createCylinder(Shot shot) {
|
@Override
|
||||||
final ColorRGBA color = shot.isHit() ? HIT_COLOR : SPLASH_COLOR;
|
public Spatial visit(Shell shell) {
|
||||||
final float height = shot.isHit() ? 1.2f : 0.1f;
|
final Node node = new Node(SHELL);
|
||||||
|
node.attachChild(createShell());
|
||||||
|
node.setLocalTranslation(shell.getY() + 0.5f, 10f, shell.getX() + 0.5f);
|
||||||
|
node.addControl(new ShellControl());
|
||||||
|
return node;
|
||||||
|
}
|
||||||
|
|
||||||
final Cylinder cylinder = new Cylinder(2, 20, 0.45f, height, true);
|
/**
|
||||||
final Geometry geometry = new Geometry(SHOT, cylinder);
|
* Creates a graphical representation of a shell.
|
||||||
|
*
|
||||||
geometry.setMaterial(createColoredMaterial(color));
|
* @return the spatial representing the shell
|
||||||
geometry.rotate(HALF_PI, 0f, 0f);
|
*/
|
||||||
// compute the center of the shot in world coordinates
|
private Spatial createShell() {
|
||||||
geometry.setLocalTranslation(shot.getY() + 0.5f, 0f, shot.getX() + 0.5f);
|
final Spatial model = app.getAssetManager().loadModel(ROCKET);
|
||||||
|
model.scale(0.0025f);
|
||||||
return geometry;
|
model.rotate(PI, 0f, 0f);
|
||||||
|
model.setShadowMode(ShadowMode.CastAndReceive);
|
||||||
|
return model;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -141,7 +233,13 @@ public Spatial visit(Battleship ship) {
|
|||||||
* @return the spatial representing the battleship
|
* @return the spatial representing the battleship
|
||||||
*/
|
*/
|
||||||
private Spatial createShip(Battleship ship) {
|
private Spatial createShip(Battleship ship) {
|
||||||
return ship.getLength() == 4 ? createBattleship(ship) : createBox(ship);
|
return switch (ship.getLength()) {
|
||||||
|
case 1 -> createVessel(ship);
|
||||||
|
case 2 -> createSubmarine(ship);
|
||||||
|
case 3 -> createDestroyer(ship);
|
||||||
|
case 4 -> createBattleship(ship);
|
||||||
|
default -> createBox(ship);
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -152,10 +250,10 @@ private Spatial createShip(Battleship ship) {
|
|||||||
*/
|
*/
|
||||||
private Spatial createBox(Battleship ship) {
|
private Spatial createBox(Battleship ship) {
|
||||||
final Box box = new Box(0.5f * (ship.getMaxY() - ship.getMinY()) + 0.3f,
|
final Box box = new Box(0.5f * (ship.getMaxY() - ship.getMinY()) + 0.3f,
|
||||||
0.3f,
|
0.3f,
|
||||||
0.5f * (ship.getMaxX() - ship.getMinX()) + 0.3f);
|
0.5f * (ship.getMaxX() - ship.getMinX()) + 0.3f);
|
||||||
final Geometry geometry = new Geometry(SHIP, box);
|
final Geometry geometry = new Geometry(SHIP, box);
|
||||||
geometry.setMaterial(createColoredMaterial(BOX_COLOR));
|
geometry.setMaterial(createColoredMaterial());
|
||||||
geometry.setShadowMode(ShadowMode.CastAndReceive);
|
geometry.setShadowMode(ShadowMode.CastAndReceive);
|
||||||
|
|
||||||
return geometry;
|
return geometry;
|
||||||
@@ -167,16 +265,14 @@ private Spatial createBox(Battleship ship) {
|
|||||||
* the material's render state is set to use alpha blending, allowing for
|
* the material's render state is set to use alpha blending, allowing for
|
||||||
* semi-transparent rendering.
|
* semi-transparent rendering.
|
||||||
*
|
*
|
||||||
* @param color the {@link ColorRGBA} to be applied to the material. If the alpha value
|
|
||||||
* of the color is less than 1, the material will support transparency.
|
|
||||||
* @return a {@link Material} instance configured with the specified color and,
|
* @return a {@link Material} instance configured with the specified color and,
|
||||||
* if necessary, alpha blending enabled.
|
* if necessary, alpha blending enabled.
|
||||||
*/
|
*/
|
||||||
private Material createColoredMaterial(ColorRGBA color) {
|
private Material createColoredMaterial() {
|
||||||
final Material material = new Material(app.getAssetManager(), UNSHADED);
|
final Material material = new Material(app.getAssetManager(), UNSHADED);
|
||||||
if (color.getAlpha() < 1f)
|
if (SeaSynchronizer.BOX_COLOR.getAlpha() < 1f)
|
||||||
material.getAdditionalRenderState().setBlendMode(BlendMode.Alpha);
|
material.getAdditionalRenderState().setBlendMode(BlendMode.Alpha);
|
||||||
material.setColor(COLOR, color);
|
material.setColor(COLOR, SeaSynchronizer.BOX_COLOR);
|
||||||
return material;
|
return material;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -196,6 +292,68 @@ private Spatial createBattleship(Battleship ship) {
|
|||||||
return model;
|
return model;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Creates a detailed 3D model to represent a destroyer battleship.
|
||||||
|
*
|
||||||
|
* @param ship the battleship to be represented
|
||||||
|
* @return the spatial representing the destroyer battleship
|
||||||
|
*/
|
||||||
|
private Spatial createDestroyer(Battleship ship) {
|
||||||
|
final Spatial model = app.getAssetManager().loadModel(DESTROYER_MODEL);
|
||||||
|
|
||||||
|
Material mat = new Material(app.getAssetManager(), UNSHADED);
|
||||||
|
mat.setTexture("ColorMap", app.getAssetManager().loadTexture(DESTROYER_TEXTURE));
|
||||||
|
mat.getAdditionalRenderState().setBlendMode(BlendMode.Off);
|
||||||
|
model.setMaterial(mat);
|
||||||
|
|
||||||
|
model.setQueueBucket(RenderQueue.Bucket.Opaque);
|
||||||
|
|
||||||
|
model.rotate(-HALF_PI, calculateRotationAngle(ship.getRot()), 0f);
|
||||||
|
model.scale(0.1f);
|
||||||
|
model.setLocalTranslation(0f, 0.25f, 0f);
|
||||||
|
model.setShadowMode(ShadowMode.CastAndReceive);
|
||||||
|
|
||||||
|
return model;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Creates a detailed 3D model to represent a Type II U-boat submarine.
|
||||||
|
*
|
||||||
|
* @param ship the battleship to be represented
|
||||||
|
* @return the spatial representing the Type II U-boat submarine
|
||||||
|
*/
|
||||||
|
private Spatial createSubmarine(Battleship ship) {
|
||||||
|
final Spatial model = app.getAssetManager().loadModel(TYPE_II_UBOAT_MODEL);
|
||||||
|
|
||||||
|
Material mat = new Material(app.getAssetManager(), UNSHADED);
|
||||||
|
mat.setTexture("ColorMap", app.getAssetManager().loadTexture(TYPE_II_UBOAT_TEXTURE));
|
||||||
|
model.setMaterial(mat);
|
||||||
|
|
||||||
|
model.rotate(-HALF_PI, calculateRotationAngle(ship.getRot()), 0f);
|
||||||
|
model.scale(0.25f);
|
||||||
|
model.getLocalTranslation().addLocal(0f, -0.15f, 0f);
|
||||||
|
model.setShadowMode(ShadowMode.CastAndReceive);
|
||||||
|
|
||||||
|
return model;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Creates a detailed 3D model to represent a vessel.
|
||||||
|
*
|
||||||
|
* @param ship the battleship to be represented
|
||||||
|
* @return the spatial representing the vessel
|
||||||
|
*/
|
||||||
|
private Spatial createVessel(Battleship ship) {
|
||||||
|
final Spatial model = app.getAssetManager().loadModel(ATLANTICA_MODEL);
|
||||||
|
|
||||||
|
model.rotate(-HALF_PI, calculateRotationAngle(ship.getRot()), 0f);
|
||||||
|
model.scale(0.0003f);
|
||||||
|
model.getLocalTranslation().addLocal(0f, -0.05f, 0f);
|
||||||
|
model.setShadowMode(ShadowMode.CastAndReceive);
|
||||||
|
|
||||||
|
return model;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Calculates the rotation angle for the specified rotation.
|
* Calculates the rotation angle for the specified rotation.
|
||||||
*
|
*
|
||||||
|
|||||||
@@ -0,0 +1,42 @@
|
|||||||
|
package pp.battleship.client.gui;
|
||||||
|
|
||||||
|
import com.jme3.renderer.RenderManager;
|
||||||
|
import com.jme3.renderer.ViewPort;
|
||||||
|
import com.jme3.scene.control.AbstractControl;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Controls the movement and rotation of a shell in the game.
|
||||||
|
* The shell moves downward at a constant speed and rotates around its Y-axis.
|
||||||
|
* When the shell reaches a certain Y-coordinate, it is removed from its parent node.
|
||||||
|
*/
|
||||||
|
public class ShellControl extends AbstractControl {
|
||||||
|
private final static float SHELL_SPEED = 7.5f;
|
||||||
|
private final static float SHELL_ROTATION_SPEED = 0.5f;
|
||||||
|
private final static float MIN_HEIGHT = 0.7f;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Updates the shell's position and rotation.
|
||||||
|
* If the shell's Y-coordinate is less than or equal to 1.0, it is detached from its parent node.
|
||||||
|
*
|
||||||
|
* @param tpf time per frame, used to ensure consistent movement speed across different frame rates
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
protected void controlUpdate(float tpf) {
|
||||||
|
spatial.move(0, -SHELL_SPEED * tpf, 0);
|
||||||
|
spatial.rotate(0, SHELL_ROTATION_SPEED, 0);
|
||||||
|
if (spatial.getLocalTranslation().getY() <= MIN_HEIGHT) {
|
||||||
|
spatial.getParent().detachChild(spatial);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Renders the shell. This method is currently not used.
|
||||||
|
*
|
||||||
|
* @param rm the RenderManager
|
||||||
|
* @param vp the ViewPort
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
protected void controlRender(RenderManager rm, ViewPort vp) {
|
||||||
|
// nothing to do here
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,82 @@
|
|||||||
|
package pp.battleship.client.gui;
|
||||||
|
|
||||||
|
import com.jme3.math.Vector3f;
|
||||||
|
import com.jme3.renderer.RenderManager;
|
||||||
|
import com.jme3.renderer.ViewPort;
|
||||||
|
import com.jme3.scene.control.AbstractControl;
|
||||||
|
import pp.battleship.model.Shell;
|
||||||
|
import pp.util.Position;
|
||||||
|
|
||||||
|
import java.lang.System.Logger;
|
||||||
|
import java.lang.System.Logger.Level;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Controls the animation of a shell in the map view.
|
||||||
|
* This class handles the movement of a shell from its starting position to its target position
|
||||||
|
* using linear interpolation over a specified duration.
|
||||||
|
*/
|
||||||
|
public class ShellMapControl extends AbstractControl {
|
||||||
|
private static final Logger LOGGER = System.getLogger(ShellMapControl.class.getName());
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The duration of the shell animation in seconds.
|
||||||
|
*/
|
||||||
|
private final static float ANIMATION_DURATION = 0.8f;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The end position of the shell in the map view.
|
||||||
|
*/
|
||||||
|
private final Position endPos;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The progress of the shell's movement, ranging from 0 to 1.
|
||||||
|
*/
|
||||||
|
private float progress = 0f;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Constructs a new instance of {@link ShellMapControl}.
|
||||||
|
*
|
||||||
|
* @param view the map view
|
||||||
|
* @param shell the shell to be controlled
|
||||||
|
*/
|
||||||
|
public ShellMapControl(MapView view, Shell shell) {
|
||||||
|
Vector3f endPos = new Vector3f(shell.getX(), 0, shell.getY());
|
||||||
|
this.endPos = view.modelToView(endPos.x, endPos.z);
|
||||||
|
LOGGER.log(Level.DEBUG, "ShellMapControl created with endPos: " + this.endPos);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Updates the position of the shell in the view with linear interpolation.
|
||||||
|
* This method is called during the update phase.
|
||||||
|
*
|
||||||
|
* @param tpf the time per frame
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
protected void controlUpdate(float tpf) {
|
||||||
|
// adjust speed by changing the multiplier
|
||||||
|
progress += tpf * ANIMATION_DURATION;
|
||||||
|
|
||||||
|
// progress is between 0 and 1
|
||||||
|
if (progress > 1f) {
|
||||||
|
progress = 1f;
|
||||||
|
}
|
||||||
|
|
||||||
|
// linearly interpolate the current position between (0, 0) and endPos
|
||||||
|
float newX = (1 - progress) * 0 + progress * endPos.getX() + MapView.getFieldSize() / 2;
|
||||||
|
float newZ = (1 - progress) * 0 + progress * endPos.getY() + MapView.getFieldSize() / 2;
|
||||||
|
|
||||||
|
spatial.setLocalTranslation(newX, newZ, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* This method is called during the render phase.
|
||||||
|
* Currently, it does nothing.
|
||||||
|
*
|
||||||
|
* @param rm the RenderManager
|
||||||
|
* @param vp the ViewPort
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
protected void controlRender(RenderManager rm, ViewPort vp) {
|
||||||
|
// nothing to do here
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -48,6 +48,10 @@ class ShipControl extends AbstractControl {
|
|||||||
*/
|
*/
|
||||||
private float time;
|
private float time;
|
||||||
|
|
||||||
|
private final Battleship ship;
|
||||||
|
|
||||||
|
private static final float SINKING_HEIGHT = -0.6f;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Constructs a new ShipControl instance for the specified Battleship.
|
* Constructs a new ShipControl instance for the specified Battleship.
|
||||||
* The ship's orientation determines the axis of rotation, while its length influences
|
* The ship's orientation determines the axis of rotation, while its length influences
|
||||||
@@ -65,6 +69,8 @@ public ShipControl(Battleship ship) {
|
|||||||
// Set the cycle duration and amplitude based on the ship's length
|
// Set the cycle duration and amplitude based on the ship's length
|
||||||
cycle = ship.getLength() * 2f;
|
cycle = ship.getLength() * 2f;
|
||||||
amplitude = 5f * DEG_TO_RAD / ship.getLength();
|
amplitude = 5f * DEG_TO_RAD / ship.getLength();
|
||||||
|
|
||||||
|
this.ship = ship;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -78,6 +84,15 @@ protected void controlUpdate(float tpf) {
|
|||||||
// If spatial is null, do nothing
|
// If spatial is null, do nothing
|
||||||
if (spatial == null) return;
|
if (spatial == null) return;
|
||||||
|
|
||||||
|
// Handle ship sinking by moving it downwards
|
||||||
|
if (ship.isDestroyed()) {
|
||||||
|
if (spatial.getLocalTranslation().getY() < SINKING_HEIGHT) {
|
||||||
|
spatial.getParent().detachChild(spatial);
|
||||||
|
} else {
|
||||||
|
spatial.move(0, -tpf * 0.1f, 0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Update the time within the oscillation cycle
|
// Update the time within the oscillation cycle
|
||||||
time = (time + tpf) % cycle;
|
time = (time + tpf) % cycle;
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,104 @@
|
|||||||
|
# 3ds Max Wavefront OBJ Exporter v0.97b - (c)2007 guruware
|
||||||
|
# File Created: 16.12.2011 14:18:52
|
||||||
|
|
||||||
|
newmtl white
|
||||||
|
Ns 53.0000
|
||||||
|
Ni 1.5000
|
||||||
|
d 1.0000
|
||||||
|
Tr 0.0000
|
||||||
|
Tf 1.0000 1.0000 1.0000
|
||||||
|
illum 2
|
||||||
|
Ka 0.6667 0.6667 0.6667
|
||||||
|
Kd 0.6667 0.6667 0.6667
|
||||||
|
Ks 0.1800 0.1800 0.1800
|
||||||
|
Ke 0.0000 0.0000 0.0000
|
||||||
|
|
||||||
|
newmtl boat_elements_black
|
||||||
|
Ns 55.0000
|
||||||
|
Ni 1.5000
|
||||||
|
d 1.0000
|
||||||
|
Tr 0.0000
|
||||||
|
Tf 1.0000 1.0000 1.0000
|
||||||
|
illum 2
|
||||||
|
Ka 0.0000 0.0000 0.0000
|
||||||
|
Kd 0.0000 0.0000 0.0000
|
||||||
|
Ks 0.3600 0.3600 0.3600
|
||||||
|
Ke 0.0000 0.0000 0.0000
|
||||||
|
|
||||||
|
newmtl boat_glass
|
||||||
|
Ns 60.0000
|
||||||
|
Ni 7.0000
|
||||||
|
d 0.4000
|
||||||
|
Tr 0.6000
|
||||||
|
Tf 0.4000 0.4000 0.4000
|
||||||
|
illum 2
|
||||||
|
Ka 0.1059 0.1569 0.1451
|
||||||
|
Kd 0.1059 0.1569 0.1451
|
||||||
|
Ks 0.6750 0.6750 0.6750
|
||||||
|
Ke 0.0000 0.0000 0.0000
|
||||||
|
|
||||||
|
newmtl boat_screw_hooks_bronze
|
||||||
|
Ns 80.0000
|
||||||
|
Ni 1.5000
|
||||||
|
d 1.0000
|
||||||
|
Tr 0.0000
|
||||||
|
Tf 1.0000 1.0000 1.0000
|
||||||
|
illum 2
|
||||||
|
Ka 0.2941 0.2157 0.0510
|
||||||
|
Kd 0.2941 0.2157 0.0510
|
||||||
|
Ks 0.7200 0.7200 0.7200
|
||||||
|
Ke 0.0000 0.0000 0.0000
|
||||||
|
|
||||||
|
newmtl boat_silver
|
||||||
|
Ns 80.0000
|
||||||
|
Ni 1.5000
|
||||||
|
d 1.0000
|
||||||
|
Tr 0.0000
|
||||||
|
Tf 1.0000 1.0000 1.0000
|
||||||
|
illum 2
|
||||||
|
Ka 0.3333 0.3333 0.3333
|
||||||
|
Kd 0.3333 0.3333 0.3333
|
||||||
|
Ks 0.7200 0.7200 0.7200
|
||||||
|
Ke 0.0000 0.0000 0.0000
|
||||||
|
|
||||||
|
newmtl boat_buffer
|
||||||
|
Ns 10.0000
|
||||||
|
Ni 1.5000
|
||||||
|
d 1.0000
|
||||||
|
Tr 0.0000
|
||||||
|
Tf 1.0000 1.0000 1.0000
|
||||||
|
illum 2
|
||||||
|
Ka 1.0000 1.0000 1.0000
|
||||||
|
Kd 1.0000 1.0000 1.0000
|
||||||
|
Ks 0.2700 0.2700 0.2700
|
||||||
|
Ke 0.0000 0.0000 0.0000
|
||||||
|
map_Ka boat_buffer_diffuse.jpg
|
||||||
|
map_Kd boat_buffer_diffuse.jpg
|
||||||
|
|
||||||
|
newmtl boat_roof_accessory
|
||||||
|
Ns 15.0000
|
||||||
|
Ni 1.5000
|
||||||
|
d 1.0000
|
||||||
|
Tr 0.0000
|
||||||
|
Tf 1.0000 1.0000 1.0000
|
||||||
|
illum 2
|
||||||
|
Ka 1.0000 1.0000 1.0000
|
||||||
|
Kd 1.0000 1.0000 1.0000
|
||||||
|
Ks 0.3600 0.3600 0.3600
|
||||||
|
Ke 0.0000 0.0000 0.0000
|
||||||
|
map_Ka boat_roof_accessory_diffuse.jpg
|
||||||
|
map_Kd boat_roof_accessory_diffuse.jpg
|
||||||
|
|
||||||
|
newmtl boat_body
|
||||||
|
Ns 55.0000
|
||||||
|
Ni 1.5000
|
||||||
|
d 1.0000
|
||||||
|
Tr 0.0000
|
||||||
|
Tf 1.0000 1.0000 1.0000
|
||||||
|
illum 2
|
||||||
|
Ka 1.0000 1.0000 1.0000
|
||||||
|
Kd 1.0000 1.0000 1.0000
|
||||||
|
Ks 0.3600 0.3600 0.3600
|
||||||
|
Ke 0.0000 0.0000 0.0000
|
||||||
|
map_Ka boat_body_diffuse.jpg
|
||||||
|
map_Kd boat_body_diffuse.jpg
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
based on:
|
||||||
|
https://free3d.com/3d-model/boat-v2--225787.html
|
||||||
|
License: Free Personal Use Only
|
||||||
|
After Width: | Height: | Size: 56 KiB |
|
After Width: | Height: | Size: 166 KiB |
|
After Width: | Height: | Size: 98 KiB |
@@ -0,0 +1,92 @@
|
|||||||
|
# Blender 4.1.0 MTL File: 'None'
|
||||||
|
# www.blender.org
|
||||||
|
|
||||||
|
newmtl Battleship
|
||||||
|
Ns 256.000031
|
||||||
|
Ka 1.000000 1.000000 1.000000
|
||||||
|
Ks 0.000000 0.000000 0.000000
|
||||||
|
Ke 0.000000 0.000000 0.000000
|
||||||
|
Ni 1.000000
|
||||||
|
d 1.000000
|
||||||
|
illum 1
|
||||||
|
map_Kd BattleshipC.jpg
|
||||||
|
|
||||||
|
newmtl blinn1SG
|
||||||
|
Ns 256.000031
|
||||||
|
Ka 1.000000 1.000000 1.000000
|
||||||
|
Kd 0.500000 0.500000 0.500000
|
||||||
|
Ks 0.000000 0.000000 0.000000
|
||||||
|
Ke 0.000000 0.000000 0.000000
|
||||||
|
Ni 1.000000
|
||||||
|
d 1.000000
|
||||||
|
illum 1
|
||||||
|
|
||||||
|
newmtl blinn2SG
|
||||||
|
Ns 256.000031
|
||||||
|
Ka 1.000000 1.000000 1.000000
|
||||||
|
Kd 0.500000 0.500000 0.500000
|
||||||
|
Ks 0.000000 0.000000 0.000000
|
||||||
|
Ke 0.000000 0.000000 0.000000
|
||||||
|
Ni 1.000000
|
||||||
|
d 1.000000
|
||||||
|
illum 1
|
||||||
|
|
||||||
|
newmtl blinn3SG
|
||||||
|
Ns 256.000031
|
||||||
|
Ka 1.000000 1.000000 1.000000
|
||||||
|
Kd 0.500000 0.500000 0.500000
|
||||||
|
Ks 0.500000 0.500000 0.500000
|
||||||
|
Ke 0.000000 0.000000 0.000000
|
||||||
|
Ni 1.000000
|
||||||
|
d 1.000000
|
||||||
|
illum 2
|
||||||
|
|
||||||
|
newmtl blinn4SG
|
||||||
|
Ns 256.000031
|
||||||
|
Ka 1.000000 1.000000 1.000000
|
||||||
|
Kd 0.500000 0.500000 0.500000
|
||||||
|
Ks 0.500000 0.500000 0.500000
|
||||||
|
Ke 0.000000 0.000000 0.000000
|
||||||
|
Ni 1.000000
|
||||||
|
d 1.000000
|
||||||
|
illum 2
|
||||||
|
|
||||||
|
newmtl blinn5SG
|
||||||
|
Ns 256.000031
|
||||||
|
Ka 1.000000 1.000000 1.000000
|
||||||
|
Kd 0.500000 0.500000 0.500000
|
||||||
|
Ks 0.500000 0.500000 0.500000
|
||||||
|
Ke 0.000000 0.000000 0.000000
|
||||||
|
Ni 1.000000
|
||||||
|
d 1.000000
|
||||||
|
illum 2
|
||||||
|
|
||||||
|
newmtl blinn6SG
|
||||||
|
Ns 256.000031
|
||||||
|
Ka 1.000000 1.000000 1.000000
|
||||||
|
Kd 0.500000 0.500000 0.500000
|
||||||
|
Ks 0.500000 0.500000 0.500000
|
||||||
|
Ke 0.000000 0.000000 0.000000
|
||||||
|
Ni 1.000000
|
||||||
|
d 1.000000
|
||||||
|
illum 2
|
||||||
|
|
||||||
|
newmtl blinn7SG
|
||||||
|
Ns 256.000031
|
||||||
|
Ka 1.000000 1.000000 1.000000
|
||||||
|
Kd 0.500000 0.500000 0.500000
|
||||||
|
Ks 0.500000 0.500000 0.500000
|
||||||
|
Ke 0.000000 0.000000 0.000000
|
||||||
|
Ni 1.000000
|
||||||
|
d 1.000000
|
||||||
|
illum 2
|
||||||
|
|
||||||
|
newmtl blinn8SG
|
||||||
|
Ns 256.000031
|
||||||
|
Ka 1.000000 1.000000 1.000000
|
||||||
|
Kd 0.500000 0.500000 0.500000
|
||||||
|
Ks 0.500000 0.500000 0.500000
|
||||||
|
Ke 0.000000 0.000000 0.000000
|
||||||
|
Ni 1.000000
|
||||||
|
d 1.000000
|
||||||
|
illum 2
|
||||||
|
After Width: | Height: | Size: 360 KiB |
@@ -0,0 +1,3 @@
|
|||||||
|
based on:
|
||||||
|
https://free3d.com/3d-model/battleship-v1--611736.html
|
||||||
|
License: Free Personal Use Only
|
||||||
@@ -0,0 +1,250 @@
|
|||||||
|
#
|
||||||
|
# Generated by Sweet Home 3D - ven. janv. 02 20:37:08 CET 2015
|
||||||
|
# http://www.sweethome3d.com/
|
||||||
|
#
|
||||||
|
|
||||||
|
newmtl FrontColorNoCulling
|
||||||
|
illum 1
|
||||||
|
Ka 0.2 0.2 0.2
|
||||||
|
Kd 0.2 0.2 0.2
|
||||||
|
Ks 0.0 0.0 0.0
|
||||||
|
Ns 0.0
|
||||||
|
|
||||||
|
newmtl ForegroundColor
|
||||||
|
illum 1
|
||||||
|
Ka 0.2 0.2 0.2
|
||||||
|
Kd 0.2 0.2 0.2
|
||||||
|
Ks 0.0 0.0 0.0
|
||||||
|
Ns 0.0
|
||||||
|
|
||||||
|
newmtl white
|
||||||
|
illum 1
|
||||||
|
Ka 0.48235294 0.5019608 0.5803922
|
||||||
|
Kd 0.48235294 0.5019608 0.5803922
|
||||||
|
Ks 0.0 0.0 0.0
|
||||||
|
Ns 0.0
|
||||||
|
|
||||||
|
newmtl white_Cylinder_5
|
||||||
|
illum 1
|
||||||
|
Ka 0.47843137 0.49803922 0.5764706
|
||||||
|
Kd 0.47843137 0.49803922 0.5764706
|
||||||
|
Ks 0.0 0.0 0.0
|
||||||
|
Ns 0.0
|
||||||
|
|
||||||
|
newmtl white_Cylinder_10
|
||||||
|
illum 1
|
||||||
|
Ka 0.8784314 0.8745098 0.8901961
|
||||||
|
Kd 0.8784314 0.8745098 0.8901961
|
||||||
|
Ks 0.0 0.0 0.0
|
||||||
|
Ns 0.0
|
||||||
|
|
||||||
|
newmtl FrontColorNoCulling_11
|
||||||
|
illum 1
|
||||||
|
Ka 0.8784314 0.8745098 0.8901961
|
||||||
|
Kd 0.8784314 0.8745098 0.8901961
|
||||||
|
Ks 0.0 0.0 0.0
|
||||||
|
Ns 0.0
|
||||||
|
|
||||||
|
newmtl ForegroundColor_12
|
||||||
|
illum 1
|
||||||
|
Ka 0.8784314 0.8745098 0.8901961
|
||||||
|
Kd 0.8784314 0.8745098 0.8901961
|
||||||
|
Ks 0.0 0.0 0.0
|
||||||
|
Ns 0.0
|
||||||
|
|
||||||
|
newmtl white_Mesh_13
|
||||||
|
illum 1
|
||||||
|
Ka 0.6 0.6 0.6
|
||||||
|
Kd 0.6 0.6 0.6
|
||||||
|
Ks 0.0 0.0 0.0
|
||||||
|
Ns 0.0
|
||||||
|
|
||||||
|
newmtl Cube_1_1_1
|
||||||
|
illum 1
|
||||||
|
Ka 0.0 0.0 0.0
|
||||||
|
Kd 0.0 0.0 0.0
|
||||||
|
Ks 0.0 0.0 0.0
|
||||||
|
Ns 1.0
|
||||||
|
|
||||||
|
newmtl Cylinder_7_7
|
||||||
|
illum 1
|
||||||
|
Ka 0.4 0.4 0.4
|
||||||
|
Kd 0.4 0.4 0.4
|
||||||
|
Ks 0.0 0.0 0.0
|
||||||
|
Ns 1.0
|
||||||
|
|
||||||
|
newmtl Cylinder_10_10
|
||||||
|
illum 1
|
||||||
|
Ka 0.8 0.4 0.0
|
||||||
|
Kd 0.8 0.4 0.0
|
||||||
|
Ks 0.0 0.0 0.0
|
||||||
|
Ns 1.0
|
||||||
|
|
||||||
|
newmtl Cylinder_11_11
|
||||||
|
illum 2
|
||||||
|
Ka 0.2 0.2 0.2
|
||||||
|
Kd 0.2 0.2 0.2
|
||||||
|
Ks 0.0 0.0 0.0
|
||||||
|
Ns 1.0
|
||||||
|
|
||||||
|
newmtl 12_12
|
||||||
|
illum 1
|
||||||
|
Ka 0.2 0.2 0.2
|
||||||
|
Kd 0.2 0.2 0.2
|
||||||
|
Ks 0.0 0.0 0.0
|
||||||
|
Ns 1.0
|
||||||
|
|
||||||
|
newmtl Cube_1_1_1_Cube_1_1_1_38
|
||||||
|
illum 1
|
||||||
|
Ka 0.6 0.6 0.6
|
||||||
|
Kd 0.6 0.6 0.6
|
||||||
|
Ks 0.0 0.0 0.0
|
||||||
|
Ns 1.0
|
||||||
|
|
||||||
|
newmtl white_Cylinder_58
|
||||||
|
illum 1
|
||||||
|
Ka 0.1882353 0.27058825 0.58431375
|
||||||
|
Kd 0.1882353 0.27058825 0.58431375
|
||||||
|
Ks 0.0 0.0 0.0
|
||||||
|
Ns 0.0
|
||||||
|
|
||||||
|
newmtl white_Cylinder_59
|
||||||
|
illum 1
|
||||||
|
Ka 0.3137255 0.14901961 0.011764706
|
||||||
|
Kd 0.3137255 0.14901961 0.011764706
|
||||||
|
Ks 0.0 0.0 0.0
|
||||||
|
Ns 0.0
|
||||||
|
|
||||||
|
newmtl 1_1
|
||||||
|
illum 2
|
||||||
|
Ka 0.2 0.2 0.2
|
||||||
|
Kd 1.0 1.0 1.0
|
||||||
|
Ks 0.5 0.5 0.5
|
||||||
|
Ns 64.0
|
||||||
|
Ni 1.0
|
||||||
|
d 0.48000002
|
||||||
|
map_Kd Missile_AIM-120_D_[AMRAAM]_1_1.png
|
||||||
|
|
||||||
|
newmtl Cube_1_2_2
|
||||||
|
illum 1
|
||||||
|
Ka 0.8 0.4 0.0
|
||||||
|
Kd 0.8 0.4 0.0
|
||||||
|
Ks 0.0 0.0 0.0
|
||||||
|
Ns 1.0
|
||||||
|
|
||||||
|
newmtl Cylinder_4_4
|
||||||
|
illum 2
|
||||||
|
Ka 0.6 0.6 0.6
|
||||||
|
Kd 0.6 0.6 0.6
|
||||||
|
Ks 0.5 0.5 0.5
|
||||||
|
Ns 64.0
|
||||||
|
|
||||||
|
newmtl Cylinder_5_5
|
||||||
|
illum 2
|
||||||
|
Ka 0.8 0.8 0.0
|
||||||
|
Kd 0.8 0.8 0.0
|
||||||
|
Ks 0.5 0.5 0.5
|
||||||
|
Ns 64.0
|
||||||
|
|
||||||
|
newmtl Cylinder_6_6
|
||||||
|
illum 2
|
||||||
|
Ka 0.8784314 0.8745098 0.8901961
|
||||||
|
Kd 0.8784314 0.8745098 0.8901961
|
||||||
|
Ks 0.5 0.5 0.5
|
||||||
|
Ns 64.0
|
||||||
|
|
||||||
|
newmtl Cylinder_10_10_Cylinder_10_10_73
|
||||||
|
illum 1
|
||||||
|
Ka 0.2 0.2 0.2
|
||||||
|
Kd 0.2 0.2 0.2
|
||||||
|
Ks 0.0 0.0 0.0
|
||||||
|
Ns 1.0
|
||||||
|
|
||||||
|
newmtl 11_11
|
||||||
|
illum 1
|
||||||
|
Ka 0.6 0.6 0.6
|
||||||
|
Kd 0.6 0.6 0.6
|
||||||
|
Ks 0.0 0.0 0.0
|
||||||
|
Ns 1.0
|
||||||
|
|
||||||
|
newmtl Cube_1_1_1_Cube_1_1_1_76
|
||||||
|
illum 1
|
||||||
|
Ka 0.2 0.2 0.2
|
||||||
|
Kd 1.0 1.0 1.0
|
||||||
|
Ks 0.0 0.0 0.0
|
||||||
|
Ns 1.0
|
||||||
|
Ni 1.0
|
||||||
|
map_Kd Missile_AIM-120_D_[AMRAAM]_Cube_1_1_1_Cube_1_1_1_76.png
|
||||||
|
|
||||||
|
newmtl Cylinder_2_2
|
||||||
|
illum 2
|
||||||
|
Ka 0.6 0.6 0.6
|
||||||
|
Kd 0.6 0.6 0.6
|
||||||
|
Ks 0.5 0.5 0.5
|
||||||
|
Ns 64.0
|
||||||
|
|
||||||
|
newmtl Cylinder_3_3
|
||||||
|
illum 1
|
||||||
|
Ka 0.4 0.4 0.0
|
||||||
|
Kd 0.4 0.4 0.0
|
||||||
|
Ks 0.0 0.0 0.0
|
||||||
|
Ns 1.0
|
||||||
|
|
||||||
|
newmtl Cylinder_4_4_Cylinder_4_4_79
|
||||||
|
illum 1
|
||||||
|
Ka 0.0 0.0 0.0
|
||||||
|
Kd 0.0 0.0 0.0
|
||||||
|
Ks 0.0 0.0 0.0
|
||||||
|
Ns 1.0
|
||||||
|
|
||||||
|
newmtl Cube_1_5_5
|
||||||
|
illum 1
|
||||||
|
Ka 0.2 0.2 0.2
|
||||||
|
Kd 1.0 1.0 1.0
|
||||||
|
Ks 0.0 0.0 0.0
|
||||||
|
Ns 1.0
|
||||||
|
map_Kd Missile_AIM-120_D_[AMRAAM]_Cube_1_5_5.png
|
||||||
|
|
||||||
|
newmtl Cube_1_6_6
|
||||||
|
illum 1
|
||||||
|
Ka 0.2 0.2 0.2
|
||||||
|
Kd 1.0 1.0 1.0
|
||||||
|
Ks 0.0 0.0 0.0
|
||||||
|
Ns 1.0
|
||||||
|
Ni 1.0
|
||||||
|
map_Kd Missile_AIM-120_D_[AMRAAM]_Cube_1_6_6.png
|
||||||
|
|
||||||
|
newmtl Cylinder_1_1
|
||||||
|
illum 1
|
||||||
|
Ka 0.4 0.4 0.4
|
||||||
|
Kd 0.4 0.4 0.4
|
||||||
|
Ks 0.0 0.0 0.0
|
||||||
|
Ns 1.0
|
||||||
|
|
||||||
|
newmtl Cube_1_5_5_Cube_1_5_5_86
|
||||||
|
illum 1
|
||||||
|
Ka 0.2 0.2 0.2
|
||||||
|
Kd 0.2 0.2 0.2
|
||||||
|
Ks 0.0 0.0 0.0
|
||||||
|
Ns 1.0
|
||||||
|
|
||||||
|
newmtl Cube_1_6_6_Cube_1_6_6_87
|
||||||
|
illum 1
|
||||||
|
Ka 0.8 0.0 0.0
|
||||||
|
Kd 0.8 0.0 0.0
|
||||||
|
Ks 0.0 0.0 0.0
|
||||||
|
Ns 1.0
|
||||||
|
|
||||||
|
newmtl Cylinder_7_7_Cylinder_7_7_88
|
||||||
|
illum 1
|
||||||
|
Ka 0.8 0.4 0.0
|
||||||
|
Kd 0.8 0.4 0.0
|
||||||
|
Ks 0.0 0.0 0.0
|
||||||
|
Ns 1.0
|
||||||
|
|
||||||
|
newmtl Cylinder_8_8
|
||||||
|
illum 1
|
||||||
|
Ka 0.4 0.6 0.0
|
||||||
|
Kd 0.4 0.6 0.0
|
||||||
|
Ks 0.0 0.0 0.0
|
||||||
|
Ns 1.0
|
||||||
|
After Width: | Height: | Size: 210 KiB |
|
After Width: | Height: | Size: 164 KiB |
|
After Width: | Height: | Size: 289 KiB |
|
After Width: | Height: | Size: 26 KiB |
@@ -0,0 +1,3 @@
|
|||||||
|
based on:
|
||||||
|
https://free3d.com/de/3d-model/aim-120d-missile-51025.html
|
||||||
|
License: Free Personal Use Only
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
based on:
|
||||||
|
https://free3d.com/3d-model/wwii-ship-german-type-ii-uboat-v2--700733.html
|
||||||
|
License: Free Personal Use Only
|
||||||
|
After Width: | Height: | Size: 168 KiB |
@@ -0,0 +1,16 @@
|
|||||||
|
# 3ds Max Wavefront OBJ Exporter v0.97b - (c)2007 guruware
|
||||||
|
# File Created: 29.03.2012 14:25:39
|
||||||
|
|
||||||
|
newmtl default
|
||||||
|
Ns 35.0000
|
||||||
|
Ni 1.5000
|
||||||
|
d 1.0000
|
||||||
|
Tr 0.0000
|
||||||
|
Tf 1.0000 1.0000 1.0000
|
||||||
|
illum 2
|
||||||
|
Ka 1.0000 1.0000 1.0000
|
||||||
|
Kd 1.0000 1.0000 1.0000
|
||||||
|
Ks 0.5400 0.5400 0.5400
|
||||||
|
Ke 0.0000 0.0000 0.0000
|
||||||
|
map_Ka 14084_WWII_ship_German_Type_II_U-boat_diff.jpg
|
||||||
|
map_Kd 14084_WWII_ship_German_Type_II_U-boat_diff.jpg
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
Personal-use only.
|
||||||
|
|
||||||
|
menu_music.ogg
|
||||||
|
https://pixabay.com/de/music/szenen-aufbauen-demolition-outline-science-fiction-trailer-music-191960/
|
||||||
|
pirates.ogg
|
||||||
|
https://pixabay.com/de/music/epische-klassik-pirates-163389/
|
||||||
|
win_the_game.gg
|
||||||
|
https://pixabay.com/de/users/enrico_dering-31760131/
|
||||||
|
defeat.ogg
|
||||||
|
https://pixabay.com/de/music/dramaszene-defeat-charles-michel-140604/
|
||||||
@@ -0,0 +1,159 @@
|
|||||||
|
package pp.battleship.game.client;
|
||||||
|
|
||||||
|
import pp.battleship.message.client.AnimationMessage;
|
||||||
|
import pp.battleship.message.server.EffectMessage;
|
||||||
|
import pp.battleship.model.Battleship;
|
||||||
|
import pp.battleship.model.IntPoint;
|
||||||
|
import pp.battleship.model.Shell;
|
||||||
|
import pp.battleship.model.ShipMap;
|
||||||
|
import pp.battleship.notification.Music;
|
||||||
|
import pp.battleship.notification.Sound;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Represents the state of the game during an animation sequence.
|
||||||
|
* This state handles the progress and completion of the animation,
|
||||||
|
* updates the game state accordingly, and transitions to the next state.
|
||||||
|
*/
|
||||||
|
public class AnimationState extends ClientState {
|
||||||
|
/**
|
||||||
|
* Progress of the current animation, ranging from 0 to 1.
|
||||||
|
*/
|
||||||
|
private float animationProgress = 0;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Duration of the animation in seconds.
|
||||||
|
*/
|
||||||
|
private final static float ANIMATION_DURATION = 0.375f;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Speed of the shell in the animation.
|
||||||
|
*/
|
||||||
|
private final static float SHELL_SPEED = 0.3f;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The effect message received from the server.
|
||||||
|
*/
|
||||||
|
private final EffectMessage msg;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The shell involved in the animation.
|
||||||
|
*/
|
||||||
|
private final Shell shell;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Constructs an AnimationState with the specified game logic, effect message, and shell.
|
||||||
|
*
|
||||||
|
* @param logic the game logic associated with this state
|
||||||
|
* @param msg the effect message received from the server
|
||||||
|
* @param shell the shell involved in the animation
|
||||||
|
*/
|
||||||
|
public AnimationState(ClientGameLogic logic, EffectMessage msg, Shell shell) {
|
||||||
|
super(logic);
|
||||||
|
this.msg = msg;
|
||||||
|
this.shell = shell;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Ends the animation state and transitions to the next state:<br>
|
||||||
|
* - Plays the appropriate sound.<br>
|
||||||
|
* - Updates the affected map.<br>
|
||||||
|
* - Adds destroyed ships to the opponent's map.<br>
|
||||||
|
* - Sends an `AnimationMessage` to the server.<br>
|
||||||
|
* - If the game is over, transitions to `GameOverState` and plays music.<br>
|
||||||
|
* - Otherwise, transitions to `BattleState`.
|
||||||
|
*/
|
||||||
|
public void endState() {
|
||||||
|
playSound(msg);
|
||||||
|
affectedMap(msg).add(msg.getShot());
|
||||||
|
affectedMap(msg).remove(shell);
|
||||||
|
|
||||||
|
if (destroyedOpponentShip(msg))
|
||||||
|
logic.getOpponentMap().add(msg.getDestroyedShip());
|
||||||
|
|
||||||
|
logic.send(new AnimationMessage());
|
||||||
|
if (msg.isGameOver()) {
|
||||||
|
for (Battleship ship : msg.getRemainingOpponentShips()) {
|
||||||
|
logic.getOpponentMap().add(ship);
|
||||||
|
}
|
||||||
|
logic.setState(new GameOverState(logic));
|
||||||
|
if (msg.isOwnShot())
|
||||||
|
logic.playMusic(Music.VICTORY_MUSIC);
|
||||||
|
else
|
||||||
|
logic.playMusic(Music.DEFEAT_MUSIC);
|
||||||
|
} else {
|
||||||
|
logic.setState(new BattleState(logic, msg.isMyTurn()));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Checks if the battle state should be shown.
|
||||||
|
*
|
||||||
|
* @return true if the battle state should be shown, false otherwise
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
public boolean showBattle() {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Determines which map (own or opponent's) should be affected by the shot based on the message.
|
||||||
|
*
|
||||||
|
* @param msg the effect message received from the server
|
||||||
|
* @return the map (either the opponent's or player's own map) that is affected by the shot
|
||||||
|
*/
|
||||||
|
private ShipMap affectedMap(EffectMessage msg) {
|
||||||
|
return msg.isOwnShot() ? logic.getOpponentMap() : logic.getOwnMap();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Checks if the opponent's ship was destroyed by the player's shot.
|
||||||
|
*
|
||||||
|
* @param msg the effect message received from the server
|
||||||
|
* @return true if the shot destroyed an opponent's ship, false otherwise
|
||||||
|
*/
|
||||||
|
|
||||||
|
private boolean destroyedOpponentShip(EffectMessage msg) {
|
||||||
|
return msg.getDestroyedShip() != null && msg.isOwnShot();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Plays a sound based on the outcome of the shot. Different sounds are played for a miss, hit,
|
||||||
|
* or destruction of a ship.
|
||||||
|
*
|
||||||
|
* @param msg the effect message containing the result of the shot
|
||||||
|
*/
|
||||||
|
private void playSound(EffectMessage msg) {
|
||||||
|
if (!msg.getShot().isHit())
|
||||||
|
logic.playSound(Sound.SPLASH);
|
||||||
|
else if (msg.getDestroyedShip() == null)
|
||||||
|
logic.playSound(Sound.EXPLOSION);
|
||||||
|
else
|
||||||
|
logic.playSound(Sound.DESTROYED_SHIP);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Handles a click on the opponent's map.
|
||||||
|
*
|
||||||
|
* @param pos the position where the click occurred
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
public void clickOpponentMap(IntPoint pos) {
|
||||||
|
if (!msg.isMyTurn())
|
||||||
|
logic.setInfoText("wait.its.not.your.turn");
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Updates the state of the animation. This method increments the animationProgress value
|
||||||
|
* until it exceeds a threshold, at which point the state ends.
|
||||||
|
*
|
||||||
|
* @param delta the time elapsed since the last update, in seconds
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
public void update(float delta) {
|
||||||
|
if (animationProgress > ANIMATION_DURATION) {
|
||||||
|
endState();
|
||||||
|
} else {
|
||||||
|
animationProgress += delta * SHELL_SPEED;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -10,11 +10,10 @@
|
|||||||
import pp.battleship.message.client.ShootMessage;
|
import pp.battleship.message.client.ShootMessage;
|
||||||
import pp.battleship.message.server.EffectMessage;
|
import pp.battleship.message.server.EffectMessage;
|
||||||
import pp.battleship.model.IntPoint;
|
import pp.battleship.model.IntPoint;
|
||||||
|
import pp.battleship.model.Shell;
|
||||||
import pp.battleship.model.ShipMap;
|
import pp.battleship.model.ShipMap;
|
||||||
import pp.battleship.notification.Sound;
|
import pp.battleship.notification.Sound;
|
||||||
|
|
||||||
import java.lang.System.Logger.Level;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Represents the state of the client where players take turns to attack each other's ships.
|
* Represents the state of the client where players take turns to attack each other's ships.
|
||||||
*/
|
*/
|
||||||
@@ -32,11 +31,21 @@ public BattleState(ClientGameLogic logic, boolean myTurn) {
|
|||||||
this.myTurn = myTurn;
|
this.myTurn = myTurn;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Checks if the battle state should be shown.
|
||||||
|
*
|
||||||
|
* @return true if the battle state should be shown, false otherwise
|
||||||
|
*/
|
||||||
@Override
|
@Override
|
||||||
public boolean showBattle() {
|
public boolean showBattle() {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Handles a click on the opponent's map.
|
||||||
|
*
|
||||||
|
* @param pos the position where the click occurred
|
||||||
|
*/
|
||||||
@Override
|
@Override
|
||||||
public void clickOpponentMap(IntPoint pos) {
|
public void clickOpponentMap(IntPoint pos) {
|
||||||
if (!myTurn)
|
if (!myTurn)
|
||||||
@@ -52,17 +61,16 @@ else if (logic.getOpponentMap().isValid(pos))
|
|||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public void receivedEffect(EffectMessage msg) {
|
public void receivedEffect(EffectMessage msg) {
|
||||||
ClientGameLogic.LOGGER.log(Level.INFO, "report effect: {0}", msg); //NON-NLS
|
ClientGameLogic.LOGGER.log(System.Logger.Level.INFO, "report effect: {0}", msg); //NON-NLS
|
||||||
playSound(msg);
|
// Update turn and info text
|
||||||
myTurn = msg.isMyTurn();
|
myTurn = msg.isMyTurn();
|
||||||
logic.setInfoText(msg.getInfoTextKey());
|
logic.setInfoText(msg.getInfoTextKey());
|
||||||
affectedMap(msg).add(msg.getShot());
|
// Add the shell to the affected map
|
||||||
if (destroyedOpponentShip(msg))
|
Shell shell = new Shell(msg.getShot());
|
||||||
logic.getOpponentMap().add(msg.getDestroyedShip());
|
affectedMap(msg).add(shell);
|
||||||
if (msg.isGameOver()) {
|
// Change state to AnimationState
|
||||||
msg.getRemainingOpponentShips().forEach(logic.getOwnMap()::add);
|
logic.playSound(Sound.SHELL_FIRED);
|
||||||
logic.setState(new GameOverState(logic));
|
logic.setState(new AnimationState(logic, msg, shell));
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -74,29 +82,4 @@ public void receivedEffect(EffectMessage msg) {
|
|||||||
private ShipMap affectedMap(EffectMessage msg) {
|
private ShipMap affectedMap(EffectMessage msg) {
|
||||||
return msg.isOwnShot() ? logic.getOpponentMap() : logic.getOwnMap();
|
return msg.isOwnShot() ? logic.getOpponentMap() : logic.getOwnMap();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Checks if the opponent's ship was destroyed by the player's shot.
|
|
||||||
*
|
|
||||||
* @param msg the effect message received from the server
|
|
||||||
* @return true if the shot destroyed an opponent's ship, false otherwise
|
|
||||||
*/
|
|
||||||
private boolean destroyedOpponentShip(EffectMessage msg) {
|
|
||||||
return msg.getDestroyedShip() != null && msg.isOwnShot();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Plays a sound based on the outcome of the shot. Different sounds are played for a miss, hit,
|
|
||||||
* or destruction of a ship.
|
|
||||||
*
|
|
||||||
* @param msg the effect message containing the result of the shot
|
|
||||||
*/
|
|
||||||
private void playSound(EffectMessage msg) {
|
|
||||||
if (!msg.getShot().isHit())
|
|
||||||
logic.playSound(Sound.SPLASH);
|
|
||||||
else if (msg.getDestroyedShip() == null)
|
|
||||||
logic.playSound(Sound.EXPLOSION);
|
|
||||||
else
|
|
||||||
logic.playSound(Sound.DESTROYED_SHIP);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -15,13 +15,7 @@
|
|||||||
import pp.battleship.model.IntPoint;
|
import pp.battleship.model.IntPoint;
|
||||||
import pp.battleship.model.ShipMap;
|
import pp.battleship.model.ShipMap;
|
||||||
import pp.battleship.model.dto.ShipMapDTO;
|
import pp.battleship.model.dto.ShipMapDTO;
|
||||||
import pp.battleship.notification.ClientStateEvent;
|
import pp.battleship.notification.*;
|
||||||
import pp.battleship.notification.GameEvent;
|
|
||||||
import pp.battleship.notification.GameEventBroker;
|
|
||||||
import pp.battleship.notification.GameEventListener;
|
|
||||||
import pp.battleship.notification.InfoTextEvent;
|
|
||||||
import pp.battleship.notification.Sound;
|
|
||||||
import pp.battleship.notification.SoundEvent;
|
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
@@ -258,6 +252,15 @@ public void playSound(Sound sound) {
|
|||||||
notifyListeners(new SoundEvent(sound));
|
notifyListeners(new SoundEvent(sound));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Emits an event to play the specified music.
|
||||||
|
*
|
||||||
|
* @param music the music to be played.
|
||||||
|
*/
|
||||||
|
public void playMusic(Music music) {
|
||||||
|
notifyListeners(new MusicEvent(music));
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Loads a map from the specified file.
|
* Loads a map from the specified file.
|
||||||
*
|
*
|
||||||
|
|||||||
@@ -16,6 +16,7 @@
|
|||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.lang.System.Logger.Level;
|
import java.lang.System.Logger.Level;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
import static pp.battleship.Resources.lookup;
|
import static pp.battleship.Resources.lookup;
|
||||||
import static pp.battleship.model.Battleship.Status.INVALID_PREVIEW;
|
import static pp.battleship.model.Battleship.Status.INVALID_PREVIEW;
|
||||||
@@ -111,8 +112,7 @@ private void placeShip(IntPoint cursor) {
|
|||||||
harbor().remove(selectedInHarbor);
|
harbor().remove(selectedInHarbor);
|
||||||
preview = null;
|
preview = null;
|
||||||
selectedInHarbor = null;
|
selectedInHarbor = null;
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
preview.setStatus(INVALID_PREVIEW);
|
preview.setStatus(INVALID_PREVIEW);
|
||||||
ownMap().add(preview);
|
ownMap().add(preview);
|
||||||
}
|
}
|
||||||
@@ -135,8 +135,7 @@ public void clickHarbor(IntPoint pos) {
|
|||||||
harbor().add(selectedInHarbor);
|
harbor().add(selectedInHarbor);
|
||||||
preview = null;
|
preview = null;
|
||||||
selectedInHarbor = null;
|
selectedInHarbor = null;
|
||||||
}
|
} else if (shipAtCursor != null) {
|
||||||
else if (shipAtCursor != null) {
|
|
||||||
selectedInHarbor = shipAtCursor;
|
selectedInHarbor = shipAtCursor;
|
||||||
selectedInHarbor.setStatus(VALID_PREVIEW);
|
selectedInHarbor.setStatus(VALID_PREVIEW);
|
||||||
harbor().remove(selectedInHarbor);
|
harbor().remove(selectedInHarbor);
|
||||||
@@ -238,6 +237,8 @@ public void loadMap(File file) throws IOException {
|
|||||||
final ShipMapDTO dto = ShipMapDTO.loadFrom(file);
|
final ShipMapDTO dto = ShipMapDTO.loadFrom(file);
|
||||||
if (!dto.fits(logic.getDetails()))
|
if (!dto.fits(logic.getDetails()))
|
||||||
throw new IOException(lookup("map.doesnt.fit"));
|
throw new IOException(lookup("map.doesnt.fit"));
|
||||||
|
if (!validMap(dto))
|
||||||
|
throw new IOException(lookup("map.invalid"));
|
||||||
ownMap().clear();
|
ownMap().clear();
|
||||||
dto.getShips().forEach(ownMap()::add);
|
dto.getShips().forEach(ownMap()::add);
|
||||||
harbor().clear();
|
harbor().clear();
|
||||||
@@ -264,4 +265,70 @@ public boolean mayLoadMap() {
|
|||||||
public boolean maySaveMap() {
|
public boolean maySaveMap() {
|
||||||
return harbor().getItems().isEmpty();
|
return harbor().getItems().isEmpty();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Validates the given ShipMapDTO by checking if all ships are within bounds
|
||||||
|
* and do not overlap with each other.
|
||||||
|
*
|
||||||
|
* @param dto the ShipMapDTO to validate
|
||||||
|
* @return true if the map is valid, false otherwise
|
||||||
|
*/
|
||||||
|
private boolean validMap(ShipMapDTO dto) {
|
||||||
|
return inBounds(dto) && !overlaps(dto);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Checks if all ships in the given ShipMapDTO are within the bounds of the map.
|
||||||
|
*
|
||||||
|
* @param dto the ShipMapDTO to validate
|
||||||
|
* @return true if all ships are within bounds, false otherwise
|
||||||
|
*/
|
||||||
|
private boolean inBounds(ShipMapDTO dto) {
|
||||||
|
List<Battleship> ships = dto.getShips();
|
||||||
|
for (Battleship ship : ships) {
|
||||||
|
if (!isWithinBounds(ship, dto.getWidth(), dto.getHeight())) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Checks if the given ship is within the bounds of the map.
|
||||||
|
*
|
||||||
|
* @param ship the Battleship to check
|
||||||
|
* @param width the width of the map
|
||||||
|
* @param height the height of the map
|
||||||
|
* @return true if the ship is within bounds, false otherwise
|
||||||
|
*/
|
||||||
|
private boolean isWithinBounds(Battleship ship, int width, int height) {
|
||||||
|
int minX = ship.getMinX();
|
||||||
|
int maxX = ship.getMaxX();
|
||||||
|
int minY = ship.getMinY();
|
||||||
|
int maxY = ship.getMaxY();
|
||||||
|
return minX >= 0 && minX < width &&
|
||||||
|
minY >= 0 && minY < height &&
|
||||||
|
maxX >= 0 && maxX < width &&
|
||||||
|
maxY >= 0 && maxY < height;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Checks if any ships in the given ShipMapDTO overlap with each other.
|
||||||
|
*
|
||||||
|
* @param dto the ShipMapDTO to validate
|
||||||
|
* @return true if any ships overlap, false otherwise
|
||||||
|
*/
|
||||||
|
private boolean overlaps(ShipMapDTO dto) {
|
||||||
|
List<Battleship> ships = dto.getShips();
|
||||||
|
for (int i = 0; i < ships.size(); i++) {
|
||||||
|
Battleship ship1 = ships.get(i);
|
||||||
|
for (int j = i + 1; j < ships.size(); j++) {
|
||||||
|
Battleship ship2 = ships.get(j);
|
||||||
|
if (ship1.collidesWith(ship2)) {
|
||||||
|
return true; // Collision detected
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,7 +7,9 @@
|
|||||||
|
|
||||||
package pp.battleship.game.client;
|
package pp.battleship.game.client;
|
||||||
|
|
||||||
|
import pp.battleship.message.server.GameDetails;
|
||||||
import pp.battleship.message.server.StartBattleMessage;
|
import pp.battleship.message.server.StartBattleMessage;
|
||||||
|
import pp.battleship.notification.Music;
|
||||||
|
|
||||||
import java.lang.System.Logger.Level;
|
import java.lang.System.Logger.Level;
|
||||||
|
|
||||||
@@ -37,5 +39,19 @@ public void receivedStartBattle(StartBattleMessage msg) {
|
|||||||
ClientGameLogic.LOGGER.log(Level.INFO, "start battle, {0} turn", msg.isMyTurn() ? "my" : "other's"); //NON-NLS
|
ClientGameLogic.LOGGER.log(Level.INFO, "start battle, {0} turn", msg.isMyTurn() ? "my" : "other's"); //NON-NLS
|
||||||
logic.setInfoText(msg.getInfoTextKey());
|
logic.setInfoText(msg.getInfoTextKey());
|
||||||
logic.setState(new BattleState(logic, msg.isMyTurn()));
|
logic.setState(new BattleState(logic, msg.isMyTurn()));
|
||||||
|
logic.playMusic(Music.GAME_MUSIC);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Handles the GameDetails message received from the server.
|
||||||
|
* If the map is invalid, the editor state is set.
|
||||||
|
*
|
||||||
|
* @param msg the GameDetails message received
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
public void receivedGameDetails(GameDetails msg) {
|
||||||
|
ClientGameLogic.LOGGER.log(Level.WARNING, "Invalid Map"); //NON-NLS
|
||||||
|
logic.setInfoText("map.invalid");
|
||||||
|
logic.setState(new EditorState(logic));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,6 +8,7 @@
|
|||||||
package pp.battleship.game.server;
|
package pp.battleship.game.server;
|
||||||
|
|
||||||
import pp.battleship.BattleshipConfig;
|
import pp.battleship.BattleshipConfig;
|
||||||
|
import pp.battleship.message.client.AnimationMessage;
|
||||||
import pp.battleship.message.client.ClientInterpreter;
|
import pp.battleship.message.client.ClientInterpreter;
|
||||||
import pp.battleship.message.client.MapMessage;
|
import pp.battleship.message.client.MapMessage;
|
||||||
import pp.battleship.message.client.ShootMessage;
|
import pp.battleship.message.client.ShootMessage;
|
||||||
@@ -35,6 +36,7 @@ public class ServerGameLogic implements ClientInterpreter {
|
|||||||
private final BattleshipConfig config;
|
private final BattleshipConfig config;
|
||||||
private final List<Player> players = new ArrayList<>(2);
|
private final List<Player> players = new ArrayList<>(2);
|
||||||
private final Set<Player> readyPlayers = new HashSet<>();
|
private final Set<Player> readyPlayers = new HashSet<>();
|
||||||
|
private final Set<Player> finishedAnimation = new HashSet<>();
|
||||||
private final ServerSender serverSender;
|
private final ServerSender serverSender;
|
||||||
private Player activePlayer;
|
private Player activePlayer;
|
||||||
private ServerState state = ServerState.WAIT;
|
private ServerState state = ServerState.WAIT;
|
||||||
@@ -142,8 +144,77 @@ public Player addPlayer(int id) {
|
|||||||
public void received(MapMessage msg, int from) {
|
public void received(MapMessage msg, int from) {
|
||||||
if (state != ServerState.SET_UP)
|
if (state != ServerState.SET_UP)
|
||||||
LOGGER.log(Level.ERROR, "playerReady not allowed in {0}", state); //NON-NLS
|
LOGGER.log(Level.ERROR, "playerReady not allowed in {0}", state); //NON-NLS
|
||||||
else
|
else if (validMap(msg))
|
||||||
playerReady(getPlayerById(from), msg.getShips());
|
playerReady(getPlayerById(from), msg.getShips());
|
||||||
|
else {
|
||||||
|
LOGGER.log(Level.ERROR, "map does not fit game details"); //NON-NLS
|
||||||
|
send(getPlayerById(from), new GameDetails(config));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Validates the received map message by checking if all ships are within bounds
|
||||||
|
* and do not overlap with each other.
|
||||||
|
*
|
||||||
|
* @param msg the received MapMessage containing the ships
|
||||||
|
* @return true if the map is valid, false otherwise
|
||||||
|
*/
|
||||||
|
private boolean validMap(MapMessage msg) {
|
||||||
|
List<Battleship> ships = msg.getShips();
|
||||||
|
return inBounds(ships) && !overlaps(ships);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Checks if all ships in the given list are within the bounds of the map.
|
||||||
|
*
|
||||||
|
* @param ships the list of Battleships to validate
|
||||||
|
* @return true if all ships are within bounds, false otherwise
|
||||||
|
*/
|
||||||
|
private boolean inBounds(List<Battleship> ships) {
|
||||||
|
for (Battleship ship : ships) {
|
||||||
|
if (!isWithinBounds(ship)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Checks if the given ship is within the bounds of the map.
|
||||||
|
*
|
||||||
|
* @param ship the Battleship to check
|
||||||
|
* @return true if the ship is within bounds, false otherwise
|
||||||
|
*/
|
||||||
|
private boolean isWithinBounds(Battleship ship) {
|
||||||
|
int minX = ship.getMinX();
|
||||||
|
int maxX = ship.getMaxX();
|
||||||
|
int minY = ship.getMinY();
|
||||||
|
int maxY = ship.getMaxY();
|
||||||
|
int width = config.getMapWidth();
|
||||||
|
int height = config.getMapHeight();
|
||||||
|
return minX >= 0 && minX < width &&
|
||||||
|
minY >= 0 && minY < height &&
|
||||||
|
maxX >= 0 && maxX < width &&
|
||||||
|
maxY >= 0 && maxY < height;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Checks if any ships in the given list overlap with each other.
|
||||||
|
*
|
||||||
|
* @param ships the list of Battleships to validate
|
||||||
|
* @return true if any ships overlap, false otherwise
|
||||||
|
*/
|
||||||
|
private boolean overlaps(List<Battleship> ships) {
|
||||||
|
for (int i = 0; i < ships.size(); i++) {
|
||||||
|
Battleship ship1 = ships.get(i);
|
||||||
|
for (int j = i + 1; j < ships.size(); j++) {
|
||||||
|
Battleship ship2 = ships.get(j);
|
||||||
|
if (ship1.collidesWith(ship2)) {
|
||||||
|
return true; // Collision detected
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -156,8 +227,40 @@ public void received(MapMessage msg, int from) {
|
|||||||
public void received(ShootMessage msg, int from) {
|
public void received(ShootMessage msg, int from) {
|
||||||
if (state != ServerState.BATTLE)
|
if (state != ServerState.BATTLE)
|
||||||
LOGGER.log(Level.ERROR, "shoot not allowed in {0}", state); //NON-NLS
|
LOGGER.log(Level.ERROR, "shoot not allowed in {0}", state); //NON-NLS
|
||||||
else
|
else {
|
||||||
|
setState(ServerState.ANIMATION);
|
||||||
shoot(getPlayerById(from), msg.getPosition());
|
shoot(getPlayerById(from), msg.getPosition());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Handles the reception of an {@link AnimationMessage}.
|
||||||
|
* Marks the player's animation as finished and transitions the game state if necessary.
|
||||||
|
*
|
||||||
|
* @param msg the received {@code AnimationMessage}
|
||||||
|
* @param from the ID of the sender client
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
public void received(AnimationMessage msg, int from) {
|
||||||
|
if (state != ServerState.ANIMATION)
|
||||||
|
LOGGER.log(Level.ERROR, "animation not allowed in {0}", state); //NON-NLS
|
||||||
|
else
|
||||||
|
finishedAnimation(getPlayerById(from));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Marks the player's animation as finished and transitions the game state if necessary.
|
||||||
|
*
|
||||||
|
* @param player the player whose animation is finished
|
||||||
|
*/
|
||||||
|
private void finishedAnimation(Player player) {
|
||||||
|
if (!finishedAnimation.add(player)) {
|
||||||
|
LOGGER.log(Level.ERROR, "{0}'s animation was already finished", player);
|
||||||
|
}
|
||||||
|
if (finishedAnimation.size() == 2) {
|
||||||
|
finishedAnimation.clear();
|
||||||
|
setState(ServerState.BATTLE);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -195,8 +298,7 @@ void shoot(Player p, IntPoint pos) {
|
|||||||
send(activePlayer, EffectMessage.miss(true, pos));
|
send(activePlayer, EffectMessage.miss(true, pos));
|
||||||
send(otherPlayer, EffectMessage.miss(false, pos));
|
send(otherPlayer, EffectMessage.miss(false, pos));
|
||||||
activePlayer = otherPlayer;
|
activePlayer = otherPlayer;
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
// shot hit a ship
|
// shot hit a ship
|
||||||
selectedShip.hit(pos);
|
selectedShip.hit(pos);
|
||||||
if (otherPlayer.getMap().getRemainingShips().isEmpty()) {
|
if (otherPlayer.getMap().getRemainingShips().isEmpty()) {
|
||||||
@@ -204,13 +306,11 @@ void shoot(Player p, IntPoint pos) {
|
|||||||
send(activePlayer, EffectMessage.won(pos, selectedShip));
|
send(activePlayer, EffectMessage.won(pos, selectedShip));
|
||||||
send(otherPlayer, EffectMessage.lost(pos, selectedShip, activePlayer.getMap().getRemainingShips()));
|
send(otherPlayer, EffectMessage.lost(pos, selectedShip, activePlayer.getMap().getRemainingShips()));
|
||||||
setState(ServerState.GAME_OVER);
|
setState(ServerState.GAME_OVER);
|
||||||
}
|
} else if (selectedShip.isDestroyed()) {
|
||||||
else if (selectedShip.isDestroyed()) {
|
|
||||||
// ship has been destroyed, but game is not yet over
|
// ship has been destroyed, but game is not yet over
|
||||||
send(activePlayer, EffectMessage.shipDestroyed(true, pos, selectedShip));
|
send(activePlayer, EffectMessage.shipDestroyed(true, pos, selectedShip));
|
||||||
send(otherPlayer, EffectMessage.shipDestroyed(false, pos, selectedShip));
|
send(otherPlayer, EffectMessage.shipDestroyed(false, pos, selectedShip));
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
// ship has been hit, but it hasn't been destroyed
|
// ship has been hit, but it hasn't been destroyed
|
||||||
send(activePlayer, EffectMessage.hit(true, pos));
|
send(activePlayer, EffectMessage.hit(true, pos));
|
||||||
send(otherPlayer, EffectMessage.hit(false, pos));
|
send(otherPlayer, EffectMessage.hit(false, pos));
|
||||||
|
|||||||
@@ -26,6 +26,11 @@ enum ServerState {
|
|||||||
*/
|
*/
|
||||||
BATTLE,
|
BATTLE,
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The server is waiting for clients to finish their animations.
|
||||||
|
*/
|
||||||
|
ANIMATION,
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The game has ended because all the ships of one player have been destroyed.
|
* The game has ended because all the ships of one player have been destroyed.
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -7,10 +7,7 @@
|
|||||||
|
|
||||||
package pp.battleship.game.singlemode;
|
package pp.battleship.game.singlemode;
|
||||||
|
|
||||||
import pp.battleship.message.client.ClientInterpreter;
|
import pp.battleship.message.client.*;
|
||||||
import pp.battleship.message.client.ClientMessage;
|
|
||||||
import pp.battleship.message.client.MapMessage;
|
|
||||||
import pp.battleship.message.client.ShootMessage;
|
|
||||||
import pp.battleship.model.Battleship;
|
import pp.battleship.model.Battleship;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -63,6 +60,19 @@ public void received(MapMessage msg, int from) {
|
|||||||
copiedMessage = new MapMessage(msg.getShips().stream().map(Copycat::copy).toList());
|
copiedMessage = new MapMessage(msg.getShips().stream().map(Copycat::copy).toList());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Handles the reception of a {@link AnimationMessage}.
|
||||||
|
* Since a {@code AnimationMessage} does not need to be copied, it is directly assigned.
|
||||||
|
*
|
||||||
|
* @param msg the received {@code AnimationMessage}
|
||||||
|
* @param from the identifier of the sender
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
public void received(AnimationMessage msg, int from) {
|
||||||
|
// copying is not necessary
|
||||||
|
copiedMessage = msg;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Creates a copy of the provided {@link Battleship}.
|
* Creates a copy of the provided {@link Battleship}.
|
||||||
*
|
*
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
package pp.battleship.game.singlemode;
|
package pp.battleship.game.singlemode;
|
||||||
|
|
||||||
import pp.battleship.game.client.BattleshipClient;
|
import pp.battleship.game.client.BattleshipClient;
|
||||||
|
import pp.battleship.message.client.AnimationMessage;
|
||||||
import pp.battleship.message.client.MapMessage;
|
import pp.battleship.message.client.MapMessage;
|
||||||
import pp.battleship.message.client.ShootMessage;
|
import pp.battleship.message.client.ShootMessage;
|
||||||
import pp.battleship.message.server.EffectMessage;
|
import pp.battleship.message.server.EffectMessage;
|
||||||
@@ -121,6 +122,7 @@ public void received(StartBattleMessage msg) {
|
|||||||
@Override
|
@Override
|
||||||
public void received(EffectMessage msg) {
|
public void received(EffectMessage msg) {
|
||||||
LOGGER.log(Level.INFO, "Received EffectMessage: {0}", msg); //NON-NLS
|
LOGGER.log(Level.INFO, "Received EffectMessage: {0}", msg); //NON-NLS
|
||||||
|
connection.sendRobotMessage(new AnimationMessage());
|
||||||
if (msg.isMyTurn())
|
if (msg.isMyTurn())
|
||||||
shoot();
|
shoot();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,27 @@
|
|||||||
|
package pp.battleship.message.client;
|
||||||
|
|
||||||
|
import com.jme3.network.serializing.Serializable;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A message indicating an animation event is finished in the game. (Client → Server)
|
||||||
|
*/
|
||||||
|
@Serializable
|
||||||
|
public class AnimationMessage extends ClientMessage {
|
||||||
|
/**
|
||||||
|
* Constructs a new AnimationMessage instance.
|
||||||
|
*/
|
||||||
|
public AnimationMessage() {
|
||||||
|
super();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Accepts a visitor for processing this message.
|
||||||
|
*
|
||||||
|
* @param interpreter the visitor to be used for processing
|
||||||
|
* @param from the connection ID of the sender
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
public void accept(ClientInterpreter interpreter, int from) {
|
||||||
|
interpreter.received(this, from);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -26,4 +26,12 @@ public interface ClientInterpreter {
|
|||||||
* @param from the connection ID from which the message was received
|
* @param from the connection ID from which the message was received
|
||||||
*/
|
*/
|
||||||
void received(MapMessage msg, int from);
|
void received(MapMessage msg, int from);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Processes a received AnimationMessage.
|
||||||
|
*
|
||||||
|
* @param msg the AnimationMessage to be processed
|
||||||
|
* @param from the connection ID from which the message was received
|
||||||
|
*/
|
||||||
|
void received(AnimationMessage msg, int from);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,32 @@
|
|||||||
|
package pp.battleship.model;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Represents a shell in the Battleship game.
|
||||||
|
*/
|
||||||
|
public class Shell implements Item {
|
||||||
|
private final int x;
|
||||||
|
private final int y;
|
||||||
|
|
||||||
|
public Shell(Shot shot) {
|
||||||
|
this.x = shot.getX();
|
||||||
|
this.y = shot.getY();
|
||||||
|
}
|
||||||
|
|
||||||
|
public int getX() {
|
||||||
|
return x;
|
||||||
|
}
|
||||||
|
|
||||||
|
public int getY() {
|
||||||
|
return y;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public <T> T accept(Visitor<T> visitor) {
|
||||||
|
return visitor.visit(this);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void accept(VoidVisitor visitor) {
|
||||||
|
visitor.visit(this);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -10,6 +10,7 @@
|
|||||||
import pp.battleship.notification.GameEvent;
|
import pp.battleship.notification.GameEvent;
|
||||||
import pp.battleship.notification.GameEventBroker;
|
import pp.battleship.notification.GameEventBroker;
|
||||||
import pp.battleship.notification.ItemAddedEvent;
|
import pp.battleship.notification.ItemAddedEvent;
|
||||||
|
import pp.battleship.notification.ItemRemovedEvent;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
@@ -90,6 +91,15 @@ public void add(Shot shot) {
|
|||||||
addItem(shot);
|
addItem(shot);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Adds a shell to the map and triggers an item addition event.
|
||||||
|
*
|
||||||
|
* @param shell the shell to be added to the map
|
||||||
|
*/
|
||||||
|
public void add(Shell shell) {
|
||||||
|
addItem(shell);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Removes an item from the map and triggers an item removal event.
|
* Removes an item from the map and triggers an item removal event.
|
||||||
*
|
*
|
||||||
@@ -97,7 +107,7 @@ public void add(Shot shot) {
|
|||||||
*/
|
*/
|
||||||
public void remove(Item item) {
|
public void remove(Item item) {
|
||||||
items.remove(item);
|
items.remove(item);
|
||||||
notifyListeners(new ItemAddedEvent(item, this));
|
notifyListeners(new ItemRemovedEvent(item, this));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -180,8 +190,8 @@ public int getHeight() {
|
|||||||
*/
|
*/
|
||||||
public boolean isValid(Battleship ship) {
|
public boolean isValid(Battleship ship) {
|
||||||
return isValid(ship.getMinX(), ship.getMinY()) &&
|
return isValid(ship.getMinX(), ship.getMinY()) &&
|
||||||
isValid(ship.getMaxX(), ship.getMaxY()) &&
|
isValid(ship.getMaxX(), ship.getMaxY()) &&
|
||||||
getShips().filter(s -> s != ship).noneMatch(ship::collidesWith);
|
getShips().filter(s -> s != ship).noneMatch(ship::collidesWith);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -193,8 +203,8 @@ public boolean isValid(Battleship ship) {
|
|||||||
*/
|
*/
|
||||||
public Battleship findShipAt(int x, int y) {
|
public Battleship findShipAt(int x, int y) {
|
||||||
return getShips().filter(ship -> ship.contains(x, y))
|
return getShips().filter(ship -> ship.contains(x, y))
|
||||||
.findAny()
|
.findAny()
|
||||||
.orElse(null);
|
.orElse(null);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -226,7 +236,7 @@ public boolean isValid(IntPosition pos) {
|
|||||||
*/
|
*/
|
||||||
public boolean isValid(int x, int y) {
|
public boolean isValid(int x, int y) {
|
||||||
return x >= 0 && x < width &&
|
return x >= 0 && x < width &&
|
||||||
y >= 0 && y < height;
|
y >= 0 && y < height;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -28,4 +28,12 @@ public interface Visitor<T> {
|
|||||||
* @return the result of visiting the Battleship element
|
* @return the result of visiting the Battleship element
|
||||||
*/
|
*/
|
||||||
T visit(Battleship ship);
|
T visit(Battleship ship);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Visits a Shell element.
|
||||||
|
*
|
||||||
|
* @param shell the Shell element to visit
|
||||||
|
* @return the result of visiting the Shell element
|
||||||
|
*/
|
||||||
|
T visit(Shell shell);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -25,4 +25,11 @@ public interface VoidVisitor {
|
|||||||
* @param ship the Battleship element to visit
|
* @param ship the Battleship element to visit
|
||||||
*/
|
*/
|
||||||
void visit(Battleship ship);
|
void visit(Battleship ship);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Visits a Shell element.
|
||||||
|
*
|
||||||
|
* @param shell the Shell element to visit
|
||||||
|
*/
|
||||||
|
void visit(Shell shell);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -114,4 +114,22 @@ public static ShipMapDTO loadFrom(File file) throws IOException {
|
|||||||
throw new IOException(e.getLocalizedMessage());
|
throw new IOException(e.getLocalizedMessage());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns the width of the ship map.
|
||||||
|
*
|
||||||
|
* @return the width of the ship map
|
||||||
|
*/
|
||||||
|
public int getWidth() {
|
||||||
|
return width;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns the height of the ship map.
|
||||||
|
*
|
||||||
|
* @return the height of the ship map
|
||||||
|
*/
|
||||||
|
public int getHeight() {
|
||||||
|
return height;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -39,6 +39,13 @@ default void receivedEvent(InfoTextEvent event) { /* do nothing */ }
|
|||||||
*/
|
*/
|
||||||
default void receivedEvent(SoundEvent event) { /* do nothing */ }
|
default void receivedEvent(SoundEvent event) { /* do nothing */ }
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Indicates that music shall be played.
|
||||||
|
*
|
||||||
|
* @param event the received event
|
||||||
|
*/
|
||||||
|
default void receivedEvent(MusicEvent event) { /* do nothing */ }
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Indicates that the client's state has changed.
|
* Indicates that the client's state has changed.
|
||||||
*
|
*
|
||||||
|
|||||||
@@ -0,0 +1,23 @@
|
|||||||
|
package pp.battleship.notification;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Enumeration representing different types of music used in the game.
|
||||||
|
*/
|
||||||
|
public enum Music {
|
||||||
|
/**
|
||||||
|
* Music for the game.
|
||||||
|
*/
|
||||||
|
GAME_MUSIC,
|
||||||
|
/**
|
||||||
|
* Music for the menu.
|
||||||
|
*/
|
||||||
|
MENU_MUSIC,
|
||||||
|
/**
|
||||||
|
* Music for victory.
|
||||||
|
*/
|
||||||
|
VICTORY_MUSIC,
|
||||||
|
/**
|
||||||
|
* Music for defeat.
|
||||||
|
*/
|
||||||
|
DEFEAT_MUSIC
|
||||||
|
}
|
||||||
@@ -0,0 +1,20 @@
|
|||||||
|
package pp.battleship.notification;
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Event when music is played in the game.
|
||||||
|
*
|
||||||
|
* @param music the music to be played
|
||||||
|
*/
|
||||||
|
public record MusicEvent(Music music) implements GameEvent {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Notifies the game event listener of this event.
|
||||||
|
*
|
||||||
|
* @param listener the game event listener
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
public void notifyListener(GameEventListener listener) {
|
||||||
|
listener.receivedEvent(this);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -22,5 +22,9 @@ public enum Sound {
|
|||||||
/**
|
/**
|
||||||
* Sound of a ship being destroyed.
|
* Sound of a ship being destroyed.
|
||||||
*/
|
*/
|
||||||
DESTROYED_SHIP
|
DESTROYED_SHIP,
|
||||||
|
/**
|
||||||
|
* Sound of a shot being fired.
|
||||||
|
*/
|
||||||
|
SHELL_FIRED
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -24,6 +24,7 @@ button.connect=Connect
|
|||||||
button.cancel=Cancel
|
button.cancel=Cancel
|
||||||
server.dialog=Server
|
server.dialog=Server
|
||||||
host.name=Host
|
host.name=Host
|
||||||
|
host.own-server=Host own server
|
||||||
port.number=Port
|
port.number=Port
|
||||||
wait.its.not.your.turn=Wait, it's not your turn!!
|
wait.its.not.your.turn=Wait, it's not your turn!!
|
||||||
menu.quit=Quit game
|
menu.quit=Quit game
|
||||||
@@ -31,9 +32,11 @@ menu.return-to-game=Return to game
|
|||||||
menu.sound-enabled=Sound switched on
|
menu.sound-enabled=Sound switched on
|
||||||
menu.map.load=Load map from file...
|
menu.map.load=Load map from file...
|
||||||
menu.map.save=Save map in file...
|
menu.map.save=Save map in file...
|
||||||
|
menu.music-toggle=Music on/off
|
||||||
label.file=File:
|
label.file=File:
|
||||||
label.connecting=Connecting...
|
label.connecting=Connecting...
|
||||||
dialog.error=Error
|
dialog.error=Error
|
||||||
dialog.question=Question
|
dialog.question=Question
|
||||||
port.must.be.integer=Port must be an integer number
|
port.must.be.integer=Port must be an integer number
|
||||||
map.doesnt.fit=The map doesn't fit to this game
|
map.doesnt.fit=The map doesn't fit to this game
|
||||||
|
map.invalid=The map is invalid
|
||||||
|
|||||||
@@ -25,15 +25,18 @@ button.cancel=Abbruch
|
|||||||
server.dialog=Server
|
server.dialog=Server
|
||||||
host.name=Host
|
host.name=Host
|
||||||
port.number=Port
|
port.number=Port
|
||||||
|
host.own-server=Server hosten
|
||||||
wait.its.not.your.turn=Warte, Du bist nicht dran!!
|
wait.its.not.your.turn=Warte, Du bist nicht dran!!
|
||||||
menu.quit=Spiel beenden
|
menu.quit=Spiel beenden
|
||||||
menu.return-to-game=Zurück zum Spiel
|
menu.return-to-game=Zurück zum Spiel
|
||||||
menu.sound-enabled=Sound eingeschaltet
|
menu.sound-enabled=Sound eingeschaltet
|
||||||
menu.map.load=Karte von Datei laden...
|
menu.map.load=Karte von Datei laden...
|
||||||
menu.map.save=Karte in Datei speichern...
|
menu.map.save=Karte in Datei speichern...
|
||||||
|
menu.music-toggle=Musik an/aus
|
||||||
label.file=Datei:
|
label.file=Datei:
|
||||||
label.connecting=Verbindung wird aufgebaut...
|
label.connecting=Verbindung wird aufgebaut...
|
||||||
dialog.error=Fehler
|
dialog.error=Fehler
|
||||||
dialog.question=Frage
|
dialog.question=Frage
|
||||||
port.must.be.integer=Der Port muss eine ganze Zahl sein
|
port.must.be.integer=Der Port muss eine ganze Zahl sein
|
||||||
map.doesnt.fit=Diese Karte passt nicht zu diesem Spiel
|
map.doesnt.fit=Diese Karte passt nicht zu diesem Spiel
|
||||||
|
map.invalid=Die Karte ist ungültig
|
||||||
|
|||||||
@@ -18,6 +18,7 @@
|
|||||||
import pp.battleship.game.server.Player;
|
import pp.battleship.game.server.Player;
|
||||||
import pp.battleship.game.server.ServerGameLogic;
|
import pp.battleship.game.server.ServerGameLogic;
|
||||||
import pp.battleship.game.server.ServerSender;
|
import pp.battleship.game.server.ServerSender;
|
||||||
|
import pp.battleship.message.client.AnimationMessage;
|
||||||
import pp.battleship.message.client.ClientMessage;
|
import pp.battleship.message.client.ClientMessage;
|
||||||
import pp.battleship.message.client.MapMessage;
|
import pp.battleship.message.client.MapMessage;
|
||||||
import pp.battleship.message.client.ShootMessage;
|
import pp.battleship.message.client.ShootMessage;
|
||||||
@@ -56,8 +57,7 @@ public class BattleshipServer implements MessageListener<HostedConnection>, Conn
|
|||||||
try {
|
try {
|
||||||
manager.readConfiguration(new FileInputStream("logging.properties"));
|
manager.readConfiguration(new FileInputStream("logging.properties"));
|
||||||
LOGGER.log(Level.INFO, "Successfully read logging properties"); //NON-NLS
|
LOGGER.log(Level.INFO, "Successfully read logging properties"); //NON-NLS
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e) {
|
|
||||||
LOGGER.log(Level.INFO, e.getMessage());
|
LOGGER.log(Level.INFO, e.getMessage());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -92,8 +92,7 @@ private void startServer() {
|
|||||||
myServer.start();
|
myServer.start();
|
||||||
registerListeners();
|
registerListeners();
|
||||||
LOGGER.log(Level.INFO, "Server started: {0}", myServer.isRunning()); //NON-NLS
|
LOGGER.log(Level.INFO, "Server started: {0}", myServer.isRunning()); //NON-NLS
|
||||||
}
|
} catch (IOException e) {
|
||||||
catch (IOException e) {
|
|
||||||
LOGGER.log(Level.ERROR, "Couldn't start server: {0}", e.getMessage()); //NON-NLS
|
LOGGER.log(Level.ERROR, "Couldn't start server: {0}", e.getMessage()); //NON-NLS
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
@@ -102,8 +101,7 @@ private void startServer() {
|
|||||||
private void processNextMessage() {
|
private void processNextMessage() {
|
||||||
try {
|
try {
|
||||||
pendingMessages.take().process(logic);
|
pendingMessages.take().process(logic);
|
||||||
}
|
} catch (InterruptedException ex) {
|
||||||
catch (InterruptedException ex) {
|
|
||||||
LOGGER.log(Level.INFO, "Interrupted while waiting for messages"); //NON-NLS
|
LOGGER.log(Level.INFO, "Interrupted while waiting for messages"); //NON-NLS
|
||||||
Thread.currentThread().interrupt();
|
Thread.currentThread().interrupt();
|
||||||
}
|
}
|
||||||
@@ -114,6 +112,7 @@ private void initializeSerializables() {
|
|||||||
Serializer.registerClass(StartBattleMessage.class);
|
Serializer.registerClass(StartBattleMessage.class);
|
||||||
Serializer.registerClass(MapMessage.class);
|
Serializer.registerClass(MapMessage.class);
|
||||||
Serializer.registerClass(ShootMessage.class);
|
Serializer.registerClass(ShootMessage.class);
|
||||||
|
Serializer.registerClass(AnimationMessage.class);
|
||||||
Serializer.registerClass(EffectMessage.class);
|
Serializer.registerClass(EffectMessage.class);
|
||||||
Serializer.registerClass(Battleship.class);
|
Serializer.registerClass(Battleship.class);
|
||||||
Serializer.registerClass(IntPoint.class);
|
Serializer.registerClass(IntPoint.class);
|
||||||
@@ -123,6 +122,7 @@ private void initializeSerializables() {
|
|||||||
private void registerListeners() {
|
private void registerListeners() {
|
||||||
myServer.addMessageListener(this, MapMessage.class);
|
myServer.addMessageListener(this, MapMessage.class);
|
||||||
myServer.addMessageListener(this, ShootMessage.class);
|
myServer.addMessageListener(this, ShootMessage.class);
|
||||||
|
myServer.addMessageListener(this, AnimationMessage.class);
|
||||||
myServer.addConnectionListener(this);
|
myServer.addConnectionListener(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -163,18 +163,45 @@ public static float atan2(float fY, float fX) {
|
|||||||
return (float) Math.atan2(fY, fX);
|
return (float) Math.atan2(fY, fX);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A direct call to Math.sinh.
|
||||||
|
*
|
||||||
|
* @param x The value for which to compute the hyperbolic sine
|
||||||
|
* @return Math.sinh(x)
|
||||||
|
* @see Math#sinh(double)
|
||||||
|
*/
|
||||||
public static float sinh(float x) {
|
public static float sinh(float x) {
|
||||||
return (float) Math.sinh(x);
|
return (float) Math.sinh(x);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A direct call to Math.cosh.
|
||||||
|
*
|
||||||
|
* @param x The value for which to compute the hyperbolic cosine
|
||||||
|
* @return Math.cosh(x)
|
||||||
|
* @see Math#cosh(double)
|
||||||
|
*/
|
||||||
public static float cosh(float x) {
|
public static float cosh(float x) {
|
||||||
return (float) Math.cosh(x);
|
return (float) Math.cosh(x);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A direct call to Math.tanh.
|
||||||
|
*
|
||||||
|
* @param x The value for which to compute the hyperbolic tangent
|
||||||
|
* @return Math.tanh(x)
|
||||||
|
* @see Math#tanh(double)
|
||||||
|
*/
|
||||||
public static float tanh(float x) {
|
public static float tanh(float x) {
|
||||||
return (float) Math.tanh(x);
|
return (float) Math.tanh(x);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns the hyperbolic cotangent of a value.
|
||||||
|
* @param x The value for which to compute the hyperbolic cotangent.
|
||||||
|
* @return The hyperbolic cotangent of x.
|
||||||
|
* @see Math#tanh(double)
|
||||||
|
*/
|
||||||
public static float coth(float x) {
|
public static float coth(float x) {
|
||||||
return (float) (1d / Math.tanh(x));
|
return (float) (1d / Math.tanh(x));
|
||||||
}
|
}
|
||||||
@@ -239,6 +266,14 @@ public static float exp(float fValue) {
|
|||||||
return (float) Math.exp(fValue);
|
return (float) Math.exp(fValue);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns e^fValue - 1.
|
||||||
|
* This is equivalent to calling Math.expm1.
|
||||||
|
*
|
||||||
|
* @param fValue The exponent to raise e to, minus 1.
|
||||||
|
* @return The result of e^fValue - 1.
|
||||||
|
* @see Math#expm1(double)
|
||||||
|
*/
|
||||||
public static float expm1(float fValue) {
|
public static float expm1(float fValue) {
|
||||||
return (float) Math.expm1(fValue);
|
return (float) Math.expm1(fValue);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -19,6 +19,7 @@
|
|||||||
library('jme3-testdata', 'org.jmonkeyengine', 'jme3-testdata').versionRef('jme')
|
library('jme3-testdata', 'org.jmonkeyengine', 'jme3-testdata').versionRef('jme')
|
||||||
library('jme3-lwjgl', 'org.jmonkeyengine', 'jme3-lwjgl').versionRef('jme')
|
library('jme3-lwjgl', 'org.jmonkeyengine', 'jme3-lwjgl').versionRef('jme')
|
||||||
library('jme3-lwjgl3', 'org.jmonkeyengine', 'jme3-lwjgl3').versionRef('jme')
|
library('jme3-lwjgl3', 'org.jmonkeyengine', 'jme3-lwjgl3').versionRef('jme')
|
||||||
|
library('jme3-effects', 'org.jmonkeyengine', 'jme3-effects').versionRef('jme')
|
||||||
|
|
||||||
library('lemur', 'com.simsilica:lemur:1.16.0')
|
library('lemur', 'com.simsilica:lemur:1.16.0')
|
||||||
library('lemur-proto', 'com.simsilica:lemur-proto:1.13.0')
|
library('lemur-proto', 'com.simsilica:lemur-proto:1.13.0')
|
||||||
|
|||||||