Merge branch 'development' into Cheerpipe/development

Artemis-RGB · May 22, 2021 · 95f3f23 · 95f3f23
2 parents 52d0efb + 3825c34
commit 95f3f23
Show file tree

Hide file tree

Showing 289 changed files with 12,436 additions and 1,442 deletions.
diff --git a/src/Artemis.Core/Artemis.Core.csproj b/src/Artemis.Core/Artemis.Core.csproj
@@ -80,4 +80,10 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
+
+  <ItemGroup>
+    <None Update="DefaultLayouts\**">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
 </Project>
diff --git a/src/Artemis.Core/Artemis.Core.csproj.DotSettings b/src/Artemis.Core/Artemis.Core.csproj.DotSettings
@@ -1,5 +1,8 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
 	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=defaulttypes/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=models_005Cprofile_005Cadaption/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=models_005Cprofile_005Cadaptionhints/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=models_005Cprofile_005Cadaption_005Chints/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=models_005Cprofile_005Cconditions_005Cwrappers/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=models_005Cprofile_005Cdatabindings_005Cmodes/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=models_005Cprofile_005Cdatabindings_005Cmodes_005Cconditional/@EntryIndexedValue">True</s:Boolean>
@@ -53,6 +56,9 @@
 	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=plugins_005Clayerbrushes_005Cinternal/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=plugins_005Clayereffects_005Cinternal/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=plugins_005Cmodules_005Cactivationrequirements/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=plugins_005Cprerequisites/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=plugins_005Cprerequisites_005Cprerequisiteaction/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=plugins_005Cprofiling/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=plugins_005Csettings/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=rgb_002Enet/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=services_005Ccolorquantizer/@EntryIndexedValue">True</s:Boolean>

diff --git a/src/Artemis.Core/Constants.cs b/src/Artemis.Core/Constants.cs
@@ -62,8 +62,8 @@ public static class Constants
         /// </summary>
         public static readonly Plugin CorePlugin = new(CorePluginInfo, new DirectoryInfo(ApplicationFolder), null);
 
