Connector to GeographicalConnector for attached decorations

EliphasNUIT · EliphasNUIT · commit 4a8aaf239913 · 2023-12-23T15:04:29.000+01:00
diff --git a/GW2EIEvtcParser/EIData/CombatReplay/Decorations/CircleDecoration.cs b/GW2EIEvtcParser/EIData/CombatReplay/Decorations/CircleDecoration.cs
@@ -7,22 +7,22 @@ internal class CircleDecoration : FormDecoration
         public int Radius { get; }
         public int MinRadius { get; }
 
-        public CircleDecoration(int radius, (long start, long end) lifespan, string color, Connector connector) : base(lifespan, color, connector)
+        public CircleDecoration(int radius, (long start, long end) lifespan, string color, GeographicalConnector connector) : base(lifespan, color, connector)
         {
             Radius = radius;
         }
 
-        public CircleDecoration(int radius, int minRadius, (long start, long end) lifespan, string color, Connector connector) : base(lifespan, color, connector)
+        public CircleDecoration(int radius, int minRadius, (long start, long end) lifespan, string color, GeographicalConnector connector) : base(lifespan, color, connector)
         {
             Radius = radius;
             MinRadius = minRadius;
         }
 
-        public CircleDecoration(int radius, Segment lifespan, string color, Connector connector) : this(radius, (lifespan.Start, lifespan.End), color, connector)
+        public CircleDecoration(int radius, Segment lifespan, string color, GeographicalConnector connector) : this(radius, (lifespan.Start, lifespan.End), color, connector)
         {
         }
 
-        public CircleDecoration(int radius, int minRadius, Segment lifespan, string color, Connector connector) : this(radius, minRadius, (lifespan.Start, lifespan.End), color, connector)
+        public CircleDecoration(int radius, int minRadius, Segment lifespan, string color, GeographicalConnector connector) : this(radius, minRadius, (lifespan.Start, lifespan.End), color, connector)
         {
         }
 
diff --git a/GW2EIEvtcParser/EIData/CombatReplay/Decorations/DoughnutDecoration.cs b/GW2EIEvtcParser/EIData/CombatReplay/Decorations/DoughnutDecoration.cs
@@ -7,7 +7,7 @@ internal class DoughnutDecoration : FormDecoration
         public int OuterRadius { get; }
         public int InnerRadius { get; }
 
