Color brush - Added linear gradient rotation

Profile editor - Updated conditions UI
This commit is contained in:
SpoinkyNL committed 2020-08-03 22:41:13 +02:00
1 parent 791204fcab
commit 9c95c8354e
21 files changed
+400 -150

No files matched your search

+7 -3
View File
@@ -39,6 +39,7 @@ namespace Artemis.Core.Models.Profile
Parent = parent;
Name = name;
Enabled = true;
DisplayContinuously = true;
General = new LayerGeneralProperties {IsCorePropertyGroup = true};
Transform = new LayerTransformProperties {IsCorePropertyGroup = true};
@@ -131,8 +132,11 @@ namespace Artemis.Core.Models.Profile
keyframes.AddRange(baseLayerProperty.BaseKeyframes);
foreach (var baseLayerProperty in Transform.GetAllLayerProperties())
keyframes.AddRange(baseLayerProperty.BaseKeyframes);
foreach (var baseLayerProperty in LayerBrush.BaseProperties.GetAllLayerProperties())
keyframes.AddRange(baseLayerProperty.BaseKeyframes);
if (LayerBrush?.BaseProperties != null)
{
foreach (var baseLayerProperty in LayerBrush.BaseProperties.GetAllLayerProperties())
keyframes.AddRange(baseLayerProperty.BaseKeyframes);
}
return keyframes;
}
@@ -246,7 +250,7 @@ namespace Artemis.Core.Models.Profile
if (stickToMainSegment)
{
if (!RepeatMainSegment)
if (!DisplayContinuously)
{
var position = timeOverride + StartSegmentLength;
if (position > StartSegmentLength + EndSegmentLength)