peet/Gruppe-02-clone
1
0
Fork 0
mirror of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02.git synced 2024-11-28 17:49:44 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed sizes of the boats

Browse Source
This commit is contained in:
Tamino Mueller 2024-10-11 10:22:17 +02:00
parent 2b8bfb82ba
commit 2192f6dbc3
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Projekte/Boje.j3o Normal file
View File

Binary file not shown.

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

@ -150,8 +150,7 @@ class SeaSynchronizer extends ShipMapSynchronizer {
private Spatial createShip(Battleship ship) { private Spatial createShip(Battleship ship) {
switch (ship.getLength()) { switch (ship.getLength()) {
case 1:
return createBoje(ship);
case 2: case 2:
return createUX23(ship); return createUX23(ship);
@ -160,7 +159,7 @@ class SeaSynchronizer extends ShipMapSynchronizer {
return createMarlow66(ship); return createMarlow66(ship);
case 4: case 4:
return createBattleship(ship); return createBattleship(ship);
case 5: case 1:
return createAllienship(ship); return createAllienship(ship);
default: default:
@ -171,7 +170,7 @@ class SeaSynchronizer extends ShipMapSynchronizer {
final Spatial model = app.getAssetManager().loadModel(ALIENSHIP); final Spatial model = app.getAssetManager().loadModel(ALIENSHIP);
model.rotate(-HALF_PI, calculateRotationAngle(ship.getRot()), 0f); model.rotate(-HALF_PI, calculateRotationAngle(ship.getRot()), 0f);
model.scale(0.05f); model.scale(0.10f);
model.setShadowMode(ShadowMode.CastAndReceive); model.setShadowMode(ShadowMode.CastAndReceive);
return model;} return model;}
@ -180,7 +179,7 @@ class SeaSynchronizer extends ShipMapSynchronizer {
model.rotate(-HALF_PI, calculateRotationAngle(ship.getRot()), 0f); model.rotate(-HALF_PI, calculateRotationAngle(ship.getRot()), 0f);
// model.move(0f, -0.05f, 0f); // model.move(0f, -0.05f, 0f);
model.scale(0.27f); model.scale(0.89f);
model.setShadowMode(ShadowMode.CastAndReceive); model.setShadowMode(ShadowMode.CastAndReceive);
return model; return model;
@ -192,7 +191,7 @@ class SeaSynchronizer extends ShipMapSynchronizer {
model.rotate(0f, calculateRotationAngle(ship.getRot()), 0f); model.rotate(0f, calculateRotationAngle(ship.getRot()), 0f);
model.move(0f, 0.25f, 0f); model.move(0f, 0.25f, 0f);
model.scale(0.0185f); model.scale(0.135f);
model.setShadowMode(ShadowMode.CastAndReceive); model.setShadowMode(ShadowMode.CastAndReceive);
return model; return model;
@ -202,8 +201,8 @@ class SeaSynchronizer extends ShipMapSynchronizer {
final Spatial model = app.getAssetManager().loadModel(BOJE); final Spatial model = app.getAssetManager().loadModel(BOJE);
model.rotate(0f, calculateRotationAngle(ship.getRot()), 0f); model.rotate(0f, calculateRotationAngle(ship.getRot()), 0f);
model.move(0.25f, 0.00f, 0.25f); model.move(0.00f, 0.25f, 0.00f);
model.scale(1.1f); model.scale(12.23f);
model.setShadowMode(ShadowMode.CastAndReceive); model.setShadowMode(ShadowMode.CastAndReceive);
return model; return model;