WIP on making edit tool compatible with proper translations

src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/Tools/EditToolView.xaml

@@ -10,119 +10,183 @@
              d:DesignWidth="800"
              d:DataContext="{d:DesignInstance {x:Type local:EditToolViewModel}}">
     <Canvas UseLayoutRounding="False">
-        <Canvas>
+        <Canvas >
-            <!-- The rectangle around the shape that allows modification -->
+            <!-- The part of the layer's shape that is inside the layer -->
-            <Canvas.RenderTransform>
+            <Path Data="{Binding ShapeGeometry, Mode=OneWay}"
-                <TransformGroup Children="{Binding LayerTransformChildren}" />
+                  Fill="Transparent"
-            </Canvas.RenderTransform>
+                  Stroke="{DynamicResource PrimaryHueMidBrush}"
-            <Rectangle Width="{Binding ShapeSkRect.Width}"
+                  StrokeThickness="1"
-                       Height="{Binding ShapeSkRect.Height}"
+                  StrokeDashArray="2 2"
-                       Canvas.Left="{Binding ShapeSkRect.Left}"
+                  Cursor="Hand"
-                       Canvas.Top="{Binding ShapeSkRect.Top}"
+                  MouseDown="{s:Action ShapeEditMouseDown}"
-                       Fill="Transparent"
+                  MouseUp="{s:Action ShapeEditMouseUp}"
-                       Stroke="{DynamicResource PrimaryHueMidBrush}"
+                  MouseMove="{s:Action Move}">
-                       StrokeThickness="1"
+            </Path>
-                       StrokeDashArray="2 2"
-                       Cursor="Hand"
-                       MouseDown="{s:Action ShapeEditMouseDown}"
-                       MouseUp="{s:Action ShapeEditMouseUp}"
-                       MouseMove="{s:Action Move}" />
 
-            <!-- Top left display -->
+            <!-- Mutation points -->
-            <Rectangle Width="4" Height="4" Canvas.Left="{Binding ShapeSkRect.Left}" Canvas.Top="{Binding ShapeSkRect.Top}" Fill="{DynamicResource SecondaryAccentBrush}" Margin="-2,-2,0,0" />
+            <Rectangle Width="4" Height="4" Canvas.Left="{Binding TopLeft.X}" Canvas.Top="{Binding TopLeft.Y}" Fill="{DynamicResource SecondaryAccentBrush}" Margin="-2,-2,0,0" />
+            <Rectangle Width="4" Height="4" Canvas.Left="{Binding TopRight.X}" Canvas.Top="{Binding TopRight.Y}" Fill="{DynamicResource SecondaryAccentBrush}" Margin="-2,-2,0,0" />
+            <Rectangle Width="4" Height="4" Canvas.Left="{Binding BottomRight.X}" Canvas.Top="{Binding BottomRight.Y}" Fill="{DynamicResource SecondaryAccentBrush}" Margin="-2,-2,0,0" />
+            <Rectangle Width="4" Height="4" Canvas.Left="{Binding BottomLeft.X}" Canvas.Top="{Binding BottomLeft.Y}" Fill="{DynamicResource SecondaryAccentBrush}" Margin="-2,-2,0,0" />
+            <Rectangle Width="4" Height="4" Canvas.Left="{Binding TopCenter.X}" Canvas.Top="{Binding TopCenter.Y}" Fill="{DynamicResource SecondaryAccentBrush}" Margin="-2,-2,0,0" />
+            <Rectangle Width="4" Height="4" Canvas.Left="{Binding RightCenter.X}" Canvas.Top="{Binding RightCenter.Y}" Fill="{DynamicResource SecondaryAccentBrush}" Margin="-2,-2,0,0" />
+            <Rectangle Width="4" Height="4" Canvas.Left="{Binding BottomCenter.X}" Canvas.Top="{Binding BottomCenter.Y}" Fill="{DynamicResource SecondaryAccentBrush}" Margin="-2,-2,0,0" />
+            <Rectangle Width="4" Height="4" Canvas.Left="{Binding LeftCenter.X}" Canvas.Top="{Binding LeftCenter.Y}" Fill="{DynamicResource SecondaryAccentBrush}" Margin="-2,-2,0,0" />
+
+            <!-- Anchor point -->
+            <Ellipse MouseDown="{s:Action AnchorEditMouseDown}"
+                     MouseUp="{s:Action ShapeEditMouseUp}"
+                     MouseMove="{s:Action AnchorMove}"
+                     Width="6" Height="6" Fill="{DynamicResource SecondaryAccentBrush}" Canvas.Left="{Binding ShapeAnchor.X}" Canvas.Top="{Binding ShapeAnchor.Y}" Margin="-3,-3,0,0"
+                     Cursor="SizeAll" />
+        </Canvas>
+        <Canvas>
+            <Canvas.RenderTransform>
+                <TransformGroup Children="{Binding ShapeTransformCollection}" />
+            </Canvas.RenderTransform>
             <!-- Top left rotate handle -->
             <Rectangle MouseDown="{s:Action ShapeEditMouseDown}"
                        MouseUp="{s:Action ShapeEditMouseUp}"
                        MouseMove="{s:Action TopLeftRotate}"
