amacocian/MonoGame.Extended
1
0
Fork 0
mirror of https://github.com/AlexMacocian/MonoGame.Extended.git synced 2026-07-25 08:22:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix nested transform WorldMatrix calculation (#385)

Browse Source 
* fix nested transform calculations

* TransformComponent2D implements IMovable, IRotatable, IScalable
This commit is contained in:
John Girvin
2017-05-14 20:31:20 +10:00
committed by Dylan Wilson
parent 9b7614ceb9
commit e82a0fca8f
2 changed files with 14 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/MonoGame.Extended.Entities/Entities/TransformComponent2D.cs
+6 -14
View File
@@ -4,7 +4,7 @@ using Microsoft.Xna.Framework;
namespace MonoGame.Extended.Entities
{
[EntityComponent]
public class TransformComponent2D : EntityComponent
public class TransformComponent2D : EntityComponent, IMovable, IRotatable, IScalable
{
private TransformFlags _flags = TransformFlags.All; // dirty flags, set all dirty flags when created
private Matrix2D _localMatrix; // model space to local space
@@ -148,6 +148,7 @@ namespace MonoGame.Extended.Entities
RecalculateLocalMatrixIfNecessary();
RecalculateWorldMatrix(ref _localMatrix, out _worldMatrix);
_flags &= ~TransformFlags.WorldMatrixIsDirty;
}
@@ -167,7 +168,7 @@ namespace MonoGame.Extended.Entities
if (Parent != null)
{
Parent.GetWorldMatrix(out matrix);
Matrix2D.Multiply(ref matrix, ref localMatrix, out matrix);
Matrix2D.Multiply(ref localMatrix, ref matrix, out matrix);
}
else
{
@@ -177,18 +178,9 @@ namespace MonoGame.Extended.Entities
private void RecalculateLocalMatrix(out Matrix2D matrix)
{
if (Parent != null)
{
var parentPosition = Parent.Position;
matrix = Matrix2D.CreateTranslation(-parentPosition) * Matrix2D.CreateScale(_scale) *
Matrix2D.CreateRotationZ(-_rotation) * Matrix2D.CreateTranslation(parentPosition) *
Matrix2D.CreateTranslation(_position);
}
else
{
matrix = Matrix2D.CreateScale(_scale) * Matrix2D.CreateRotationZ(-_rotation) *
Matrix2D.CreateTranslation(_position);
}
matrix = Matrix2D.CreateScale(_scale) *
Matrix2D.CreateRotationZ(_rotation) *
Matrix2D.CreateTranslation(_position);
}
[Flags]
Source/MonoGame.Extended/Transform.cs
+8 -13
View File
@@ -165,6 +165,7 @@ namespace MonoGame.Extended
RecalculateLocalMatrixIfNecessary();
RecalculateWorldMatrix(ref _localMatrix, out _worldMatrix);
_flags &= ~TransformFlags.WorldMatrixIsDirty;
TranformUpdated?.Invoke();
}
@@ -287,26 +288,20 @@ namespace MonoGame.Extended
if (Parent != null)
{
Parent.GetWorldMatrix(out matrix);
Matrix2D.Multiply(ref matrix, ref localMatrix, out matrix);
Matrix2D.Multiply(ref localMatrix, ref matrix, out matrix);
}
else
{
matrix = localMatrix;
}
}
protected internal override void RecalculateLocalMatrix(out Matrix2D matrix)
{
if (Parent != null)
{
var parentPosition = Parent.Position;
matrix = Matrix2D.CreateTranslation(-parentPosition)*Matrix2D.CreateScale(_scale)*
Matrix2D.CreateRotationZ(-_rotation)*Matrix2D.CreateTranslation(parentPosition)*
Matrix2D.CreateTranslation(_position);
}
else
{
matrix = Matrix2D.CreateScale(_scale)*Matrix2D.CreateRotationZ(-_rotation)*
Matrix2D.CreateTranslation(_position);
}
matrix = Matrix2D.CreateScale(_scale) *
Matrix2D.CreateRotationZ(_rotation) *
Matrix2D.CreateTranslation(_position);
}
}
}