-        public DoughnutDecoration(int innerRadius, int outerRadius, (long start, long end) lifespan, string color, Connector connector) : base(lifespan, color, connector)
+        public DoughnutDecoration(int innerRadius, int outerRadius, (long start, long end) lifespan, string color, GeographicalConnector connector) : base(lifespan, color, connector)
         {
             InnerRadius = innerRadius;
             OuterRadius = outerRadius;
diff --git a/GW2EIEvtcParser/EIData/CombatReplay/Decorations/FormDecoration.cs b/GW2EIEvtcParser/EIData/CombatReplay/Decorations/FormDecoration.cs
@@ -10,7 +10,7 @@ internal abstract class FormDecoration : GenericAttachedDecoration
         public int GrowingEnd { get; private set; }
         public bool GrowingReverse { get; private set; }
 
-        protected FormDecoration((long , long) lifespan, string color, Connector connector) : base(lifespan, connector)
+        protected FormDecoration((long , long) lifespan, string color, GeographicalConnector connector) : base(lifespan, connector)
         {
             Color = color;
         }
diff --git a/GW2EIEvtcParser/EIData/CombatReplay/Decorations/GenericAttachedDecoration.cs b/GW2EIEvtcParser/EIData/CombatReplay/Decorations/GenericAttachedDecoration.cs
@@ -6,11 +6,11 @@ namespace GW2EIEvtcParser.EIData
     internal abstract class GenericAttachedDecoration : GenericDecoration
     {
 
-        public Connector ConnectedTo { get; }
+        public GeographicalConnector ConnectedTo { get; }
         public RotationConnector RotationConnectedTo { get; protected set; }
         public SkillModeDescriptor SkillMode;
 
-        protected GenericAttachedDecoration((long , long ) lifespan, Connector connector) : base(lifespan)
+        protected GenericAttachedDecoration((long , long ) lifespan, GeographicalConnector connector) : base(lifespan)
         {
             ConnectedTo = connector;
         }
diff --git a/GW2EIEvtcParser/EIData/CombatReplay/Decorations/IconDecoration.cs b/GW2EIEvtcParser/EIData/CombatReplay/Decorations/IconDecoration.cs
@@ -9,23 +9,23 @@ internal class IconDecoration : GenericAttachedDecoration
         public int WorldSize { get; }
         public float Opacity { get; }
 
-        public IconDecoration(string icon, int pixelSize, float opacity, (long start, long end) lifespan, Connector connector) : base(lifespan, connector)
+        public IconDecoration(string icon, int pixelSize, float opacity, (long start, long end) lifespan, GeographicalConnector connector) : base(lifespan, connector)
         {
             Image = icon;
             PixelSize = pixelSize;
             Opacity = opacity;
         }
 
-        public IconDecoration(string icon, int pixelSize, int worldSize, float opacity, (long start, long end) lifespan, Connector connector) : this(icon, pixelSize, opacity, lifespan, connector)
+        public IconDecoration(string icon, int pixelSize, int worldSize, float opacity, (long start, long end) lifespan, GeographicalConnector connector) : this(icon, pixelSize, opacity, lifespan, connector)
         {
             WorldSize = worldSize;
         }
 
-        public IconDecoration(string icon, int pixelSize, float opacity, Segment lifespan, Connector connector) : this(icon, pixelSize, opacity, (lifespan.Start, lifespan.End), connector)
+        public IconDecoration(string icon, int pixelSize, float opacity, Segment lifespan, GeographicalConnector connector) : this(icon, pixelSize, opacity, (lifespan.Start, lifespan.End), connector)
         {
         }
 
-        public IconDecoration(string icon, int pixelSize, int worldSize, float opacity, Segment lifespan, Connector connector) : this(icon, pixelSize, worldSize, opacity, (lifespan.Start, lifespan.End), connector)
+        public IconDecoration(string icon, int pixelSize, int worldSize, float opacity, Segment lifespan, GeographicalConnector connector) : this(icon, pixelSize, worldSize, opacity, (lifespan.Start, lifespan.End), connector)
         {
         }
 
diff --git a/GW2EIEvtcParser/EIData/CombatReplay/Decorations/LineDecoration.cs b/GW2EIEvtcParser/EIData/CombatReplay/Decorations/LineDecoration.cs
@@ -4,14 +4,14 @@ namespace GW2EIEvtcParser.EIData
 {
     internal class LineDecoration : FormDecoration
     {
-        public Connector ConnectedFrom { get; }
+        public GeographicalConnector ConnectedFrom { get; }
 
-        public LineDecoration((long start, long end) lifespan, string color, Connector connector, Connector targetConnector) : base( lifespan, color, connector)
+        public LineDecoration((long start, long end) lifespan, string color, GeographicalConnector connector, GeographicalConnector targetConnector) : base( lifespan, color, connector)
         {
             ConnectedFrom = targetConnector;
         }
 
-        public LineDecoration(Segment lifespan, string color, Connector connector, Connector targetConnector) : this((lifespan.Start, lifespan.End), color, connector, targetConnector)
+        public LineDecoration(Segment lifespan, string color, GeographicalConnector connector, GeographicalConnector targetConnector) : this((lifespan.Start, lifespan.End), color, connector, targetConnector)
         {
         }
         public override FormDecoration UsingFilled(bool filled)
diff --git a/GW2EIEvtcParser/EIData/CombatReplay/Decorations/PieDecoration.cs b/GW2EIEvtcParser/EIData/CombatReplay/Decorations/PieDecoration.cs
@@ -9,7 +9,7 @@ internal class PieDecoration : CircleDecoration
 
         //using arcs rotation argument as Input (cone in facing direction). Y direction is reversed due to different axis definitions for arc and javascript
 
-        public PieDecoration(int radius, float openingAngle, (long start, long end) lifespan, string color, Connector connector) : base(radius, lifespan, color, connector)
+        public PieDecoration(int radius, float openingAngle, (long start, long end) lifespan, string color, GeographicalConnector connector) : base(radius, lifespan, color, connector)
         {
             OpeningAngle = openingAngle;
         }
diff --git a/GW2EIEvtcParser/EIData/CombatReplay/Decorations/RectangleDecoration.cs b/GW2EIEvtcParser/EIData/CombatReplay/Decorations/RectangleDecoration.cs
@@ -7,7 +7,7 @@ internal class RectangleDecoration : FormDecoration
         public int Height { get; }
         public int Width { get; }
 
-        public RectangleDecoration(int width, int height, (long start, long end) lifespan, string color, Connector connector) : base( lifespan, color, connector)
+        public RectangleDecoration(int width, int height, (long start, long end) lifespan, string color, GeographicalConnector connector) : base( lifespan, color, connector)
         {
             Height = height;
             Width = width;

Original file line number	Diff line number	Diff line change
`@@ -7,22 +7,22 @@ internal class CircleDecoration : FormDecoration`
`7`	`7`	`public int Radius { get; }`
`8`	`8`	`public int MinRadius { get; }`
`9`	`9`
`10`		`- public CircleDecoration(int radius, (long start, long end) lifespan, string color, Connector connector) : base(lifespan, color, connector)`
	`10`	`+ public CircleDecoration(int radius, (long start, long end) lifespan, string color, GeographicalConnector connector) : base(lifespan, color, connector)`
`11`	`11`	`{`
`12`	`12`	`Radius = radius;`
`13`	`13`	`}`
`14`	`14`
`15`		`- public CircleDecoration(int radius, int minRadius, (long start, long end) lifespan, string color, Connector connector) : base(lifespan, color, connector)`
	`15`	`+ public CircleDecoration(int radius, int minRadius, (long start, long end) lifespan, string color, GeographicalConnector connector) : base(lifespan, color, connector)`
`16`	`16`	`{`
`17`	`17`	`Radius = radius;`
`18`	`18`	`MinRadius = minRadius;`
`19`	`19`	`}`
`20`	`20`
`21`		`- public CircleDecoration(int radius, Segment lifespan, string color, Connector connector) : this(radius, (lifespan.Start, lifespan.End), color, connector)`
	`21`	`+ public CircleDecoration(int radius, Segment lifespan, string color, GeographicalConnector connector) : this(radius, (lifespan.Start, lifespan.End), color, connector)`
`22`	`22`	`{`
`23`	`23`	`}`
`24`	`24`
`25`		`- public CircleDecoration(int radius, int minRadius, Segment lifespan, string color, Connector connector) : this(radius, minRadius, (lifespan.Start, lifespan.End), color, connector)`
	`25`	`+ public CircleDecoration(int radius, int minRadius, Segment lifespan, string color, GeographicalConnector connector) : this(radius, minRadius, (lifespan.Start, lifespan.End), color, connector)`
`26`	`26`	`{`
`27`	`27`	`}`
`28`	`28`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ internal class DoughnutDecoration : FormDecoration`
`7`	`7`	`public int OuterRadius { get; }`
`8`	`8`	`public int InnerRadius { get; }`
`9`	`9`
`10`		`- public DoughnutDecoration(int innerRadius, int outerRadius, (long start, long end) lifespan, string color, Connector connector) : base(lifespan, color, connector)`
	`10`	`+ public DoughnutDecoration(int innerRadius, int outerRadius, (long start, long end) lifespan, string color, GeographicalConnector connector) : base(lifespan, color, connector)`
`11`	`11`	`{`
`12`	`12`	`InnerRadius = innerRadius;`
`13`	`13`	`OuterRadius = outerRadius;`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ internal abstract class FormDecoration : GenericAttachedDecoration`
`10`	`10`	`public int GrowingEnd { get; private set; }`
`11`	`11`	`public bool GrowingReverse { get; private set; }`
`12`	`12`
`13`		`- protected FormDecoration((long , long) lifespan, string color, Connector connector) : base(lifespan, connector)`
	`13`	`+ protected FormDecoration((long , long) lifespan, string color, GeographicalConnector connector) : base(lifespan, connector)`
`14`	`14`	`{`
`15`	`15`	`Color = color;`
`16`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,11 +6,11 @@ namespace GW2EIEvtcParser.EIData`
`6`	`6`	`internal abstract class GenericAttachedDecoration : GenericDecoration`
`7`	`7`	`{`
`8`	`8`
`9`		`- public Connector ConnectedTo { get; }`
	`9`	`+ public GeographicalConnector ConnectedTo { get; }`
`10`	`10`	`public RotationConnector RotationConnectedTo { get; protected set; }`
`11`	`11`	`public SkillModeDescriptor SkillMode;`
`12`	`12`
`13`		`- protected GenericAttachedDecoration((long , long ) lifespan, Connector connector) : base(lifespan)`
	`13`	`+ protected GenericAttachedDecoration((long , long ) lifespan, GeographicalConnector connector) : base(lifespan)`
`14`	`14`	`{`
`15`	`15`	`ConnectedTo = connector;`
`16`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,23 +9,23 @@ internal class IconDecoration : GenericAttachedDecoration`
`9`	`9`	`public int WorldSize { get; }`
`10`	`10`	`public float Opacity { get; }`
`11`	`11`
`12`		`- public IconDecoration(string icon, int pixelSize, float opacity, (long start, long end) lifespan, Connector connector) : base(lifespan, connector)`
	`12`	`+ public IconDecoration(string icon, int pixelSize, float opacity, (long start, long end) lifespan, GeographicalConnector connector) : base(lifespan, connector)`
`13`	`13`	`{`
`14`	`14`	`Image = icon;`
`15`	`15`	`PixelSize = pixelSize;`
`16`	`16`	`Opacity = opacity;`
`17`	`17`	`}`
`18`	`18`
`19`		`- public IconDecoration(string icon, int pixelSize, int worldSize, float opacity, (long start, long end) lifespan, Connector connector) : this(icon, pixelSize, opacity, lifespan, connector)`
	`19`	`+ public IconDecoration(string icon, int pixelSize, int worldSize, float opacity, (long start, long end) lifespan, GeographicalConnector connector) : this(icon, pixelSize, opacity, lifespan, connector)`
`20`	`20`	`{`
`21`	`21`	`WorldSize = worldSize;`
`22`	`22`	`}`
`23`	`23`
`24`		`- public IconDecoration(string icon, int pixelSize, float opacity, Segment lifespan, Connector connector) : this(icon, pixelSize, opacity, (lifespan.Start, lifespan.End), connector)`
	`24`	`+ public IconDecoration(string icon, int pixelSize, float opacity, Segment lifespan, GeographicalConnector connector) : this(icon, pixelSize, opacity, (lifespan.Start, lifespan.End), connector)`
`25`	`25`	`{`
`26`	`26`	`}`
`27`	`27`
`28`		`- public IconDecoration(string icon, int pixelSize, int worldSize, float opacity, Segment lifespan, Connector connector) : this(icon, pixelSize, worldSize, opacity, (lifespan.Start, lifespan.End), connector)`
	`28`	`+ public IconDecoration(string icon, int pixelSize, int worldSize, float opacity, Segment lifespan, GeographicalConnector connector) : this(icon, pixelSize, worldSize, opacity, (lifespan.Start, lifespan.End), connector)`
`29`	`29`	`{`
`30`	`30`	`}`
`31`	`31`
Original file line number	Diff line number	Diff line change
`@@ -4,14 +4,14 @@ namespace GW2EIEvtcParser.EIData`
`4`	`4`	`{`
`5`	`5`	`internal class LineDecoration : FormDecoration`
`6`	`6`	`{`
`7`		`- public Connector ConnectedFrom { get; }`
	`7`	`+ public GeographicalConnector ConnectedFrom { get; }`
`8`	`8`
`9`		`- public LineDecoration((long start, long end) lifespan, string color, Connector connector, Connector targetConnector) : base( lifespan, color, connector)`
	`9`	`+ public LineDecoration((long start, long end) lifespan, string color, GeographicalConnector connector, GeographicalConnector targetConnector) : base( lifespan, color, connector)`
`10`	`10`	`{`
`11`	`11`	`ConnectedFrom = targetConnector;`
`12`	`12`	`}`
`13`	`13`
`14`		`- public LineDecoration(Segment lifespan, string color, Connector connector, Connector targetConnector) : this((lifespan.Start, lifespan.End), color, connector, targetConnector)`
	`14`	`+ public LineDecoration(Segment lifespan, string color, GeographicalConnector connector, GeographicalConnector targetConnector) : this((lifespan.Start, lifespan.End), color, connector, targetConnector)`
`15`	`15`	`{`
`16`	`16`	`}`
`17`	`17`	`public override FormDecoration UsingFilled(bool filled)`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ internal class PieDecoration : CircleDecoration`
`9`	`9`
`10`	`10`	`//using arcs rotation argument as Input (cone in facing direction). Y direction is reversed due to different axis definitions for arc and javascript`
`11`	`11`
`12`		`- public PieDecoration(int radius, float openingAngle, (long start, long end) lifespan, string color, Connector connector) : base(radius, lifespan, color, connector)`
	`12`	`+ public PieDecoration(int radius, float openingAngle, (long start, long end) lifespan, string color, GeographicalConnector connector) : base(radius, lifespan, color, connector)`
`13`	`13`	`{`
`14`	`14`	`OpeningAngle = openingAngle;`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ internal class RectangleDecoration : FormDecoration`
`7`	`7`	`public int Height { get; }`
`8`	`8`	`public int Width { get; }`
`9`	`9`
`10`		`- public RectangleDecoration(int width, int height, (long start, long end) lifespan, string color, Connector connector) : base( lifespan, color, connector)`
	`10`	`+ public RectangleDecoration(int width, int height, (long start, long end) lifespan, string color, GeographicalConnector connector) : base( lifespan, color, connector)`
`11`	`11`	`{`
`12`	`12`	`Height = height;`
`13`	`13`	`Width = width;`