diff --git a/T3-Unity/Assets/Prefabs/Runner.prefab b/T3-Unity/Assets/Prefabs/Runner.prefab new file mode 100644 index 0000000000000000000000000000000000000000..8dd8c1ff5bfaa831305f31cb96247bbf4a2d34cd --- /dev/null +++ b/T3-Unity/Assets/Prefabs/Runner.prefab @@ -0,0 +1,230 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &625262611286937654 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7880584362641886927} + - component: {fileID: 114736490466060796} + m_Layer: 0 + m_Name: Runner + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7880584362641886927 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 625262611286937654} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 117.85736, y: 2.7792358, z: 82.664764} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 7450415508252682683} + - {fileID: 8674158381984612206} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &114736490466060796 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 625262611286937654} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cf1ed6e0202793488b285ce66b95cc8, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &915889190875002457 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8674158381984612206} + - component: {fileID: 1774386687331026366} + - component: {fileID: 9149670456554055795} + - component: {fileID: 8730312896995346045} + m_Layer: 0 + m_Name: Cylinder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8674158381984612206 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 915889190875002457} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 7880584362641886927} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &1774386687331026366 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 915889190875002457} + m_Mesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &9149670456554055795 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 915889190875002457} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 24f0563fef1133141bb3fbf8d396a44b, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!136 &8730312896995346045 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 915889190875002457} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + m_Radius: 0.5000001 + m_Height: 2 + m_Direction: 1 + m_Center: {x: 0.000000059604645, y: 0, z: -0.00000008940697} +--- !u!1 &7386495333654814808 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7450415508252682683} + - component: {fileID: 3481524135186394163} + - component: {fileID: 331940685426315474} + - component: {fileID: 5146914991577904448} + m_Layer: 0 + m_Name: Sphere + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7450415508252682683 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7386495333654814808} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 1.274, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 7880584362641886927} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &3481524135186394163 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7386495333654814808} + m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &331940685426315474 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7386495333654814808} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 3bcf7eea616b30749a4e57ca3684feb3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!135 &5146914991577904448 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7386495333654814808} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: 0.5 + m_Center: {x: 0, y: 0, z: 0} diff --git a/T3-Unity/Assets/Prefabs/Runner.prefab.meta b/T3-Unity/Assets/Prefabs/Runner.prefab.meta new file mode 100644 index 0000000000000000000000000000000000000000..12843237981e4888d5749bd6bc7cb340f3afc1d0 --- /dev/null +++ b/T3-Unity/Assets/Prefabs/Runner.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 4256cfb91b73ae34aab9be42e6a067de +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/T3-Unity/Assets/Runners.cs b/T3-Unity/Assets/Runners.cs new file mode 100644 index 0000000000000000000000000000000000000000..d59e351fb8f0b46aa9545a4ffa93fcb703b823e3 --- /dev/null +++ b/T3-Unity/Assets/Runners.cs @@ -0,0 +1,42 @@ +using System; +using System.Collections.Generic; +using UnityEngine; + +public class Runners : MonoBehaviour +{ + public float speed = 10f; + + private Transform target; + private int waypointIndex = 0; + + void Start() + { + target = WaypointsFactory.getInstance().getWp()[0]; + + float vitesse = (float.Parse(RunnersFactory.getInstance().getRandom().Next(75, 125).ToString()) / 100f) * 10f; + speed = vitesse; + } + + private void Update() + { + Vector3 dir = target.position - transform.position; + transform.Translate(dir.normalized * speed * Time.deltaTime, Space.World); + + if (Vector3.Distance(transform.position, target.position) <= 0.3f) //Marge d'erreur + { + GetNextWaypoint(); + } + } + + private void GetNextWaypoint() + { + if (waypointIndex >= WaypointsFactory.getInstance().getWp().Count - 1) + { + Destroy(gameObject); + return; + } + + waypointIndex++; + target = WaypointsFactory.getInstance().getWp()[waypointIndex]; + } +} diff --git a/T3-Unity/Assets/Runners.cs.meta b/T3-Unity/Assets/Runners.cs.meta new file mode 100644 index 0000000000000000000000000000000000000000..d18afa0a39f0f051785bf07668538888b5531a5b --- /dev/null +++ b/T3-Unity/Assets/Runners.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 0cf1ed6e0202793488b285ce66b95cc8 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/T3-Unity/Assets/RunnersFactory.cs b/T3-Unity/Assets/RunnersFactory.cs new file mode 100644 index 0000000000000000000000000000000000000000..7a741107b3cc741c1d3ecf043b59c10dce5a8e48 --- /dev/null +++ b/T3-Unity/Assets/RunnersFactory.cs @@ -0,0 +1,37 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class RunnersFactory : MonoBehaviour +{ + public int nbJoueur; + public Transform parent; + public Runners copy; + private System.Random rdn; + private static RunnersFactory instance; + + void Start() + { + instance = this; + rdn = new System.Random(); + for (int i = 0; i<nbJoueur; i++) + { + Instantiate(copy, + new Vector3(WaypointsFactory.getInstance().getWp()[0].transform.position.x, + WaypointsFactory.getInstance().getWp()[0].transform.position.y, + WaypointsFactory.getInstance().getWp()[0].transform.position.z), + new Quaternion(0, 0, 0, 0), parent); + } + } + + public System.Random getRandom() + { + return rdn; + } + + + public static RunnersFactory getInstance() + { + return instance; + } +} diff --git a/T3-Unity/Assets/RunnersFactory.cs.meta b/T3-Unity/Assets/RunnersFactory.cs.meta new file mode 100644 index 0000000000000000000000000000000000000000..3635e14643a65f5b6d2a0625086cff2dcab54f45 --- /dev/null +++ b/T3-Unity/Assets/RunnersFactory.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 7e94988962f28d44cb28d67668b8f1ad +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/T3-Unity/Assets/Scenes/Main_Menu.unity b/T3-Unity/Assets/Scenes/Main_Menu.unity index 1e6600de18e25bc50c06ffc39c14a537b03d9678..d1bf6237d8a0be46e9b763f4c257eaeba5d85708 100644 --- a/T3-Unity/Assets/Scenes/Main_Menu.unity +++ b/T3-Unity/Assets/Scenes/Main_Menu.unity @@ -1278,6 +1278,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2049136973} + - component: {fileID: 2049136974} - component: {fileID: 2049136972} m_Layer: 5 m_Name: SceneChanger @@ -1317,3 +1318,15 @@ RectTransform: m_AnchoredPosition: {x: 458, y: 174.5} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2049136974 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2049136971} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a7edb75851d32e34d95d4cab1584002c, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/T3-Unity/Assets/Scenes/Map_Tests.unity b/T3-Unity/Assets/Scenes/Map_Tests.unity index 92ce9e873249b5ca3a263c9747983f45fcfd88c9..632011efcaa5fe7fac9273181c01a12cbd3de045 100644 --- a/T3-Unity/Assets/Scenes/Map_Tests.unity +++ b/T3-Unity/Assets/Scenes/Map_Tests.unity @@ -1745,7 +1745,7 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1440548237} m_CullTransparentMesh: 0 ---- !u!1 &1521155461 +--- !u!1 &1468520958 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1753,97 +1753,44 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1521155465} - - component: {fileID: 1521155464} - - component: {fileID: 1521155463} - - component: {fileID: 1521155462} - m_Layer: 5 - m_Name: Canvas_Step2 + - component: {fileID: 1468520960} + - component: {fileID: 1468520959} + m_Layer: 0 + m_Name: Sportifs m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!114 &1521155462 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1521155461} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1301386320, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreReversedGraphics: 1 - m_BlockingObjects: 0 - m_BlockingMask: - serializedVersion: 2 - m_Bits: 4294967295 ---- !u!114 &1521155463 + m_IsActive: 1 +--- !u!114 &1468520959 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1521155461} - m_Enabled: 1 + m_GameObject: {fileID: 1468520958} + m_Enabled: 0 m_EditorHideFlags: 0 - m_Script: {fileID: 1980459831, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: 7e94988962f28d44cb28d67668b8f1ad, type: 3} m_Name: m_EditorClassIdentifier: - m_UiScaleMode: 1 - m_ReferencePixelsPerUnit: 100 - m_ScaleFactor: 1 - m_ReferenceResolution: {x: 1920, y: 1080} - m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 0 - m_PhysicalUnit: 3 - m_FallbackScreenDPI: 96 - m_DefaultSpriteDPI: 96 - m_DynamicPixelsPerUnit: 1 ---- !u!223 &1521155464 -Canvas: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1521155461} - m_Enabled: 1 - serializedVersion: 3 - m_RenderMode: 0 - m_Camera: {fileID: 0} - m_PlaneDistance: 100 - m_PixelPerfect: 0 - m_ReceivesEvents: 1 - m_OverrideSorting: 0 - m_OverridePixelPerfect: 0 - m_SortingBucketNormalizedSize: 0 - m_AdditionalShaderChannelsFlag: 25 - m_SortingLayerID: 0 - m_SortingOrder: 0 - m_TargetDisplay: 0 ---- !u!224 &1521155465 -RectTransform: + nbJoueur: 25 + parent: {fileID: 1468520960} + copy: {fileID: 114736490466060796, guid: 4256cfb91b73ae34aab9be42e6a067de, type: 3} +--- !u!4 &1468520960 +Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1521155461} + m_GameObject: {fileID: 1468520958} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0, y: 0, z: 0} - m_Children: - - {fileID: 1831370942} + m_LocalPosition: {x: 117.85736, y: 2.7792358, z: 82.664764} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0, y: 0} --- !u!1 &1756448748 GameObject: m_ObjectHideFlags: 0 diff --git a/T3-Unity/Assets/Scenes/ui.unity b/T3-Unity/Assets/Scenes/ui.unity index 3d2aad00acbcaf0616dcc34f860d37caf6dae0a8..d33ee88885be9c18501e7d4c8b0928657746aed1 100644 --- a/T3-Unity/Assets/Scenes/ui.unity +++ b/T3-Unity/Assets/Scenes/ui.unity @@ -125,7 +125,7 @@ GameObject: - component: {fileID: 31888323} - component: {fileID: 31888322} m_Layer: 5 - m_Name: Button (1) + m_Name: ButtonAppear m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -148,8 +148,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -60} - m_SizeDelta: {x: 160, y: 53.64884} + m_AnchoredPosition: {x: -0.000015259, y: -43} + m_SizeDelta: {x: 254.77808, y: 128.67554} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &31888322 MonoBehaviour: @@ -202,6 +202,17 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + - m_Target: {fileID: 976072095} + m_MethodName: changeButtonsProperty + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!114 &31888323 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1409,6 +1420,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Canvas: {fileID: 1135662969} + Button: {fileID: 31888320} --- !u!4 &976072096 Transform: m_ObjectHideFlags: 0 @@ -2344,7 +2356,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Button + m_text: 'Appear + +' m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} @@ -2413,9 +2427,9 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: 0, w: 0} m_textInfo: textComponent: {fileID: 1834486501} - characterCount: 6 + characterCount: 7 spriteCount: 0 - spaceCount: 0 + spaceCount: 1 wordCount: 1 linkCount: 0 lineCount: 1 diff --git a/T3-Unity/Assets/Scripts/ExitScene.cs b/T3-Unity/Assets/Scripts/ExitScene.cs new file mode 100644 index 0000000000000000000000000000000000000000..8592fe0b9fc6981536d5fc3637e070d11f3fab84 --- /dev/null +++ b/T3-Unity/Assets/Scripts/ExitScene.cs @@ -0,0 +1,12 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class ExitScene : MonoBehaviour +{ + // Start is called before the first frame update + public void Exit() + { + Application.Quit(); + } +} diff --git a/T3-Unity/Assets/Scripts/ExitScene.cs.meta b/T3-Unity/Assets/Scripts/ExitScene.cs.meta new file mode 100644 index 0000000000000000000000000000000000000000..36bd6b17078fca23c4280f2be8d964bbee04b489 --- /dev/null +++ b/T3-Unity/Assets/Scripts/ExitScene.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: a7edb75851d32e34d95d4cab1584002c +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/T3-Unity/Assets/Scripts/MenuToggle.cs b/T3-Unity/Assets/Scripts/MenuToggle.cs index a2e08bfde1047de1498cace7bb79c0e011640c50..f8402db19ce7dd137a35fd5602ca37f8098cc63e 100644 --- a/T3-Unity/Assets/Scripts/MenuToggle.cs +++ b/T3-Unity/Assets/Scripts/MenuToggle.cs @@ -8,7 +8,7 @@ public class MenuToggle : MonoBehaviour { public GameObject Canvas; - + public GameObject Button; void Start() { Canvas.gameObject.SetActive(false); @@ -17,6 +17,11 @@ public class MenuToggle : MonoBehaviour { Canvas.gameObject.SetActive(true); } - + + public void changeButtonsProperty() + { + Button.gameObject.SetActive(false); + } + } diff --git a/T3-Unity/Assets/Scripts/RouteTracer.cs b/T3-Unity/Assets/Scripts/RouteTracer.cs index 6740ceb8882708b26a0db329619fcd21271cfa87..ba3ecec5c3db2aabd704566fca7bc89f4f254856 100644 --- a/T3-Unity/Assets/Scripts/RouteTracer.cs +++ b/T3-Unity/Assets/Scripts/RouteTracer.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System; using UnityEngine; +using Mapbox.Utils; public class RouteTracer : MonoBehaviour { @@ -51,8 +52,15 @@ public class RouteTracer : MonoBehaviour DrawLine(objA.transform.position, objB.transform.position, Color.cyan, 1f); } - //Recalculer les position relative entre les 2 objets - + + GameObject.Find("Player").transform.position = + new Vector3( + (float)((GameObject.FindGameObjectWithTag("start_wp").transform.position.x + GameObject.FindGameObjectWithTag("end_wp").transform.position.x) / 2d), + GameObject.Find("Player").transform.position.y, + (float)((GameObject.FindGameObjectWithTag("start_wp").transform.position.z + GameObject.FindGameObjectWithTag("end_wp").transform.position.z) / 2d) + ); + + GameObject.Find("Sportifs").GetComponent<RunnersFactory>().enabled = true; } void DrawLine(Vector3 start, Vector3 end, Color color, float width) diff --git a/T3-Unity/Assets/Scripts/SceneChanger.cs b/T3-Unity/Assets/Scripts/SceneChanger.cs new file mode 100644 index 0000000000000000000000000000000000000000..0631614c10b561ee1cbadceab3b7f16adba8f76e --- /dev/null +++ b/T3-Unity/Assets/Scripts/SceneChanger.cs @@ -0,0 +1,14 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.SceneManagement; + +public class SceneChanger : MonoBehaviour +{ + public void LoadScene(string sceneName) + { + + SceneManager.LoadScene(sceneName); + } + +} diff --git a/T3-Unity/Assets/Scripts/SceneChanger.cs.meta b/T3-Unity/Assets/Scripts/SceneChanger.cs.meta new file mode 100644 index 0000000000000000000000000000000000000000..32e089908e48d75f007a4b3c49d225f6bbcec16c --- /dev/null +++ b/T3-Unity/Assets/Scripts/SceneChanger.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: d275982db560c1a49843462e3730a0e3 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/T3-Unity/Assets/Scripts/changeplus.cs b/T3-Unity/Assets/Scripts/changeplus.cs index d0859e73d17e85ed6ccbcb498647d2408bf37d3e..d38880b4a4268615957882ee0e4c8689048fb758 100644 --- a/T3-Unity/Assets/Scripts/changeplus.cs +++ b/T3-Unity/Assets/Scripts/changeplus.cs @@ -8,7 +8,7 @@ public class ChangePlus : MonoBehaviour { public static float moins; - + public void changePlus(string word) { diff --git a/T3-Unity/Assets/test.json b/T3-Unity/Assets/test.json index 51cc471308abfbe6f31ed6bc4650ce180f4f9308..f4e9718b5ccb440bd4a94ed09cceb810497f9f0f 100644 --- a/T3-Unity/Assets/test.json +++ b/T3-Unity/Assets/test.json @@ -12,11 +12,11 @@ true ], "bearings": [ - 17 + 69 ], "location": [ - 7.714968, - 48.528406 + 7.746201, + 48.580863 ] }, { @@ -26,31 +26,47 @@ false ], "bearings": [ - 16, - 197 + 66, + 249 + ], + "location": [ + 7.746349, + 48.580901 + ], + "in": 1 + }, + { + "out": 0, + "entry": [ + true, + false + ], + "bearings": [ + 67, + 246 ], "location": [ - 7.714971, - 48.528414 + 7.746387, + 48.580912 ], "in": 1 } ], - "geometry": "qeegHqyan@??k@QUKq@Oo@QSCc@IMC", + "geometry": "kmogHw|gn@G]AC?CACAGAI", "maneuver": { - "bearing_after": 17, + "bearing_after": 69, "type": "depart", "modifier": null, "bearing_before": 0, "Location": [ - 7.714968, - 48.528406 + 7.746201, + 48.580863 ], - "instruction": "Drive north on Avenue Jean Jaurès." + "instruction": "Drive east on Place de la Chaîne d'Or." }, - "duration": 18.56, - "distance": 133.909, - "name": "Avenue Jean Jaurès", + "duration": 5.79, + "distance": 24.0, + "name": "Place de la Chaîne d'Or", "mode": "driving" }, { @@ -62,12 +78,12 @@ false ], "bearings": [ - 97, - 191 + 151, + 247 ], "location": [ - 7.715378, - 48.529575 + 7.746495, + 48.580942 ], "in": 1 }, @@ -78,12 +94,12 @@ false ], "bearings": [ - 103, - 284 + 140, + 319 ], "location": [ - 7.715956, - 48.529497 + 7.746959, + 48.580514 ], "in": 1 }, @@ -94,12 +110,12 @@ false ], "bearings": [ - 105, - 283 + 145, + 320 ], "location": [ - 7.716676, - 48.529386 + 7.747449, + 48.580126 ], "in": 1 } @@ -130,12 +146,12 @@ false ], "bearings": [ - 12, - 285 + 149, + 327 ], "location": [ - 7.717315, - 48.529275 + 7.747874, + 48.579711 ], "in": 1 } @@ -166,12 +182,12 @@ false ], "bearings": [ - 101, - 192 + 155, + 335 ], "location": [ - 7.717398, - 48.529533 + 7.748402, + 48.57908 ], "in": 1 }, @@ -182,12 +198,12 @@ false ], "bearings": [ - 141, - 281 + 154, + 335 ], "location": [ - 7.717897, - 48.529468 + 7.748432, + 48.579038 ], "in": 1 }, @@ -198,12 +214,12 @@ false ], "bearings": [ - 97, - 282 + 154, + 334 ], "location": [ - 7.718145, - 48.52937 + 7.74851, + 48.578934 ], "in": 1 }, @@ -214,35 +230,15 @@ false ], "bearings": [ - 101, - 281 + 156, + 335 ], "location": [ - 7.718471, - 48.529338 + 7.74872, + 48.578647 ], "in": 1 - } - ], - "geometry": "qlegHwhbn@JcBJBFu@?IDu@N{B", - "maneuver": { - "bearing_after": 101, - "type": "turn", - "modifier": "right", - "bearing_before": 12, - "Location": [ - 7.717398, - 48.529533 - ], - "instruction": "Turn right onto Rue de la Mésange." - }, - "duration": 42.771, - "distance": 135.0, - "name": "Rue de la Mésange", - "mode": "driving" - }, - { - "intersections": [ + }, { "out": 0, "entry": [ @@ -250,12 +246,44 @@ false ], "bearings": [ - 23, - 281 + 155, + 336 + ], + "location": [ + 7.748726, + 48.578638 + ], + "in": 1 + }, + { + "out": 0, + "entry": [ + true, + false + ], + "bearings": [ + 153, + 335 + ], + "location": [ + 7.748761, + 48.578588 + ], + "in": 1 + }, + { + "out": 0, + "entry": [ + true, + false + ], + "bearings": [ + 144, + 333 ], "location": [ - 7.719091, - 48.529258 + 7.748824, + 48.578507 ], "in": 1 }, @@ -266,12 +294,28 @@ false ], "bearings": [ - 32, - 204 + 119, + 324 ], "location": [ - 7.719748, - 48.530244 + 7.748928, + 48.578413 + ], + "in": 1 + }, + { + "out": 0, + "entry": [ + true, + false + ], + "bearings": [ + 102, + 291 + ], + "location": [ + 7.749246, + 48.578314 ], "in": 1 } @@ -302,12 +346,12 @@ false ], "bearings": [ - 115, - 212 + 104, + 281 ], "location": [ - 7.719862, - 48.530364 + 7.749626, + 48.578263 ], "in": 1 } @@ -338,12 +382,12 @@ false ], "bearings": [ - 94, - 295 + 125, + 300 ], "location": [ - 7.720224, - 48.530253 + 7.750712, + 48.577957 ], "in": 1 }, @@ -354,12 +398,12 @@ false ], "bearings": [ - 101, - 278 + 132, + 305 ], "location": [ - 7.722533, - 48.530081 + 7.750788, + 48.577922 ], "in": 1 } @@ -390,35 +434,111 @@ false ], "bearings": [ - 3, - 281 + 131, + 312 ], "location": [ - 7.722593, - 48.530073 + 7.75089, + 48.577861 ], "in": 1 - } - ], - "geometry": "}oegHeicn@UA", - "maneuver": { - "bearing_after": 3, - "type": "end of road", - "modifier": "left", - "bearing_before": 101, - "Location": [ - 7.722593, - 48.530073 - ], - "instruction": "Turn left onto Rue Vincent Scotto." - }, - "duration": 8.681, - "distance": 12.0, - "name": "Rue Vincent Scotto", - "mode": "driving" - }, - { - "intersections": [ + }, + { + "out": 0, + "entry": [ + true, + false + ], + "bearings": [ + 146, + 317 + ], + "location": [ + 7.751439, + 48.577497 + ], + "in": 1 + }, + { + "out": 0, + "entry": [ + true, + false + ], + "bearings": [ + 148, + 326 + ], + "location": [ + 7.751652, + 48.577289 + ], + "in": 1 + }, + { + "out": 0, + "entry": [ + true, + false + ], + "bearings": [ + 149, + 328 + ], + "location": [ + 7.751735, + 48.577202 + ], + "in": 1 + }, + { + "out": 0, + "entry": [ + true, + false + ], + "bearings": [ + 147, + 329 + ], + "location": [ + 7.751781, + 48.577152 + ], + "in": 1 + }, + { + "out": 0, + "entry": [ + true, + false + ], + "bearings": [ + 146, + 327 + ], + "location": [ + 7.752297, + 48.576624 + ], + "in": 1 + }, + { + "out": 0, + "entry": [ + true, + false + ], + "bearings": [ + 144, + 326 + ], + "location": [ + 7.752885, + 48.576057 + ], + "in": 1 + }, { "out": 0, "entry": [ @@ -426,8 +546,8 @@ false ], "bearings": [ - 98, - 183 + 147, + 324 ], "location": [ 7.722601, @@ -612,21 +732,21 @@ "in": 1 } ], - "geometry": "spegHgicn@@QBg@RkDN}BH{@@GH}@D[@MBWDk@b@cFD_@@QD[?A`@eDLq@RsBRyBPgCPeCJqCFoBAWEc@", + "geometry": "{mogHs~gn@ROLMTW\\e@jAaBf@i@j@i@~@y@p@i@JEFETOr@g@BA@AHENKBAHIDI@CFODQBYDo@?GBSB]Fg@Hg@Ps@H[HYFOJSVi@n@cAh@i@PQHGhBgBnBuBNONOLMTQNKXOLGHEf@MXCHCbAMd@Kp@IrAOh@ItCi@D?b@?`BDF?P@P?", "maneuver": { - "bearing_after": 98, - "type": "turn", + "bearing_after": 151, + "type": "end of road", "modifier": "right", - "bearing_before": 3, + "bearing_before": 67, "Location": [ - 7.722601, - 48.530179 + 7.746495, + 48.580942 ], - "instruction": "Turn right onto Rue Lixenbuhl." + "instruction": "Turn right onto Rue de la Division Leclerc." }, - "duration": 173.15, - "distance": 738.0, - "name": "Rue Lixenbuhl", + "duration": 276.487, + "distance": 1216.0, + "name": "Rue de la Division Leclerc", "mode": "driving" }, { @@ -890,8 +1010,8 @@ false ], "bearings": [ - 107, - 287 + 113, + 293 ], "location": [ 7.737329, @@ -906,12 +1026,12 @@ false ], "bearings": [ - 107, - 287 + 113, + 293 ], "location": [ - 7.737363, - 48.531554 + 7.75893, + 48.570693 ], "in": 1 }, @@ -926,90 +1046,774 @@ 287 ], "location": [ - 7.737954, - 48.531432 + 7.75985, + 48.570435 ], "in": 1 - } - ], - "geometry": "w|egHwnen@?M@C?I@GXcEPuBVoDf@cE@EVuBRiBh@oG", - "maneuver": { - "bearing_after": 101, - "type": "turn", - "modifier": "right", - "bearing_before": 16, - "Location": [ - 7.733723, - 48.532123 - ], - "instruction": "Turn right onto Chemin du Routoir." - }, - "duration": 122.674, - "distance": 465.0, - "name": "Chemin du Routoir", - "mode": "driving" - }, - { - "intersections": [ + }, { "out": 0, "entry": [ - true + true, + false ], "bearings": [ - 283 + 113, + 293 ], "location": [ - 7.739839, - 48.53112 + 7.759959, + 48.570404 ], - "in": 0 - } - ], - "geometry": "ovegH_ufn@??", - "maneuver": { - "bearing_after": 0, - "type": "arrive", - "modifier": null, - "bearing_before": 103, + "in": 1 + }, + { + "out": 0, + "entry": [ + true, + false + ], + "bearings": [ + 113, + 293 + ], + "location": [ + 7.761074, + 48.570092 + ], + "in": 1 + }, + { + "out": 0, + "entry": [ + true, + false + ], + "bearings": [ + 113, + 293 + ], + "location": [ + 7.761502, + 48.569972 + ], + "in": 1 + }, + { + "out": 0, + "entry": [ + true, + false + ], + "bearings": [ + 113, + 293 + ], + "location": [ + 7.763036, + 48.569543 + ], + "in": 1 + }, + { + "out": 0, + "entry": [ + true, + false + ], + "bearings": [ + 113, + 293 + ], + "location": [ + 7.763155, + 48.56951 + ], + "in": 1 + }, + { + "out": 0, + "entry": [ + true, + false + ], + "bearings": [ + 113, + 293 + ], + "location": [ + 7.763256, + 48.569482 + ], + "in": 1 + }, + { + "out": 0, + "entry": [ + true, + false + ], + "bearings": [ + 113, + 293 + ], + "location": [ + 7.763366, + 48.569451 + ], + "in": 1 + }, + { + "out": 0, + "entry": [ + true, + false + ], + "bearings": [ + 113, + 293 + ], + "location": [ + 7.763398, + 48.569442 + ], + "in": 1 + }, + { + "out": 0, + "entry": [ + true, + false + ], + "bearings": [ + 113, + 293 + ], + "location": [ + 7.764487, + 48.569137 + ], + "in": 1 + }, + { + "out": 0, + "entry": [ + true, + false + ], + "bearings": [ + 113, + 293 + ], + "location": [ + 7.764578, + 48.569112 + ], + "in": 1 + }, + { + "out": 0, + "entry": [ + true, + false + ], + "bearings": [ + 113, + 293 + ], + "location": [ + 7.76515, + 48.56895 + ], + "in": 1 + }, + { + "out": 0, + "entry": [ + true, + false + ], + "bearings": [ + 113, + 293 + ], + "location": [ + 7.765332, + 48.568899 + ], + "in": 1 + }, + { + "out": 0, + "entry": [ + true, + false + ], + "bearings": [ + 113, + 293 + ], + "location": [ + 7.765472, + 48.568859 + ], + "in": 1 + }, + { + "out": 0, + "entry": [ + true, + false + ], + "bearings": [ + 113, + 293 + ], + "location": [ + 7.766534, + 48.568562 + ], + "in": 1 + }, + { + "out": 0, + "entry": [ + true, + false + ], + "bearings": [ + 108, + 293 + ], + "location": [ + 7.766683, + 48.568521 + ], + "in": 1 + }, + { + "out": 0, + "entry": [ + true, + false + ], + "bearings": [ + 113, + 296 + ], + "location": [ + 7.767662, + 48.568254 + ], + "in": 1 + }, + { + "out": 0, + "entry": [ + true, + false + ], + "bearings": [ + 113, + 293 + ], + "location": [ + 7.768011, + 48.568155 + ], + "in": 1 + }, + { + "out": 0, + "entry": [ + true, + false + ], + "bearings": [ + 113, + 293 + ], + "location": [ + 7.768043, + 48.568146 + ], + "in": 1 + }, + { + "out": 0, + "entry": [ + true, + false + ], + "bearings": [ + 85, + 293 + ], + "location": [ + 7.768164, + 48.568112 + ], + "in": 1 + }, + { + "out": 0, + "entry": [ + true, + false + ], + "bearings": [ + 86, + 265 + ], + "location": [ + 7.768269, + 48.568118 + ], + "in": 1 + }, + { + "out": 0, + "entry": [ + true, + false + ], + "bearings": [ + 99, + 266 + ], + "location": [ + 7.768384, + 48.568123 + ], + "in": 1 + }, + { + "out": 0, + "entry": [ + true, + false + ], + "bearings": [ + 102, + 279 + ], + "location": [ + 7.76857, + 48.568103 + ], + "in": 1 + }, + { + "out": 0, + "entry": [ + true, + false + ], + "bearings": [ + 125, + 297 + ], + "location": [ + 7.770438, + 48.567707 + ], + "in": 1 + }, + { + "out": 0, + "entry": [ + true, + false + ], + "bearings": [ + 139, + 305 + ], + "location": [ + 7.770508, + 48.567674 + ], + "in": 1 + }, + { + "out": 0, + "entry": [ + true, + false + ], + "bearings": [ + 135, + 319 + ], + "location": [ + 7.770645, + 48.567571 + ], + "in": 1 + }, + { + "out": 0, + "entry": [ + true, + false + ], + "bearings": [ + 115, + 315 + ], + "location": [ + 7.770822, + 48.567454 + ], + "in": 1 + }, + { + "out": 0, + "entry": [ + true, + false + ], + "bearings": [ + 109, + 289 + ], + "location": [ + 7.771809, + 48.567207 + ], + "in": 1 + }, + { + "out": 0, + "entry": [ + true, + false + ], + "bearings": [ + 109, + 289 + ], + "location": [ + 7.772155, + 48.567128 + ], + "in": 1 + }, + { + "out": 0, + "entry": [ + true, + false + ], + "bearings": [ + 109, + 289 + ], + "location": [ + 7.772333, + 48.567087 + ], + "in": 1 + }, + { + "out": 0, + "entry": [ + true, + false + ], + "bearings": [ + 107, + 289 + ], + "location": [ + 7.772591, + 48.567029 + ], + "in": 1 + }, + { + "out": 0, + "entry": [ + true, + false + ], + "bearings": [ + 93, + 287 + ], + "location": [ + 7.772752, + 48.566997 + ], + "in": 1 + }, + { + "out": 0, + "entry": [ + true, + false + ], + "bearings": [ + 93, + 270 + ], + "location": [ + 7.773232, + 48.566986 + ], + "in": 1 + }, + { + "out": 0, + "entry": [ + true, + false + ], + "bearings": [ + 76, + 273 + ], + "location": [ + 7.77335, + 48.566982 + ], + "in": 1 + }, + { + "out": 0, + "entry": [ + true, + false + ], + "bearings": [ + 62, + 256 + ], + "location": [ + 7.77348, + 48.567003 + ], + "in": 1 + }, + { + "out": 0, + "entry": [ + true, + false + ], + "bearings": [ + 62, + 242 + ], + "location": [ + 7.773598, + 48.567045 + ], + "in": 1 + } + ], + "geometry": "qumgHqmin@NMBg@Bs@Dk@@QBY@UBa@HeA@OBQDm@HSPg@P{@`@kB`@kBp@qDHc@Ha@p@wDFU|@}EVuAnAcHBI@EDUDUDU@Ez@yE??DQZgBBI??Hc@F[??z@sEF]@OBOh@wCDKPeA@EFWAU?UBe@HkARiBPuAHg@DUDSFWBGBER[Va@BMDMd@iDNeAFa@Js@BO@O@S?Q?M?k@@WCYIWAEES", + "maneuver": { + "bearing_after": 96, + "type": "turn", + "modifier": "left", + "bearing_before": 182, + "Location": [ + 7.754008, + 48.571934 + ], + "instruction": "Turn left onto Rue de la Thumenau." + }, + "duration": 295.01, + "distance": 1574.999, + "name": "Rue de la Thumenau", + "mode": "driving" + }, + { + "intersections": [ + { + "out": 0, + "entry": [ + true, + false + ], + "bearings": [ + 148, + 242 + ], + "location": [ + 7.773733, + 48.567092 + ], + "in": 1 + }, + { + "out": 0, + "entry": [ + true, + false + ], + "bearings": [ + 182, + 328 + ], + "location": [ + 7.773783, + 48.567039 + ], + "in": 1 + } + ], + "geometry": "iwlgHyhmn@FG@AHCj@LDA", + "maneuver": { + "bearing_after": 182, + "type": "turn", + "modifier": "right", + "bearing_before": 62, + "Location": [ + 7.773733, + 48.567092 + ], + "instruction": "Turn right onto Avenue Aristide Briand." + }, + "duration": 9.99, + "distance": 41.0, + "name": "Avenue Aristide Briand", + "mode": "driving" + }, + { + "intersections": [ + { + "out": 1, + "entry": [ + false, + true + ], + "bearings": [ + 6, + 101 + ], + "location": [ + 7.773742, + 48.566743 + ], + "in": 0 + } + ], + "geometry": "culgH{hmn@LwBJ_C", + "maneuver": { + "bearing_after": 101, + "type": "turn", + "modifier": "left", + "bearing_before": 186, + "Location": [ + 7.773742, + 48.566743 + ], + "instruction": "Turn left onto Rue Jean Jaurès." + }, + "duration": 23.161, + "distance": 92.0, + "name": "Rue Jean Jaurès", + "mode": "driving" + }, + { + "intersections": [ + { + "out": 0, + "entry": [ + true, + false + ], + "bearings": [ + 199, + 278 + ], + "location": [ + 7.774975, + 48.566608 + ], + "in": 1 + } + ], + "geometry": "itlgHspmn@FDRH", + "maneuver": { + "bearing_after": 199, + "type": "turn", + "modifier": "right", + "bearing_before": 98, + "Location": [ + 7.774975, + 48.566608 + ], + "instruction": "Turn right onto Rue de Brisach." + }, + "duration": 6.757, + "distance": 16.296, + "name": "Rue de Brisach", + "mode": "driving" + }, + { + "intersections": [ + { + "out": 0, + "entry": [ + true + ], + "bearings": [ + 19 + ], + "location": [ + 7.774902, + 48.56647 + ], + "in": 0 + } + ], + "geometry": "mslgHcpmn@??", + "maneuver": { + "bearing_after": 0, + "type": "arrive", + "modifier": "left", + "bearing_before": 199, "Location": [ - 7.739839, - 48.53112 + 7.774902, + 48.56647 ], - "instruction": "You have arrived at your destination." + "instruction": "Your destination is on the left." }, "duration": 0.0, "distance": 0.0, - "name": "Chemin du Routoir", + "name": "Rue de Brisach", "mode": "driving" } ], - "summary": "Rue Lixenbuhl, Chemin du Routoir", - "duration": 573.373, - "distance": 2554.908, + "summary": "Rue de la Division Leclerc, Rue de la Thumenau", + "duration": 617.196, + "distance": 2964.296, "annotation": null } ], - "geometry": "qeegHqyan@iFqAz@aKq@Qt@qI{EyCTgAb@yMUAlFum@\\cMyDnEsNyBf@gJICfEge@", - "duration": 573.373, - "distance": 2554.908, - "weight": 709.684, + "geometry": "kmogHw|gn@O{@tFqG|FiEx@cGpAwD|JsK~BiArMoBvDF~@oKzT}jA`A{KjAsCnAeJQcEdAAXwFZN", + "duration": 617.196, + "distance": 2964.296, + "weight": 1335.145, "weight_name": "auto" } ], "waypoints": [ { - "name": "Avenue Jean Jaurès", + "name": "Place de la Chaîne d'Or", "location": [ - 7.714968, - 48.528406 + 7.746201, + 48.580863 ] }, { - "name": "Chemin du Routoir", + "name": "Rue de Brisach", "location": [ - 7.739839, - 48.53112 + 7.774902, + 48.56647 ] } ],