Changed readonly point,

NTDLS · Jan 13, 2024 · d469106 · d469106
1 parent e594ca0
commit d469106
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 44 deletions.
diff --git a/Si.GameEngine/Sprites/BasesAndInterfaces/SpriteBase.cs b/Si.GameEngine/Sprites/BasesAndInterfaces/SpriteBase.cs
@@ -243,8 +243,8 @@ public void QueueForDelete()
         /// </summary>
         public SiPoint RemoteLocation
         {
-            get => new SiPoint(_remoteLocation, true);
-            set => _remoteLocation = value.ToWriteableCopy();
+            get => new SiReadonlyPoint(_remoteLocation);
+            set => _remoteLocation = value;
         }
 
         /// <summary>
@@ -254,7 +254,7 @@ public SiPoint RemoteLocation
         public SiPoint LocalLocation
         {
             get => new SiReadonlyPoint(_localLocation);
-            set => _localLocation = value.ToWriteableCopy();
+            set => _localLocation = value;
         }
 
         /// <summary>

diff --git a/Si.Shared/Types/Geometry/SiPoint.cs b/Si.Shared/Types/Geometry/SiPoint.cs
@@ -6,31 +6,21 @@ public class SiPoint
     {
         public static SiPoint Zero = new();
 
-        private double _x;
-        private double _y;
+        protected double _x;
+        protected double _y;
 
-        public double X
+        public virtual double X
         {
             get => _x;
-            set
-            {
-                if (IsReadonly) throw new Exception("The point is readonly");
-                _x = value;
-            }
+            set => _x = value;
         }
 
-        public double Y
+        public virtual double Y
         {
             get => _y;
-            set
-            {
-                if (IsReadonly) throw new Exception("The point is readonly");
-                _y = value;
-            }
+            set => _y = value;
         }
 
-        public bool IsReadonly { get; private set; }
-
         public SiPoint()
         {
         }
@@ -47,27 +37,6 @@ public SiPoint(SiPoint p)
             Y = p.Y;
         }
 
-        public SiPoint(bool isReadonly)
-        {
-            IsReadonly = isReadonly;
-        }
-
-        public SiPoint(double x, double y, bool isReadonly)
-        {
-            IsReadonly = isReadonly;
-            _x = x;
-            _y = y;
-        }
-
-        public SiPoint(SiPoint p, bool isReadonly)
-        {
-            IsReadonly = isReadonly;
-            _x = p.X;
-            _y = p.Y;
-        }
-
-        public SiPoint ToWriteableCopy() => new SiPoint(this);
-
         public RectangleF ToRectangleF(float width, float height)
         {
             return new RectangleF((float)_x, (float)_y, width, height);
@@ -156,5 +125,7 @@ public override string ToString()
         {
             return $"{{{Math.Round(X, 4).ToString("#.####")},{Math.Round(Y, 4).ToString("#.####")}}}";
         }
+
+        public SiReadonlyPoint ToReadonlyCopy() => new SiReadonlyPoint(this);
     }
 }
diff --git a/Si.Shared/Types/Geometry/SiReadonlyPoint.cs b/Si.Shared/Types/Geometry/SiReadonlyPoint.cs
@@ -7,18 +7,41 @@ public SiReadonlyPoint()
         }
 
         public SiReadonlyPoint(double x, double y)
-            : base(x, y, true)
         {
+            _x = x;
+            _y = y;
         }
 
         public SiReadonlyPoint(SiReadonlyPoint p)
-            : base(p)
         {
+            _x = p._x;
+            _y = p._y;
         }
 
         public SiReadonlyPoint(SiPoint p)
-            : base(p)
-        {
+        {
+            _x = p.X;
+            _y = p.Y;
+        }
+
+        public override double X
+        {
+            get => _x;
+            set
+            {
+                throw new Exception("The point is readonly");
+            }
         }
+
+        public override double Y
+        {
+            get => _y;
+            set
+            {
+                throw new Exception("The point is readonly");
+            }
+        }
+
+        public SiPoint ToWriteableCopy() => new SiPoint(this);
     }
 }