Added buildings, trees and persistence to the Virtual World Scene

Samples/05 AISamples/05 AISamples.csproj

@@ -12,6 +12,8 @@
 
   <ItemGroup>
     <None Remove="Common\Resources\Markings.png" />
+    <None Remove="Common\Resources\Tree\Tree1.dae" />
+    <None Remove="Common\Resources\Tree\tree1.json" />
     <None Remove="SceneCWRSelfDrivingCar\Resources\dirt002.dds" />
     <None Remove="SceneCWRSelfDrivingCar\Resources\normal001.dds" />
     <None Remove="SceneStart\pointer.png" />
@@ -29,6 +31,12 @@
     <Content Include="Common\Resources\Markings.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
+    <Content Include="Common\Resources\Tree\Tree1.dae">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Common\Resources\Tree\tree1.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
     <Content Include="SceneCWRSelfDrivingCar\Resources\dirt002.dds">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>

Samples/05 AISamples/Common/Constants.cs

@@ -6,6 +6,8 @@ static class Constants
     {
         public const string CommonResourcesFolder = "Common/Resources/";
         public const string MarkingsTexture = CommonResourcesFolder + "markings.png";
+        public const string TreesResourcesFolder = CommonResourcesFolder + "Tree/";
+        public const string TreesModel = "Tree1.json";
 
         const float Width = 2000f;
         const float Height = 1600f;

Samples/05 AISamples/Common/Resources/Tree/tree1.json

@@ -0,0 +1,3 @@
+{
+  "modelFilename": "tree1.dae"
+}

Samples/05 AISamples/SceneCWRVirtualWorld/Content/BuildingFile.cs

@@ -0,0 +1,9 @@
+
+namespace AISamples.SceneCWRVirtualWorld.Content
+{
+    struct BuildingFile
+    {
+        public PolygonFile Polygon { get; set; }
+        public float Height { get; set; }
+    }
+}

Samples/05 AISamples/SceneCWRVirtualWorld/Content/CrossingFile.cs

@@ -0,0 +1,29 @@
+using AISamples.SceneCWRVirtualWorld.Markings;
+using System;
+
+namespace AISamples.SceneCWRVirtualWorld.Content
+{
+    struct CrossingFile : IMarkingFile
+    {
+        public string Type { get; set; }
+        public Vector2File Position { get; set; }
+        public Vector2File Direction { get; set; }
+        public float Width { get; set; }
+        public float Height { get; set; }
+        public bool Is3D { get; set; }
+
+        public readonly Marking FromMarkingFile()
+        {
+            if (Type != nameof(Crossing))
+            {
+                throw new ArgumentException("Invalid marking file type");
+            }
+
+            return new Crossing(
+                Vector2File.FromVector2File(Position),
+                Vector2File.FromVector2File(Direction),
+                Width,
+                Height);
+        }
+    }
+}

Samples/05 AISamples/SceneCWRVirtualWorld/Content/EnvelopeFile.cs

@@ -0,0 +1,11 @@
+
+namespace AISamples.SceneCWRVirtualWorld.Content
+{
+    struct EnvelopeFile
+    {
+        public Segment2File Skeleton { get; set; }
+        public float Width { get; set; }
+        public int Roundness { get; set; }
+        public PolygonFile Polygon { get; set; }
+    }
+}

Samples/05 AISamples/SceneCWRVirtualWorld/Content/GraphFile.cs

@@ -1,30 +1,9 @@
-using System.Linq;
-
+
 namespace AISamples.SceneCWRVirtualWorld.Content
 {
     struct GraphFile
     {
         public Vector2File[] Points { get; set; }
         public Segment2File[] Segments { get; set; }
-
-        public static GraphFile FromGraph(Graph graph)
-        {
-            var points = graph.GetPoints().Select(Vector2File.FromVector2).ToArray();
-            var segments = graph.GetSegments().Select(Segment2File.FromSegment).ToArray();
-
-            return new()
-            {
-                Points = points,
-                Segments = segments,
-            };
-        }
-
-        public static Graph FromGraphFile(GraphFile graph)
-        {
-            var points = graph.Points.Select(Vector2File.FromVector2File).ToArray();
-            var segments = graph.Segments.Select(Segment2File.FromSegmentFile).ToArray();
-
-            return new(points, segments);
-        }
     }
 }

Samples/05 AISamples/SceneCWRVirtualWorld/Content/IMarkingFile.cs

@@ -0,0 +1,16 @@
+using AISamples.SceneCWRVirtualWorld.Markings;
+
+namespace AISamples.SceneCWRVirtualWorld.Content
+{
+    interface IMarkingFile
+    {
+        string Type { get; set; }
+        Vector2File Position { get; set; }
+        Vector2File Direction { get; set; }
+        float Width { get; set; }
+        float Height { get; set; }
+        bool Is3D { get; set; }
+
+        Marking FromMarkingFile();
+    }
+}

Samples/05 AISamples/SceneCWRVirtualWorld/Content/LightFile.cs

@@ -0,0 +1,35 @@
+using AISamples.SceneCWRVirtualWorld.Markings;
+using System;
+
+namespace AISamples.SceneCWRVirtualWorld.Content
+{
+    struct LightFile : IMarkingFile
+    {
+        public string Type { get; set; }
+        public Vector2File Position { get; set; }
+        public Vector2File Direction { get; set; }
+        public float Width { get; set; }
+        public float Height { get; set; }
+        public bool Is3D { get; set; }
+        public LightState LightState { get; set; }
+        public float RedDuration { get; set; }
+        public float YellowDuration { get; set; }
+        public float GreenDuration { get; set; }
+
+        public readonly Marking FromMarkingFile()
+        {
+            if (Type != nameof(Light))
+            {
+                throw new ArgumentException("Invalid marking file type");
+            }
+
+            return new Light(Vector2File.FromVector2File(Position), Vector2File.FromVector2File(Direction), Width, Height)
+            {
+                LightState = LightState,
+                RedDuration = RedDuration,
+                YellowDuration = YellowDuration,
+                GreenDuration = GreenDuration
+            };
+        }
+    }
+}

Samples/05 AISamples/SceneCWRVirtualWorld/Content/ParkingFile.cs

@@ -0,0 +1,29 @@
+using AISamples.SceneCWRVirtualWorld.Markings;
+using System;
+
+namespace AISamples.SceneCWRVirtualWorld.Content
+{
+    struct ParkingFile : IMarkingFile
+    {
+        public string Type { get; set; }
+        public Vector2File Position { get; set; }
+        public Vector2File Direction { get; set; }
+        public float Width { get; set; }
+        public float Height { get; set; }
+        public bool Is3D { get; set; }
+
+        public readonly Marking FromMarkingFile()
+        {
+            if (Type != nameof(Parking))
+            {
+                throw new ArgumentException("Invalid marking file type");
+            }
+
+            return new Parking(
+                Vector2File.FromVector2File(Position),
+                Vector2File.FromVector2File(Direction),
+                Width,
+                Height);
+        }
+    }
+}

Samples/05 AISamples/SceneCWRVirtualWorld/Content/PolygonFile.cs

@@ -0,0 +1,9 @@
+
+namespace AISamples.SceneCWRVirtualWorld.Content
+{
+    struct PolygonFile
+    {
+        public Vector2File[] Vertices { get; set; }
+        public Segment2File[] Segments { get; set; }
+    }
+}

Samples/05 AISamples/SceneCWRVirtualWorld/Content/Segment2File.cs

@@ -1,25 +1,9 @@
 
-using AISamples.SceneCWRVirtualWorld.Primitives;
-
 namespace AISamples.SceneCWRVirtualWorld.Content
 {
     struct Segment2File
     {
         public Vector2File P1 { get; set; }
         public Vector2File P2 { get; set; }
-
-        public static Segment2File FromSegment(Segment2 segment)
-        {
-            return new()
-            {
-                P1 = Vector2File.FromVector2(segment.P1),
-                P2 = Vector2File.FromVector2(segment.P2),
-            };
-        }
-
-        public static Segment2 FromSegmentFile(Segment2File segment)
-        {
-            return new(Vector2File.FromVector2File(segment.P1), Vector2File.FromVector2File(segment.P2));
-        }
     }
 }

Samples/05 AISamples/SceneCWRVirtualWorld/Content/StartFile.cs

@@ -0,0 +1,29 @@
+using AISamples.SceneCWRVirtualWorld.Markings;
+using System;
+
+namespace AISamples.SceneCWRVirtualWorld.Content
+{
+    struct StartFile : IMarkingFile
+    {
+        public string Type { get; set; }
+        public Vector2File Position { get; set; }
+        public Vector2File Direction { get; set; }
+        public float Width { get; set; }
+        public float Height { get; set; }
+        public bool Is3D { get; set; }
+
+        public readonly Marking FromMarkingFile()
+        {
+            if (Type != nameof(Start))
+            {
+                throw new ArgumentException("Invalid marking file type");
+            }
+
+            return new Start(
+                Vector2File.FromVector2File(Position),
+                Vector2File.FromVector2File(Direction),
+                Width,
+                Height);
+        }
+    }
+}

Samples/05 AISamples/SceneCWRVirtualWorld/Content/StopFile.cs

@@ -0,0 +1,29 @@
+using AISamples.SceneCWRVirtualWorld.Markings;
+using System;
+
+namespace AISamples.SceneCWRVirtualWorld.Content
+{
+    struct StopFile : IMarkingFile
+    {
+        public string Type { get; set; }
+        public Vector2File Position { get; set; }
+        public Vector2File Direction { get; set; }
+        public float Width { get; set; }
+        public float Height { get; set; }
+        public bool Is3D { get; set; }
+
+        public readonly Marking FromMarkingFile()
+        {
+            if (Type != nameof(Stop))
+            {
+                throw new ArgumentException("Invalid marking file type");
+            }
+
+            return new Stop(
+                Vector2File.FromVector2File(Position),
+                Vector2File.FromVector2File(Direction),
+                Width,
+                Height);
+        }
+    }
+}

Samples/05 AISamples/SceneCWRVirtualWorld/Content/TargetFile.cs

@@ -0,0 +1,29 @@
+using AISamples.SceneCWRVirtualWorld.Markings;
+using System;
+
+namespace AISamples.SceneCWRVirtualWorld.Content
+{
+    struct TargetFile : IMarkingFile
+    {
+        public string Type { get; set; }
+        public Vector2File Position { get; set; }
+        public Vector2File Direction { get; set; }
+        public float Width { get; set; }
+        public float Height { get; set; }
+        public bool Is3D { get; set; }
+
+        public readonly Marking FromMarkingFile()
+        {
+            if (Type != nameof(Target))
+            {
+                throw new ArgumentException("Invalid marking file type");
+            }
+
+            return new Target(
+                Vector2File.FromVector2File(Position),
+                Vector2File.FromVector2File(Direction),
+                Width,
+                Height);
+        }
+    }
+}

Samples/05 AISamples/SceneCWRVirtualWorld/Content/TreeFile.cs

@@ -0,0 +1,10 @@
+
+namespace AISamples.SceneCWRVirtualWorld.Content
+{
+    struct TreeFile
+    {
+        public Vector3File Position { get; set; }
+        public float Radius { get; set; }
+        public float Height { get; set; }
+    }
+}

Samples/05 AISamples/SceneCWRVirtualWorld/Content/Vector3File.cs

@@ -0,0 +1,26 @@
+using SharpDX;
+
+namespace AISamples.SceneCWRVirtualWorld.Content
+{
+    struct Vector3File
+    {
+        public float X { get; set; }
+        public float Y { get; set; }
+        public float Z { get; set; }
+
+        public static Vector3File FromVector3(Vector3 vector)
+        {
+            return new()
+            {
+                X = vector.X,
+                Y = vector.Y,
+                Z = vector.Z
+            };
+        }
+
+        public static Vector3 FromVector3File(Vector3File vector)
+        {
+            return new(vector.X, vector.Y, vector.Z);
+        }
+    }
+}

Samples/05 AISamples/SceneCWRVirtualWorld/Content/WorldFile.cs

@@ -0,0 +1,18 @@
+using System;
+
+namespace AISamples.SceneCWRVirtualWorld.Content
+{
+    struct WorldFile
+    {
+        public GraphFile Graph { get; set; }
+        public float Height { get; set; }
+        public Guid Version { get;  set; }
+        public EnvelopeFile[] Envelopes { get; set; }
+        public EnvelopeFile[] RoadEnvelopes { get; set; }
+        public Segment2File[] RoadBorders { get; set; }
+        public BuildingFile[] Buildings { get; set; }
+        public TreeFile[] Trees { get; set; }
+        public Segment2File[] LaneGuides { get; set; }
+        public IMarkingFile[] Markings { get; set; }
+    }
+}