From 1dcca774d5e0922c483dc4957845a875e574c942 Mon Sep 17 00:00:00 2001
From: Ader Alisma 01 <ader.alisma.1@ens.etsmtl.ca>
Date: Fri, 30 Jun 2023 10:33:54 -0400
Subject: [PATCH] Correction des commentaires de merge pour ResourceMaker
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

_rigidbody est la variable contenant Rigidbody2D

Corrigé l'indentation de GenerateResource
---
 Assets/Scripts/Resource/ResourceMaker.cs | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/Assets/Scripts/Resource/ResourceMaker.cs b/Assets/Scripts/Resource/ResourceMaker.cs
index caf188e..f07df52 100644
--- a/Assets/Scripts/Resource/ResourceMaker.cs
+++ b/Assets/Scripts/Resource/ResourceMaker.cs
@@ -13,6 +13,7 @@ public class ResourceMaker : MonoBehaviour
     [SerializeField]
     private Vector2 _endPosition;
     private Vector2 _startPosition;
+    private Rigidbody2D _rigidbody;
     private float _desiredTime = 1.5f;
     private float _timePassed = 0f;
     private bool _isPlaying = false;
@@ -22,8 +23,9 @@ public class ResourceMaker : MonoBehaviour
         _resourceManagerInstance = ResourceManager.Instance;
         _startPosition = transform.position;
         transform.position = new Vector2(transform.position.x, transform.position.y + 0.5f);
-        gameObject.GetComponent<Rigidbody2D>().AddForce(transform.up * 20.0f);
-        gameObject.GetComponent<Rigidbody2D>().gravityScale = 0.1f;
+        _rigidbody = GetComponent<Rigidbody2D>();
+        _rigidbody.AddForce(transform.up * 20.0f);
+        _rigidbody.gravityScale = 0.1f;
     }
 
     /// <summary>
@@ -33,8 +35,8 @@ public class ResourceMaker : MonoBehaviour
     {
         if (Vector2.Distance(transform.position, _startPosition) < 0.01f)
         {
-            gameObject.GetComponent<Rigidbody2D>().gravityScale = 0.0f;
-            gameObject.GetComponent<Rigidbody2D>().velocity = Vector2.zero;
+            _rigidbody.gravityScale = 0.0f;
+            _rigidbody.velocity = Vector2.zero;
         }
 
         if (_isPlaying)
@@ -63,9 +65,10 @@ public class ResourceMaker : MonoBehaviour
         }
     }
 
-    public void GenerateResource(){
+    public void GenerateResource()
+    {
         _isPlaying = true;
-        gameObject.GetComponent<Rigidbody2D>().gravityScale = 0.0f;
-        gameObject.GetComponent<Rigidbody2D>().velocity = Vector2.zero;
+        _rigidbody.gravityScale = 0.0f;
+        _rigidbody.velocity = Vector2.zero;
     }
 }