-                       Width="15" Height="15" Canvas.Left="{Binding ShapeSkRect.Left}" Canvas.Top="{Binding ShapeSkRect.Top}" Fill="Transparent" Margin="-12,-12,0,0"
+                       Width="15" Height="15" 
+                       Canvas.Left="{Binding ShapeRectangle.Left}"
+                       Canvas.Top="{Binding ShapeRectangle.Top}" 
+                       Fill="Blue" 
+                       Margin="-12,-12,0,0"
                        Cursor="/Resources/aero_rotate_tl.cur" />
             <!-- Top left resize handle -->
             <Rectangle MouseDown="{s:Action ShapeEditMouseDown}"
                        MouseUp="{s:Action ShapeEditMouseUp}"
                        MouseMove="{s:Action TopLeftResize}"
-                       Width="6" Height="6" Canvas.Left="{Binding ShapeSkRect.Left}" Canvas.Top="{Binding ShapeSkRect.Top}" Fill="Transparent" Margin="-3,-3,0,0" Cursor="SizeNWSE" />
+                       Width="6" 
-
+                       Height="6" 
-            <!-- Top center display -->
+                       Canvas.Left="{Binding ShapeRectangle.Left}" 
-            <Rectangle Width="4" Height="4" Canvas.Left="{Binding ShapeSkRect.MidX}" Canvas.Top="{Binding ShapeSkRect.Top}" Fill="{DynamicResource SecondaryAccentBrush}" Margin="-2,-2,0,0" />
+                       Canvas.Top="{Binding ShapeRectangle.Top}" 
+                       Fill="Red" 
+                       Margin="-3,-3,0,0" 
+                       Cursor="SizeNWSE" />
+           
             <!-- Top center resize handle -->
             <Rectangle MouseDown="{s:Action ShapeEditMouseDown}"
                        MouseUp="{s:Action ShapeEditMouseUp}"
                        MouseMove="{s:Action TopCenterResize}"
-                       Width="10" Height="10" Canvas.Left="{Binding ShapeSkRect.MidX}" Canvas.Top="{Binding ShapeSkRect.Top}" Fill="Transparent" Margin="-5,-5,0,0" Cursor="SizeNS" />
+                       Width="10" 
+                       Height="10" 
+                       Canvas.Left="{Binding ShapeRectangle.MidX}"
+                       Canvas.Top="{Binding ShapeRectangle.Top}" 
+                       Fill="Red" 
+                       Margin="-5,-5,0,0" 
+                       Cursor="SizeNS" />
 
-            <!-- Top right display -->
-            <Rectangle Width="4" Height="4" Canvas.Left="{Binding ShapeSkRect.Right}" Canvas.Top="{Binding ShapeSkRect.Top}" Fill="{DynamicResource SecondaryAccentBrush}" Margin="-2,-2,0,0" />
             <!-- Top right rotate handle -->
             <Rectangle MouseDown="{s:Action ShapeEditMouseDown}"
                        MouseUp="{s:Action ShapeEditMouseUp}"
                        MouseMove="{s:Action TopRightRotate}"