-        internal static readonly CorePluginFeature CorePluginFeature = new() {Plugin = CorePlugin};
-        internal static readonly EffectPlaceholderPlugin EffectPlaceholderPlugin = new() {Plugin = CorePlugin};
+        internal static readonly CorePluginFeature CorePluginFeature = new() {Plugin = CorePlugin, Profiler = CorePlugin.GetProfiler("Feature - Core")};
+        internal static readonly EffectPlaceholderPlugin EffectPlaceholderPlugin = new() {Plugin = CorePlugin, Profiler = CorePlugin.GetProfiler("Feature - Effect Placeholder")};
 
         internal static JsonSerializerSettings JsonConvertSettings = new()
         {

diff --git a/src/Artemis.Core/DefaultLayouts/Artemis/Headset/Artemis 1 LED headset.xml b/src/Artemis.Core/DefaultLayouts/Artemis/Headset/Artemis 1 LED headset.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Device xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <Name>1 LEDs headset</Name>
+  <Description>The default layout for headsets with 1 LED</Description>
+  <Author>SpoinkyNL &amp; Aureshion</Author>
+  <Type>Headset</Type>
+  <Vendor>Artemis</Vendor>
+  <Model>Artemis 1 LED headset</Model>
+  <Width>242</Width>
+  <Height>233</Height>
+  <LedUnitWidth>1</LedUnitWidth>
+  <LedUnitHeight>1</LedUnitHeight>
+  <Leds>
+    <Led Id="Headset1">
+      <Shape> M0.073,0.002 L0.073,0.015 L0.293,0.937 L0.3,0.946 L0.275,0.969 L0.048,0.025z M0.925,0.001 L0.925,0.012 L0.706,0.938 L0.697,0.941 L0.729,0.97 L0.95,0.021z</Shape>
+      <X>15</X>
+      <Y>125</Y>
+      <Width>212</Width>
+      <Height>108</Height>
+    </Led>
+  </Leds>
+  <CustomData>
+    <DeviceImage>Headset.png</DeviceImage>
+  </CustomData>
+</Device>
diff --git a/src/Artemis.Core/DefaultLayouts/Artemis/Headset/Artemis 2 LEDs headset.xml b/src/Artemis.Core/DefaultLayouts/Artemis/Headset/Artemis 2 LEDs headset.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Device xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <Name>2 LEDs headset</Name>
+  <Description>The default layout for headsets with 2 LEDs</Description>
+  <Author>SpoinkyNL &amp; Aureshion</Author>
+  <Type>Headset</Type>
+  <Vendor>Artemis</Vendor>
+  <Model>Artemis 2 LEDs headset</Model>
+  <Width>242</Width>
+  <Height>233</Height>
+  <LedUnitWidth>1</LedUnitWidth>
+  <LedUnitHeight>1</LedUnitHeight>
+  <Leds>
+    <Led Id="Headset1">
+      <Shape> M0.246,0 L0.24,0.02 L0.974,0.938 L0.999,0.941 L0.916,0.965 L0.17,0.023z</Shape>
+      <X>15</X>
+      <Y>125</Y>
+      <Width>64</Width>
+      <Height>108</Height>
+    </Led>
+    <Led Id="Headset2">
+      <Shape> M0.741,-0.003 L0.755,0.012 L0.026,0.937 L0.003,0.939 L0.084,0.965 L0.833,0.027z</Shape>
+      <X>163</X>
+      <Y>~</Y>
+      <Width>64</Width>
+      <Height>108</Height>
+    </Led>
+  </Leds>
+  <CustomData>
+    <DeviceImage>Headset.png</DeviceImage>
+  </CustomData>
+</Device>
diff --git a/src/Artemis.Core/DefaultLayouts/Artemis/Headset/Artemis 4 LEDs headset.xml b/src/Artemis.Core/DefaultLayouts/Artemis/Headset/Artemis 4 LEDs headset.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Device xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <Name>4 LEDs headset</Name>
+  <Description>The default layout for headsets with 4 LEDs</Description>
+  <Author>SpoinkyNL &amp; Aureshion</Author>
+  <Type>Headset</Type>
+  <Vendor>Artemis</Vendor>
+  <Model>Artemis 4 LEDs headset</Model>
+  <Width>242</Width>
+  <Height>233</Height>
+  <LedUnitWidth>1</LedUnitWidth>
+  <LedUnitHeight>1</LedUnitHeight>
+  <Leds>
+    <Led Id="Headset1">
+      <Shape> M0.241,0.001 L0.231,0.021 L0.62,1 L0.523,1 L0.153,0.056z</Shape>
+      <X>15</X>
+      <Y>125</Y>
+      <Width>64</Width>
+      <Height>54</Height>
+    </Led>
+    <Led Id="Headset2">
+      <Shape> M0.62,0 L0.968,0.87 L0.992,0.886 L0.903,0.943 L0.523,0z</Shape>
+      <X>~</X>
+      <Y>+</Y>
+      <Width>64</Width>
+      <Height>54</Height>
+    </Led>
+    <Led Id="Headset3">
+      <Shape> M0.748,0 L0.752,0.027 L0.377,1 L0.468,1 L0.837,0.053z</Shape>
+      <X>163</X>
+      <Y>125</Y>
+      <Width>64</Width>
+      <Height>54</Height>
+    </Led>
+    <Led Id="Headset4">
+      <Shape> M0.377,0 L0.468,0 L0.09,0.935 L0,0.88 L0.032,0.863z</Shape>
+      <X>~</X>
+      <Y>+</Y>
+      <Width>64</Width>
+      <Height>54</Height>
+    </Led>
+  </Leds>
+  <CustomData>
+    <DeviceImage>Headset.png</DeviceImage>
+  </CustomData>
+</Device>
diff --git a/src/Artemis.Core/DefaultLayouts/Artemis/Headset/Headset.png b/src/Artemis.Core/DefaultLayouts/Artemis/Headset/Headset.png