Core - Layer refactor WIP

This commit is contained in:
Robert authored and SpoinkyNL committed 2020-09-08 19:17:04 +02:00
1 parent be897b99f7
commit d37420e462
33 files changed
+941 -895

No files matched your search

@@ -91,14 +91,9 @@ namespace Artemis.Core.Services
return RegisteredDataBindingModifierTypes.FirstOrDefault(o => o.PluginInfo.Guid == modifierTypePluginGuid && o.GetType().Name == modifierType);
}
public void LogModifierDeserializationFailure(DataBindingModifier dataBindingModifier, JsonSerializationException exception)
public void LogModifierDeserializationFailure(string modifierName, JsonSerializationException exception)
{
_logger.Warning(
exception,
"Failed to deserialize static parameter for operator {order}. {operatorType}",
dataBindingModifier.Entity.Order,
dataBindingModifier.Entity.ModifierType
);
_logger.Warning(exception, "Failed to deserialize static parameter for modifier {modifierName}", modifierName);
}
private void RegisterBuiltInModifiers()
@@ -41,8 +41,8 @@ namespace Artemis.Core.Services
/// <summary>
/// Logs a modifier deserialization failure
/// </summary>
/// <param name="dataBindingModifier">The modifier that failed to deserialize</param>
/// <param name="modifierName">The modifier that failed to deserialize</param>
/// <param name="exception">The JSON exception that occurred</param>
void LogModifierDeserializationFailure(DataBindingModifier dataBindingModifier, JsonSerializationException exception);
void LogModifierDeserializationFailure(string modifierName, JsonSerializationException exception);
}
}
@@ -30,8 +30,8 @@ namespace Artemis.Core.Services
parent.AddChild(layer);
// Layers have two hardcoded property groups, instantiate them
layer.General.InitializeProperties(this, layer, "General.");
layer.Transform.InitializeProperties(this, layer, "Transform.");
layer.General.Initialize(layer, "General.", Constants.CorePluginInfo);
layer.Transform.Initialize(layer, "Transform.", Constants.CorePluginInfo);
// With the properties loaded, the layer brush and effect can be instantiated
InstantiateLayerBrush(layer);
@@ -278,9 +278,9 @@ namespace Artemis.Core.Services
foreach (var layer in profile.GetAllLayers())
{
if (!layer.General.PropertiesInitialized)
layer.General.InitializeProperties(_renderElementService, layer, "General.");
layer.General.Initialize(layer, "General.", Constants.CorePluginInfo);
if (!layer.Transform.PropertiesInitialized)
layer.Transform.InitializeProperties(_renderElementService, layer, "Transform.");
layer.Transform.Initialize(layer, "Transform.", Constants.CorePluginInfo);
}
}