SharpDX3.xに移行した

[fooeditengine/FooEditEngine.git] / Core / ITextRender.cs

diff --git a/Core/ITextRender.cs b/Core/ITextRender.cs
index 2f059c4..f141026 100644 (file)
--- a/Core/ITextRender.cs
+++ b/Core/ITextRender.cs
@@ -88,9 +88,9 @@ namespace FooEditEngine
         {
             return new System.Drawing.Point((int)p.X, (int)p.Y);
         }
-        public static implicit operator SharpDX.Vector2(Point p)
+        public static implicit operator SharpDX.Mathematics.Interop.RawVector2(Point p)
         {
-            return new SharpDX.Vector2((float)p.X, (float)p.Y);
+            return new SharpDX.Mathematics.Interop.RawVector2((float)p.X, (float)p.Y);
         }
 #endif
 #if WPF
@@ -102,9 +102,9 @@ namespace FooEditEngine
         {
             return new System.Windows.Point(p.X, p.Y);
         }
-        public static implicit operator SharpDX.Vector2(Point p)
+        public static implicit operator SharpDX.Mathematics.Interop.RawVector2(Point p)
         {
-            return new SharpDX.Vector2((float)p.X, (float)p.Y);
+            return new SharpDX.Mathematics.Interop.RawVector2((float)p.X, (float)p.Y);
         }
 #endif
 #if METRO || WINDOWS_UWP
@@ -116,9 +116,9 @@ namespace FooEditEngine
         {
             return new Windows.Foundation.Point(p.X, p.Y);
         }
-        public static implicit operator SharpDX.Vector2(Point p)
+        public static implicit operator SharpDX.Mathematics.Interop.RawVector2(Point p)
         {
-            return new SharpDX.Vector2((float)p.X, (float)p.Y);
+            return new SharpDX.Mathematics.Interop.RawVector2((float)p.X, (float)p.Y);
         }
 #endif
     }
@@ -335,9 +335,9 @@ namespace FooEditEngine
         {
             return new System.Drawing.Rectangle((int)p.X, (int)p.Y, (int)p.Width, (int)p.Height);
         }
-        public static implicit operator SharpDX.RectangleF(Rectangle p)
+        public static implicit operator SharpDX.Mathematics.Interop.RawRectangleF(Rectangle p)
         {
-            return new SharpDX.RectangleF((float)p.X, (float)p.Y, (float)p.Width, (float)p.Height);
+            return new SharpDX.Mathematics.Interop.RawRectangleF((float)p.X, (float)p.Y, (float)p.BottomRight.X, (float)p.BottomRight.Y);
         }
 #endif
 #if WPF
@@ -349,9 +349,9 @@ namespace FooEditEngine
         {
             return new System.Windows.Rect(p.X, p.Y, p.Width, p.Height);
         }
-        public static implicit operator SharpDX.RectangleF(Rectangle p)
+        public static implicit operator SharpDX.Mathematics.Interop.RawRectangleF(Rectangle p)
         {
-            return new SharpDX.RectangleF((float)p.X, (float)p.Y, (float)p.Width, (float)p.Height);
+            return new SharpDX.Mathematics.Interop.RawRectangleF((float)p.X, (float)p.Y, (float)p.BottomRight.X, (float)p.BottomRight.Y);
         }
 #endif
 #if METRO || WINDOWS_UWP
@@ -364,9 +364,9 @@ namespace FooEditEngine
             return new Windows.Foundation.Rect(p.X, p.Y, p.Width, p.Height);
         }
 
-        public static implicit operator SharpDX.RectangleF(Rectangle p)
+        public static implicit operator SharpDX.Mathematics.Interop.RawRectangleF(Rectangle p)
         {
-            return new SharpDX.RectangleF((float)p.X, (float)p.Y, (float)p.Width, (float)p.Height);
+            return new SharpDX.Mathematics.Interop.RawRectangleF((float)p.X, (float)p.Y, (float)p.BottomRight.X, (float)p.BottomRight.Y);
         }
 #endif
     }