Skip to content
Snippets Groups Projects
Commit f34f13b0 authored by timeo's avatar timeo
Browse files

mort si on sort du monde en x sans passer par un panneau

parent 242f2f1f
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
core/src/body/Panneau.java
+ 1
− 1
View file @ f34f13b0
...@@ -33,7 +33,7 @@ public class Panneau { ...@@ -33,7 +33,7 @@ public class Panneau {
fixtureDefStruct.isSensor = true; fixtureDefStruct.isSensor = true;
structBody.createFixture(fixtureDefStruct); structBody.createFixture(fixtureDefStruct).setUserData("panneau");
shapeStruct.dispose(); shapeStruct.dispose();
} }
} }
\ No newline at end of file
core/src/etat/Play.java
+ 29
− 4
View file @ f34f13b0
...@@ -5,9 +5,7 @@ import com.badlogic.gdx.Gdx; ...@@ -5,9 +5,7 @@ import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.files.FileHandle; import com.badlogic.gdx.files.FileHandle;
import com.badlogic.gdx.graphics.GL20; import com.badlogic.gdx.graphics.GL20;
import com.badlogic.gdx.graphics.OrthographicCamera; import com.badlogic.gdx.graphics.OrthographicCamera;
import com.badlogic.gdx.graphics.g2d.BitmapFont;
import com.badlogic.gdx.math.Vector2; import com.badlogic.gdx.math.Vector2;
import com.badlogic.gdx.math.Vector3;
import com.badlogic.gdx.physics.box2d.Body; import com.badlogic.gdx.physics.box2d.Body;
import com.badlogic.gdx.physics.box2d.BodyDef; import com.badlogic.gdx.physics.box2d.BodyDef;
import com.badlogic.gdx.physics.box2d.Box2DDebugRenderer; import com.badlogic.gdx.physics.box2d.Box2DDebugRenderer;
...@@ -21,7 +19,6 @@ import com.mygdx.game.PlatVenture; ...@@ -21,7 +19,6 @@ import com.mygdx.game.PlatVenture;
import body.Joyau; import body.Joyau;
import body.Panneau; import body.Panneau;
import body.Platform; import body.Platform;
import body.Water;
import handlers.ContactListenerPerso; import handlers.ContactListenerPerso;
import handlers.GameStateManager; import handlers.GameStateManager;
import handlers.InputPerso; import handlers.InputPerso;
...@@ -35,6 +32,8 @@ public class Play extends GameState { ...@@ -35,6 +32,8 @@ public class Play extends GameState {
private int temps; private int temps;
private ContactListenerPerso cl; private ContactListenerPerso cl;
private int score = 0; private int score = 0;
private boolean dead = false;
private float totalTimeSinceDeath = 0;
private Body player; private Body player;
...@@ -48,7 +47,7 @@ public class Play extends GameState { ...@@ -48,7 +47,7 @@ public class Play extends GameState {
b2dr = new Box2DDebugRenderer(); b2dr = new Box2DDebugRenderer();
createWorld("assets/level_002.txt"); createWorld("assets/level_001.txt");
createPlayer(); createPlayer();
//Init b2dCam //Init b2dCam
...@@ -89,6 +88,7 @@ public class Play extends GameState { ...@@ -89,6 +88,7 @@ public class Play extends GameState {
} }
joyauToRemove.clear(); joyauToRemove.clear();
death(dt);
// Bouger la caméra en x // Bouger la caméra en x
if (player.getPosition().x * PPM > (float) (PlatVenture.largeur / 2) && player.getPosition().y * PPM <= (float) (PlatVenture.hauteur / 2) if (player.getPosition().x * PPM > (float) (PlatVenture.largeur / 2) && player.getPosition().y * PPM <= (float) (PlatVenture.hauteur / 2)
&& largeur > 16) { && largeur > 16) {
...@@ -208,4 +208,29 @@ public class Play extends GameState { ...@@ -208,4 +208,29 @@ public class Play extends GameState {
player.createFixture(foot).setUserData("foot"); player.createFixture(foot).setUserData("foot");
} }
private boolean isInside(){
boolean isinside = true;
if (player.getPosition().x < -5/PPM){ // Si la totalité du corps du joueur sort
isinside = false;
}
return isinside;
}
private void death(float dt){
if (!isInside() && !cl.isTriggerEndLevel()){
dead = true;
}
if (dead){
if (totalTimeSinceDeath > 2){
player.setLinearVelocity(0, 0);
player.setTransform(15/PPM, 20/PPM, 0);
dead = false;
totalTimeSinceDeath = 0;
} else{
totalTimeSinceDeath += dt;
}
}
}
} }
core/src/handlers/ContactListenerPerso.java
+ 12
− 0
View file @ f34f13b0
...@@ -13,6 +13,7 @@ public class ContactListenerPerso implements ContactListener { ...@@ -13,6 +13,7 @@ public class ContactListenerPerso implements ContactListener {
private int numPlayerOnGround = 0; private int numPlayerOnGround = 0;
Array<Body> bodyToRemove = new Array<Body>(); Array<Body> bodyToRemove = new Array<Body>();
private int score = 0; private int score = 0;
private boolean triggerEndLevel = false;
/** /**
* Appeler quand 2 fixtures rentre en collision * Appeler quand 2 fixtures rentre en collision
...@@ -55,6 +56,13 @@ public class ContactListenerPerso implements ContactListener { ...@@ -55,6 +56,13 @@ public class ContactListenerPerso implements ContactListener {
if (fb.getUserData() != null && fb.getUserData().equals("foot") && fa.getUserData() != null && fa.getUserData().equals("platform")){ if (fb.getUserData() != null && fb.getUserData().equals("foot") && fa.getUserData() != null && fa.getUserData().equals("platform")){
numPlayerOnGround--; numPlayerOnGround--;
} }
if (fa.getUserData() != null && fa.getUserData().equals("panneau") && fb.getUserData() != null && fb.getUserData().equals("body")){
triggerEndLevel = true;
}
else{
triggerEndLevel = false;
}
} }
/** /**
...@@ -88,4 +96,8 @@ public class ContactListenerPerso implements ContactListener { ...@@ -88,4 +96,8 @@ public class ContactListenerPerso implements ContactListener {
public int getScore() { public int getScore() {
return score; return score;
} }
public boolean isTriggerEndLevel() {
return triggerEndLevel;
}
} }
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment