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

Release

Browse Source
This commit is contained in:
SpoinkyNL 2017-01-01 12:04:49 +01:00
parent e8d83d8c53
commit 88e5901b67
4 changed files with 92 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Artemis/Artemis/Managers/EffectManager.cs
View File

@ -35,8 +35,8 @@ namespace Artemis.Managers
models.AddRange(overlayModels); models.AddRange(overlayModels);
// Add games, exclude WoW if needed // Add games, exclude WoW if needed
models.AddRange(_generalSettings.GamestatePort != 62575 models.AddRange(_generalSettings.GamestatePort != 62575
? gameModels.Where(e => e.Name != "WoW").Where(e => e.Name != "LightFX") ? gameModels.Where(e => e.Name != "WoW")
: gameModels.Where(e => e.Name != "LightFX")); : gameModels);
EffectModels = models; EffectModels = models;
_logger.Info("Intialized EffectManager"); _logger.Info("Intialized EffectManager");

146
Artemis/Artemis/Modules/Games/LightFx/LightFxModel.cs
View File

@ -1,73 +1,73 @@
using System; //using System;
using System.Collections.Generic; //using System.Collections.Generic;
using System.IO; //using System.IO;
using Artemis.DAL; //using Artemis.DAL;
using Artemis.Managers; //using Artemis.Managers;
using Artemis.Models; //using Artemis.Models;
using Artemis.Profiles.Layers.Models; //using Artemis.Profiles.Layers.Models;
using Artemis.Utilities.DataReaders; //using Artemis.Utilities.DataReaders;
using Newtonsoft.Json; //using Newtonsoft.Json;
//
namespace Artemis.Modules.Games.LightFx //namespace Artemis.Modules.Games.LightFx
{ //{
public class LightFxModel : GameModel // public class LightFxModel : GameModel
{ // {
public LightFxModel(DeviceManager deviceManager, LuaManager luaManager, PipeServer pipeServer) // public LightFxModel(DeviceManager deviceManager, LuaManager luaManager, PipeServer pipeServer)
: base(deviceManager, luaManager, SettingsProvider.Load<LightFxSettings>(), new LightFxDataModel()) // : base(deviceManager, luaManager, SettingsProvider.Load<LightFxSettings>(), new LightFxDataModel())
{ // {
Name = "LightFX"; // Name = "LightFX";
ProcessName = "LoL"; // ProcessName = "LoL";
Scale = 4; // Scale = 4;
Enabled = Settings.Enabled; // Enabled = Settings.Enabled;
Initialized = false; // Initialized = false;
//
// This model can enable itself by changing its process name to the currently running Light FX game. // // This model can enable itself by changing its process name to the currently running Light FX game.
pipeServer.PipeMessage += PipeServerOnPipeMessage; // pipeServer.PipeMessage += PipeServerOnPipeMessage;
} // }
//
public int Scale { get; set; } // public int Scale { get; set; }
//
private void PipeServerOnPipeMessage(string msg) // private void PipeServerOnPipeMessage(string msg)
{ // {
// Ensure it's Light FX JSON // // Ensure it's Light FX JSON
if (!msg.Contains("lightFxState")) // if (!msg.Contains("lightFxState"))
return; // return;
//
// Deserialize and data // // Deserialize and data
try // try
{ // {
JsonConvert.PopulateObject(msg, DataModel); // JsonConvert.PopulateObject(msg, DataModel);
} // }
catch (Exception ex) // catch (Exception ex)
{ // {
Logger?.Error(ex, "Failed to deserialize LightFX JSON"); // Logger?.Error(ex, "Failed to deserialize LightFX JSON");
throw; // throw;
} // }
//
// Setup process name // // Setup process name
ProcessName = Path.GetFileNameWithoutExtension(((LightFxDataModel) DataModel).LightFxState.game); // ProcessName = Path.GetFileNameWithoutExtension(((LightFxDataModel) DataModel).LightFxState.game);
} // }
//
public override void Dispose() // public override void Dispose()
{ // {
Initialized = false; // Initialized = false;
base.Dispose(); // base.Dispose();
} // }
//
public override void Enable() // public override void Enable()
{ // {
base.Enable(); // base.Enable();
//
Initialized = true; // Initialized = true;
} // }
//
public override void Update() // public override void Update()
{ // {
} // }
//
public override List<LayerModel> GetRenderLayers(bool keyboardOnly) // public override List<LayerModel> GetRenderLayers(bool keyboardOnly)
{ // {
return Profile.GetRenderLayers(DataModel, keyboardOnly); // return Profile.GetRenderLayers(DataModel, keyboardOnly);
} // }
} // }
} //}

32
Artemis/Artemis/Modules/Games/LightFx/LightFxViewModel.cs
View File

@ -1,16 +1,16 @@
using Artemis.Managers; //using Artemis.Managers;
using Artemis.Models; //using Artemis.Models;
using Artemis.ViewModels.Abstract; //using Artemis.ViewModels.Abstract;
using Ninject; //using Ninject;
//
namespace Artemis.Modules.Games.LightFx //namespace Artemis.Modules.Games.LightFx
{ //{
public sealed class LightFxViewModel : GameViewModel // public sealed class LightFxViewModel : GameViewModel
{ // {
public LightFxViewModel(MainManager main, IKernel kernel, // public LightFxViewModel(MainManager main, IKernel kernel,
[Named("LightFxModel")] GameModel model) : base(main, model, kernel) // [Named("LightFxModel")] GameModel model) : base(main, model, kernel)
{ // {
DisplayName = "Light FX"; // DisplayName = "Light FX";
} // }
} // }
} //}

2
Artemis/Artemis/Modules/Games/ProjectCars/ProjectCarsView.xaml
View File

@ -31,7 +31,7 @@
<Label Grid.Row="0" Grid.ColumnSpan="2" FontSize="20" HorizontalAlignment="Left"> <Label Grid.Row="0" Grid.ColumnSpan="2" FontSize="20" HorizontalAlignment="Left">
<Label.Content> <Label.Content>
<AccessText TextWrapping="Wrap" <AccessText TextWrapping="Wrap"
Text="By default shows.. nothing yet! Default profiles next update :)" /> Text="By default shows RPM on the F-keys, gear on the other keys and track flags on the numpad." />
</Label.Content> </Label.Content>
</Label> </Label>