From 4a2a0fd111dccc6cae0d31780ec42c5a38090e5d Mon Sep 17 00:00:00 2001
From: Marc-Antoine Dumont <dumont.marcantoine13@gmail.com>
Date: Thu, 29 Oct 2015 20:42:26 -0400
Subject: [PATCH] First part

---
 Assets/Scenes/Master_Scene.unity  | Bin 10196 -> 17892 bytes
 Assets/Scripts/Class/Character.cs |  12 ++++++++-
 Assets/Scripts/Gravity.cs         |  42 +++++++++++++++++++++++++++++-
 ProjectSettings/TagManager.asset  | Bin 4308 -> 4320 bytes
 4 files changed, 52 insertions(+), 2 deletions(-)

diff --git a/Assets/Scenes/Master_Scene.unity b/Assets/Scenes/Master_Scene.unity
index 18fc9bd81028eb8bf7bd64cf64ac7eba0a66eefe..15cd161e9cc454743ba2cccd493e2a22cc376670 100644
GIT binary patch
delta 5457
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

delta 339
zcmaFT&3MIMg@Hl&KLdmM6$S<deg*~=1t85}s%NBUlxE2A@Bjb*j9d&1o1b!=;oqz$
zcSeYjYqG6*u>$K9Ay<&X3PuKol|ULu0r7vJK@1FRK)J~m%q3XZL5w%%5;h!A)g4R>
z3_3s+F<=Z)%?Xv;0hF5v6c+(wh#VKl00#>RCI-gI%~qC^i*4j53t3NMWSqRz`nL;6
z7N{7k14P420+|j1Fk5RNTn3PHK+HfWAMDO2HYqG1&rH7HqA~e`H47om9a|d~28IO=
YlV$8eAZm47r5PC}Pq34i?Bl=#0D109RsaA1

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 96ec7cebc3d1779bddfa166fd4fcf75919790541..7f9c39ddb6eb907617f0b57f894340e5e6f014b1 100644
GIT binary patch
delta 42
xcmcbj_&||^fr0541B1YWjT|4C7$0o@$;8gf%gDgMzzW1}Ir;fTlNkjr0{{#T3&j8c

delta 32
ocmaE$ctw$efr0541B1YojT|4C7_V&p$;8e(S%H~lvVgz^0IwbjUH||9