-                       Width="15" Height="15" Canvas.Left="{Binding ShapeSkRect.Right}" Canvas.Top="{Binding ShapeSkRect.Top}" Fill="Transparent" Margin="-3,-12,0,0"
+                       Width="15" 
+                       Height="15" 
+                       Canvas.Left="{Binding ShapeRectangle.Right}" 
+                       Canvas.Top="{Binding ShapeRectangle.Top}" 
+                       Fill="Blue"
+                       Margin="-3,-12,0,0"
                        Cursor="/Resources/aero_rotate_tr.cur" />
             <!-- Top right resize handle -->
             <Rectangle MouseDown="{s:Action ShapeEditMouseDown}"
                        MouseUp="{s:Action ShapeEditMouseUp}"
                        MouseMove="{s:Action TopRightResize}"
-                       Width="6" Height="6" Canvas.Left="{Binding ShapeSkRect.Right}" Canvas.Top="{Binding ShapeSkRect.Top}" Fill="Transparent" Margin="-3,-3,0,0" Cursor="SizeNESW" />
+                       Width="6"
+                       Height="6"
+                       Canvas.Left="{Binding ShapeRectangle.Right}" 
+                       Canvas.Top="{Binding ShapeRectangle.Top}" 
+                       Fill="Red" 
+                       Margin="-3,-3,0,0" 
+                       Cursor="SizeNESW" />
 
-            <!-- Center right display -->
+          <!-- Center right resize handle -->
-            <Rectangle Width="4" Height="4" Canvas.Left="{Binding ShapeSkRect.Right}" Canvas.Top="{Binding ShapeSkRect.MidY}" Fill="{DynamicResource SecondaryAccentBrush}" Margin="-2,-2,0,0" />
-            <!-- Center right resize handle -->
             <Rectangle MouseDown="{s:Action ShapeEditMouseDown}"
                        MouseUp="{s:Action ShapeEditMouseUp}"
                        MouseMove="{s:Action CenterRightResize}"
-                       Width="10" Height="10" Canvas.Left="{Binding ShapeSkRect.Right}" Canvas.Top="{Binding ShapeSkRect.MidY}" Fill="Transparent" Margin="-5,-5,0,0" Cursor="SizeWE" />
+                       Width="10" 
+                       Height="10" 
+                       Canvas.Left="{Binding ShapeRectangle.Right}" 
+                       Canvas.Top="{Binding ShapeRectangle.MidY}" 
+                       Fill="Red" 
+                       Margin="-5,-5,0,0"
+                       Cursor="SizeWE" />
 
-            <!-- Bottom right display -->
+            
-            <Rectangle Width="4" Height="4" Canvas.Left="{Binding ShapeSkRect.Right}" Canvas.Top="{Binding ShapeSkRect.Bottom}" Fill="{DynamicResource SecondaryAccentBrush}" Margin="-2,-2,0,0" />
             <!-- Bottom right rotate handle -->
             <Rectangle MouseDown="{s:Action ShapeEditMouseDown}"
                        MouseUp="{s:Action ShapeEditMouseUp}"
                        MouseMove="{s:Action BottomRightRotate}"
-                       Width="15" Height="15" Canvas.Left="{Binding ShapeSkRect.Right}" Canvas.Top="{Binding ShapeSkRect.Bottom}" Fill="Transparent" Margin="-3,-3,0,0"
+                       Width="15"
+                       Height="15"
+                       Canvas.Left="{Binding ShapeRectangle.Right}" 
+                       Canvas.Top="{Binding ShapeRectangle.Bottom}" 
+                       Fill="Blue" 
+                       Margin="-3,-3,0,0"
                        Cursor="/Resources/aero_rotate_br.cur" />
             <!-- Bottom right resize handle -->
             <Rectangle MouseDown="{s:Action ShapeEditMouseDown}"
                        MouseUp="{s:Action ShapeEditMouseUp}"
                        MouseMove="{s:Action BottomRightResize}"
