CS:GO and Audio Visualization fixes

Artemis/Artemis/App.config

@@ -4,6 +4,7 @@
   <configSections>
     <sectionGroup name="userSettings"
                   type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+      <section name="Artemis.Modules.Effects.AudioVisualizer.AudioVisualization" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
       <section name="Artemis.Modules.Games.CounterStrike.CounterStrike" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
       <section name="Artemis.Settings.CounterStrike" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
       <section name="Artemis.Settings.VolumeDisplay" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
@@ -28,6 +29,26 @@
     <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
   </startup>
   <userSettings>
+    <Artemis.Modules.Effects.AudioVisualizer.AudioVisualization>
+      <setting name="Sensitivity" serializeAs="String">
+        <value>4</value>
+      </setting>
+      <setting name="Bars" serializeAs="String">
+        <value>21</value>
+      </setting>
+      <setting name="FromBottom" serializeAs="String">
+        <value>True</value>
+      </setting>
+      <setting name="FadeSpeed" serializeAs="String">
+        <value>3</value>
+      </setting>
+      <setting name="MainColor" serializeAs="String">
+        <value>#FF0000FF</value>
+      </setting>
+      <setting name="SecondaryColor" serializeAs="String">
+        <value>#FF1E90FF</value>
+      </setting>
+    </Artemis.Modules.Effects.AudioVisualizer.AudioVisualization>
     <Artemis.Modules.Games.CounterStrike.CounterStrike>
       <setting name="GameDirectory" serializeAs="String">
         <value />

Artemis/Artemis/Artemis.csproj

@@ -221,8 +221,8 @@
     <Compile Include="Utilities\Audio\FftEventArgs.cs" />
     <Compile Include="Utilities\Audio\SampleAggregator.cs" />
     <Compile Include="Utilities\ColorHelpers.cs" />
-    <Compile Include="Utilities\GameSense\GameDataReceivedEventArgs.cs" />
+    <Compile Include="Utilities\GameState\GameDataReceivedEventArgs.cs" />
-    <Compile Include="Utilities\GameSense\GameSenseWebServer.cs" />
+    <Compile Include="Utilities\GameState\GameStateWebServer.cs" />
     <Compile Include="Utilities\Memory\Memory.cs" />
     <Compile Include="Utilities\Memory\MemoryHelpers.cs" />
     <Compile Include="Utilities\Memory\Win32.cs" />

Artemis/Artemis/Models/MainModel.cs

@@ -7,7 +7,7 @@ using System.Threading;
 using Artemis.Events;
 using Artemis.KeyboardProviders;
 using Artemis.Settings;
-using Artemis.Utilities.GameSense;
+using Artemis.Utilities.GameState;
 using Artemis.Utilities.Memory;
 using Caliburn.Micro;
 
