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

Implemented profile default loading and rendering without the editor

Browse Source 
Changed edit tool rotation to allow rotation past 360 degrees
This commit is contained in:
SpoinkyNL 2020-01-26 11:35:39 +01:00
parent f8fc30ace2
commit fabb385556
13 changed files with 116 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Artemis.Core/Models/Profile/KeyframeEngines/KeyframeEngine.cs
View File

@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using Artemis.Core.Exceptions;
using Artemis.Core.Models.Profile.LayerProperties;
@ -77,8 +78,7 @@ namespace Artemis.Core.Models.Profile.KeyframeEngines
return;
var keyframes = LayerProperty.UntypedKeyframes.ToList();
Progress = Progress.Add(TimeSpan.FromMilliseconds(deltaTime));
Progress = Progress.Add(TimeSpan.FromSeconds(deltaTime));
// The current keyframe is the last keyframe before the current time
CurrentKeyframe = keyframes.LastOrDefault(k => k.Position <= Progress);
// The next keyframe is the first keyframe that's after the current time
@ -112,7 +112,7 @@ namespace Artemis.Core.Models.Profile.KeyframeEngines
public void OverrideProgress(TimeSpan progress)
{
Progress = TimeSpan.Zero;
Update(progress.TotalMilliseconds);
Update(progress.TotalSeconds);
}
/// <summary>

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

@ -135,7 +135,7 @@ namespace Artemis.Core.Models.Profile
/// <summary>
/// The rotation property of this layer range 0 - 360, also found in <see cref="Properties" />
/// </summary>
public LayerProperty<int> RotationProperty { get; private set; }
public LayerProperty<float> RotationProperty { get; private set; }
/// <summary>
/// The opacity property of this layer range 0 - 100, also found in <see cref="Properties" />
@ -153,11 +153,8 @@ namespace Artemis.Core.Models.Profile
{
property.KeyframeEngine?.Update(deltaTime);
// This is a placeholder method of repeating the animation until repeat modes are implemented
if (property.KeyframeEngine != null && property.IsUsingKeyframes && property.KeyframeEngine.NextKeyframe == null)
{
Debug.WriteLine($"Reset {property} progress");
if (property.KeyframeEngine != null && property.IsUsingKeyframes && property.KeyframeEngine.NextKeyframe == null)
property.KeyframeEngine.OverrideProgress(TimeSpan.Zero);
}
}
LayerBrush?.Update(deltaTime);
@ -421,7 +418,7 @@ namespace Artemis.Core.Models.Profile
AnchorPointProperty = new LayerProperty<SKPoint>(this, transformProperty, "Core.AnchorPoint", "Anchor Point", "The point at which the shape is attached to its position.");
PositionProperty = new LayerProperty<SKPoint>(this, transformProperty, "Core.Position", "Position", "The position of the shape.");
SizeProperty = new LayerProperty<SKSize>(this, transformProperty, "Core.Size", "Size", "The size of the shape.") {InputAffix = "%"};
RotationProperty = new LayerProperty<int>(this, transformProperty, "Core.Rotation", "Rotation", "The rotation of the shape in degrees.") {InputAffix = "°"};
RotationProperty = new LayerProperty<float>(this, transformProperty, "Core.Rotation", "Rotation", "The rotation of the shape in degrees.") {InputAffix = "°"};
OpacityProperty = new LayerProperty<float>(this, transformProperty, "Core.Opacity", "Opacity", "The opacity of the shape.") {InputAffix = "%"};
transformProperty.Children.Add(AnchorPointProperty);
transformProperty.Children.Add(PositionProperty);

2
src/Artemis.Core/Models/Profile/LayerProperties/BaseLayerProperty.cs
View File

@ -222,6 +222,8 @@ namespace Artemis.Core.Models.Profile.LayerProperties
currentKeyframe.BaseValue = value;
}
OnValueChanged();
}
/// <summary>

5
src/Artemis.Core/Plugins/Abstract/ProfileModule.cs
View File

@ -13,6 +13,11 @@ namespace Artemis.Core.Plugins.Abstract
{
}
public override void EnablePlugin()
{
throw new NotImplementedException();
}
public Profile ActiveProfile { get; private set; }
/// <inheritdoc />

