ENSEEIHT/projet-programmation-orientee-objet
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

chore: formatting + clickbutton trimmed

Browse source
This commit is contained in:
Laureηt 2021-05-27 11:46:26 +02:00
parent 68693e1cff
commit 24e0f429c3
6 changed files with 28 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
core/assets/sounds/effects/clickbutton_trim.mp3 Normal file
View file

Binary file not shown.

BIN
core/assets/sounds/effects/player_death_trim.mp3 Normal file
View file

Binary file not shown.

20
core/src/sagittarius/view/ButtonSounded/ButtonTextSounded.java
View file

@ -3,29 +3,27 @@ package sagittarius.view.ButtonSounded;
import com.badlogic.gdx.Gdx; import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.scenes.scene2d.InputEvent; import com.badlogic.gdx.scenes.scene2d.InputEvent;
import com.badlogic.gdx.scenes.scene2d.utils.ActorGestureListener; import com.badlogic.gdx.scenes.scene2d.utils.ActorGestureListener;
import com.badlogic.gdx.audio.Sound; import com.badlogic.gdx.audio.Sound;
import sagittarius.SagittariusGame; import sagittarius.SagittariusGame;
public class ButtonTextSounded extends com.kotcrab.vis.ui.widget.VisTextButton{ public class ButtonTextSounded extends com.kotcrab.vis.ui.widget.VisTextButton {
private Sound buttonclicked = Gdx.audio.newSound(Gdx.files.internal("sounds/effects/clickbutton.mp3")); private Sound buttonclicked =
Gdx.audio.newSound(Gdx.files.internal("sounds/effects/clickbutton_trim.mp3"));
public ButtonTextSounded(String name){ public ButtonTextSounded(String name) {
super(name); super(name);
this.addListener(new ActorGestureListener() { this.addListener(new ActorGestureListener() {
@Override @Override
public void tap(InputEvent event, float x, float y, int count, int button) { public void tap(InputEvent event, float x, float y, int count, int button) {
super.tap(event, x, y, count, button); super.tap(event, x, y, count, button);
if (!SagittariusGame.disableSounds) {
buttonclicked.play();
if ( !SagittariusGame.disableSounds){
buttonclicked.play();
} }
} }
}); });
} }
} }

20
core/src/sagittarius/view/ButtonSounded/CheckBoxSounded.java
View file

@ -3,29 +3,27 @@ package sagittarius.view.ButtonSounded;
import com.badlogic.gdx.Gdx; import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.scenes.scene2d.InputEvent; import com.badlogic.gdx.scenes.scene2d.InputEvent;
import com.badlogic.gdx.scenes.scene2d.utils.ActorGestureListener; import com.badlogic.gdx.scenes.scene2d.utils.ActorGestureListener;
import com.badlogic.gdx.audio.Sound; import com.badlogic.gdx.audio.Sound;
import sagittarius.SagittariusGame; import sagittarius.SagittariusGame;
public class CheckBoxSounded extends com.kotcrab.vis.ui.widget.VisCheckBox{ public class CheckBoxSounded extends com.kotcrab.vis.ui.widget.VisCheckBox {
private Sound buttonclicked = Gdx.audio.newSound(Gdx.files.internal("sounds/effects/clickbutton.mp3")); private Sound buttonclicked =
Gdx.audio.newSound(Gdx.files.internal("sounds/effects/clickbutton_trim.mp3"));
public CheckBoxSounded(String name){ public CheckBoxSounded(String name) {
super(name); super(name);
this.addListener(new ActorGestureListener() { this.addListener(new ActorGestureListener() {
@Override @Override
public void tap(InputEvent event, float x, float y, int count, int button) { public void tap(InputEvent event, float x, float y, int count, int button) {
super.tap(event, x, y, count, button); super.tap(event, x, y, count, button);
if (!SagittariusGame.disableSounds) {
buttonclicked.play();
if ( !SagittariusGame.disableSounds){
buttonclicked.play();
} }
} }
}); });
} }
} }

20
core/src/sagittarius/view/ButtonSounded/SpinnerSounded.java
View file

@ -4,29 +4,27 @@ import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.scenes.scene2d.InputEvent; import com.badlogic.gdx.scenes.scene2d.InputEvent;
import com.badlogic.gdx.scenes.scene2d.utils.ActorGestureListener; import com.badlogic.gdx.scenes.scene2d.utils.ActorGestureListener;
import com.kotcrab.vis.ui.widget.spinner.SimpleFloatSpinnerModel; import com.kotcrab.vis.ui.widget.spinner.SimpleFloatSpinnerModel;
import com.badlogic.gdx.audio.Sound; import com.badlogic.gdx.audio.Sound;
import sagittarius.SagittariusGame; import sagittarius.SagittariusGame;
public class SpinnerSounded extends com.kotcrab.vis.ui.widget.spinner.Spinner{ public class SpinnerSounded extends com.kotcrab.vis.ui.widget.spinner.Spinner {
private Sound buttonclicked = Gdx.audio.newSound(Gdx.files.internal("sounds/effects/clickbutton.mp3")); private Sound buttonclicked =
Gdx.audio.newSound(Gdx.files.internal("sounds/effects/clickbutton_trim.mp3"));
public SpinnerSounded(String name,SimpleFloatSpinnerModel SpinnerModel){ public SpinnerSounded(String name, SimpleFloatSpinnerModel SpinnerModel) {
super(name,SpinnerModel); super(name, SpinnerModel);
this.addListener(new ActorGestureListener() { this.addListener(new ActorGestureListener() {
@Override @Override
public void tap(InputEvent event, float x, float y, int count, int button) { public void tap(InputEvent event, float x, float y, int count, int button) {
super.tap(event, x, y, count, button); super.tap(event, x, y, count, button);
if (!SagittariusGame.disableSounds) {
buttonclicked.play();
if ( !SagittariusGame.disableSounds){
buttonclicked.play();
} }
} }
}); });
} }
} }

2
desktop/src/sagittarius/desktop/DesktopLauncher.java
View file

@ -17,4 +17,4 @@ public class DesktopLauncher {
new Lwjgl3Application(new SagittariusGame(), config); new Lwjgl3Application(new SagittariusGame(), config);
} }
} }