-                       Width="6" Height="6" Canvas.Left="{Binding ShapeSkRect.Right}" Canvas.Top="{Binding ShapeSkRect.Bottom}" Fill="Transparent" Margin="-3,-3,0,0" Cursor="SizeNWSE" />
+                       Width="6" 
+                       Height="6" 
+                       Canvas.Left="{Binding ShapeRectangle.Right}" 
+                       Canvas.Top="{Binding ShapeRectangle.Bottom}" 
+                       Fill="Red" 
+                       Margin="-3,-3,0,0" 
+                       Cursor="SizeNWSE" />
 
-            <!-- Bottom center display -->
+            
-            <Rectangle Width="4" Height="4" Canvas.Left="{Binding ShapeSkRect.MidX}" Canvas.Top="{Binding ShapeSkRect.Bottom}" Fill="{DynamicResource SecondaryAccentBrush}" Margin="-2,-2,0,0" />
             <!-- Bottom center resize handle -->
             <Rectangle MouseDown="{s:Action ShapeEditMouseDown}"
                        MouseUp="{s:Action ShapeEditMouseUp}"
                        MouseMove="{s:Action BottomCenterResize}"
-                       Width="10" Height="10" Canvas.Left="{Binding ShapeSkRect.MidX}" Canvas.Top="{Binding ShapeSkRect.Bottom}" Fill="Transparent" Margin="-5,-5,0,0" Cursor="SizeNS" />
+                       Width="10" 
+                       Height="10"
+                       Canvas.Left="{Binding ShapeRectangle.MidX}" 
+                       Canvas.Top="{Binding ShapeRectangle.Bottom}"
+                       Fill="Red" 
+                       Margin="-5,-5,0,0" 
+                       Cursor="SizeNS" />
 
-            <!-- Bottom left display -->
+            
-            <Rectangle Width="4" Height="4" Canvas.Left="{Binding ShapeSkRect.Left}" Canvas.Top="{Binding ShapeSkRect.Bottom}" Fill="{DynamicResource SecondaryAccentBrush}" Margin="-2,-2,0,0" />
             <!-- Bottom left rotate handle -->
             <Rectangle MouseDown="{s:Action ShapeEditMouseDown}"
                        MouseUp="{s:Action ShapeEditMouseUp}"
                        MouseMove="{s:Action BottomLeftRotate}"
-                       Width="15" Height="15" Canvas.Left="{Binding ShapeSkRect.Left}" Canvas.Top="{Binding ShapeSkRect.Bottom}" Fill="Transparent" Margin="-12,-3,0,0"
+                       Width="15"
+                       Height="15"
+                       Canvas.Left="{Binding ShapeRectangle.Left}"
+                       Canvas.Top="{Binding ShapeRectangle.Bottom}" 
+                       Fill="Blue" 
+                       Margin="-12,-3,0,0"
                        Cursor="/Resources/aero_rotate_bl.cur" />
             <!-- Bottom left resize handle -->
             <Rectangle MouseDown="{s:Action ShapeEditMouseDown}"
                        MouseUp="{s:Action ShapeEditMouseUp}"
                        MouseMove="{s:Action BottomLeftResize}"
-                       Width="6" Height="6" Canvas.Left="{Binding ShapeSkRect.Left}" Canvas.Top="{Binding ShapeSkRect.Bottom}" Fill="Transparent" Margin="-3, -3, 0,0" Cursor="SizeNESW" />
+                       Width="6"
+                       Height="6" 
+                       Canvas.Left="{Binding ShapeRectangle.Left}" 
+                       Canvas.Top="{Binding ShapeRectangle.Bottom}" 
+                       Fill="Red"
+                       Margin="-3, -3, 0,0"
+                       Cursor="SizeNESW" />
 
-            <!-- Center left display -->
+            
-            <Rectangle Width="4" Height="4" Canvas.Left="{Binding ShapeSkRect.Left}" Canvas.Top="{Binding ShapeSkRect.MidY}" Fill="{DynamicResource SecondaryAccentBrush}" Margin="-2,-2,0,0" />
             <!-- Center left resize handle -->
             <Rectangle MouseDown="{s:Action ShapeEditMouseDown}"
                        MouseUp="{s:Action ShapeEditMouseUp}"
                        MouseMove="{s:Action CenterLeftResize}"