31
src/Artemis.Core/Services/CoreService.cs
View File

@ -23,17 +23,19 @@ namespace Artemis.Core.Services
private readonly IPluginService _pluginService;
private readonly IRgbService _rgbService;
private readonly ISurfaceService _surfaceService;
private readonly IProfileService _profileService;
private List<Module> _modules;
internal CoreService(ILogger logger, IPluginService pluginService, IRgbService rgbService, ISurfaceService surfaceService)
internal CoreService(ILogger logger, IPluginService pluginService, IRgbService rgbService, ISurfaceService surfaceService, IProfileService profileService)
{
_logger = logger;
_pluginService = pluginService;
_rgbService = rgbService;
_surfaceService = surfaceService;
_profileService = profileService;
_rgbService.Surface.Updating += SurfaceOnUpdating;
_rgbService.Surface.Updated += SurfaceOnUpdated;
_modules = _pluginService.GetPluginsOfType<Module>();
_pluginService.PluginEnabled += (sender, args) => _modules = _pluginService.GetPluginsOfType<Module>();
_pluginService.PluginDisabled += (sender, args) => _modules = _pluginService.GetPluginsOfType<Module>();
@ -42,6 +44,9 @@ namespace Artemis.Core.Services
Task.Run(Initialize);
}
public bool ModuleUpdatingDisabled { get; set; }
public bool ModuleRenderingDisabled { get; set; }
public void Dispose()
{
// Dispose services
@ -75,6 +80,8 @@ namespace Artemis.Core.Services
else
_logger.Information("Initialized without an active surface entity");
await Task.Run(() => _profileService.ActivateDefaultProfiles());
OnInitialized();
}
@ -82,11 +89,14 @@ namespace Artemis.Core.Services
{
try
{
lock (_modules)
if (!ModuleUpdatingDisabled)
{
// Update all active modules
foreach (var module in _modules)
module.Update(args.DeltaTime);
lock (_modules)
{
// Update all active modules
foreach (var module in _modules)
module.Update(args.DeltaTime);
}
}
// If there is no ready bitmap brush, skip the frame
@ -102,10 +112,13 @@ namespace Artemis.Core.Services
using (var canvas = new SKCanvas(_rgbService.BitmapBrush.Bitmap))
{
canvas.Clear(new SKColor(0, 0, 0));
lock (_modules)
if (!ModuleRenderingDisabled)
{
foreach (var module in _modules)
module.Render(args.DeltaTime, _surfaceService.ActiveSurface, canvas);
lock (_modules)
{
foreach (var module in _modules)
module.Render(args.DeltaTime, _surfaceService.ActiveSurface, canvas);
}
}
OnFrameRendering(new FrameRenderingEventArgs(_modules, canvas, args.DeltaTime, _rgbService.Surface));

13
src/Artemis.Core/Services/Interfaces/ICoreService.cs
View File

@ -6,9 +6,18 @@ namespace Artemis.Core.Services.Interfaces
public interface ICoreService : IArtemisService, IDisposable
{
/// <summary>
/// Indicates wether or not the core has been initialized
/// Gets whether the or not the core has been initialized
/// </summary>
bool IsInitialized { get; set; }
bool IsInitialized { get; }
/// <summary>
/// Gets or sets whether modules are updated each frame by calling their Update method
/// </summary>
bool ModuleUpdatingDisabled { get; set; }
/// <summary>
/// Gets or sets whether modules are rendered each frame by calling their Render method
/// </summary>
bool ModuleRenderingDisabled { get; set; }
/// <summary>
/// Occurs the core has finished initializing

1
src/Artemis.Core/Services/Storage/Interfaces/IProfileService.cs
View File

@ -7,6 +7,7 @@ namespace Artemis.Core.Services.Storage.Interfaces
{
public interface IProfileService : IArtemisService
{
void ActivateDefaultProfiles();
Profile CreateProfile(ProfileModule module, string name);
List<Profile> GetProfiles(ProfileModule module);
Profile GetActiveProfile(ProfileModule module);

15
src/Artemis.Core/Services/Storage/ProfileService.cs
View File

@ -14,7 +14,7 @@ using Newtonsoft.Json;
namespace Artemis.Core.Services.Storage
{
/// <summary>
/// Provides access to profile storage
/// Provides access to profile storage and is responsible for activating default profiles
/// </summary>
public class ProfileService : IProfileService
{
@ -35,6 +35,14 @@ namespace Artemis.Core.Services.Storage
_pluginService.PluginLoaded += OnPluginLoaded;
}
public void ActivateDefaultProfiles()
{
foreach (var profileModule in _pluginService.GetPluginsOfType<ProfileModule>())
{
var activeProfile = GetActiveProfile(profileModule);
ActivateProfile(profileModule, activeProfile);
}
}
public List<Profile> GetProfiles(ProfileModule module)
{
@ -204,6 +212,11 @@ namespace Artemis.Core.Services.Storage
ActiveProfilesInstantiateProfileLayerBrushes();
ActiveProfilesInstantiateKeyframeEngines();
}
else if (e.PluginInfo.Instance is ProfileModule profileModule)
{
var activeProfile = GetActiveProfile(profileModule);
ActivateProfile(profileModule, activeProfile);
}
}
#endregion

1
src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/PropertyTree/PropertyInput/PropertyInputViewModel.cs
View File

@ -34,6 +34,7 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.PropertyTree.P
throw new ArtemisUIException($"This input VM does not support the provided type {layerPropertyViewModel.LayerProperty.Type.Name}");
LayerPropertyViewModel = layerPropertyViewModel;
layerPropertyViewModel.LayerProperty.ValueChanged += (sender, args) => Update();
Update();
Initialized = true;

2
src/Artemis.UI/Screens/Module/ProfileEditor/ProfileEditorViewModel.cs
View File

@ -146,6 +146,7 @@ namespace Artemis.UI.Screens.Module.ProfileEditor
protected override void OnActivate()
{
LoadWorkspaceSettings();
_profileEditorService.StopRegularRender();
Task.Run(LoadProfiles);
base.OnActivate();
}
@ -153,6 +154,7 @@ namespace Artemis.UI.Screens.Module.ProfileEditor
protected override void OnDeactivate()
{
SaveWorkspaceSettings();
_profileEditorService.ResumeRegularRender();
base.OnDeactivate();
}

48
src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/Tools/EditToolViewModel.cs
View File

@ -20,8 +20,7 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.Visualization.Tools
private SKPoint _dragOffset;
private SKPoint _dragStart;
private SKPoint _dragStartAnchor;
private double _dragStartAngle;
private double _dragAngleOffset;
private float _previousDragAngle;
private SKSize _dragStartScale;
private bool _isDragging;
@ -111,8 +110,8 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.Visualization.Tools
// The path starts at 0,0 so there's no simple way to get the position relative to the top-left of the path
_dragStart = GetRelativePosition(sender, e).ToSKPoint();
_dragStartScale = layer.SizeProperty.CurrentValue;
_dragStartAngle = layer.RotationProperty.CurrentValue;
_dragAngleOffset = _dragStartAngle - CalculateAngle(_layerEditorService.GetLayerAnchor(layer, true), _dragStart);
_previousDragAngle = CalculateAngle(_layerEditorService.GetLayerAnchor(layer, true), _dragStart);
// Store the original position and do a test to figure out the mouse offset
var originalPosition = layer.PositionProperty.CurrentValue;
var scaledDragStart = _layerEditorService.GetScaledPoint(layer, _dragStart, true);
@ -358,15 +357,30 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.Visualization.Tools
{
if (!_isDragging || !(ProfileEditorService.SelectedProfileElement is Layer layer))
return;
var newRotation = CalculateAngle(_layerEditorService.GetLayerAnchor(layer, true), GetRelativePosition(sender, e).ToSKPoint()) + _dragAngleOffset;
if (newRotation < 0)
newRotation = 360 + newRotation;
var current = layer.RotationProperty.CurrentValue;
layer.RotationProperty.SetCurrentValue((int) Math.Round(newRotation, MidpointRounding.AwayFromZero), ProfileEditorService.CurrentTime);
Debug.WriteLine($"New rotation: {layer.RotationProperty.CurrentValue} Difference: {(layer.RotationProperty.CurrentValue - current)}");
var previousDragAngle = _previousDragAngle;
var newRotation = CalculateAngle(_layerEditorService.GetLayerAnchor(layer, true), GetRelativePosition(sender, e).ToSKPoint());
_previousDragAngle = newRotation;
// Allow the user to rotate the shape in increments of 5
if (Keyboard.IsKeyDown(Key.LeftShift) || Keyboard.IsKeyDown(Key.RightShift))
newRotation = (float)Math.Round(newRotation / 5f) * 5f;
var difference = newRotation - previousDragAngle;
if (difference < -350)
difference += 360;
else if (difference > 350)
difference -= 360;
newRotation = layer.RotationProperty.CurrentValue + difference;
// Round the end-result to increments of 5 as well, to avoid staying on an offset
if (Keyboard.IsKeyDown(Key.LeftShift) || Keyboard.IsKeyDown(Key.RightShift))
newRotation = (float)Math.Round(newRotation / 5f) * 5f;
else
newRotation = (float)Math.Round(newRotation, 2, MidpointRounding.AwayFromZero);
Debug.WriteLine(newRotation);
layer.RotationProperty.SetCurrentValue(newRotation, ProfileEditorService.CurrentTime);
ProfileEditorService.UpdateProfilePreview();
}
@ -459,12 +473,12 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.Visualization.Tools
return Math.Max(0.001f, _dragStartScale.Height + scaleToAdd);
}
private double CalculateAngle(SKPoint start, SKPoint arrival)
private float CalculateAngle(SKPoint start, SKPoint arrival)
{
var radian = Math.Atan2(start.Y - arrival.Y, start.X - arrival.X);
var angle = radian * (180 / Math.PI);
if (angle < 0.0)
angle += 360.0;
var radian = (float) Math.Atan2(start.Y - arrival.Y, start.X - arrival.X);
var angle = radian * (180f / (float) Math.PI);
if (angle < 0f)
angle += 360f;
return angle;
}

3
src/Artemis.UI/Services/Interfaces/IProfileEditorService.cs
View File

@ -47,5 +47,8 @@ namespace Artemis.UI.Services.Interfaces
/// Occurs when the profile preview has been updated
/// </summary>
event EventHandler ProfilePreviewUpdated;
void StopRegularRender();
void ResumeRegularRender();
}
}

21
src/Artemis.UI/Services/ProfileEditorService.cs
View File

@ -2,6 +2,7 @@
using System.Linq;
using Artemis.Core.Models.Profile;
using Artemis.Core.Plugins.Abstract;
using Artemis.Core.Services.Interfaces;
using Artemis.Core.Services.Storage.Interfaces;
using Artemis.UI.Services.Interfaces;
@ -9,12 +10,14 @@ namespace Artemis.UI.Services
{
public class ProfileEditorService : IProfileEditorService
{
private readonly ICoreService _coreService;
private readonly IProfileService _profileService;
private TimeSpan _currentTime;
private TimeSpan _lastUpdateTime;
public ProfileEditorService(IProfileService profileService)
public ProfileEditorService(ICoreService coreService, IProfileService profileService)
{
_coreService = coreService;
_profileService = profileService;
}
@ -75,8 +78,10 @@ namespace Artemis.UI.Services
// Force layer shape to redraw
layer.LayerShape?.CalculateRenderProperties();
// Update the brush with the delta (which can now be negative ^^)
layer.Update(delta.TotalSeconds);
// Manually update the layer's engine and brush
foreach (var property in layer.Properties)
property.KeyframeEngine?.Update(delta.TotalSeconds);
layer.LayerBrush?.Update(delta.TotalSeconds);
}
_lastUpdateTime = CurrentTime;
@ -122,6 +127,16 @@ namespace Artemis.UI.Services
public event EventHandler CurrentTimeChanged;
public event EventHandler ProfilePreviewUpdated;
public void StopRegularRender()
{
_coreService.ModuleUpdatingDisabled = true;
}
public void ResumeRegularRender()
{
_coreService.ModuleUpdatingDisabled = false;
}
protected virtual void OnSelectedProfileElementUpdated()
{
SelectedProfileElementUpdated?.Invoke(this, EventArgs.Empty);