From 88e5901b67a9048a802d71ba2f38fdc9bfa232f0 Mon Sep 17 00:00:00 2001 From: SpoinkyNL Date: Sun, 1 Jan 2017 12:04:49 +0100 Subject: [PATCH] Release --- Artemis/Artemis/Managers/EffectManager.cs | 4 +- .../Modules/Games/LightFx/LightFxModel.cs | 146 +++++++++--------- .../Modules/Games/LightFx/LightFxViewModel.cs | 32 ++-- .../Games/ProjectCars/ProjectCarsView.xaml | 2 +- 4 files changed, 92 insertions(+), 92 deletions(-) diff --git a/Artemis/Artemis/Managers/EffectManager.cs b/Artemis/Artemis/Managers/EffectManager.cs index 5936411dd..4088dbda8 100644 --- a/Artemis/Artemis/Managers/EffectManager.cs +++ b/Artemis/Artemis/Managers/EffectManager.cs @@ -35,8 +35,8 @@ namespace Artemis.Managers models.AddRange(overlayModels); // Add games, exclude WoW if needed models.AddRange(_generalSettings.GamestatePort != 62575 - ? gameModels.Where(e => e.Name != "WoW").Where(e => e.Name != "LightFX") - : gameModels.Where(e => e.Name != "LightFX")); + ? gameModels.Where(e => e.Name != "WoW") + : gameModels); EffectModels = models; _logger.Info("Intialized EffectManager"); diff --git a/Artemis/Artemis/Modules/Games/LightFx/LightFxModel.cs b/Artemis/Artemis/Modules/Games/LightFx/LightFxModel.cs index 3d77bc907..b46b7e6ee 100644 --- a/Artemis/Artemis/Modules/Games/LightFx/LightFxModel.cs +++ b/Artemis/Artemis/Modules/Games/LightFx/LightFxModel.cs @@ -1,73 +1,73 @@ -using System; -using System.Collections.Generic; -using System.IO; -using Artemis.DAL; -using Artemis.Managers; -using Artemis.Models; -using Artemis.Profiles.Layers.Models; -using Artemis.Utilities.DataReaders; -using Newtonsoft.Json; - -namespace Artemis.Modules.Games.LightFx -{ - public class LightFxModel : GameModel - { - public LightFxModel(DeviceManager deviceManager, LuaManager luaManager, PipeServer pipeServer) - : base(deviceManager, luaManager, SettingsProvider.Load(), new LightFxDataModel()) - { - Name = "LightFX"; - ProcessName = "LoL"; - Scale = 4; - Enabled = Settings.Enabled; - Initialized = false; - - // This model can enable itself by changing its process name to the currently running Light FX game. - pipeServer.PipeMessage += PipeServerOnPipeMessage; - } - - public int Scale { get; set; } - - private void PipeServerOnPipeMessage(string msg) - { - // Ensure it's Light FX JSON - if (!msg.Contains("lightFxState")) - return; - - // Deserialize and data - try - { - JsonConvert.PopulateObject(msg, DataModel); - } - catch (Exception ex) - { - Logger?.Error(ex, "Failed to deserialize LightFX JSON"); - throw; - } - - // Setup process name - ProcessName = Path.GetFileNameWithoutExtension(((LightFxDataModel) DataModel).LightFxState.game); - } - - public override void Dispose() - { - Initialized = false; - base.Dispose(); - } - - public override void Enable() - { - base.Enable(); - - Initialized = true; - } - - public override void Update() - { - } - - public override List GetRenderLayers(bool keyboardOnly) - { - return Profile.GetRenderLayers(DataModel, keyboardOnly); - } - } -} \ No newline at end of file +//using System; +//using System.Collections.Generic; +//using System.IO; +//using Artemis.DAL; +//using Artemis.Managers; +//using Artemis.Models; +//using Artemis.Profiles.Layers.Models; +//using Artemis.Utilities.DataReaders; +//using Newtonsoft.Json; +// +//namespace Artemis.Modules.Games.LightFx +//{ +// public class LightFxModel : GameModel +// { +// public LightFxModel(DeviceManager deviceManager, LuaManager luaManager, PipeServer pipeServer) +// : base(deviceManager, luaManager, SettingsProvider.Load(), new LightFxDataModel()) +// { +// Name = "LightFX"; +// ProcessName = "LoL"; +// Scale = 4; +// Enabled = Settings.Enabled; +// Initialized = false; +// +// // This model can enable itself by changing its process name to the currently running Light FX game. +// pipeServer.PipeMessage += PipeServerOnPipeMessage; +// } +// +// public int Scale { get; set; } +// +// private void PipeServerOnPipeMessage(string msg) +// { +// // Ensure it's Light FX JSON +// if (!msg.Contains("lightFxState")) +// return; +// +// // Deserialize and data +// try +// { +// JsonConvert.PopulateObject(msg, DataModel); +// } +// catch (Exception ex) +// { +// Logger?.Error(ex, "Failed to deserialize LightFX JSON"); +// throw; +// } +// +// // Setup process name +// ProcessName = Path.GetFileNameWithoutExtension(((LightFxDataModel) DataModel).LightFxState.game); +// } +// +// public override void Dispose() +// { +// Initialized = false; +// base.Dispose(); +// } +// +// public override void Enable() +// { +// base.Enable(); +// +// Initialized = true; +// } +// +// public override void Update() +// { +// } +// +// public override List GetRenderLayers(bool keyboardOnly) +// { +// return Profile.GetRenderLayers(DataModel, keyboardOnly); +// } +// } +//} \ No newline at end of file diff --git a/Artemis/Artemis/Modules/Games/LightFx/LightFxViewModel.cs b/Artemis/Artemis/Modules/Games/LightFx/LightFxViewModel.cs index 23ab9c59b..a2d86d3f5 100644 --- a/Artemis/Artemis/Modules/Games/LightFx/LightFxViewModel.cs +++ b/Artemis/Artemis/Modules/Games/LightFx/LightFxViewModel.cs @@ -1,16 +1,16 @@ -using Artemis.Managers; -using Artemis.Models; -using Artemis.ViewModels.Abstract; -using Ninject; - -namespace Artemis.Modules.Games.LightFx -{ - public sealed class LightFxViewModel : GameViewModel - { - public LightFxViewModel(MainManager main, IKernel kernel, - [Named("LightFxModel")] GameModel model) : base(main, model, kernel) - { - DisplayName = "Light FX"; - } - } -} \ No newline at end of file +//using Artemis.Managers; +//using Artemis.Models; +//using Artemis.ViewModels.Abstract; +//using Ninject; +// +//namespace Artemis.Modules.Games.LightFx +//{ +// public sealed class LightFxViewModel : GameViewModel +// { +// public LightFxViewModel(MainManager main, IKernel kernel, +// [Named("LightFxModel")] GameModel model) : base(main, model, kernel) +// { +// DisplayName = "Light FX"; +// } +// } +//} \ No newline at end of file diff --git a/Artemis/Artemis/Modules/Games/ProjectCars/ProjectCarsView.xaml b/Artemis/Artemis/Modules/Games/ProjectCars/ProjectCarsView.xaml index 0fd088dd3..e31d9c3be 100644 --- a/Artemis/Artemis/Modules/Games/ProjectCars/ProjectCarsView.xaml +++ b/Artemis/Artemis/Modules/Games/ProjectCars/ProjectCarsView.xaml @@ -31,7 +31,7 @@