-                       Width="10" Height="10" Canvas.Left="{Binding ShapeSkRect.Left}" Canvas.Top="{Binding ShapeSkRect.MidY}" Fill="Transparent" Margin="-5,-5,0,0" Cursor="SizeWE" />
+                       Width="10"
-        </Canvas>
+                       Height="10"
-        <Canvas>
+                       Canvas.Left="{Binding ShapeRectangle.Left}" 
-            <!-- Anchor point -->
+                       Canvas.Top="{Binding ShapeRectangle.MidY}" 
-            <Ellipse MouseDown="{s:Action AnchorEditMouseDown}"
+                       Fill="Red" 
-                     MouseUp="{s:Action ShapeEditMouseUp}"
+                       Margin="-5,-5,0,0" 
-                     MouseMove="{s:Action AnchorMove}"
+                       Cursor="SizeWE" />
-                     Width="6" Height="6" Fill="{DynamicResource SecondaryAccentBrush}" Canvas.Left="{Binding AnchorSkPoint.X}" Canvas.Top="{Binding AnchorSkPoint.Y}" Margin="-3,-3,0,0"
-                     Cursor="SizeAll" />
         </Canvas>
     </Canvas>
+    
 </UserControl>

src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/Tools/EditToolViewModel.cs

@@ -33,9 +33,10 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.Visualization.Tools
             profileEditorService.ProfilePreviewUpdated += (sender, args) => Update();
         }
 
-        public SKRect ShapeSkRect { get; set; }
+        public SKRect ShapeRectangle { get; set; }
-        public SKPoint AnchorSkPoint { get; set; }
+        public SKPoint ShapeAnchor { get; set; }
-        public TransformCollection LayerTransformChildren { get; set; }
+        public RectangleGeometry ShapeGeometry { get; set; }
+        public TransformCollection ShapeTransformCollection { get; set; }
 
         private void Update()
         {
@@ -43,13 +44,41 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.Visualization.Tools
             {
                 if (layer.LayerShape != null)
                 {
-                    ShapeSkRect = _layerEditorService.GetShapeRenderRect(layer.LayerShape).ToSKRect();
+                    ShapeRectangle = _layerEditorService.GetShapeRenderRect(layer.LayerShape).ToSKRect();
-                    AnchorSkPoint = layer.LayerShape.GetUnscaledAnchor();
+                    ShapeAnchor = _layerEditorService.GetLayerAnchor(layer, true);
-                    Execute.PostToUIThread(() => LayerTransformChildren = _layerEditorService.GetLayerTransformGroup(layer).Children);
+
+                    Execute.PostToUIThread(() =>
+                    {
+                        var shapeGeometry = new RectangleGeometry(_layerEditorService.GetShapeRenderRect(layer.LayerShape));
+                        shapeGeometry.Transform = _layerEditorService.GetLayerTransformGroup(layer);
+                        shapeGeometry.Freeze();
+                        ShapeGeometry = shapeGeometry;
+                        ShapeTransformCollection = _layerEditorService.GetLayerTransformGroup(layer).Children;
+
+                        // Get a square path to use for mutation point placement
+                        var path = _layerEditorService.GetLayerPath(layer);
+                        TopLeft = path.Points[0];
+                        TopRight = path.Points[1];
+                        BottomRight = path.Points[2];
+                        BottomLeft = path.Points[3];
+
+                        TopCenter = new SKPoint((TopLeft.X + TopRight.X) / 2, (TopLeft.Y + TopRight.Y) / 2);
+                        RightCenter = new SKPoint((TopRight.X + BottomRight.X) / 2, (TopRight.Y + BottomRight.Y) / 2);
+                        BottomCenter = new SKPoint((BottomLeft.X + BottomRight.X) / 2, (BottomLeft.Y + BottomRight.Y) / 2);
+                        LeftCenter = new SKPoint((TopLeft.X + BottomLeft.X) / 2, (TopLeft.Y + BottomLeft.Y) / 2);
+                    });
                 }
             }
         }
 
