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

bug fix

Browse Source 
fixed first few fire frames being displayed at the edge of the map
added README.txt files for used images
This commit is contained in:
Timo Brennförder
2024-10-10 23:26:15 +02:00
parent 24f20f855f
commit 264b854cbe
5 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Projekte/battleship/client/src/main/java/pp/battleship/client/gui/HitEffectHandler.java
View File

@@ -57,11 +57,11 @@ public void hitEffect(Node battleshipNode, Shot shot){
debris.setMaterial(debrisMaterial); debris.setMaterial(debrisMaterial);
debris.setImagesX(2); debris.setImagesX(2);
debris.setImagesY(2); debris.setImagesY(2);
debris.setStartColor(ColorRGBA.DarkGray); debris.setStartColor(ColorRGBA.White);
debris.setEndColor(ColorRGBA.Gray); debris.setEndColor(ColorRGBA.White);
debris.getParticleInfluencer().setInitialVelocity(new Vector3f(0.25f, 2f, 0.25f)); debris.getParticleInfluencer().setInitialVelocity(new Vector3f(0.25f, 2f, 0.25f));
debris.setStartSize(1.2f); debris.setStartSize(0.25f);
debris.setEndSize(0.8f); debris.setEndSize(0.1f);
debris.setGravity(0, 1.5f, 0); debris.setGravity(0, 1.5f, 0);
debris.getParticleInfluencer().setVelocityVariation(0.3f); debris.getParticleInfluencer().setVelocityVariation(0.3f);
debris.setLowLife(1f); debris.setLowLife(1f);
@@ -87,6 +87,7 @@ public void hitEffect(Node battleshipNode, Shot shot){
fire.getParticleInfluencer().setVelocityVariation(0.2f); fire.getParticleInfluencer().setVelocityVariation(0.2f);
fire.setLocalTranslation(shot.getY() + 0.5f, 0f, shot.getX() + 0.5f); fire.setLocalTranslation(shot.getY() + 0.5f, 0f, shot.getX() + 0.5f);
fire.getLocalTranslation().subtractLocal(battleshipNode.getLocalTranslation()); fire.getLocalTranslation().subtractLocal(battleshipNode.getLocalTranslation());
battleshipNode.attachChild(fire);
fire.emitAllParticles(); fire.emitAllParticles();
// LOGGER.log(Level.DEBUG, "Created HitEffect at {0}", explosion.getLocalTranslation().toString()); // LOGGER.log(Level.DEBUG, "Created HitEffect at {0}", explosion.getLocalTranslation().toString());
@@ -96,7 +97,6 @@ public void hitEffect(Node battleshipNode, Shot shot){
battleshipNode.attachChild(explosion); battleshipNode.attachChild(explosion);
explosion.addControl(new EffectControl(explosion, battleshipNode)); explosion.addControl(new EffectControl(explosion, battleshipNode));
battleshipNode.attachChild(fire);
fire.addControl(new EffectControl(fire, battleshipNode)); fire.addControl(new EffectControl(fire, battleshipNode));
battleshipNode.attachChild(debris); battleshipNode.attachChild(debris);
debris.addControl(new EffectControl(debris, battleshipNode)); debris.addControl(new EffectControl(debris, battleshipNode));

2
Projekte/battleship/client/src/main/resources/Textures/Debris/README.txt Normal file
View File

@@ -0,0 +1,2 @@
Created using Metal Plates 13 from ambientCG.com,
licensed under the Creative Commons CC0 1.0 Universal License.

BIN
Projekte/battleship/client/src/main/resources/Textures/Debris/debris.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 32 KiB

After

Width:  |  Height:  |  Size: 5.8 MiB

2
Projekte/battleship/client/src/main/resources/Textures/Fire/README.txt Normal file
View File

@@ -0,0 +1,2 @@
https://www.rawpixel.com/image/13141087/png-fire-bonfire-illuminated-destruction-generated-image-rawpixel
Licence: Free for personal use

BIN
Projekte/battleship/client/src/main/resources/Textures/Fire/fire.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.5 MiB

After

Width:  |  Height:  |  Size: 3.4 MiB