mirror of
https://github.com/Artemis-RGB/Artemis
synced 2026-11-12 03:48:56 +00:00
Core wip things tired of writing descriptive messages ^^
This commit is contained in:
1 parent
d37420e462
commit
4cfe71796c
10 files changed
+24
-76
No files matched your search
@@ -118,27 +118,6 @@ namespace Artemis.Core
|
||||
return $"[Layer] {nameof(Name)}: {Name}, {nameof(Order)}: {Order}";
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
public override List<BaseLayerPropertyKeyframe> GetAllKeyframes()
|
||||
{
|
||||
if (_disposed)
|
||||
throw new ObjectDisposedException("Layer");
|
||||
|
||||
var keyframes = base.GetAllKeyframes();
|
||||
|
||||
foreach (var baseLayerProperty in General.GetAllLayerProperties())
|
||||
keyframes.AddRange(baseLayerProperty.BaseKeyframes);
|
||||
foreach (var baseLayerProperty in Transform.GetAllLayerProperties())
|
||||
keyframes.AddRange(baseLayerProperty.BaseKeyframes);
|
||||
if (LayerBrush?.BaseProperties != null)
|
||||
{
|
||||
foreach (var baseLayerProperty in LayerBrush.BaseProperties.GetAllLayerProperties())
|
||||
keyframes.AddRange(baseLayerProperty.BaseKeyframes);
|
||||
}
|
||||
|
||||
return keyframes;
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
protected override void Dispose(bool disposing)
|
||||
{
|
||||
@@ -311,19 +290,7 @@ namespace Artemis.Core
|
||||
baseLayerEffect.Update(delta);
|
||||
}
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
public override List<BaseLayerProperty> GetAllLayerProperties()
|
||||
{
|
||||
var result = base.GetAllLayerProperties();
|
||||
result.AddRange(General.GetAllLayerProperties());
|
||||
result.AddRange(Transform.GetAllLayerProperties());
|
||||
if (LayerBrush?.BaseProperties != null)
|
||||
result.AddRange(LayerBrush.BaseProperties.GetAllLayerProperties());
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
/// <inheritdoc />
|
||||
public override void Render(double deltaTime, SKCanvas canvas, SKImageInfo canvasInfo)
|
||||
{
|
||||
@@ -383,7 +350,6 @@ namespace Artemis.Core
|
||||
if (Parent is Folder parentFolder)
|
||||
targetLocation = Path.Bounds.Location - parentFolder.Path.Bounds.Location;
|
||||
|
||||
|
||||
canvas.DrawBitmap(_layerBitmap, targetLocation, layerPaint);
|
||||
}
|
||||
|
||||
|
||||
@@ -6,6 +6,7 @@ using System.Reflection;
|
||||
using Artemis.Core.LayerBrushes;
|
||||
using Artemis.Core.LayerEffects;
|
||||
using Artemis.Core.Properties;
|
||||
using Artemis.Core.Services;
|
||||
using Artemis.Storage.Entities.Profile;
|
||||
|
||||
namespace Artemis.Core
|
||||
@@ -170,6 +171,14 @@ namespace Artemis.Core
|
||||
OnPropertyGroupInitialized();
|
||||
}
|
||||
|
||||
internal void InitializeDataBindings(IDataModelService dataModelService, IDataModelService dataModelService1)
|
||||
{
|
||||
foreach (var layerProperty in LayerProperties)
|
||||
{
|
||||
layerProperty.InitializeDataBindings(dataModelService);
|
||||
}
|
||||
}
|
||||
|
||||
internal void ApplyToEntity()
|
||||
{
|
||||
if (!PropertiesInitialized)
|
||||
|
||||
@@ -12,21 +12,6 @@ namespace Artemis.Core
|
||||
{
|
||||
public abstract class RenderProfileElement : ProfileElement
|
||||
{
|
||||
/// <summary>
|
||||
/// Returns a list of all keyframes on all properties and effects of this layer
|
||||
/// </summary>
|
||||
public virtual List<BaseLayerPropertyKeyframe> GetAllKeyframes()
|
||||
{
|
||||
var keyframes = new List<BaseLayerPropertyKeyframe>();
|
||||
foreach (var layerEffect in LayerEffects)
|
||||
{
|
||||
foreach (var baseLayerProperty in layerEffect.BaseProperties.GetAllLayerProperties())
|
||||
keyframes.AddRange(baseLayerProperty.BaseKeyframes);
|
||||
}
|
||||
|
||||
return keyframes;
|
||||
}
|
||||
|
||||
protected void ApplyRenderElementDefaults()
|
||||
{
|
||||
MainSegmentLength = TimeSpan.FromSeconds(5);
|
||||
@@ -312,16 +297,5 @@ namespace Artemis.Core
|
||||
|
||||
#endregion
|
||||
|
||||
/// <summary>
|
||||
/// Returns all the layer properties of this profile element
|
||||
/// </summary>
|
||||
public virtual List<BaseLayerProperty> GetAllLayerProperties()
|
||||
{
|
||||
var result = new List<BaseLayerProperty>();
|
||||
foreach (var baseLayerEffect in LayerEffects)
|
||||
result.AddRange(baseLayerEffect.BaseProperties.GetAllLayerProperties());
|
||||
|
||||
return result;
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user