diff --git a/T3-Unity/Assets/Scripts/Button UI.meta b/T3-Unity/Assets/Scripts/Button UI.meta index c8f76efdfd1162fb071ac42b41adbcec9f71be70..263368da5207ee35ef2035efe0c66f2a5b84bc33 100644 --- a/T3-Unity/Assets/Scripts/Button UI.meta +++ b/T3-Unity/Assets/Scripts/Button UI.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 607157bcd612982428eb831284c1bead +guid: 938a99ef3fbf97549b73d5dfa55c7e37 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/T3-Unity/Assets/Scripts/GameManager.cs b/T3-Unity/Assets/Scripts/GameManager.cs index 636ed8802857542f6a2b1aa0243ad3b313e70b8d..d56d09944ee72d7ca2f6d6bcf6ebfb24949ab84a 100644 --- a/T3-Unity/Assets/Scripts/GameManager.cs +++ b/T3-Unity/Assets/Scripts/GameManager.cs @@ -35,7 +35,7 @@ namespace Scripts //! @brief Se répète toutes les 14ms (temps par défaut dans Unity). //! @details Permet deposer les waypoints START et END à partir du clic et de la position de la souris. - //! Active le script @b Route.RouteTracer de manière à tracer les routes entre les deux waypoints. + //! Active le script @b Routes.RouteTracer de manière à tracer les routes entre les deux waypoints. //! La variable @a indexWaypoint sert à récupérer le préfabriquée voulu dans waypoints et pour noter à quel étape de création est le joueur. void Update() { @@ -86,8 +86,6 @@ namespace Scripts _indexWaypoint = 4; } - - //GameObject.Find("GameManager").GetComponent<RouteTracer>().enabled = true; } } diff --git a/T3-Unity/Assets/Scripts/IA.meta b/T3-Unity/Assets/Scripts/IA.meta index 03b0b64c9cf02f94ce03d3e78f4230059554afaa..161176d3d7db0b5889949ad82094800e01ab5541 100644 --- a/T3-Unity/Assets/Scripts/IA.meta +++ b/T3-Unity/Assets/Scripts/IA.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ca46b3b81a6c90243acbcce8edb7659c +guid: 58752ef5665804f44bf9dce4e2876b9b folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/T3-Unity/Assets/Scripts/IA/PlayerController.cs b/T3-Unity/Assets/Scripts/IA/PlayerController.cs deleted file mode 100644 index 2ae88052078c23041751cc817915ca9ce39a4165..0000000000000000000000000000000000000000 --- a/T3-Unity/Assets/Scripts/IA/PlayerController.cs +++ /dev/null @@ -1,62 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class PlayerController : MonoBehaviour -{ - private GameObject player; - public float speed; - public float maxY; - public float minY; - private float trueSpeed; - - // Start is called before the first frame update - void Start() - { - trueSpeed = speed; - player = GameObject.Find("Player"); - } - - // Update is called once per frame - void Update() - { - if (Input.GetKey(KeyCode.Z)) - { - player.transform.Translate(0, 0, 1 * speed); - } - - if (Input.GetKey(KeyCode.Q)) - { - player.transform.Translate(-1 * speed, 0, 0); - } - - if (Input.GetKey(KeyCode.S)) - { - player.transform.Translate(0, 0, -1 * speed); - } - - if (Input.GetKey(KeyCode.D)) - { - player.transform.Translate(1 * speed, 0, 0); - } - - if (Input.GetKey(KeyCode.Space) && player.transform.position.y <= maxY) - { - player.transform.Translate(0, 1 * speed, 0); - } - - if (Input.GetKey(KeyCode.LeftControl) && player.transform.position.y >= minY) - { - player.transform.Translate(0, -1 * speed, 0); - } - - if (Input.GetKey(KeyCode.LeftShift)) - { - speed = 2 * trueSpeed ; - } - else - { - speed = trueSpeed; - } - } -} diff --git a/T3-Unity/Assets/Scripts/Map.meta b/T3-Unity/Assets/Scripts/Map.meta index d43cb2b98d52264444e643cca2f5002f45c78f99..079e0d68d68d54e628a9f06c99e3c36eee374bb2 100644 --- a/T3-Unity/Assets/Scripts/Map.meta +++ b/T3-Unity/Assets/Scripts/Map.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4bd06838c6bae9e4c851fdf644725c43 +guid: 83c92beabb7b86a4c918cc4556b2e513 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/T3-Unity/Assets/Scripts/MapBox.meta b/T3-Unity/Assets/Scripts/MapBox.meta index 2faa8722919132d46157d96ed560c2b36d8bc4d3..c52c9efe86c4fb6275b6f335dd9f3beb4d3c3de4 100644 --- a/T3-Unity/Assets/Scripts/MapBox.meta +++ b/T3-Unity/Assets/Scripts/MapBox.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a7285e8f584ddd243b3351cb522b3b2e +guid: fa99c0f97eade234eab2a35695f083d2 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/T3-Unity/Assets/Scripts/Obstacle.meta b/T3-Unity/Assets/Scripts/Obstacle.meta index 35a6ec1869db913aec6a2e4d08c142d481096d5c..4a0caecc98629f9764f2dcb0ab1c62e4490dfc82 100644 --- a/T3-Unity/Assets/Scripts/Obstacle.meta +++ b/T3-Unity/Assets/Scripts/Obstacle.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 52b8bf46189c1df4b8cf3ad8b5c919cb +guid: 0769b8875758a4f4ca967971659317da folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/T3-Unity/Assets/Scripts/Routes.meta b/T3-Unity/Assets/Scripts/Routes.meta index 7ce4a8bc15ce5e31d3e3f2bf386da4319e3c5cca..26b4016a17f90a428be90104665033ea1c8947d6 100644 --- a/T3-Unity/Assets/Scripts/Routes.meta +++ b/T3-Unity/Assets/Scripts/Routes.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ee1ab971b5d74e047901e5f185470c06 +guid: 70a24ccac175e014a98fc79f9ab7b6fc folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/T3-Unity/Assets/Scripts/UI.meta b/T3-Unity/Assets/Scripts/UI.meta index e22bedd2bba75637f6546309cce11082ed0ebce5..3e527cd4c90e11d8924a09945f734a09dd5e635b 100644 --- a/T3-Unity/Assets/Scripts/UI.meta +++ b/T3-Unity/Assets/Scripts/UI.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 59c69f6cd73b6234d8a16a515649cd32 +guid: e886650e748043842b8b5b204bf6f2ae folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/T3-Unity/Assets/Scripts/Waypoints.meta b/T3-Unity/Assets/Scripts/Waypoints.meta index 682a6f662f0706812ba73058ff60b72b325119ae..f2257ed23f45c309b76524768dcdecbe39b52a53 100644 --- a/T3-Unity/Assets/Scripts/Waypoints.meta +++ b/T3-Unity/Assets/Scripts/Waypoints.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 58f637f77258f2d45aced42fe5d4425d +guid: aab15d0f62ec5e84a8daf5dec909a032 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/T3-Unity/Assets/Scripts/Waypoints/WaypointSpawner.cs b/T3-Unity/Assets/Scripts/Waypoints/WaypointSpawner.cs index 54f5111614512fe09e56096136f7725cf0e7c178..1cef3d1e4acc5febc644ddf14cefd89655d364c0 100644 --- a/T3-Unity/Assets/Scripts/Waypoints/WaypointSpawner.cs +++ b/T3-Unity/Assets/Scripts/Waypoints/WaypointSpawner.cs @@ -6,24 +6,21 @@ using Mapbox.Unity.Utilities; using System.Collections.Generic; + //! @authors Wakestufou + //! @brief "Insérer description rapide" + //! @details "Insérer description détaillée" public class WaypointSpawner : MonoBehaviour { - [SerializeField] - AbstractMap _map; - - [SerializeField] - [Geocode] - string[] _locationStrings; - Vector2d[] _locations; - - [SerializeField] - float _spawnScale = 100f; - - [SerializeField] - GameObject _markerPrefab; - - List<GameObject> _spawnedObjects; + // Champs privés + Vector2d[] _locations; //<! "Insérer description de la variable" + List<GameObject> _spawnedObjects; //<! "Insérer description de la variable" + [SerializeField] AbstractMap _map; //<! "Insérer description de la variable" + [SerializeField] [Geocode] string[] _locationStrings; + [SerializeField] float _spawnScale = 100f; //<! "Insérer description de la variable" + [SerializeField] GameObject _markerPrefab; //<! "Insérer description de la variable" + //! @brief Se lance au lancement du script. + //! @details "Insérer description détaillée" void Start() { _locations = new Vector2d[_locationStrings.Length]; @@ -39,6 +36,8 @@ } } + //! @brief Se répète toutes les 14ms (temps par défaut dans Unity). + //! @details "Insérer description détaillée" private void Update() { int count = _spawnedObjects.Count;