ClemensFischer/XAML-Map-Control
1
0
Fork 0
mirror of https://github.com/ClemensFischer/XAML-Map-Control.git synced 2026-04-09 00:14:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

Updated ViewTransform

Browse source
This commit is contained in:
ClemensFischer 2026-01-01 21:49:21 +01:00
parent f8f6fdc973
commit 00bb6756cf
1 changed files with 26 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

59
MapControl/Shared/ViewTransform.cs
View file

@ -47,15 +47,15 @@ namespace MapControl
{ {
Scale = scale; Scale = scale;
Rotation = ((rotation % 360d) + 360d) % 360d; Rotation = ((rotation % 360d) + 360d) % 360d;
var transform = new Matrix(scale, 0d, 0d, -scale, -scale * mapCenter.X, scale * mapCenter.Y);
#if AVALONIA #if AVALONIA
MapToViewMatrix = Matrix.CreateTranslation(-mapCenter.X, -mapCenter.Y) MapToViewMatrix = transform
* Matrix.CreateScale(scale, -scale) * Matrix.CreateRotation(Matrix.ToRadians(Rotation))
* Matrix.CreateRotation(Matrix.ToRadians(Rotation)) * Matrix.CreateTranslation(viewCenter.X, viewCenter.Y);
* Matrix.CreateTranslation(viewCenter.X, viewCenter.Y);
ViewToMapMatrix = MapToViewMatrix.Invert(); ViewToMapMatrix = MapToViewMatrix.Invert();
#else #else
var transform = new Matrix(scale, 0d, 0d, -scale, -scale * mapCenter.X, scale * mapCenter.Y);
transform.Rotate(Rotation); transform.Rotate(Rotation);
transform.Translate(viewCenter.X, viewCenter.Y); transform.Translate(viewCenter.X, viewCenter.Y);
MapToViewMatrix = transform; MapToViewMatrix = transform;
@ -70,11 +70,10 @@ namespace MapControl
/// </summary> /// </summary>
public Matrix GetMapTransform(Point relativeScale) public Matrix GetMapTransform(Point relativeScale)
{ {
#if AVALONIA
return Matrix.CreateScale(Scale * relativeScale.X, Scale * relativeScale.Y)
* Matrix.CreateRotation(Matrix.ToRadians(Rotation));
#else
var transform = new Matrix(Scale * relativeScale.X, 0d, 0d, Scale * relativeScale.Y, 0d, 0d); var transform = new Matrix(Scale * relativeScale.X, 0d, 0d, Scale * relativeScale.Y, 0d, 0d);
#if AVALONIA
return transform * Matrix.CreateRotation(Matrix.ToRadians(Rotation));
#else
transform.Rotate(Rotation); transform.Rotate(Rotation);
return transform; return transform;
#endif #endif
@ -96,12 +95,12 @@ namespace MapControl
var viewOrigin = MapToViewMatrix.Transform(mapOrigin); var viewOrigin = MapToViewMatrix.Transform(mapOrigin);
var transformScale = Scale / tileMatrixScale; var transformScale = Scale / tileMatrixScale;
#if AVALONIA
return Matrix.CreateScale(transformScale, transformScale)
* Matrix.CreateRotation(Matrix.ToRadians(Rotation))
* Matrix.CreateTranslation(viewOrigin.X, viewOrigin.Y);
#else
var transform = new Matrix(transformScale, 0d, 0d, transformScale, 0d, 0d); var transform = new Matrix(transformScale, 0d, 0d, transformScale, 0d, 0d);
#if AVALONIA
return transform
* Matrix.CreateRotation(Matrix.ToRadians(Rotation))
* Matrix.CreateTranslation(viewOrigin.X, viewOrigin.Y);
#else
transform.Rotate(Rotation); transform.Rotate(Rotation);
transform.Translate(viewOrigin.X, viewOrigin.Y); transform.Translate(viewOrigin.X, viewOrigin.Y);
return transform; return transform;
@ -117,31 +116,25 @@ namespace MapControl
// //
var origin = ViewToMapMatrix.Transform(new Point()); var origin = ViewToMapMatrix.Transform(new Point());
// Translation from origin to tile matrix origin in pixels.
//
var originOffsetX = tileMatrixScale * (origin.X - tileMatrixTopLeft.X);
var originOffsetY = tileMatrixScale * (tileMatrixTopLeft.Y - origin.Y);
var transformScale = tileMatrixScale / Scale; var transformScale = tileMatrixScale / Scale;
#if AVALONIA
var transform = Matrix.CreateScale(transformScale, transformScale)
* Matrix.CreateRotation(Matrix.ToRadians(-Rotation))
* Matrix.CreateTranslation(
tileMatrixScale * (origin.X - tileMatrixTopLeft.X),
tileMatrixScale * (tileMatrixTopLeft.Y - origin.Y));
// Transform view bounds to tile pixel bounds.
//
return new Rect(0d, 0d, viewWidth, viewHeight).TransformToAABB(transform);
#else
var transform = new Matrix(transformScale, 0d, 0d, transformScale, 0d, 0d); var transform = new Matrix(transformScale, 0d, 0d, transformScale, 0d, 0d);
var viewRect = new Rect(0d, 0d, viewWidth, viewHeight);
#if AVALONIA
return viewRect.TransformToAABB(transform
* Matrix.CreateRotation(Matrix.ToRadians(-Rotation))
* Matrix.CreateTranslation(originOffsetX, originOffsetY));
#else
transform.Rotate(-Rotation); transform.Rotate(-Rotation);
transform.Translate(originOffsetX, originOffsetY);
// Translate origin to tile matrix origin in pixels.
//
transform.Translate(
tileMatrixScale * (origin.X - tileMatrixTopLeft.X),
tileMatrixScale * (tileMatrixTopLeft.Y - origin.Y));
// Transform view bounds to tile pixel bounds. // Transform view bounds to tile pixel bounds.
// //
return new MatrixTransform { Matrix = transform } return new MatrixTransform { Matrix = transform }.TransformBounds(viewRect);
.TransformBounds(new Rect(0d, 0d, viewWidth, viewHeight));
#endif #endif
} }
} }