+        public SKPoint TopLeft { get; set; }
+        public SKPoint TopRight { get; set; }
+        public SKPoint BottomRight { get; set; }
+        public SKPoint BottomLeft { get; set; }
+        public SKPoint TopCenter { get; set; }
+        public SKPoint RightCenter { get; set; }
+        public SKPoint BottomCenter { get; set; }
+        public SKPoint LeftCenter { get; set; }
 
         public void ShapeEditMouseDown(object sender, MouseButtonEventArgs e)
         {
@@ -82,8 +111,8 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.Visualization.Tools
             ShapeEditMouseDown(sender, e);
             // Override the drag offset
             var dragStartPosition = GetRelativePosition(sender, e);
-            _dragOffsetX = AnchorSkPoint.X - dragStartPosition.X;
+//            _dragOffsetX = AnchorSkPoint.X - dragStartPosition.X;
-            _dragOffsetY = AnchorSkPoint.Y - dragStartPosition.Y;
+//            _dragOffsetY = AnchorSkPoint.Y - dragStartPosition.Y;
             _dragStart = dragStartPosition;
         }
 
@@ -117,25 +146,30 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.Visualization.Tools
                 return;
 
             var position = GetRelativePosition(sender, e);
-            var skRect = layer.LayerShape.RenderRectangle;
+            var skRect = _layerEditorService.GetShapeRenderRect(layer.LayerShape).ToSKRect();
             var x = (float) (position.X + _dragOffsetX);
             var y = (float) (position.Y + _dragOffsetY);
 
-            // TODO: Update the translation
+            if (Keyboard.IsKeyDown(Key.LeftShift) || Keyboard.IsKeyDown(Key.RightShift))
-            // if (!Keyboard.IsKeyDown(Key.LeftShift) && !Keyboard.IsKeyDown(Key.RightShift))
+            {
-            //     layer.LayerShape.SetFromUnscaledRectangle(SKRect.Create(x, y, skRect.Width, skRect.Height), ProfileEditorService.CurrentTime);
+                if (_draggingVertically)
-            // else
+                    x = skRect.Left;
-            // {
+                else if (_draggingHorizontally)
-            //     if (_draggingVertically)
+                    y = skRect.Top;
-            //         layer.LayerShape.SetFromUnscaledRectangle(SKRect.Create(skRect.Left, y, skRect.Width, skRect.Height), ProfileEditorService.CurrentTime);
+                else
-            //     else if (_draggingHorizontally)
+                {
-            //         layer.LayerShape.SetFromUnscaledRectangle(SKRect.Create(x, skRect.Top, skRect.Width, skRect.Height), ProfileEditorService.CurrentTime);
+                    _draggingHorizontally = Math.Abs(position.X - _dragStart.X) > Math.Abs(position.Y - _dragStart.Y);
-            //     else
+                    _draggingVertically = Math.Abs(position.X - _dragStart.X) < Math.Abs(position.Y - _dragStart.Y);
-            //     {
+                    return;
-            //         _draggingHorizontally = Math.Abs(position.X - _dragStart.X) > Math.Abs(position.Y - _dragStart.Y);
+                }
-            //         _draggingVertically = Math.Abs(position.X - _dragStart.X) < Math.Abs(position.Y - _dragStart.Y);
+            }
-            //     }
+
-            // }
+            // Convert the desired X and Y position to a translation
+            var layerRect = _layerEditorService.GetLayerRenderRect(layer).ToSKRect();
+            var translation = layer.PositionProperty.CurrentValue;
+            var scaled = _layerEditorService.GetScaledPoint(layer, new SKPoint(x , y));
+            Console.WriteLine(scaled);
+            layer.PositionProperty.SetCurrentValue(scaled, ProfileEditorService.CurrentTime);
 
             ProfileEditorService.UpdateProfilePreview();
         }

src/Artemis.UI/Services/LayerShapeService.cs

@@ -21,18 +21,6 @@ namespace Artemis.UI.Services
         }
 
         /// <inheritdoc />
