diff --git a/Assets/Scenes/Master_Scene.unity b/Assets/Scenes/Master_Scene.unity index 18fc9bd..15cd161 100644 Binary files a/Assets/Scenes/Master_Scene.unity and b/Assets/Scenes/Master_Scene.unity differ diff --git a/Assets/Scripts/Class/Character.cs b/Assets/Scripts/Class/Character.cs index 4336d89..7bd42a3 100644 --- a/Assets/Scripts/Class/Character.cs +++ b/Assets/Scripts/Class/Character.cs @@ -4,13 +4,15 @@ public class Character{ private int mass; private int mouvementSpeed { get; set; } private int forceJump { get; set; } + private bool touchingTheFloor; - public Character(int m, int mvtSpeed, int fJump) + public Character(int m, int mvtSpeed, int fJump, bool touchFloor) { this.mass = m; this.mouvementSpeed = mvtSpeed; this.forceJump = fJump; + this.touchingTheFloor = touchFloor; } @@ -23,5 +25,13 @@ public class Character{ this.mass = m; } + public void setTouchingTheFloor(bool touchFloor){ + this.touchingTheFloor = touchFloor; + } + public bool isTouchingTheFloor() + { + return touchingTheFloor; + } + } diff --git a/Assets/Scripts/Gravity.cs b/Assets/Scripts/Gravity.cs index 1a6d1a5..3d73f18 100644 --- a/Assets/Scripts/Gravity.cs +++ b/Assets/Scripts/Gravity.cs @@ -4,9 +4,49 @@ using System.Collections; public class Gravity : MonoBehaviour { public Character player; + void Start() + { + player = new Character(1, 10, 10, false); + } // Update is called once per frame void Update () { - int test = player.getMass(); + + if (!player.isTouchingTheFloor()) + { + this.gameObject.transform.Translate(0,-0.1f,0); + } + + if (Input.GetKey("p")) + { + player.setTouchingTheFloor(false); + } } + + void OnTriggerStay2D(Collider2D other) + { + if (other.gameObject.tag == "Floor") + { + player.setTouchingTheFloor(true); + } + + } + + void OnTriggerExit2D(Collider2D other) + { + if (other.gameObject.tag == "Floor") + { + + player.setTouchingTheFloor(false); + } + + } + + void OnTriggerEnter2D(Collider2D other) + { + if (other.gameObject.tag == "Floor") + { + player.setTouchingTheFloor(true); + } + } } diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 96ec7ce..7f9c39d 100644 Binary files a/ProjectSettings/TagManager.asset and b/ProjectSettings/TagManager.asset differ