diff --git a/Projekte/battleship/client/src/main/java/pp/battleship/client/gui/SeaSynchronizer.java b/Projekte/battleship/client/src/main/java/pp/battleship/client/gui/SeaSynchronizer.java index 41020354..885ceb5a 100644 --- a/Projekte/battleship/client/src/main/java/pp/battleship/client/gui/SeaSynchronizer.java +++ b/Projekte/battleship/client/src/main/java/pp/battleship/client/gui/SeaSynchronizer.java @@ -19,17 +19,12 @@ import com.jme3.scene.Node; import com.jme3.scene.Spatial; import com.jme3.scene.shape.Box; -import com.jme3.scene.shape.Cylinder; import pp.battleship.client.BattleshipApp; import pp.battleship.model.Battleship; import pp.battleship.model.Rotation; import pp.battleship.model.ShipMap; import pp.battleship.model.Shot; -import java.lang.System.Logger; -import java.lang.System.Logger.Level; - - import static java.util.Objects.requireNonNull; import static pp.util.FloatMath.HALF_PI; import static pp.util.FloatMath.PI; @@ -40,8 +35,7 @@ * It extends the {@link ShipMapSynchronizer} to provide specific synchronization * logic for the sea map. */ -class SeaSynchronizer extends ShipMapSynchronizer { - private static final Logger LOGGER = System.getLogger(SeaSynchronizer.class.getName()); +class SeaSynchronizer extends ShipMapSynchronizer { ; 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 @@ -52,10 +46,7 @@ class SeaSynchronizer extends ShipMapSynchronizer { private static final String ATLANTICA_MODEL = "Models/Atlantica/Atlantica.j3o"; //NON-NLS private static final String COLOR = "Color"; //NON-NLS private static final String SHIP = "ship"; //NON-NLS - private static final String SHOT = "shot"; //NON-NLS 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 BattleshipApp app; @@ -233,7 +224,7 @@ private Spatial createBox(Battleship ship) { 0.3f, 0.5f * (ship.getMaxX() - ship.getMinX()) + 0.3f); final Geometry geometry = new Geometry(SHIP, box); - geometry.setMaterial(createColoredMaterial(BOX_COLOR)); + geometry.setMaterial(createColoredMaterial()); geometry.setShadowMode(ShadowMode.CastAndReceive); return geometry; @@ -245,16 +236,14 @@ private Spatial createBox(Battleship ship) { * the material's render state is set to use alpha blending, allowing for * 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, * if necessary, alpha blending enabled. */ - private Material createColoredMaterial(ColorRGBA color) { + private Material createColoredMaterial() { final Material material = new Material(app.getAssetManager(), UNSHADED); - if (color.getAlpha() < 1f) + if (SeaSynchronizer.BOX_COLOR.getAlpha() < 1f) material.getAdditionalRenderState().setBlendMode(BlendMode.Alpha); - material.setColor(COLOR, color); + material.setColor(COLOR, SeaSynchronizer.BOX_COLOR); return material; } diff --git a/Projekte/battleship/client/src/main/java/pp/battleship/client/gui/ShipControl.java b/Projekte/battleship/client/src/main/java/pp/battleship/client/gui/ShipControl.java index 2e012e90..8c2f0905 100644 --- a/Projekte/battleship/client/src/main/java/pp/battleship/client/gui/ShipControl.java +++ b/Projekte/battleship/client/src/main/java/pp/battleship/client/gui/ShipControl.java @@ -13,7 +13,6 @@ import com.jme3.renderer.ViewPort; import com.jme3.scene.control.AbstractControl; import pp.battleship.model.Battleship; -import pp.battleship.model.ShipMap; import static pp.util.FloatMath.DEG_TO_RAD; import static pp.util.FloatMath.TWO_PI;