-        public Rect GetShapeRenderRect(LayerShape layerShape)
-        {
-            // Adjust the render rectangle for the difference in render scale
-            var renderScale = _settingsService.GetSetting("Core.RenderScale", 1.0).Value;
-            return new Rect(
-                layerShape.RenderRectangle.Left / renderScale * 1,
-                layerShape.RenderRectangle.Top / renderScale * 1,
-                Math.Max(0, layerShape.RenderRectangle.Width / renderScale * 1),
-                Math.Max(0, layerShape.RenderRectangle.Height / renderScale * 1)
-            );
-        }
-
         public Rect GetLayerRenderRect(Layer layer)
         {
             // Adjust the render rectangle for the difference in render scale
@@ -45,6 +33,80 @@ namespace Artemis.UI.Services
             );
         }
 
+        /// <inheritdoc />
+        public SKPath GetLayerPath(Layer layer)
+        {
+            var layerRect = GetLayerRenderRect(layer).ToSKRect();
+            var shapeRect = GetShapeRenderRect(layer.LayerShape).ToSKRect();
+
+            // Apply transformation like done by the core during layer rendering
+            var anchor = GetLayerAnchor(layer, false);
+            var position = layer.PositionProperty.CurrentValue;
+            var size = layer.SizeProperty.CurrentValue;
+            var rotation = layer.RotationProperty.CurrentValue;
+
+            var path = new SKPath();
+            path.AddRect(shapeRect);
+
+            path.Transform(SKMatrix.MakeScale(size.Width, size.Height, anchor.X, anchor.Y));
+            path.Transform(SKMatrix.MakeRotationDegrees(rotation, anchor.X, anchor.Y));
+            path.Transform(SKMatrix.MakeTranslation(position.X * layerRect.Width, position.Y * layerRect.Height));
+
+            return path;
+        }
+
+        /// <inheritdoc />
+        public SKPoint GetLayerAnchor(Layer layer, bool includeTranslate)
+        {
+            var layerRect = GetLayerRenderRect(layer).ToSKRect();
+            var shapeRect = GetShapeRenderRect(layer.LayerShape).ToSKRect();
+            var anchor = layer.AnchorPointProperty.CurrentValue;
+
+            // Scale the anchor and make it originate from the center of the untranslated layer shape
+            anchor.X = anchor.X * layerRect.Width + shapeRect.MidX;
+            anchor.Y = anchor.Y * layerRect.Height + shapeRect.MidY;
+
+            if (includeTranslate)
+            {
+                var position = layer.PositionProperty.CurrentValue;
+                anchor.X += position.X * layerRect.Width;
+                anchor.Y += position.Y * layerRect.Height;
+            }
+
+            return anchor;
+        }
+
+        /// <inheritdoc />
+        public TransformGroup GetLayerTransformGroup(Layer layer)
+        {
+            var layerRect = GetLayerRenderRect(layer).ToSKRect();
+
+            // Apply transformation like done by the core during layer rendering
+            var anchor = GetLayerAnchor(layer, false);
+            var position = layer.PositionProperty.CurrentValue;
+            var size = layer.SizeProperty.CurrentValue;
+            var rotation = layer.RotationProperty.CurrentValue;
+
+            var transformGroup = new TransformGroup();
+            transformGroup.Children.Add(new ScaleTransform(size.Width, size.Height, anchor.X, anchor.Y));
+            transformGroup.Children.Add(new RotateTransform(rotation, anchor.X, anchor.Y));
+            transformGroup.Children.Add(new TranslateTransform(position.X * layerRect.Width, position.Y * layerRect.Height));
+            return transformGroup;
+        }
+
+        /// <inheritdoc />
+        public Rect GetShapeRenderRect(LayerShape layerShape)
+        {
+            // Adjust the render rectangle for the difference in render scale
+            var renderScale = _settingsService.GetSetting("Core.RenderScale", 1.0).Value;
+            return new Rect(
+                layerShape.RenderRectangle.Left / renderScale * 1,
+                layerShape.RenderRectangle.Top / renderScale * 1,
+                Math.Max(0, layerShape.RenderRectangle.Width / renderScale * 1),
+                Math.Max(0, layerShape.RenderRectangle.Height / renderScale * 1)
+            );
+        }
+
         /// <inheritdoc />
         public void SetShapeRenderRect(LayerShape layerShape, Rect rect)
         {
@@ -66,31 +128,50 @@ namespace Artemis.UI.Services
         }
 
         /// <inheritdoc />
