DarthAffe/Artemis
1
0
Fork 0
mirror of https://github.com/Artemis-RGB/Artemis synced 2025-12-13 05:48:35 +00:00
Code Issues Releases Wiki Activity

Revert "Layer brushes - Moved abstract classes to their own namespace"

Browse Source 
This reverts commit 6ab7ecfe5c4525571e566ceb8a1490b288e2bc40.
This commit is contained in:
SpoinkyNL 2020-06-04 20:29:14 +02:00
parent 852711aa11
commit e841d81a5d
14 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Artemis.Core/Models/Profile/Layer.cs
View File

@ -8,7 +8,6 @@ using Artemis.Core.Models.Profile.LayerProperties.Attributes;
using Artemis.Core.Models.Profile.LayerShapes;
using Artemis.Core.Models.Surface;
using Artemis.Core.Plugins.LayerBrush;
using Artemis.Core.Plugins.LayerBrush.Abstract;
using Artemis.Core.Services;
using Artemis.Core.Services.Interfaces;
using Artemis.Storage.Entities.Profile;

4
src/Artemis.Core/Plugins/LayerBrush/Abstract/BaseLayerBrush.cs → src/Artemis.Core/Plugins/LayerBrush/BaseLayerBrush.cs
View File

@ -1,11 +1,13 @@
using System;
using System.Linq;
using Artemis.Core.Models.Profile;
using Artemis.Core.Plugins.Models;
using Artemis.Core.Services.Interfaces;
using RGB.NET.Core;
using RGB.NET.Groups;
using SkiaSharp;
namespace Artemis.Core.Plugins.LayerBrush.Abstract
namespace Artemis.Core.Plugins.LayerBrush
{
/// <summary>
/// For internal use only, please use <see cref="LayerBrush{T}" /> or <see cref="RgbNetLayerBrush{T}" /> or instead

2
src/Artemis.Core/Plugins/LayerBrush/Abstract/LayerBrush.cs → src/Artemis.Core/Plugins/LayerBrush/LayerBrush.cs
View File

@ -4,7 +4,7 @@ using Artemis.Core.Services.Interfaces;
using RGB.NET.Core;
using SkiaSharp;
namespace Artemis.Core.Plugins.LayerBrush.Abstract
namespace Artemis.Core.Plugins.LayerBrush
{
public abstract class LayerBrush<T> : PropertiesLayerBrush<T> where T : LayerPropertyGroup
{

1
src/Artemis.Core/Plugins/LayerBrush/LayerBrushProvider.cs
View File

@ -1,7 +1,6 @@
using System.Collections.Generic;
using System.Collections.ObjectModel;
using Artemis.Core.Plugins.Abstract;
using Artemis.Core.Plugins.LayerBrush.Abstract;
using Artemis.Core.Plugins.Models;
namespace Artemis.Core.Plugins.LayerBrush

2
src/Artemis.Core/Plugins/LayerBrush/Abstract/PropertiesLayerBrush.cs → src/Artemis.Core/Plugins/LayerBrush/PropertiesLayerBrush.cs
View File

@ -3,7 +3,7 @@ using Artemis.Core.Models.Profile;
using Artemis.Core.Plugins.Exceptions;
using Artemis.Core.Services.Interfaces;
namespace Artemis.Core.Plugins.LayerBrush.Abstract
namespace Artemis.Core.Plugins.LayerBrush
{
/// <summary>
/// For internal use only, please use <see cref="LayerBrush{T}" /> or <see cref="RgbNetLayerBrush{T}" /> or instead

2
src/Artemis.Core/Plugins/LayerBrush/Abstract/RgbNetLayerBrush.cs → src/Artemis.Core/Plugins/LayerBrush/RgbNetLayerBrush.cs
View File

@ -6,7 +6,7 @@ using RGB.NET.Core;
using RGB.NET.Groups;
using SkiaSharp;
namespace Artemis.Core.Plugins.LayerBrush.Abstract
namespace Artemis.Core.Plugins.LayerBrush
{
public abstract class RgbNetLayerBrush<T> : PropertiesLayerBrush<T> where T : LayerPropertyGroup
{

1
src/Artemis.Core/Services/Interfaces/ILayerService.cs
View File

@ -1,6 +1,5 @@
using Artemis.Core.Models.Profile;
using Artemis.Core.Plugins.LayerBrush;
using Artemis.Core.Plugins.LayerBrush.Abstract;
namespace Artemis.Core.Services.Interfaces
{

1
src/Artemis.Core/Services/LayerService.cs
View File

@ -3,7 +3,6 @@ using System.Linq;
using Artemis.Core.Exceptions;
using Artemis.Core.Models.Profile;
using Artemis.Core.Plugins.LayerBrush;
using Artemis.Core.Plugins.LayerBrush.Abstract;
using Artemis.Core.Services.Interfaces;
using Ninject;
using Ninject.Parameters;

6
src/Artemis.UI.Shared/Controls/DraggableFloat.xaml
View File

@ -21,12 +21,12 @@
<Rectangle x:Name="BorderVisual"
StrokeDashArray="2 2" Stroke="{DynamicResource SecondaryAccentBrush}" StrokeThickness="1"
Width="{Binding RelativeSource={RelativeSource AncestorType={x:Type Border}}, Path=ActualWidth}"
Height="{Binding RelativeSource={RelativeSource AncestorType={x:Type Border}}, Path=ActualHeight}" />
Height="{Binding RelativeSource={RelativeSource AncestorType={x:Type Border}}, Path=ActualHeight}">
</Rectangle>
</VisualBrush.Visual>
</VisualBrush>
</Border.BorderBrush>
<TextBlock Style="{x:Null}"
Width="60"
<TextBlock Width="60"
Height="17"
Padding="1 0"
Margin="0 4 0 0"

1
src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/LayerPropertiesViewModel.cs
View File

@ -10,7 +10,6 @@ using Artemis.Core.Models.Profile;
using Artemis.Core.Models.Profile.LayerProperties;
using Artemis.Core.Models.Profile.LayerProperties.Attributes;
using Artemis.Core.Plugins.LayerBrush;
using Artemis.Core.Plugins.LayerBrush.Abstract;
using Artemis.Core.Services;
using Artemis.Core.Services.Interfaces;
using Artemis.UI.Events;

1
src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/ProfileViewModel.cs
View File

@ -7,7 +7,6 @@ using Artemis.Core.Events;
using Artemis.Core.Models.Profile;
using Artemis.Core.Models.Surface;
using Artemis.Core.Plugins.LayerBrush;
using Artemis.Core.Plugins.LayerBrush.Abstract;
using Artemis.Core.Plugins.Models;
using Artemis.Core.Services;
using Artemis.Core.Services.Interfaces;

3
src/Plugins/Artemis.Plugins.LayerBrushes.Color/ColorBrush.cs
View File

@ -1,7 +1,6 @@
using System;
using Artemis.Core.Models.Profile;
using Artemis.Core.Plugins.LayerBrush;
using Artemis.Core.Plugins.LayerBrush.Abstract;
using SkiaSharp;
namespace Artemis.Plugins.LayerBrushes.Color
@ -73,7 +72,7 @@ namespace Artemis.Plugins.LayerBrushes.Color
SKShaderTileMode.Repeat),
GradientType.RadialGradient => SKShader.CreateRadialGradient(
center,
Math.Max(_shaderBounds.Width, _shaderBounds.Height),
Math.Min(_shaderBounds.Width, _shaderBounds.Height),
Properties.Gradient.BaseValue.GetColorsArray(),
Properties.Gradient.BaseValue.GetPositionsArray(),
SKShaderTileMode.Repeat),

1
src/Plugins/Artemis.Plugins.LayerBrushes.ColorRgbNet/RgbNetColorBrush.cs
View File

@ -2,7 +2,6 @@
using Artemis.Core.Extensions;
using Artemis.Core.Models.Profile;
using Artemis.Core.Plugins.LayerBrush;
using Artemis.Core.Plugins.LayerBrush.Abstract;
using RGB.NET.Brushes;
using RGB.NET.Core;

1
src/Plugins/Artemis.Plugins.LayerBrushes.Noise/NoiseBrush.cs
View File

@ -2,7 +2,6 @@
using System.ComponentModel;
using Artemis.Core.Models.Profile;
using Artemis.Core.Plugins.LayerBrush;
using Artemis.Core.Plugins.LayerBrush.Abstract;
using Artemis.Core.Services.Interfaces;
using Artemis.Plugins.LayerBrushes.Noise.Utilities;
using SkiaSharp;