@@ -22,7 +22,7 @@ namespace Artemis.Models
         {
             EffectModels = new List<EffectModel>();
             KeyboardProviders = ProviderHelper.GetKeyboardProviders();
-            GameSenseWebServer = new GameSenseWebServer();
+            GameStateWebServer = new GameStateWebServer();
 
             Events = events;
             Fps = 25;
@@ -38,7 +38,7 @@ namespace Artemis.Models
         public KeyboardProvider ActiveKeyboard { get; set; }
         public List<KeyboardProvider> KeyboardProviders { get; set; }
 
-        public GameSenseWebServer GameSenseWebServer { get; set; }
+        public GameStateWebServer GameStateWebServer { get; set; }
         public IEventAggregator Events { get; set; }
         public int Fps { get; set; }
         public bool Enabled { get; set; }
@@ -50,7 +50,7 @@ namespace Artemis.Models
             LoadLastKeyboard();
 
             // Start the webserver
-            GameSenseWebServer.Start();
+            GameStateWebServer.Start();
 
             // Load last non-game effect and enable
             LoadLastEffect();

Artemis/Artemis/Modules/Effects/AudioVisualizer/AudioVisualization.Designer.cs

@@ -49,13 +49,13 @@ namespace Artemis.Modules.Effects.AudioVisualizer {
         
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("1")]
+        [global::System.Configuration.DefaultSettingValueAttribute("True")]
-        public int Spread {
+        public bool FromBottom {
             get {
-                return ((int)(this["Spread"]));
+                return ((bool)(this["FromBottom"]));
             }
             set {
-                this["Spread"] = value;
+                this["FromBottom"] = value;
             }
         }
         

Artemis/Artemis/Modules/Effects/AudioVisualizer/AudioVisualization.settings

@@ -1,7 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-
+<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="Artemis.Modules.Effects.AudioVisualizer" GeneratedClassName="AudioVisualization">
-<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)"
-              GeneratedClassNamespace="Artemis.Settings" GeneratedClassName="AudioVisualization">
   <Profiles />
   <Settings>
     <Setting Name="Sensitivity" Type="System.Int32" Scope="User">
@@ -10,8 +8,8 @@
     <Setting Name="Bars" Type="System.Int32" Scope="User">
       <Value Profile="(Default)">21</Value>
     </Setting>
-    <Setting Name="Spread" Type="System.Int32" Scope="User">
+    <Setting Name="FromBottom" Type="System.Boolean" Scope="User">
-      <Value Profile="(Default)">1</Value>
+      <Value Profile="(Default)">True</Value>
     </Setting>
     <Setting Name="FadeSpeed" Type="System.Int32" Scope="User">
       <Value Profile="(Default)">3</Value>

Artemis/Artemis/Modules/Effects/AudioVisualizer/AudioVisualizerModel.cs

@@ -18,6 +18,7 @@ namespace Artemis.Modules.Effects.AudioVisualizer
         private readonly SampleAggregator _sampleAggregator = new SampleAggregator(FftLength);
         private bool _generating;
         private IWaveIn _waveIn;
+        private bool _previousFromBottom;
 
         public AudioVisualizerModel(AudioVisualizerSettings settings)
         {
@@ -96,6 +97,9 @@ namespace Artemis.Modules.Effects.AudioVisualizer
             // Clear the rectangle cache on Bars settings change
             if (SoundRectangles.Count != Settings.Bars)
                 SoundRectangles.Clear();
+            if (Settings.FromBottom != _previousFromBottom)
+                SoundRectangles.Clear();
+            _previousFromBottom = Settings.FromBottom;
 
             // Parse spectrum data
             for (var i = 0; i < Settings.Bars; i++)
@@ -123,6 +127,9 @@ namespace Artemis.Modules.Effects.AudioVisualizer
                 // Apply Bars setting
                 SoundRectangles[i].X = (int) Math.Ceiling((double) Lines/Settings.Bars)*i;
                 SoundRectangles[i].Width = (int) Math.Ceiling((double) Lines/Settings.Bars);
+
+                if (Settings.FromBottom)
+                    SoundRectangles[i].Y = (Scale*8) - SoundRectangles[i].Height;
             }
             _generating = false;
         }
@@ -144,6 +151,7 @@ namespace Artemis.Modules.Effects.AudioVisualizer
                 foreach (var soundRectangle in SoundRectangles)
                     soundRectangle.Draw(g);
             }
+
             _generating = false;
             return bitmap;
         }

Artemis/Artemis/Modules/Effects/AudioVisualizer/AudioVisualizerSettings.cs

@@ -13,7 +13,7 @@ namespace Artemis.Modules.Effects.AudioVisualizer
 
         public int Sensitivity { get; set; }
         public int Bars { get; set; }
-        public int Spread { get; set; }
+        public bool FromBottom { get; set; }
         public int FadeSpeed { get; set; }
         public Color MainColor { get; set; }
         public Color SecondaryColor { get; set; }