-        public TransformGroup GetLayerTransformGroup(Layer layer)
+        public SKPoint GetScaledPoint(Layer layer, SKPoint point)
         {
-            var layerRect = GetLayerRenderRect(layer).ToSKRect();
+            var rect = GetLayerRenderRect(layer).ToSKRect();
-            var shapeRect = GetShapeRenderRect(layer.LayerShape).ToSKRect();
+            // Adjust the provided rect for the difference in render scale
-
+            var renderScale = _settingsService.GetSetting("Core.RenderScale", 1.0).Value;
-            // Apply transformation like done by the core during layer rendering
+            return new SKPoint(
-            var anchor = layer.AnchorPointProperty.CurrentValue;
+                100f / layer.AbsoluteRectangle.Width * ((float) (point.X * renderScale) - rect.Left) / 100f,
-            var position = layer.PositionProperty.CurrentValue;
+                100f / layer.AbsoluteRectangle.Height * ((float) (point.Y * renderScale) - rect.Top) / 100f
-            var size = layer.SizeProperty.CurrentValue;
+            );
-            var rotation = layer.RotationProperty.CurrentValue;
-            // Scale the anchor and make it originate from the center of the untranslated layer shape
-            anchor.X = anchor.X * layerRect.Width + shapeRect.MidX;
-            anchor.Y = anchor.Y * layerRect.Height + shapeRect.MidY;
-            
-            var transformGroup = new TransformGroup();
-            transformGroup.Children.Add(new ScaleTransform(size.Width, size.Height, anchor.X, anchor.Y));
-            transformGroup.Children.Add(new RotateTransform(rotation, anchor.X, anchor.Y));
-            transformGroup.Children.Add(new TranslateTransform(position.X * layerRect.Width, position.Y * layerRect.Height));
-
-            return transformGroup;
         }
     }
 
     public interface ILayerEditorService : IArtemisUIService
     {
+        /// <summary>
+        ///     Returns an absolute and scaled rectangle for the given layer that is corrected for the current render scale.
+        /// </summary>
+        /// <param name="layer"></param>
+        /// <returns></returns>
+        Rect GetLayerRenderRect(Layer layer);
+
+        /// <summary>
+        ///     Returns an absolute and scaled rectangular path for the given layer that is corrected for the current render scale.
+        /// </summary>
+        /// <param name="layer"></param>
+        /// <returns></returns>
+        SKPath GetLayerPath(Layer layer);
+
+        /// <summary>
+        ///     Returns an absolute and scaled anchor for the given layer, optionally with the translation applied.
+        /// </summary>
+        /// <param name="layer"></param>
+        /// <param name="includeTranslate"></param>
+        /// <returns></returns>
+        SKPoint GetLayerAnchor(Layer layer, bool includeTranslate);
+
+        /// <summary>
+        ///     Creates a WPF transform group that contains all the transformations required to render the provided layer.
+        ///     Note: Run on UI thread.
+        /// </summary>
+        /// <param name="layer"></param>
+        /// <returns></returns>
+        TransformGroup GetLayerTransformGroup(Layer layer);
+
         /// <summary>
         ///     Returns an absolute and scaled rectangle for the given shape that is corrected for the current render scale.
         /// </summary>
@@ -106,11 +187,11 @@ namespace Artemis.UI.Services
         void SetShapeRenderRect(LayerShape layerShape, Rect rect);
 
         /// <summary>
-        /// Creates a WPF transform group that contains all the transformations required to render the provided layer.
+        /// Returns a new point scaled to the layer.
-        /// Note: Run on UI thread.
         /// </summary>
         /// <param name="layer"></param>
+        /// <param name="point"></param>
         /// <returns></returns>
-        TransformGroup GetLayerTransformGroup(Layer layer);
+        SKPoint GetScaledPoint(Layer layer, SKPoint point);
     }
 }