fix lane load

autocore-ai · Mar 10, 2020 · 1b1666b · 1b1666b
1 parent f679663
commit 1b1666b
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 5 deletions.
diff --git a/Runtime/Autoware/ADASGo/ADASGoLane.cs b/Runtime/Autoware/ADASGo/ADASGoLane.cs
@@ -26,6 +26,18 @@ sealed class ADASGoLane : LineSegment<ADASGoLane>, IADASMapGameObject
     {
         public GameObject GameObject => gameObject;
         public MonoBehaviour MonoBehaviour => this;
+        ADASGoSlicesLane slices;
+        public ADASGoSlicesLane Slices
+        {
+            get
+            {
+                if (slices)
+                {
+                    slices = GetComponentInParent<ADASGoSlicesLane>();
+                }
+                return slices;
+            }
+        }
         public CollectionADASLane CollectionLane { get; set; }
         [HideInInspector] public ADASMapLane.Jct jct;
         [HideInInspector] public List<ADASGoLane> bLane;

diff --git a/Runtime/Autoware/ADASGo/ADASGoSlicesLane.cs b/Runtime/Autoware/ADASGo/ADASGoSlicesLane.cs
@@ -75,14 +75,26 @@ public void UpdateRef()
                 child.First().UpdateRef();
                 child.Last().UpdateRef();
                 var target = child[0];
-                if (target.bLane != null)
+                if (target.bLane != null && target.bLane.Count > 0)
                 {
-                    bLane = target.bLane.Select(_ => _.GetComponentInParent<ADASGoSlicesLane>()).ToList();
+                    foreach (var item in target.bLane)
+                    {
+                        if (item?.Slices)
+                        {
+                            bLane.Add(item.Slices);
+                        }
+                    }
                 }
                 target = child[child.Length - 1];
-                if (target.fLane != null)
+                if (target.fLane != null && target.fLane.Count > 0)
                 {
-                    fLane = target.fLane.Select(_ => _.GetComponentInParent<ADASGoSlicesLane>()).ToList();
+                    foreach (var item in target.fLane)
+                    {
+                        if (item?.Slices)
+                        {
+                            fLane.Add(item.Slices);
+                        }
+                    }
                 }
             }
             else

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "com.autocore.map-toolbox",
   "displayName": "Autoware Map Toolbox",
-  "version": "0.0.10-preview.4",
+  "version": "0.0.10-preview.5",
   "unity": "2019.3",
   "description": "Map tools for Autoware",
   "dependencies": {