diff --git a/SpineViewer/Models/SpineObjectModel.cs b/SpineViewer/Models/SpineObjectModel.cs index 116d266..6501865 100644 --- a/SpineViewer/Models/SpineObjectModel.cs +++ b/SpineViewer/Models/SpineObjectModel.cs @@ -87,13 +87,13 @@ namespace SpineViewer.Models public bool UsePma { get { lock (_lock) return _spineObject.UsePma; } - set { lock (_lock) SetProperty(_spineObject.UsePma, value, _spineObject, (m, v) => m.UsePma = v); } + set { lock (_lock) SetProperty(_spineObject.UsePma, value, v => _spineObject.UsePma = v); } } public ISkeleton.Physics Physics { get { lock (_lock) return _spineObject.Physics; } - set { lock (_lock) SetProperty(_spineObject.Physics, value, _spineObject, (m, v) => m.Physics = v); } + set { lock (_lock) SetProperty(_spineObject.Physics, value, v => _spineObject.Physics = v); } } /// @@ -128,7 +128,7 @@ namespace SpineViewer.Models public bool FlipX { get { lock (_lock) return _spineObject.Skeleton.ScaleX < 0; } - set { lock (_lock) SetProperty(_spineObject.Skeleton.ScaleX < 0, value, _spineObject, (m, v) => m.Skeleton.ScaleX *= -1); } + set { lock (_lock) SetProperty(_spineObject.Skeleton.ScaleX < 0, value, v => _spineObject.Skeleton.ScaleX *= -1); } } /// @@ -137,19 +137,19 @@ namespace SpineViewer.Models public bool FlipY { get { lock (_lock) return _spineObject.Skeleton.ScaleY < 0; } - set { lock (_lock) SetProperty(_spineObject.Skeleton.ScaleY < 0, value, _spineObject, (m, v) => m.Skeleton.ScaleY *= -1); } + set { lock (_lock) SetProperty(_spineObject.Skeleton.ScaleY < 0, value, v => _spineObject.Skeleton.ScaleY *= -1); } } public float X { get { lock (_lock) return _spineObject.Skeleton.X; } - set { lock (_lock) SetProperty(_spineObject.Skeleton.X, value, _spineObject, (m, v) => m.Skeleton.X = v); } + set { lock (_lock) SetProperty(_spineObject.Skeleton.X, value, v => _spineObject.Skeleton.X = v); } } public float Y { get { lock (_lock) return _spineObject.Skeleton.Y; } - set { lock (_lock) SetProperty(_spineObject.Skeleton.Y, value, _spineObject, (m, v) => m.Skeleton.Y = v); } + set { lock (_lock) SetProperty(_spineObject.Skeleton.Y, value, v => _spineObject.Skeleton.Y = v); } } public ImmutableArray Skins => _skins; @@ -242,67 +242,67 @@ namespace SpineViewer.Models public bool EnableDebug { get { lock (_lock) return _spineObject.EnableDebug; } - set { lock (_lock) SetProperty(_spineObject.EnableDebug, value, _spineObject, (m, v) => m.EnableDebug = v); } + set { lock (_lock) SetProperty(_spineObject.EnableDebug, value, v => _spineObject.EnableDebug = v); } } public bool DebugTexture { get { lock (_lock) return _spineObject.DebugTexture; } - set { lock (_lock) SetProperty(_spineObject.DebugTexture, value, _spineObject, (m, v) => m.DebugTexture = v); } + set { lock (_lock) SetProperty(_spineObject.DebugTexture, value, v => _spineObject.DebugTexture = v); } } public bool DebugBounds { get { lock (_lock) return _spineObject.DebugBounds; } - set { lock (_lock) SetProperty(_spineObject.DebugBounds, value, _spineObject, (m, v) => m.DebugBounds = v); } + set { lock (_lock) SetProperty(_spineObject.DebugBounds, value, v => _spineObject.DebugBounds = v); } } public bool DebugBones { get { lock (_lock) return _spineObject.DebugBones; } - set { lock (_lock) SetProperty(_spineObject.DebugBones, value, _spineObject, (m, v) => m.DebugBones = v); } + set { lock (_lock) SetProperty(_spineObject.DebugBones, value, v => _spineObject.DebugBones = v); } } public bool DebugRegions { get { lock (_lock) return _spineObject.DebugRegions; } - set { lock (_lock) SetProperty(_spineObject.DebugRegions, value, _spineObject, (m, v) => m.DebugRegions = v); } + set { lock (_lock) SetProperty(_spineObject.DebugRegions, value, v => _spineObject.DebugRegions = v); } } public bool DebugMeshHulls { get { lock (_lock) return _spineObject.DebugMeshHulls; } - set { lock (_lock) SetProperty(_spineObject.DebugMeshHulls, value, _spineObject, (m, v) => m.DebugMeshHulls = v); } + set { lock (_lock) SetProperty(_spineObject.DebugMeshHulls, value, v => _spineObject.DebugMeshHulls = v); } } public bool DebugMeshes { get { lock (_lock) return _spineObject.DebugMeshes; } - set { lock (_lock) SetProperty(_spineObject.DebugMeshes, value, _spineObject, (m, v) => m.DebugMeshes = v); } + set { lock (_lock) SetProperty(_spineObject.DebugMeshes, value, v => _spineObject.DebugMeshes = v); } } public bool DebugBoundingBoxes { get { lock (_lock) return _spineObject.DebugBoundingBoxes; } - set { lock (_lock) SetProperty(_spineObject.DebugBoundingBoxes, value, _spineObject, (m, v) => m.DebugBoundingBoxes = v); } + set { lock (_lock) SetProperty(_spineObject.DebugBoundingBoxes, value, v => _spineObject.DebugBoundingBoxes = v); } } public bool DebugPaths { get { lock (_lock) return _spineObject.DebugPaths; } - set { lock (_lock) SetProperty(_spineObject.DebugPaths, value, _spineObject, (m, v) => m.DebugPaths = v); } + set { lock (_lock) SetProperty(_spineObject.DebugPaths, value, v => _spineObject.DebugPaths = v); } } public bool DebugPoints { get { lock (_lock) return _spineObject.DebugPoints; } - set { lock (_lock) SetProperty(_spineObject.DebugPoints, value, _spineObject, (m, v) => m.DebugPoints = v); } + set { lock (_lock) SetProperty(_spineObject.DebugPoints, value, v => _spineObject.DebugPoints = v); } } public bool DebugClippings { get { lock (_lock) return _spineObject.DebugClippings; } - set { lock (_lock) SetProperty(_spineObject.DebugClippings, value, _spineObject, (m, v) => m.DebugClippings = v); } + set { lock (_lock) SetProperty(_spineObject.DebugClippings, value, v => _spineObject.DebugClippings = v); } } public void Update(float delta) @@ -376,12 +376,12 @@ namespace SpineViewer.Models _spineObject.Skeleton.ScaleX = config.Scale; _spineObject.Skeleton.ScaleY = config.Scale; OnPropertyChanged(nameof(Scale)); - SetProperty(_spineObject.Skeleton.ScaleX < 0, config.FlipX, _spineObject, (m, v) => m.Skeleton.ScaleX *= -1, nameof(FlipX)); - SetProperty(_spineObject.Skeleton.ScaleY < 0, config.FlipY, _spineObject, (m, v) => m.Skeleton.ScaleY *= -1, nameof(FlipY)); - SetProperty(_spineObject.Skeleton.X, config.X, _spineObject, (m, v) => m.Skeleton.X = v, nameof(X)); - SetProperty(_spineObject.Skeleton.Y, config.Y, _spineObject, (m, v) => m.Skeleton.Y = v, nameof(Y)); - SetProperty(_spineObject.UsePma, config.UsePma, _spineObject, (m, v) => m.UsePma = v, nameof(UsePma)); - SetProperty(_spineObject.Physics, Enum.Parse(config.Physics ?? "Update", true), _spineObject, (m, v) => m.Physics = v, nameof(Physics)); + SetProperty(_spineObject.Skeleton.ScaleX < 0, config.FlipX, v => _spineObject.Skeleton.ScaleX *= -1, nameof(FlipX)); + SetProperty(_spineObject.Skeleton.ScaleY < 0, config.FlipY, v => _spineObject.Skeleton.ScaleY *= -1, nameof(FlipY)); + SetProperty(_spineObject.Skeleton.X, config.X, v => _spineObject.Skeleton.X = v, nameof(X)); + SetProperty(_spineObject.Skeleton.Y, config.Y, v => _spineObject.Skeleton.Y = v, nameof(Y)); + SetProperty(_spineObject.UsePma, config.UsePma, v => _spineObject.UsePma = v, nameof(UsePma)); + SetProperty(_spineObject.Physics, Enum.Parse(config.Physics ?? "Update", true), v => _spineObject.Physics = v, nameof(Physics)); foreach (var name in _spineObject.Data.Skins.Select(v => v.Name).Except(config.LoadedSkins)) if (_spineObject.SetSkinStatus(name, false)) @@ -405,16 +405,16 @@ namespace SpineViewer.Models trackIndex++; } - SetProperty(_spineObject.DebugTexture, config.DebugTexture, _spineObject, (m, v) => m.DebugTexture = v, nameof(DebugTexture)); - SetProperty(_spineObject.DebugBounds, config.DebugBounds, _spineObject, (m, v) => m.DebugBounds = v, nameof(DebugBounds)); - SetProperty(_spineObject.DebugBones, config.DebugBones, _spineObject, (m, v) => m.DebugBones = v, nameof(DebugBones)); - SetProperty(_spineObject.DebugRegions, config.DebugRegions, _spineObject, (m, v) => m.DebugRegions = v, nameof(DebugRegions)); - SetProperty(_spineObject.DebugMeshHulls, config.DebugMeshHulls, _spineObject, (m, v) => m.DebugMeshHulls = v, nameof(DebugMeshHulls)); - SetProperty(_spineObject.DebugMeshes, config.DebugMeshes, _spineObject, (m, v) => m.DebugMeshes = v, nameof(DebugMeshes)); - SetProperty(_spineObject.DebugBoundingBoxes, config.DebugBoundingBoxes, _spineObject, (m, v) => m.DebugBoundingBoxes = v, nameof(DebugBoundingBoxes)); - SetProperty(_spineObject.DebugPaths, config.DebugPaths, _spineObject, (m, v) => m.DebugPaths = v, nameof(DebugPaths)); - SetProperty(_spineObject.DebugPoints, config.DebugPoints, _spineObject, (m, v) => m.DebugPoints = v, nameof(DebugPoints)); - SetProperty(_spineObject.DebugClippings, config.DebugClippings, _spineObject, (m, v) => m.DebugClippings = v, nameof(DebugClippings)); + SetProperty(_spineObject.DebugTexture, config.DebugTexture, v => _spineObject.DebugTexture = v, nameof(DebugTexture)); + SetProperty(_spineObject.DebugBounds, config.DebugBounds, v => _spineObject.DebugBounds = v, nameof(DebugBounds)); + SetProperty(_spineObject.DebugBones, config.DebugBones, v => _spineObject.DebugBones = v, nameof(DebugBones)); + SetProperty(_spineObject.DebugRegions, config.DebugRegions, v => _spineObject.DebugRegions = v, nameof(DebugRegions)); + SetProperty(_spineObject.DebugMeshHulls, config.DebugMeshHulls, v => _spineObject.DebugMeshHulls = v, nameof(DebugMeshHulls)); + SetProperty(_spineObject.DebugMeshes, config.DebugMeshes, v => _spineObject.DebugMeshes = v, nameof(DebugMeshes)); + SetProperty(_spineObject.DebugBoundingBoxes, config.DebugBoundingBoxes, v => _spineObject.DebugBoundingBoxes = v, nameof(DebugBoundingBoxes)); + SetProperty(_spineObject.DebugPaths, config.DebugPaths, v => _spineObject.DebugPaths = v, nameof(DebugPaths)); + SetProperty(_spineObject.DebugPoints, config.DebugPoints, v => _spineObject.DebugPoints = v, nameof(DebugPoints)); + SetProperty(_spineObject.DebugClippings, config.DebugClippings, v => _spineObject.DebugClippings = v, nameof(DebugClippings)); } } diff --git a/SpineViewer/ViewModels/MainWindow/SFMLRendererViewModel.cs b/SpineViewer/ViewModels/MainWindow/SFMLRendererViewModel.cs index 6441782..7125d4d 100644 --- a/SpineViewer/ViewModels/MainWindow/SFMLRendererViewModel.cs +++ b/SpineViewer/ViewModels/MainWindow/SFMLRendererViewModel.cs @@ -88,55 +88,55 @@ namespace SpineViewer.ViewModels.MainWindow public uint ResolutionX { get => _renderer.Resolution.X; - set => SetProperty(_renderer.Resolution.X, value, _renderer, (r, v) => r.Resolution = new(v, r.Resolution.Y)); + set => SetProperty(_renderer.Resolution.X, value, v => _renderer.Resolution = new(v, _renderer.Resolution.Y)); } public uint ResolutionY { get => _renderer.Resolution.Y; - set => SetProperty(_renderer.Resolution.Y, value, _renderer, (r, v) => r.Resolution = new(r.Resolution.X, v)); + set => SetProperty(_renderer.Resolution.Y, value, v => _renderer.Resolution = new(_renderer.Resolution.X, v)); } public float CenterX { get => _renderer.Center.X; - set => SetProperty(_renderer.Center.X, value, _renderer, (r, v) => r.Center = new(v, r.Center.Y)); + set => SetProperty(_renderer.Center.X, value, v => _renderer.Center = new(v, _renderer.Center.Y)); } public float CenterY { get => _renderer.Center.Y; - set => SetProperty(_renderer.Center.Y, value, _renderer, (r, v) => r.Center = new(r.Center.X, v)); + set => SetProperty(_renderer.Center.Y, value, v => _renderer.Center = new(_renderer.Center.X, v)); } public float Zoom { get => _renderer.Zoom; - set => SetProperty(_renderer.Zoom, value, _renderer, (r, v) => r.Zoom = value); + set => SetProperty(_renderer.Zoom, value, v => _renderer.Zoom = value); } public float Rotation { get => _renderer.Rotation; - set => SetProperty(_renderer.Rotation, value, _renderer, (r, v) => r.Rotation = value); + set => SetProperty(_renderer.Rotation, value, v => _renderer.Rotation = value); } public bool FlipX { get => _renderer.FlipX; - set => SetProperty(_renderer.FlipX, value, _renderer, (r, v) => r.FlipX = value); + set => SetProperty(_renderer.FlipX, value, v => _renderer.FlipX = value); } public bool FlipY { get => _renderer.FlipY; - set => SetProperty(_renderer.FlipY, value, _renderer, (r, v) => r.FlipY = value); + set => SetProperty(_renderer.FlipY, value, v => _renderer.FlipY = value); } public uint MaxFps { get => _renderer.MaxFps; - set => SetProperty(_renderer.MaxFps, value, _renderer, (r, v) => r.MaxFps = value); + set => SetProperty(_renderer.MaxFps, value, v => _renderer.MaxFps = value); } public bool ShowAxis @@ -149,7 +149,7 @@ namespace SpineViewer.ViewModels.MainWindow public Color BackgroundColor { get => Color.FromRgb(_backgroundColor.R, _backgroundColor.G, _backgroundColor.B); - set => SetProperty(BackgroundColor, value, this, (m, v) => m._backgroundColor = new(value.R, value.G, value.B)); + set => SetProperty(BackgroundColor, value, v => _backgroundColor = new(value.R, value.G, value.B)); } private SFML.Graphics.Color _backgroundColor = new(105, 105, 105);