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

removed the generic TParent type parameter from Transform2D

Browse Source
This commit is contained in:
Dylan Wilson
2017-08-31 09:52:52 +10:00
parent f88c6a3f5e
commit dff508b6a3
6 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/MonoGame.Extended.Particles/ParticleEffect.cs
+1 -1
View File
@@ -8,7 +8,7 @@ using Newtonsoft.Json;
namespace MonoGame.Extended.Particles
{
public class ParticleEffect : Transform2D<ParticleEffect>
public class ParticleEffect : Transform2D
{
public ParticleEffect(string name = null, bool autoTrigger = true, float autoTriggerDelay = 0f)
{
Source/MonoGame.Extended.SceneGraphs/SceneNode.cs
+1 -1
View File
@@ -5,7 +5,7 @@ using MonoGame.Extended.Sprites;
namespace MonoGame.Extended.SceneGraphs
{
public class SceneNode : Transform2D<SceneNode>
public class SceneNode : Transform2D
{
public SceneNode(string name)
: this(name, Vector2.Zero, 0, Vector2.One)
Source/MonoGame.Extended/Sprites/Sprite.cs
+1 -1
View File
@@ -6,7 +6,7 @@ using MonoGame.Extended.TextureAtlases;
namespace MonoGame.Extended.Sprites
{
public class Sprite : Transform2D<Sprite>, IColorable, IRectangularF, ISpriteBatchDrawable
public class Sprite : Transform2D, IColorable, IRectangularF, ISpriteBatchDrawable
{
private TextureRegion2D _textureRegion;
Source/MonoGame.Extended/Transform.cs
+8 -11
View File
@@ -19,7 +19,6 @@ namespace MonoGame.Extended
/// three-dimensions.
/// </summary>
/// <typeparam name="TMatrix">The type of the matrix.</typeparam>
/// <typeparam name="TParent">The type of the parent transform.</typeparam>
/// <remarks>
/// <para>
/// Every game object has a transform which is used to store and manipulate the position, rotation and scale
@@ -27,17 +26,17 @@ namespace MonoGame.Extended
/// objects hierarchically.
/// </para>
/// <para>
/// This class shouldn't be used directly. Instead use either of the derived classes; <see cref="Transform2D{TParent}" /> or
/// This class shouldn't be used directly. Instead use either of the derived classes; <see cref="Transform2D" /> or
/// Transform3D.
/// </para>
/// </remarks>
[EditorBrowsable(EditorBrowsableState.Never)]
public abstract class BaseTransform<TMatrix, TParent>
where TMatrix : struct where TParent : BaseTransform<TMatrix, TParent>
public abstract class BaseTransform<TMatrix>
where TMatrix : struct
{
private TransformFlags _flags = TransformFlags.All; // dirty flags, set all dirty flags when created
private TMatrix _localMatrix; // model space to local space
private TParent _parent; // parent
private BaseTransform<TMatrix> _parent; // parent
private TMatrix _worldMatrix; // local space to world space
// internal contructor because people should not be using this class directly; they should use Transform2D or Transform3D
@@ -89,7 +88,7 @@ namespace MonoGame.Extended
/// </para>
/// </remarks>
[EditorBrowsable(EditorBrowsableState.Never)]
public TParent Parent
public BaseTransform<TMatrix> Parent
{
get { return _parent; }
set
@@ -137,7 +136,7 @@ namespace MonoGame.Extended
TransformBecameDirty?.Invoke();
}
private void OnParentChanged(TParent oldParent, TParent newParent)
private void OnParentChanged(BaseTransform<TMatrix> oldParent, BaseTransform<TMatrix> newParent)
{
var parent = oldParent;
while (parent != null)
@@ -190,8 +189,7 @@ namespace MonoGame.Extended
/// <summary>
/// Represents the position, rotation, and scale of a two-dimensional game object.
/// </summary>
/// <typeparam name="TParent">The type of the parent.</typeparam>
/// <seealso cref="BaseTransform{Matrix2D, TParent}" />
/// <seealso cref="BaseTransform{Matrix2D}" />
/// <seealso cref="IMovable" />
/// <seealso cref="IRotatable" />
/// <seealso cref="IScalable" />
@@ -202,8 +200,7 @@ namespace MonoGame.Extended
/// objects hierarchically.
/// </para>
/// </remarks>
public class Transform2D<TParent> : BaseTransform<Matrix2D, TParent>, IMovable, IRotatable, IScalable
where TParent : Transform2D<TParent>
public class Transform2D : BaseTransform<Matrix2D>, IMovable, IRotatable, IScalable
{
private Vector2 _position;
private float _rotation;