Profile modules - Encapsulation fixes

Data bindings - Abstracted the data model selection

src/Artemis.Core/Plugins/Modules/Module.cs

@@ -164,6 +164,16 @@ namespace Artemis.Core.Modules
         /// </param>
         public abstract void ModuleDeactivated(bool isOverride);
 
+        internal virtual void InternalUpdate(double deltaTime)
+        {
+            Update(deltaTime);
+        }
+
+        internal virtual void InternalRender(double deltaTime, ArtemisSurface surface, SKCanvas canvas, SKImageInfo canvasInfo)
+        {
+            Render(deltaTime, surface, canvas, canvasInfo);
+        }
+
         /// <summary>
         ///     Evaluates the activation requirements following the <see cref="ActivationRequirementMode" /> and returns the result
         /// </summary>

src/Artemis.Core/Plugins/Modules/ProfileModule.cs

@@ -118,15 +118,7 @@ namespace Artemis.Core.Modules
         ///     Indicates whether or not a profile change is being animated
         /// </summary>
         public bool AnimatingProfileChange { get; private set; }
-
-        /// <summary>
-        ///     Called before the profile updates, this is the best place to perform data model updates
-        /// </summary>
-        /// <param name="deltaTime">Time in seconds since the last update</param>
-        public virtual void ProfileUpdate(double deltaTime)
-        {
-        }
-
+        
         /// <summary>
         ///     Called after the profile has updated
         /// </summary>
@@ -135,17 +127,6 @@ namespace Artemis.Core.Modules
         {
         }
 
-        /// <summary>
-        ///     Called before the profile renders
-        /// </summary>
-        /// <param name="deltaTime">Time since the last render</param>
-        /// <param name="surface">The RGB Surface to render to</param>
-        /// <param name="canvas"></param>
-        /// <param name="canvasInfo"></param>
-        public virtual void ProfileRender(double deltaTime, ArtemisSurface surface, SKCanvas canvas, SKImageInfo canvasInfo)
-        {
-        }
-
         /// <summary>
         ///     Called after the profile has rendered
         /// </summary>
@@ -157,10 +138,9 @@ namespace Artemis.Core.Modules
         {
         }
 
-        /// <inheritdoc />
-        public sealed override void Update(double deltaTime)
+        internal override void InternalUpdate(double deltaTime)
         {
-            ProfileUpdate(deltaTime);
+            Update(deltaTime);
 
             lock (this)
             {
@@ -176,10 +156,9 @@ namespace Artemis.Core.Modules
             ProfileUpdated(deltaTime);
         }
 
-        /// <inheritdoc />
-        public sealed override void Render(double deltaTime, ArtemisSurface surface, SKCanvas canvas, SKImageInfo canvasInfo)
+        internal override void InternalRender(double deltaTime, ArtemisSurface surface, SKCanvas canvas, SKImageInfo canvasInfo)
         {
-            ProfileRender(deltaTime, surface, canvas, canvasInfo);
+            Render(deltaTime, surface, canvas, canvasInfo);
 
             lock (this)
             {

src/Artemis.Core/Services/CoreService.cs

@@ -174,7 +174,7 @@ namespace Artemis.Core.Services
 
                 // Update all active modules
                 foreach (var module in modules)
-                    module.Update(args.DeltaTime);
+                    module.InternalUpdate(args.DeltaTime);
 
                 // If there is no ready bitmap brush, skip the frame
                 if (_rgbService.BitmapBrush == null)
@@ -192,7 +192,7 @@ namespace Artemis.Core.Services
                     {
                         // While non-activated modules may be updated above if they expand the main data model, they may never render
                         foreach (var module in modules.Where(m => m.IsActivated))
-                            module.Render(args.DeltaTime, _surfaceService.ActiveSurface, canvas, _rgbService.BitmapBrush.Bitmap.Info);
+                            module.InternalRender(args.DeltaTime, _surfaceService.ActiveSurface, canvas, _rgbService.BitmapBrush.Bitmap.Info);
                     }
 
                     OnFrameRendering(new FrameRenderingEventArgs(modules, canvas, args.DeltaTime, _rgbService.Surface));

src/Artemis.Core/Utilities/IntroAnimation.cs

@@ -77,6 +77,16 @@ namespace Artemis.Core
             throw new NotImplementedException();
         }
 
+        public override void Update(double deltaTime)
+        {
+            throw new NotImplementedException();
+        }
+
+        public override void Render(double deltaTime, ArtemisSurface surface, SKCanvas canvas, SKImageInfo canvasInfo)
+        {
+            throw new NotImplementedException();
+        }
+
         public override void ModuleActivated(bool isOverride)
         {
             throw new NotImplementedException();