@@ -22,7 +22,7 @@ namespace Artemis.Modules.Effects.AudioVisualizer
         {
             Sensitivity = AudioVisualization.Default.Sensitivity;
             Bars = AudioVisualization.Default.Bars;
-            Spread = AudioVisualization.Default.Spread;
+            FromBottom = AudioVisualization.Default.FromBottom;
             FadeSpeed = AudioVisualization.Default.FadeSpeed;
             MainColor = AudioVisualization.Default.MainColor;
             SecondaryColor = AudioVisualization.Default.SecondaryColor;
@@ -32,7 +32,7 @@ namespace Artemis.Modules.Effects.AudioVisualizer
         {
             AudioVisualization.Default.Sensitivity = Sensitivity;
             AudioVisualization.Default.Bars = Bars;
-            AudioVisualization.Default.Spread = Spread;
+            AudioVisualization.Default.FromBottom = FromBottom;
             AudioVisualization.Default.FadeSpeed = FadeSpeed;
             AudioVisualization.Default.MainColor = MainColor;
             AudioVisualization.Default.SecondaryColor = SecondaryColor;
@@ -44,7 +44,7 @@ namespace Artemis.Modules.Effects.AudioVisualizer
         {
             Sensitivity = 4;
             Bars = 21;
-            Spread = 1;
+            FromBottom = true;
             FadeSpeed = 3;
             MainColor = Color.FromArgb(255, 0, 0, 255);
             SecondaryColor = Color.FromArgb(255, 30, 144, 255);

Artemis/Artemis/Modules/Effects/AudioVisualizer/AudioVisualizerView.xaml

@@ -85,6 +85,14 @@
                     SmallChange="7"
                     IsSnapToTickEnabled="True" />
         </StackPanel>
+        <StackPanel Grid.Row="3"
+                    Grid.Column="0"
+                    HorizontalAlignment="Left">
+            <controls:ToggleSwitch IsChecked="{Binding Path=AudioVisualizerSettings.FromBottom, Mode=TwoWay}"
+                                   Header="Origin"
+                                   OnLabel="Bottom" OffLabel="Top"
+                                   Margin="5,3,0,0" Width="125" />
+        </StackPanel>
         <!-- Fadeout slider -->
         <StackPanel Grid.Row="3"
                     Grid.Column="1"

Artemis/Artemis/Modules/Games/CounterStrike/CounterStrikeModel.cs

@@ -6,7 +6,7 @@ using System.Drawing.Drawing2D;
 using System.Linq;
 using Artemis.Models;
 using Artemis.Utilities;
-using Artemis.Utilities.GameSense;
+using Artemis.Utilities.GameState;
 using Artemis.Utilities.Keyboard;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
@@ -18,7 +18,6 @@ namespace Artemis.Modules.Games.CounterStrike
         private readonly CounterStrikeSettings _counterStrikeSettings;
         private readonly MainModel _mainModel;
 
-        // TODO: Make functional (CS' new gamestate intergration broke this)
         public CounterStrikeModel(CounterStrikeSettings counterStrikeSettings, MainModel mainModel)
         {
             _counterStrikeSettings = counterStrikeSettings;
@@ -50,12 +49,12 @@ namespace Artemis.Modules.Games.CounterStrike
 
         public override void Dispose()
         {
-            _mainModel.GameSenseWebServer.GameDataReceived -= HandleGameData;
+            _mainModel.GameStateWebServer.GameDataReceived -= HandleGameData;
         }
 
         public override void Enable()
         {
-            _mainModel.GameSenseWebServer.GameDataReceived += HandleGameData;
+            _mainModel.GameStateWebServer.GameDataReceived += HandleGameData;
         }
 
         public override void Update()
@@ -81,7 +80,7 @@ namespace Artemis.Modules.Games.CounterStrike
                 return;
 
             var health = CsJson["player"]["state"]["health"].Value<int>();
-            if (health > 25)
+            if (health > 25 || health < 1)
                 return;
 
             TeamRect.Colors = new List<Color> {Color.Red, Color.DarkOrange, Color.Red, Color.DarkOrange};
@@ -120,7 +119,7 @@ namespace Artemis.Modules.Games.CounterStrike
                 return;
 
             var t1 = Color.FromArgb(255, 255, 129, 0);
-            var t2 = Color.FromArgb(255, 255, 89, 0);
+            var t2 = Color.FromArgb(255, 255, 170, 125);
 
             var ct1 = Color.FromArgb(255, 203, 238, 255);
             var ct2 = Color.FromArgb(255, 0, 173, 255);

Artemis/Artemis/Modules/Games/CounterStrike/CounterStrikeViewModel.cs

@@ -59,7 +59,7 @@ namespace Artemis.Modules.Games.CounterStrike
                 return;
             if (Directory.Exists(CounterStrikeSettings.GameDirectory + "/csgo/cfg"))
             {
-                var cfgFile = Properties.Resources.gamestateConfigFileCsGo.Replace("{{port}}", MainModel.GameSenseWebServer.Port.ToString());
+                var cfgFile = Properties.Resources.gamestateConfigFileCsGo.Replace("{{port}}", MainModel.GameStateWebServer.Port.ToString());
                 File.WriteAllText(CounterStrikeSettings.GameDirectory + "/csgo/cfg/gamestate_integration_artemis.cfg", cfgFile);
                 return;
             }

Artemis/Artemis/Modules/Games/Witcher3/Witcher3Model.cs

@@ -12,6 +12,7 @@ namespace Artemis.Modules.Games.Witcher3
 {
     public class Witcher3Model : GameModel
     {
+        // TODO: Update for 1.12
         public Witcher3Model(RocketLeagueSettings settings)
         {
             Name = "Witcher3";
@@ -19,8 +20,7 @@ namespace Artemis.Modules.Games.Witcher3
             Scale = 4;
 
             Settings = settings;
-            SignRect = new KeyboardRectangle(Scale, 0, 0, 84, 24, new List<Color> {Color.Blue, Color.Red},
+            SignRect = new KeyboardRectangle(Scale, 0, 0, 84, 24, new List<Color>(), LinearGradientMode.Horizontal)
-                LinearGradientMode.Horizontal)
             {
                 Rotate = true,
                 LoopSpeed = 0.5
@@ -69,19 +69,43 @@ namespace Artemis.Modules.Games.Witcher3
             {
                 case 0:
                     // Aard
-                    SignRect.Colors = new List<Color> {Color.DeepSkyBlue, Color.Blue, Color.DeepSkyBlue, Color.Blue};
+                    SignRect.Colors = new List<Color>
+                    {
+                        Color.DeepSkyBlue,
+                        Color.Blue,
+                        Color.DeepSkyBlue,
+                        Color.Blue
+                    };
                     break;
                 case 1:
                     // Yrden
-                    SignRect.Colors = new List<Color> {Color.Purple, Color.DeepPink, Color.Purple, Color.DeepPink};
+                    SignRect.Colors = new List<Color>
+                    {
+                        Color.Purple,
+                        Color.DeepPink,
+                        Color.Purple,
+                        Color.DeepPink
+                    };
                     break;
                 case 2:
                     // Igni
-                    SignRect.Colors = new List<Color> {Color.DarkOrange, Color.Red, Color.DarkOrange, Color.Red};
+                    SignRect.Colors = new List<Color>
+                    {
+                        Color.DarkOrange,
+                        Color.Red,
+                        Color.DarkOrange,
+                        Color.Red
+                    };
                     break;
                 case 3:
                     // Quen
-                    SignRect.Colors = new List<Color> {Color.DarkOrange, Color.Yellow, Color.DarkOrange, Color.Yellow};
+                    SignRect.Colors = new List<Color>
+                    {
+                        Color.DarkOrange,
+                        Color.Yellow,
+                        Color.DarkOrange,
+                        Color.Yellow
+                    };
                     break;
                 case 4:
                     // Axii

Artemis/Artemis/Resources/gamestateConfigFileCsGo.txt

@@ -1,6 +1,6 @@
 "Artemis"
 {
- "uri" "127.0.0.1:{{port}}/csgo_game_event"
+ "uri" "http://127.0.0.1:{{port}}/csgo_game_event"
  "timeout" "5.0"
  "buffer"  "0.1"
  "throttle" "0.1"

Artemis/Artemis/Utilities/GameState/GameDataReceivedEventArgs.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace Artemis.Utilities.GameSense
+namespace Artemis.Utilities.GameState
 {
     public class GameDataReceivedEventArgs : EventArgs
     {

Artemis/Artemis/Utilities/GameState/GameStateWebServer.cs

@@ -6,16 +6,16 @@ using System.Text;
 using System.Threading;
 using Newtonsoft.Json;
 
-namespace Artemis.Utilities.GameSense
+namespace Artemis.Utilities.GameState
 {
-    public class GameSenseWebServer
+    public class GameStateWebServer
     {
         public delegate void GameDataReceivedEventHandler(
             object sender, GameDataReceivedEventArgs gameDataReceivedEventArgs);
 
         private readonly HttpListener _listener = new HttpListener();
 
-        public GameSenseWebServer()
+        public GameStateWebServer()
         {
             Start();
         }
@@ -81,7 +81,7 @@ namespace Artemis.Utilities.GameSense
             if (!Directory.Exists(path))
                 Directory.CreateDirectory(path);
 
-            var content = "{\"address\":\"localhost:" + Port + "\"}";
+            var content = "{\"address\":\"127.0.0.1:" + Port + "\"}";
             File.WriteAllText(path + @"\coreProps.json", content);
         }