From e75cfe9df299da9705989c51503e3698e295710f Mon Sep 17 00:00:00 2001
From: Jordan <jordan.pereira@etu.unistra.fr>
Date: Wed, 15 Dec 2021 21:01:24 +0100
Subject: [PATCH] Merge Joffrey - Jordan
---
.../{Map_Tests.unity => Map_Tests1.unity} | 95 +-
...Tests.unity.meta => Map_Tests1.unity.meta} | 0
T3-Unity/Assets/Scripts/GameManager.cs | 4 +-
.../Assets/{ => Scripts}/WaypointsFactory.cs | 0
.../{ => Scripts}/WaypointsFactory.cs.meta | 0
T3-Unity/Assets/test.json | 1558 +++++------------
.../ProjectSettings/EditorBuildSettings.asset | 2 +-
7 files changed, 492 insertions(+), 1167 deletions(-)
rename T3-Unity/Assets/Scenes/{Map_Tests.unity => Map_Tests1.unity} (96%)
rename T3-Unity/Assets/Scenes/{Map_Tests.unity.meta => Map_Tests1.unity.meta} (100%)
rename T3-Unity/Assets/{ => Scripts}/WaypointsFactory.cs (100%)
rename T3-Unity/Assets/{ => Scripts}/WaypointsFactory.cs.meta (100%)
diff --git a/T3-Unity/Assets/Scenes/Map_Tests.unity b/T3-Unity/Assets/Scenes/Map_Tests1.unity
similarity index 96%
rename from T3-Unity/Assets/Scenes/Map_Tests.unity
rename to T3-Unity/Assets/Scenes/Map_Tests1.unity
index 632011e..66f9e71 100644
--- a/T3-Unity/Assets/Scenes/Map_Tests.unity
+++ b/T3-Unity/Assets/Scenes/Map_Tests1.unity
@@ -1745,7 +1745,7 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1440548237}
m_CullTransparentMesh: 0
---- !u!1 &1468520958
+--- !u!1 &1521155461
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -1753,44 +1753,97 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 1468520960}
- - component: {fileID: 1468520959}
- m_Layer: 0
- m_Name: Sportifs
+ - component: {fileID: 1521155465}
+ - component: {fileID: 1521155464}
+ - component: {fileID: 1521155463}
+ - component: {fileID: 1521155462}
+ m_Layer: 5
+ m_Name: Canvas_Step2
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!114 &1468520959
+ 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: 1468520958}
- m_Enabled: 0
+ m_GameObject: {fileID: 1521155461}
+ m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 7e94988962f28d44cb28d67668b8f1ad, type: 3}
+ m_Script: {fileID: 1301386320, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
- nbJoueur: 25
- parent: {fileID: 1468520960}
- copy: {fileID: 114736490466060796, guid: 4256cfb91b73ae34aab9be42e6a067de, type: 3}
---- !u!4 &1468520960
-Transform:
+ m_IgnoreReversedGraphics: 1
+ m_BlockingObjects: 0
+ m_BlockingMask:
+ serializedVersion: 2
+ m_Bits: 4294967295
+--- !u!114 &1521155463
+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: 1980459831, guid: f70555f144d8491a825f0804e09c671c, 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: 1468520958}
+ 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:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1521155461}
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: []
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 0, y: 0, z: 0}
+ m_Children:
+ - {fileID: 1831370942}
m_Father: {fileID: 0}
- m_RootOrder: 7
+ m_RootOrder: 4
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
@@ -2019,7 +2072,7 @@ CanvasRenderer:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1831370941}
- m_CullTransparentMesh: 0
+ m_CullTransparentMesh: 1
--- !u!1 &2056313308
GameObject:
m_ObjectHideFlags: 0
diff --git a/T3-Unity/Assets/Scenes/Map_Tests.unity.meta b/T3-Unity/Assets/Scenes/Map_Tests1.unity.meta
similarity index 100%
rename from T3-Unity/Assets/Scenes/Map_Tests.unity.meta
rename to T3-Unity/Assets/Scenes/Map_Tests1.unity.meta
diff --git a/T3-Unity/Assets/Scripts/GameManager.cs b/T3-Unity/Assets/Scripts/GameManager.cs
index 6de9e49..96ae30a 100644
--- a/T3-Unity/Assets/Scripts/GameManager.cs
+++ b/T3-Unity/Assets/Scripts/GameManager.cs
@@ -54,7 +54,7 @@ public class GameManager : MonoBehaviour
canvasStep2.transform.GetChild(0).GetChild(1).gameObject.SetActive(true);
break;
case 1:
- canvasStep2.Destroy();
+ canvasStep2.gameObject.SetActive(false);
break;
}
@@ -103,7 +103,7 @@ public class GameManager : MonoBehaviour
public void lockMovement()
{
map.GetComponent<QuadTreeCameraMovement>().enabled = false;
- canvasStep1.Destroy();
+ canvasStep1.gameObject.SetActive(false);
locked = true;
canvasStep2.GetComponentInChildren<Transform>().gameObject.SetActive(true);
diff --git a/T3-Unity/Assets/WaypointsFactory.cs b/T3-Unity/Assets/Scripts/WaypointsFactory.cs
similarity index 100%
rename from T3-Unity/Assets/WaypointsFactory.cs
rename to T3-Unity/Assets/Scripts/WaypointsFactory.cs
diff --git a/T3-Unity/Assets/WaypointsFactory.cs.meta b/T3-Unity/Assets/Scripts/WaypointsFactory.cs.meta
similarity index 100%
rename from T3-Unity/Assets/WaypointsFactory.cs.meta
rename to T3-Unity/Assets/Scripts/WaypointsFactory.cs.meta
diff --git a/T3-Unity/Assets/test.json b/T3-Unity/Assets/test.json
index f4e9718..4932d41 100644
--- a/T3-Unity/Assets/test.json
+++ b/T3-Unity/Assets/test.json
@@ -15,8 +15,8 @@
69
],
"location": [
- 7.746201,
- 48.580863
+ 7.746558,
+ 48.572156
]
},
{
@@ -26,12 +26,12 @@
false
],
"bearings": [
- 66,
+ 161,
249
],
"location": [
- 7.746349,
- 48.580901
+ 7.746729,
+ 48.5722
],
"in": 1
},
@@ -42,31 +42,31 @@
false
],
"bearings": [
- 67,
- 246
+ 162,
+ 341
],
"location": [
- 7.746387,
- 48.580912
+ 7.746929,
+ 48.571814
],
"in": 1
}
],
- "geometry": "kmogHw|gn@G]AC?CACAGAI",
+ "geometry": "_wmgH__hn@Ga@lAg@DC",
"maneuver": {
"bearing_after": 69,
"type": "depart",
"modifier": null,
"bearing_before": 0,
"Location": [
- 7.746201,
- 48.580863
+ 7.746558,
+ 48.572156
],
- "instruction": "Drive east on Place de la Chaîne d'Or."
+ "instruction": "Drive east on Rue Guido Guersi."
},
- "duration": 5.79,
- "distance": 24.0,
- "name": "Place de la Chaîne d'Or",
+ "duration": 24.62,
+ "distance": 62.235,
+ "name": "Rue Guido Guersi",
"mode": "driving"
},
{
@@ -78,151 +78,203 @@
false
],
"bearings": [
- 151,
- 247
+ 250,
+ 342
],
"location": [
- 7.746495,
- 48.580942
+ 7.746948,
+ 48.571776
],
"in": 1
},
{
- "out": 0,
+ "out": 1,
"entry": [
- true,
- false
+ false,
+ true
],
"bearings": [
- 140,
- 319
+ 70,
+ 252
],
"location": [
- 7.746959,
- 48.580514
+ 7.745795,
+ 48.571497
],
- "in": 1
+ "in": 0
},
{
- "out": 0,
+ "out": 1,
"entry": [
- true,
- false
+ false,
+ true
],
"bearings": [
- 145,
- 320
+ 72,
+ 254
],
"location": [
- 7.747449,
- 48.580126
+ 7.744899,
+ 48.571307
],
- "in": 1
+ "in": 0
+ },
+ {
+ "out": 1,
+ "entry": [
+ false,
+ true
+ ],
+ "bearings": [
+ 79,
+ 260
+ ],
+ "location": [
+ 7.742773,
+ 48.570948
+ ],
+ "in": 0
+ },
+ {
+ "out": 1,
+ "entry": [
+ false,
+ true
+ ],
+ "bearings": [
+ 85,
+ 272
+ ],
+ "location": [
+ 7.740545,
+ 48.570839
+ ],
+ "in": 0
}
],
- "geometry": "{legHc|an@?E?MN_BToCT}B",
+ "geometry": "stmgHmahn@v@fFd@pDd@fEJ`ADj@Hz@Dv@Dl@Dx@BfA@dB?dB@b@@ZAzBAXAPERKVuApD",
"maneuver": {
- "bearing_after": 97,
- "type": "turn",
+ "bearing_after": 250,
+ "type": "end of road",
"modifier": "right",
- "bearing_before": 11,
+ "bearing_before": 162,
"Location": [
- 7.715378,
- 48.529575
+ 7.746948,
+ 48.571776
],
- "instruction": "Turn right onto Rue des Sports."
+ "instruction": "Turn right onto Rue de la Corderie."
},
- "duration": 28.153,
- "distance": 147.0,
- "name": "Rue des Sports",
+ "duration": 70.062,
+ "distance": 648.0,
+ "name": "Rue de la Corderie",
"mode": "driving"
},
{
"intersections": [
{
- "out": 0,
+ "out": 1,
"entry": [
- true,
- false
+ false,
+ true
],
"bearings": [
- 149,
- 327
+ 126,
+ 289
],
"location": [
- 7.747874,
- 48.579711
+ 7.738597,
+ 48.57139
],
- "in": 1
+ "in": 0
}
],
- "geometry": "_kegHehbn@q@Q",
+ "geometry": "ermgHgmfn@GZALAJ?JBNBHBJDD",
"maneuver": {
- "bearing_after": 12,
- "type": "end of road",
- "modifier": "left",
- "bearing_before": 105,
+ "bearing_after": 289,
+ "type": "fork",
+ "modifier": "slight left",
+ "bearing_before": 306,
"Location": [
- 7.717315,
- 48.529275
+ 7.738597,
+ 48.57139
],
- "instruction": "Turn left onto Rue des Menuisiers."
+ "instruction": "Keep left to take Rue du Kuehlager."
},
- "duration": 11.005,
- "distance": 29.0,
- "name": "Rue des Menuisiers",
+ "duration": 5.647,
+ "distance": 45.0,
+ "name": "Rue du Kuehlager",
"mode": "driving"
},
{
"intersections": [
{
- "out": 0,
+ "out": 1,
"entry": [
- true,
- false
+ false,
+ true
],
"bearings": [
- 155,
- 335
+ 60,
+ 201
],
"location": [
- 7.748402,
- 48.57908
+ 7.738045,
+ 48.571355
],
- "in": 1
+ "in": 0
},
{
- "out": 0,
+ "out": 1,
"entry": [
- true,
- false
+ false,
+ true
],
"bearings": [
- 154,
- 335
+ 21,
+ 183
],
"location": [
- 7.748432,
- 48.579038
+ 7.73796,
+ 48.571207
],
- "in": 1
+ "in": 0
},
{
- "out": 0,
+ "out": 1,
"entry": [
- true,
- false
+ false,
+ true
],
"bearings": [
- 154,
- 334
+ 2,
+ 164
],
"location": [
- 7.74851,
- 48.578934
+ 7.737924,
+ 48.570533
],
- "in": 1
- },
+ "in": 0
+ }
+ ],
+ "geometry": "_rmgHyifn@HFFDJBF?j@BrABJAHAFCBCBI?G@S",
+ "maneuver": {
+ "bearing_after": 201,
+ "type": "continue",
+ "modifier": "slight left",
+ "bearing_before": 240,
+ "Location": [
+ 7.738045,
+ 48.571355
+ ],
+ "instruction": "Bear left to stay on Rue du Kuehlager."
+ },
+ "duration": 20.734,
+ "distance": 127.0,
+ "name": "Rue du Kuehlager",
+ "mode": "driving"
+ },
+ {
+ "intersections": [
{
"out": 0,
"entry": [
@@ -230,12 +282,12 @@
false
],
"bearings": [
- 156,
- 335
+ 84,
+ 300
],
"location": [
- 7.74872,
- 48.578647
+ 7.738172,
+ 48.570328
],
"in": 1
},
@@ -246,12 +298,12 @@
false
],
"bearings": [
- 155,
- 336
+ 86,
+ 264
],
"location": [
- 7.748726,
- 48.578638
+ 7.739587,
+ 48.570433
],
"in": 1
},
@@ -262,12 +314,12 @@
false
],
"bearings": [
- 153,
- 335
+ 87,
+ 266
],
"location": [
- 7.748761,
- 48.578588
+ 7.739912,
+ 48.570448
],
"in": 1
},
@@ -278,12 +330,12 @@
false
],
"bearings": [
- 144,
- 333
+ 84,
+ 270
],
"location": [
- 7.748824,
- 48.578507
+ 7.741345,
+ 48.570464
],
"in": 1
},
@@ -294,12 +346,12 @@
false
],
"bearings": [
- 119,
- 324
+ 66,
+ 262
],
"location": [
- 7.748928,
- 48.578413
+ 7.742174,
+ 48.57053
],
"in": 1
},
@@ -310,84 +362,12 @@
false
],
"bearings": [
- 102,
- 291
- ],
- "location": [
- 7.749246,
- 48.578314
- ],
- "in": 1
- }
- ],
- "geometry": "{jegHisbn@CA_EaCWU",
- "maneuver": {
- "bearing_after": 23,
- "type": "end of road",
- "modifier": "left",
- "bearing_before": 101,
- "Location": [
- 7.719091,
- 48.529258
- ],
- "instruction": "Turn left onto Route Burkel."
- },
- "duration": 26.949,
- "distance": 136.0,
- "name": "Route Burkel",
- "mode": "driving"
- },
- {
- "intersections": [
- {
- "out": 0,
- "entry": [
- true,
- false
- ],
- "bearings": [
- 104,
- 281
- ],
- "location": [
- 7.749626,
- 48.578263
- ],
- "in": 1
- }
- ],
- "geometry": "wqegHcxbn@TgA",
- "maneuver": {
- "bearing_after": 115,
- "type": "turn",
- "modifier": "right",
- "bearing_before": 32,
- "Location": [
- 7.719862,
- 48.530364
- ],
- "instruction": "Turn right onto Rue Sodbronn."
- },
- "duration": 7.534,
- "distance": 29.0,
- "name": "Rue Sodbronn",
- "mode": "driving"
- },
- {
- "intersections": [
- {
- "out": 0,
- "entry": [
- true,
- false
- ],
- "bearings": [
- 125,
- 300
+ 80,
+ 246
],
"location": [
- 7.750712,
- 48.577957
+ 7.742453,
+ 48.570611
],
"in": 1
},
@@ -398,31 +378,31 @@
false
],
"bearings": [
- 132,
- 305
+ 71,
+ 252
],
"location": [
- 7.750788,
- 48.577922
+ 7.745524,
+ 48.571137
],
"in": 1
}
],
- "geometry": "aqegHkzbn@?[LyEPgE?C@K@K",
+ "geometry": "qkmgHqjfn@S{GAa@A]A{@?mA?uCEsAGoAOw@IqAKsAQiBWkCUsBSuAQuASmB",
"maneuver": {
- "bearing_after": 94,
+ "bearing_after": 84,
"type": "turn",
"modifier": "slight left",
- "bearing_before": 115,
+ "bearing_before": 120,
"Location": [
- 7.720224,
- 48.530253
+ 7.738172,
+ 48.570328
],
- "instruction": "Bear left onto Rue Lixenbuhl."
+ "instruction": "Bear left onto M 1004."
},
- "duration": 35.306,
- "distance": 176.0,
- "name": "Rue Lixenbuhl",
+ "duration": 44.659,
+ "distance": 628.0,
+ "name": "",
"mode": "driving"
},
{
@@ -434,12 +414,12 @@
false
],
"bearings": [
- 131,
- 312
+ 101,
+ 254
],
"location": [
- 7.75089,
- 48.577861
+ 7.746503,
+ 48.571334
],
"in": 1
},
@@ -450,12 +430,12 @@
false
],
"bearings": [
- 146,
- 317
+ 81,
+ 281
],
"location": [
- 7.751439,
- 48.577497
+ 7.746794,
+ 48.571295
],
"in": 1
},
@@ -466,12 +446,12 @@
false
],
"bearings": [
- 148,
- 326
+ 84,
+ 261
],
"location": [
- 7.751652,
- 48.577289
+ 7.747273,
+ 48.571346
],
"in": 1
},
@@ -482,12 +462,12 @@
false
],
"bearings": [
- 149,
- 328
+ 81,
+ 261
],
"location": [
- 7.751735,
- 48.577202
+ 7.748165,
+ 48.571422
],
"in": 1
},
@@ -498,15 +478,35 @@
false
],
"bearings": [
- 147,
- 329
+ 81,
+ 263
],
"location": [
- 7.751781,
- 48.577152
+ 7.74927,
+ 48.571527
],
"in": 1
- },
+ }
+ ],
+ "geometry": "yqmgHs~gn@Dy@I_BG_CEq@KoBImBO_D",
+ "maneuver": {
+ "bearing_after": 101,
+ "type": "off ramp",
+ "modifier": "slight right",
+ "bearing_before": 74,
+ "Location": [
+ 7.746503,
+ 48.571334
+ ],
+ "instruction": "Take the exit."
+ },
+ "duration": 31.098,
+ "distance": 265.0,
+ "name": "",
+ "mode": "driving"
+ },
+ {
+ "intersections": [
{
"out": 0,
"entry": [
@@ -514,12 +514,12 @@
false
],
"bearings": [
- 146,
- 327
+ 84,
+ 261
],
"location": [
- 7.752297,
- 48.576624
+ 7.750067,
+ 48.571609
],
"in": 1
},
@@ -530,15 +530,35 @@
false
],
"bearings": [
- 144,
- 326
+ 72,
+ 262
],
"location": [
- 7.752885,
- 48.576057
+ 7.750462,
+ 48.571641
],
"in": 1
- },
+ }
+ ],
+ "geometry": "qsmgH}thn@Ao@C]E[",
+ "maneuver": {
+ "bearing_after": 84,
+ "type": "fork",
+ "modifier": "slight right",
+ "bearing_before": 81,
+ "Location": [
+ 7.750067,
+ 48.571609
+ ],
+ "instruction": "Keep right to take M 1004."
+ },
+ "duration": 9.047,
+ "distance": 40.0,
+ "name": "",
+ "mode": "driving"
+ },
+ {
+ "intersections": [
{
"out": 0,
"entry": [
@@ -546,12 +566,12 @@
false
],
"bearings": [
- 147,
- 324
+ 72,
+ 252
],
"location": [
- 7.722601,
- 48.530179
+ 7.750605,
+ 48.571672
],
"in": 1
},
@@ -562,12 +582,12 @@
false
],
"bearings": [
- 102,
- 280
+ 79,
+ 252
],
"location": [
- 7.723748,
- 48.530052
+ 7.750781,
+ 48.57171
],
"in": 1
},
@@ -578,12 +598,12 @@
false
],
"bearings": [
- 105,
- 284
+ 85,
+ 263
],
"location": [
- 7.724684,
- 48.529917
+ 7.752026,
+ 48.571851
],
"in": 1
},
@@ -594,12 +614,12 @@
false
],
"bearings": [
- 104,
- 285
+ 92,
+ 269
],
"location": [
- 7.725166,
- 48.529833
+ 7.752779,
+ 48.571878
],
"in": 1
},
@@ -610,12 +630,12 @@
false
],
"bearings": [
- 104,
- 284
+ 93,
+ 272
],
"location": [
- 7.725241,
- 48.529821
+ 7.753709,
+ 48.571857
],
"in": 1
},
@@ -626,12 +646,12 @@
false
],
"bearings": [
- 104,
- 284
+ 96,
+ 271
],
"location": [
- 7.725357,
- 48.529802
+ 7.754079,
+ 48.571849
],
"in": 1
},
@@ -642,12 +662,12 @@
false
],
"bearings": [
- 104,
- 283
+ 99,
+ 276
],
"location": [
- 7.72672,
- 48.529588
+ 7.754283,
+ 48.571834
],
"in": 1
},
@@ -659,11 +679,11 @@
],
"bearings": [
103,
- 284
+ 281
],
"location": [
- 7.72688,
- 48.529562
+ 7.75485,
+ 48.57177
],
"in": 1
},
@@ -674,12 +694,12 @@
false
],
"bearings": [
- 106,
+ 101,
283
],
"location": [
- 7.72697,
- 48.529548
+ 7.75498,
+ 48.57175
],
"in": 1
},
@@ -690,12 +710,12 @@
false
],
"bearings": [
- 107,
- 286
+ 99,
+ 281
],
"location": [
- 7.727111,
- 48.529521
+ 7.755094,
+ 48.571735
],
"in": 1
},
@@ -707,11 +727,11 @@
],
"bearings": [
102,
- 284
+ 279
],
"location": [
- 7.729395,
- 48.529078
+ 7.755264,
+ 48.571717
],
"in": 1
},
@@ -722,83 +742,35 @@
false
],
"bearings": [
- 100,
+ 107,
282
],
"location": [
- 7.730066,
- 48.528985
+ 7.755777,
+ 48.571644
],
"in": 1
}
],
- "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?",
+ "geometry": "}smgHgxhn@Gc@QmCIkBCkAAiABkD?M@K?G?[?G?QBg@Bs@Dk@@QBY@UBa@HeA@OBQDm@HS",
"maneuver": {
- "bearing_after": 151,
- "type": "end of road",
- "modifier": "right",
- "bearing_before": 67,
+ "bearing_after": 72,
+ "type": "new name",
+ "modifier": "straight",
+ "bearing_before": 72,
"Location": [
- 7.746495,
- 48.580942
+ 7.750605,
+ 48.571672
],
- "instruction": "Turn right onto Rue de la Division Leclerc."
+ "instruction": "Continue on Rue de la Thumenau."
},
- "duration": 276.487,
- "distance": 1216.0,
- "name": "Rue de la Division Leclerc",
+ "duration": 77.34,
+ "distance": 413.0,
+ "name": "Rue de la Thumenau",
"mode": "driving"
},
{
"intersections": [
- {
- "out": 1,
- "entry": [
- false,
- true
- ],
- "bearings": [
- 257,
- 337
- ],
- "location": [
- 7.732328,
- 48.528841
- ],
- "in": 0
- },
- {
- "out": 1,
- "entry": [
- false,
- true
- ],
- "bearings": [
- 157,
- 316
- ],
- "location": [
- 7.732256,
- 48.528951
- ],
- "in": 0
- },
- {
- "out": 1,
- "entry": [
- false,
- true
- ],
- "bearings": [
- 141,
- 341
- ],
- "location": [
- 7.73137,
- 48.529577
- ],
- "in": 0
- },
{
"out": 0,
"entry": [
@@ -806,12 +778,12 @@
false
],
"bearings": [
- 9,
- 189
+ 166,
+ 292
],
"location": [
- 7.731437,
- 48.530457
+ 7.756105,
+ 48.571563
],
"in": 1
},
@@ -822,12 +794,12 @@
false
],
"bearings": [
- 10,
- 189
+ 167,
+ 346
],
"location": [
- 7.731735,
- 48.531675
+ 7.756176,
+ 48.571379
],
"in": 1
},
@@ -838,31 +810,31 @@
false
],
"bearings": [
- 10,
- 190
+ 165,
+ 347
],
"location": [
- 7.731827,
- 48.532005
+ 7.756232,
+ 48.571221
],
"in": 1
}
],
- "geometry": "ghegHafen@ULOV{AdCKLEDMHIBM@S?uB]sF{@aAQMCe@I",
+ "geometry": "gsmgHuzin@b@MHATGXGNK",
"maneuver": {
- "bearing_after": 337,
+ "bearing_after": 166,
"type": "turn",
- "modifier": "left",
- "bearing_before": 77,
+ "modifier": "right",
+ "bearing_before": 112,
"Location": [
- 7.732328,
- 48.528841
+ 7.756105,
+ 48.571563
],
- "instruction": "Turn left onto Rue de l'Industrie."
+ "instruction": "Turn right onto Route du Polygone."
},
- "duration": 58.087,
- "distance": 413.0,
- "name": "Rue de l'Industrie",
+ "duration": 19.477,
+ "distance": 64.0,
+ "name": "Route du Polygone",
"mode": "driving"
},
{
@@ -874,31 +846,31 @@
false
],
"bearings": [
- 103,
- 190
+ 260,
+ 343
],
"location": [
- 7.731899,
- 48.53227
+ 7.756327,
+ 48.571006
],
"in": 1
}
],
- "geometry": "u}egHkcen@@KDe@\\{G?M@K",
+ "geometry": "yomgHa|in@b@rH?F",
"maneuver": {
- "bearing_after": 103,
+ "bearing_after": 260,
"type": "turn",
"modifier": "right",
- "bearing_before": 10,
+ "bearing_before": 163,
"Location": [
- 7.731899,
- 48.53227
+ 7.756327,
+ 48.571006
],
- "instruction": "Turn right onto Rue du Travail."
+ "instruction": "Turn right onto Rue de Nomény."
},
- "duration": 32.798,
- "distance": 135.0,
- "name": "Rue du Travail",
+ "duration": 16.925,
+ "distance": 118.0,
+ "name": "Rue de Nomény",
"mode": "driving"
},
{
@@ -910,35 +882,15 @@
false
],
"bearings": [
- 16,
- 279
+ 9,
+ 80
],
"location": [
- 7.733701,
- 48.532072
+ 7.754745,
+ 48.57083
],
"in": 1
- }
- ],
- "geometry": "m|egHsnen@IC",
- "maneuver": {
- "bearing_after": 16,
- "type": "turn",
- "modifier": "left",
- "bearing_before": 99,
- "Location": [
- 7.733701,
- 48.532072
- ],
- "instruction": "Turn left onto Route du Rhin."
- },
- "duration": 7.705,
- "distance": 6.0,
- "name": "Route du Rhin",
- "mode": "driving"
- },
- {
- "intersections": [
+ },
{
"out": 0,
"entry": [
@@ -946,12 +898,12 @@
false
],
"bearings": [
- 101,
- 196
+ 10,
+ 189
],
"location": [
- 7.733723,
- 48.532123
+ 7.75476,
+ 48.570893
],
"in": 1
},
@@ -962,620 +914,12 @@
false
],
"bearings": [
- 102,
- 282
- ],
- "location": [
- 7.734879,
- 48.531965
- ],
- "in": 1
- },
- {
- "out": 0,
- "entry": [
- true,
- false
- ],
- "bearings": [
- 102,
- 282
- ],
- "location": [
- 7.735472,
- 48.531884
- ],
- "in": 1
- },
- {
- "out": 0,
- "entry": [
- true,
- false
- ],
- "bearings": [
- 107,
- 282
- ],
- "location": [
- 7.736353,
- 48.531763
- ],
- "in": 1
- },
- {
- "out": 0,
- "entry": [
- true,
- false
- ],
- "bearings": [
- 113,
- 293
- ],
- "location": [
- 7.737329,
- 48.531561
- ],
- "in": 1
- },
- {
- "out": 0,
- "entry": [
- true,
- false
- ],
- "bearings": [
- 113,
- 293
- ],
- "location": [
- 7.75893,
- 48.570693
- ],
- "in": 1
- },
- {
- "out": 0,
- "entry": [
- true,
- false
- ],
- "bearings": [
- 106,
- 287
- ],
- "location": [
- 7.75985,
- 48.570435
- ],
- "in": 1
- },
- {
- "out": 0,
- "entry": [
- true,
- false
- ],
- "bearings": [
- 113,
- 293
- ],
- "location": [
- 7.759959,
- 48.570404
- ],
- "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
+ 10,
+ 190
],
"location": [
- 7.77335,
- 48.566982
+ 7.75492,
+ 48.571524
],
"in": 1
},
@@ -1586,12 +930,12 @@
false
],
"bearings": [
- 62,
- 256
+ 10,
+ 191
],
"location": [
- 7.77348,
- 48.567003
+ 7.75498,
+ 48.57175
],
"in": 1
},
@@ -1602,87 +946,51 @@
false
],
"bearings": [
- 62,
- 242
+ 8,
+ 190
],
"location": [
- 7.773598,
- 48.567045
+ 7.755001,
+ 48.571826
],
"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",
+ "geometry": "unmgHerin@KA}B_@QACAGAKCCAOCOC",
"maneuver": {
- "bearing_after": 96,
+ "bearing_after": 9,
"type": "turn",
- "modifier": "left",
- "bearing_before": 182,
+ "modifier": "right",
+ "bearing_before": 260,
"Location": [
- 7.754008,
- 48.571934
+ 7.754745,
+ 48.57083
],
- "instruction": "Turn left onto Rue de la Thumenau."
+ "instruction": "Turn right onto Avenue de Colmar."
},
- "duration": 295.01,
- "distance": 1574.999,
- "name": "Rue de la Thumenau",
+ "duration": 25.087,
+ "distance": 122.0,
+ "name": "Avenue de Colmar",
"mode": "driving"
},
{
"intersections": [
{
- "out": 0,
+ "out": 1,
"entry": [
- true,
- false
+ false,
+ true
],
"bearings": [
- 148,
- 242
+ 188,
+ 282
],
"location": [
- 7.773733,
- 48.567092
+ 7.755018,
+ 48.571906
],
- "in": 1
+ "in": 0
},
- {
- "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": [
@@ -1690,67 +998,31 @@
true
],
"bearings": [
- 6,
- 101
+ 102,
+ 281
],
"location": [
- 7.773742,
- 48.566743
+ 7.754897,
+ 48.571923
],
"in": 0
}
],
- "geometry": "culgH{hmn@LwBJ_C",
+ "geometry": "mumgH{sin@AVG|@",
"maneuver": {
- "bearing_after": 101,
- "type": "turn",
+ "bearing_after": 282,
+ "type": "end of road",
"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,
+ "bearing_before": 8,
"Location": [
- 7.774975,
- 48.566608
+ 7.755018,
+ 48.571906
],
- "instruction": "Turn right onto Rue de Brisach."
+ "instruction": "Turn left onto Avenue Jean Jaurès."
},
- "duration": 6.757,
- "distance": 16.296,
- "name": "Rue de Brisach",
+ "duration": 13.935,
+ "distance": 32.148,
+ "name": "Avenue Jean Jaurès",
"mode": "driving"
},
{
@@ -1761,59 +1033,59 @@
true
],
"bearings": [
- 19
+ 101
],
"location": [
- 7.774902,
- 48.56647
+ 7.754588,
+ 48.571961
],
"in": 0
}
],
- "geometry": "mslgHcpmn@??",
+ "geometry": "wumgHeqin@??",
"maneuver": {
"bearing_after": 0,
"type": "arrive",
- "modifier": "left",
- "bearing_before": 199,
+ "modifier": "right",
+ "bearing_before": 281,
"Location": [
- 7.774902,
- 48.56647
+ 7.754588,
+ 48.571961
],
- "instruction": "Your destination is on the left."
+ "instruction": "Your destination is on the right."
},
"duration": 0.0,
"distance": 0.0,
- "name": "Rue de Brisach",
+ "name": "Avenue Jean Jaurès",
"mode": "driving"
}
],
- "summary": "Rue de la Division Leclerc, Rue de la Thumenau",
- "duration": 617.196,
- "distance": 2964.296,
+ "summary": "Rue de la Corderie, M 1004",
+ "duration": 358.632,
+ "distance": 2564.383,
"annotation": null
}
],
- "geometry": "kmogHw|gn@O{@tFqG|FiEx@cGpAwD|JsK~BiArMoBvDF~@oKzT}jA`A{KjAsCnAeJQcEdAAXwFZN",
- "duration": 617.196,
- "distance": 2964.296,
- "weight": 1335.145,
+ "geometry": "_wmgH__hn@Ga@rAk@bC`Rp@pK@`LiBnFKt@Pv@pDVTIDe@g@_X_DaZDy@}@oSKiBYqDOaGHkHt@mJlBk@b@zHwEu@ItA",
+ "duration": 358.632,
+ "distance": 2564.383,
+ "weight": 556.336,
"weight_name": "auto"
}
],
"waypoints": [
{
- "name": "Place de la Chaîne d'Or",
+ "name": "Rue Guido Guersi",
"location": [
- 7.746201,
- 48.580863
+ 7.746558,
+ 48.572156
]
},
{
- "name": "Rue de Brisach",
+ "name": "Avenue Jean Jaurès",
"location": [
- 7.774902,
- 48.56647
+ 7.754588,
+ 48.571961
]
}
],
diff --git a/T3-Unity/ProjectSettings/EditorBuildSettings.asset b/T3-Unity/ProjectSettings/EditorBuildSettings.asset
index 17638cb..370a76e 100644
--- a/T3-Unity/ProjectSettings/EditorBuildSettings.asset
+++ b/T3-Unity/ProjectSettings/EditorBuildSettings.asset
@@ -12,7 +12,7 @@ EditorBuildSettings:
path: Assets/Scenes/PlacementObject_1.unity
guid: 40275f15a185c5242b37076a9c27b1d1
- enabled: 0
- path: Assets/Scenes/Map_Tests.unity
+ path: Assets/Scenes/Map_Tests1.unity
guid: 32fc8cc296ff6a44ca9e752fdfb4a379
- enabled: 1
path: Assets/Scenes/Main_Menu.unity
--
GitLab