commit 96df3ce30432115ce7e86ac8f3885d61a9381211
parent f9ac9f4b423846b2307e9a05bcf9048586b04347
Author: Steven Atkinson <[email protected]>
Date: Mon, 2 Jan 2023 10:54:15 -0600
Refactor color scheme code (#28)
* Refactor colors to separate header
* Add Colors.h to VS projects, update targets
Diffstat:
12 files changed, 132 insertions(+), 100 deletions(-)
diff --git a/NeuralAmpModeler/Colors.h b/NeuralAmpModeler/Colors.h
@@ -0,0 +1,72 @@
+//
+// Colors.h
+// NeuralAmpModeler-macOS
+//
+// Created by Steven Atkinson on 12/27/22.
+//
+// Store the defined colors for the plugin in one place
+
+#ifndef Colors_h
+#define Colors_h
+
+#include "IGraphicsStructs.h"
+
+namespace PluginColors {
+ // COLORS!
+ const iplug::igraphics::IColor OFF_WHITE(255, 243, 246, 249); // Material UI because Heidi said so
+
+ // From group photo
+ //const iplug::igraphics::IColor NAM_5(255, 206, 194, 224); // Languid Lavendar
+ //const iplug::igraphics::IColor NAM_4(255, 30, 30, 39); // Raisin Black
+ //const iplug::igraphics::IColor NAM_3(255, 48, 43, 96); // Space Cadet
+ //const iplug::igraphics::IColor NAM_2(255, 3, 2, 1); // Black
+ //const iplug::igraphics::IColor NAM_1(255, 18, 15, 18); // Smoky Black
+
+ // Blue palette "Microsoft"
+ //const iplug::igraphics::IColor NAM_1(255, 13, 27, 42); // Black Fogra 29
+ //const iplug::igraphics::IColor NAM_2(255, 27, 38, 59); // Oxford Blue
+ //const iplug::igraphics::IColor NAM_3(255, 65, 90, 119); // Bedazzled Blue
+ //const iplug::igraphics::IColor NAM_4(255, 119, 141, 169); // Shadow Blue
+ //const iplug::igraphics::IColor NAM_5(224, 225, 221, 224); // Platinum
+
+ // Dark theme
+ //const iplug::igraphics::IColor NAM_1(255, 26, 20, 35); // Xiketic
+ //const iplug::igraphics::IColor NAM_2(255, 55, 37, 73); // Dark Purple
+ //const iplug::igraphics::IColor NAM_3(255, 119, 76, 96); // Twilight Lavendar
+ //const iplug::igraphics::IColor NAM_4(255, 183, 93, 105); // Popstar
+ //const iplug::igraphics::IColor NAM_5(224, 234, 205, 194); // Unbleached Silk
+
+ //const iplug::igraphics::IColor MOUSEOVER = NAM_5.WithOpacity(0.3);
+
+ // My 3 colors (purple)
+ //const iplug::igraphics::IColor NAM_1(255, 18, 17, 19); // Smoky Black
+ //const iplug::igraphics::IColor NAM_2(255, 115, 93, 120); // Old Lavendar
+ //const iplug::igraphics::IColor NAM_3(255, 189, 185, 196); // Lavendar Gray
+ // Alts
+ //const iplug::igraphics::IColor NAM_2(255, 34, 39, 37); // Charleston Green
+ //const iplug::igraphics::IColor NAM_2(255, 114, 161, 229); // Little Boy Blue
+ //const iplug::igraphics::IColor NAM_3(255, 247, 247, 242); // Baby Powder
+ //const iplug::igraphics::IColor NAM_3(255, 230, 220, 249); // Pale Purple Pantone
+ //const iplug::igraphics::IColor NAM_3(255, 218, 203, 246); // Lavender Blue
+
+ //Blue mode
+ const iplug::igraphics::IColor NAM_1(255, 29, 26, 31); // Raisin Black
+ const iplug::igraphics::IColor NAM_2(255, 80, 133, 232); // Azure
+ const iplug::igraphics::IColor NAM_3(255, 162, 178, 191); // Cadet Blue Crayola
+ // Alts
+ //const iplug::igraphics::IColor NAM_1(255, 18, 17, 19); // Smoky Black
+ //const iplug::igraphics::IColor NAM_2(255, 126, 188, 230); // Camel
+ //const iplug::igraphics::IColor NAM_2(255, 152, 202, 235); // Pale Cerulean
+ //const iplug::igraphics::IColor NAM_2(255, 46, 116, 163); // French Blue
+ //const iplug::igraphics::IColor NAM_2(255, 80, 171, 232); // Blue Jeans
+ //const iplug::igraphics::IColor NAM_3(255, 189, 185, 196); // Aero
+ //const iplug::igraphics::IColor NAM_3(255, 221, 237, 248); // Alice Blue
+ //const iplug::igraphics::IColor NAM_3(255, 207, 220, 229); // Beau Blue
+ //const iplug::igraphics::IColor NAM_3(255, 187, 199, 208); // Silver Sand
+
+ // Misc
+ const iplug::igraphics::IColor MOUSEOVER = NAM_3.WithOpacity(0.3);
+ const iplug::igraphics::IColor HELP_TEXT = iplug::igraphics::COLOR_WHITE;
+};
+
+#endif /* Colors_h */
diff --git a/NeuralAmpModeler/NeuralAmpModeler.cpp b/NeuralAmpModeler/NeuralAmpModeler.cpp
@@ -6,65 +6,11 @@
#include "NeuralAmpModeler.h"
#include "IPlug_include_in_plug_src.h"
#include "IControls.h"
+#include "Colors.h"
using namespace iplug;
using namespace igraphics;
-// COLORS!
-const IColor COLOR_OFF_WHITE(255, 243, 246, 249); // Maeterial UI because Heidi said so
-
-// From group photo
-//const IColor COLOR_NAM_5(255, 206, 194, 224); // Languid Lavendar
-//const IColor COLOR_NAM_4(255, 30, 30, 39); // Raisin Black
-//const IColor COLOR_NAM_3(255, 48, 43, 96); // Space Cadet
-//const IColor COLOR_NAM_2(255, 3, 2, 1); // Black
-//const IColor COLOR_NAM_1(255, 18, 15, 18); // Smoky Black
-
-// Blue palette "Microsoft"
-//const IColor COLOR_NAM_1(255, 13, 27, 42); // Black Fogra 29
-//const IColor COLOR_NAM_2(255, 27, 38, 59); // Oxford Blue
-//const IColor COLOR_NAM_3(255, 65, 90, 119); // Bedazzled Blue
-//const IColor COLOR_NAM_4(255, 119, 141, 169); // Shadow Blue
-//const IColor COLOR_NAM_5(224, 225, 221, 224); // Platinum
-
-// Dark theme
-//const IColor COLOR_NAM_1(255, 26, 20, 35); // Xiketic
-//const IColor COLOR_NAM_2(255, 55, 37, 73); // Dark Purple
-//const IColor COLOR_NAM_3(255, 119, 76, 96); // Twilight Lavendar
-//const IColor COLOR_NAM_4(255, 183, 93, 105); // Popstar
-//const IColor COLOR_NAM_5(224, 234, 205, 194); // Unbleached Silk
-
-//const IColor COLOR_MOUSEOVER = COLOR_NAM_5.WithOpacity(0.3);
-
-// My 3 colors (purple)
-//const IColor COLOR_NAM_1(255, 18, 17, 19); // Smoky Black
-//const IColor COLOR_NAM_2(255, 115, 93, 120); // Old Lavendar
-//const IColor COLOR_NAM_3(255, 189, 185, 196); // Lavendar Gray
-//const IColor COLOR_NAM_2(255, 34, 39, 37); // Charleston Green
-//const IColor COLOR_NAM_2(255, 114, 161, 229); // Little Boy Blue
-//const IColor COLOR_NAM_3(255, 247, 247, 242); // Baby Powder
-//const IColor COLOR_NAM_3(255, 230, 220, 249); // Pale Purple Pantone
-//const IColor COLOR_NAM_3(255, 218, 203, 246); // Lavender Blue
-
-//Blue mode
-//const IColor COLOR_NAM_1(255, 18, 17, 19); // Smoky Black
-const IColor COLOR_NAM_1(255, 29, 26, 31); // Raisin Black
-//const IColor COLOR_NAM_2(255, 126, 188, 230); // Camel
-//const IColor COLOR_NAM_2(255, 152, 202, 235); // Pale Cerulean
-//const IColor COLOR_NAM_2(255, 46, 116, 163); // French Blue
-//const IColor COLOR_NAM_2(255, 80, 171, 232); // Blue Jeans
-const IColor COLOR_NAM_2(255, 80, 133, 232); // Azure
-//const IColor COLOR_NAM_3(255, 189, 185, 196); // Aero
-//const IColor COLOR_NAM_3(255, 221, 237, 248); // Alice Blue
-//const IColor COLOR_NAM_3(255, 207, 220, 229); // Beau Blue
-//const IColor COLOR_NAM_3(255, 187, 199, 208); // Silver Sand
-const IColor COLOR_NAM_3(255, 162, 178, 191); // Cadet Blue Crayola
-
-
-const IColor COLOR_MOUSEOVER = COLOR_NAM_3.WithOpacity(0.3);
-
-const IColor COLOR_HELP_TEXT = COLOR_WHITE;
-
class IRolloverSVGButtonControl : public ISVGButtonControl
{
public:
@@ -76,7 +22,7 @@ public:
void Draw(IGraphics& g) override
{
if (mMouseIsOver)
- g.FillRect(COLOR_MOUSEOVER, mRECT);
+ g.FillRect(PluginColors::MOUSEOVER, mRECT);
ISVGButtonControl::Draw(g);
}
@@ -93,7 +39,7 @@ public:
void Draw(IGraphics& g) override
{
if (mMouseIsOver)
- g.FillEllipse(COLOR_MOUSEOVER, mRECT);
+ g.FillEllipse(PluginColors::MOUSEOVER, mRECT);
ISVGButtonControl::Draw(g);
}
@@ -152,18 +98,18 @@ NeuralAmpModeler::NeuralAmpModeler(const InstanceInfo& info)
true, // Show label
true, // Show value
{
- DEFAULT_BGCOLOR, //COLOR_NAM_1, //DEFAULT_BGCOLOR, // Background
- COLOR_NAM_1, // .WithOpacity(0.5), // Foreground
- COLOR_NAM_2.WithOpacity(0.4), // .WithOpacity(0.4), // Pressed
- COLOR_NAM_3, // Frame
- COLOR_MOUSEOVER, // Highlight
+ DEFAULT_BGCOLOR, //PluginColors::NAM_1, //DEFAULT_BGCOLOR, // Background
+ PluginColors::NAM_1, // .WithOpacity(0.5), // Foreground
+ PluginColors::NAM_2.WithOpacity(0.4), // .WithOpacity(0.4), // Pressed
+ PluginColors::NAM_3, // Frame
+ PluginColors::MOUSEOVER, // Highlight
DEFAULT_SHCOLOR, // Shadow
- COLOR_NAM_2 , // Extra 1
+ PluginColors::NAM_2 , // Extra 1
COLOR_RED, // Extra 2
DEFAULT_X3COLOR // Extra 3
}, // Colors
- {DEFAULT_TEXT_SIZE + 5.f, EVAlign::Middle, COLOR_NAM_3}, // Knob label text
- {DEFAULT_TEXT_SIZE + 5.f, EVAlign::Bottom, COLOR_NAM_3}, // Knob value text
+ {DEFAULT_TEXT_SIZE + 5.f, EVAlign::Middle, PluginColors::NAM_3}, // Knob label text
+ {DEFAULT_TEXT_SIZE + 5.f, EVAlign::Bottom, PluginColors::NAM_3}, // Knob value text
DEFAULT_HIDE_CURSOR,
DEFAULT_DRAW_FRAME,
false,
@@ -178,10 +124,10 @@ NeuralAmpModeler::NeuralAmpModeler(const InstanceInfo& info)
//auto tolexPNG = pGraphics->LoadBitmap(TOLEX_FN);
//pGraphics->AttachControl(new IBitmapControl(pGraphics->GetBounds(), tolexPNG, kNoParameter))->SetBlend(IBlend(EBlend::Default, 0.5));
// The background inside the outermost border
- pGraphics->AttachControl(new IVPanelControl(mainArea, "", style.WithColor(kFG, COLOR_NAM_1))); // .WithContrast(-0.75)
+ pGraphics->AttachControl(new IVPanelControl(mainArea, "", style.WithColor(kFG, PluginColors::NAM_1))); // .WithContrast(-0.75)
pGraphics->AttachControl(new IVLabelControl(titleLabel, "Neural Amp Modeler", style
.WithDrawFrame(false)
- .WithValueText({30, EAlign::Center, COLOR_NAM_3})));
+ .WithValueText({30, EAlign::Center, PluginColors::NAM_3})));
// pGraphics->AttachControl(new IVBakedPresetManagerControl(modelArea, style.WithValueText({DEFAULT_TEXT_SIZE, EVAlign::Middle, COLOR_WHITE})));
@@ -195,7 +141,7 @@ NeuralAmpModeler::NeuralAmpModeler(const InstanceInfo& info)
};
// Tells us what model is loaded
- pGraphics->AttachControl(new IVPanelControl(modelArea, "", style.WithColor(kFG, COLOR_NAM_1))); // .WithContrast(-0.75)
+ pGraphics->AttachControl(new IVPanelControl(modelArea, "", style.WithColor(kFG, PluginColors::NAM_1))); // .WithContrast(-0.75)
pGraphics->AttachControl(new IRolloverSVGButtonControl(modelArea.GetFromLeft(30).GetPadded(-2.f), loadModel, folderSVG));
pGraphics->AttachControl(new IVUpdateableLabelControl(modelArea.GetReducedFromLeft(30), "Select model...", style.WithDrawFrame(false).WithValueText(style.valueText.WithVAlign(EVAlign::Middle))), kCtrlTagModelName);
@@ -204,34 +150,34 @@ NeuralAmpModeler::NeuralAmpModeler(const InstanceInfo& info)
pGraphics->AttachControl(new IVPeakAvgMeterControl(meterArea, "", style.WithWidgetFrac(0.5)
.WithShowValue(false)
- .WithColor(kFG, COLOR_NAM_2), EDirection::Horizontal, {}, 0, -60.f, 12.f, {}), kCtrlTagMeter)
+ .WithColor(kFG, PluginColors::NAM_2), EDirection::Horizontal, {}, 0, -60.f, 12.f, {}), kCtrlTagMeter)
->As<IVPeakAvgMeterControl<>>()->SetPeakSize(2.0f);
pGraphics->AttachControl(new IVAboutBoxControl(
new IRolloverCircleSVGButtonControl(mainArea.GetFromTRHC(50, 50).GetCentredInside(20, 20), DefaultClickActionFunc, helpSVG),
new IPanelControl(IRECT(),
// COLOR_LIGHT_GRAY,
- IPattern::CreateLinearGradient(b, EDirection::Vertical, { {COLOR_NAM_3, 0.f}, {COLOR_NAM_1, 1.f} }),
+ IPattern::CreateLinearGradient(b, EDirection::Vertical, { {PluginColors::NAM_3, 0.f}, {PluginColors::NAM_1, 1.f} }),
false, // draw frame
// AttachFunc
[style](IContainerBase* pParent, const IRECT& r) {
- pParent->AddChildControl(new IVPanelControl(IRECT(), "", style.WithColor(kFR, COLOR_NAM_3.WithOpacity(0.1)).WithColor(kFG, COLOR_NAM_1.WithOpacity(0.1))));
+ pParent->AddChildControl(new IVPanelControl(IRECT(), "", style.WithColor(kFR, PluginColors::NAM_3.WithOpacity(0.1)).WithColor(kFG, PluginColors::NAM_1.WithOpacity(0.1))));
pParent->AddChildControl(new IVLabelControl(IRECT(), "Neural Amp Modeler", style
.WithDrawFrame(false)
- .WithValueText({30, EAlign::Center, COLOR_HELP_TEXT})));
+ .WithValueText({30, EAlign::Center, PluginColors::HELP_TEXT})));
WDL_String versionStr {"Version "};
versionStr.Append(PLUG_VERSION_STR);
pParent->AddChildControl(new IVLabelControl(IRECT(), versionStr.Get(), style
.WithDrawFrame(false)
- .WithValueText({DEFAULT_TEXT_SIZE, EAlign::Center, COLOR_HELP_TEXT })));
+ .WithValueText({DEFAULT_TEXT_SIZE, EAlign::Center, PluginColors::HELP_TEXT })));
pParent->AddChildControl(new IVLabelControl(IRECT(), "By Steven Atkinson", style
.WithDrawFrame(false)
- .WithValueText({DEFAULT_TEXT_SIZE, EAlign::Center, COLOR_HELP_TEXT})));
+ .WithValueText({DEFAULT_TEXT_SIZE, EAlign::Center, PluginColors::HELP_TEXT})));
pParent->AddChildControl(new IURLControl(IRECT(),
"Train your own model",
- "https://github.com/sdatkinson/neural-amp-modeler", {DEFAULT_TEXT_SIZE, COLOR_HELP_TEXT }));
+ "https://github.com/sdatkinson/neural-amp-modeler", {DEFAULT_TEXT_SIZE, PluginColors::HELP_TEXT }));
},
// ResizeFunc
[](IContainerBase* pParent, const IRECT& r) {
diff --git a/NeuralAmpModeler/projects/NeuralAmpModeler-aax.vcxproj b/NeuralAmpModeler/projects/NeuralAmpModeler-aax.vcxproj
@@ -36,27 +36,27 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
- <PlatformToolset>v142</PlatformToolset>
+ <PlatformToolset>v143</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Tracer|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
- <PlatformToolset>v142</PlatformToolset>
+ <PlatformToolset>v143</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
- <PlatformToolset>v142</PlatformToolset>
+ <PlatformToolset>v143</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
- <PlatformToolset>v142</PlatformToolset>
+ <PlatformToolset>v143</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Tracer|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
- <PlatformToolset>v142</PlatformToolset>
+ <PlatformToolset>v143</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
- <PlatformToolset>v142</PlatformToolset>
+ <PlatformToolset>v143</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
@@ -496,6 +496,7 @@
<ClInclude Include="..\..\iPlug2\IPlug\IPlugUtilities.h" />
<ClInclude Include="..\..\iPlug2\IPlug\IPlug_include_in_plug_hdr.h" />
<ClInclude Include="..\..\iPlug2\IPlug\IPlug_include_in_plug_src.h" />
+ <ClInclude Include="..\Colors.h" />
<ClInclude Include="..\config.h" />
<ClInclude Include="..\dsp\activations.h" />
<ClInclude Include="..\dsp\cnpy.h" />
diff --git a/NeuralAmpModeler/projects/NeuralAmpModeler-aax.vcxproj.filters b/NeuralAmpModeler/projects/NeuralAmpModeler-aax.vcxproj.filters
@@ -255,6 +255,7 @@
<ClInclude Include="..\dsp\util.h">
<Filter>dsp</Filter>
</ClInclude>
+ <ClInclude Include="..\Colors.h" />
</ItemGroup>
<ItemGroup>
<Filter Include="resources">
diff --git a/NeuralAmpModeler/projects/NeuralAmpModeler-app.vcxproj b/NeuralAmpModeler/projects/NeuralAmpModeler-app.vcxproj
@@ -38,41 +38,41 @@
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v142</PlatformToolset>
+ <PlatformToolset>v143</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v142</PlatformToolset>
+ <PlatformToolset>v143</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v142</PlatformToolset>
+ <PlatformToolset>v143</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v142</PlatformToolset>
+ <PlatformToolset>v143</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Tracer|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v142</PlatformToolset>
+ <PlatformToolset>v143</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Tracer|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v142</PlatformToolset>
+ <PlatformToolset>v143</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
@@ -317,6 +317,7 @@
<ClInclude Include="..\..\iPlug2\IPlug\IPlugUtilities.h" />
<ClInclude Include="..\..\iPlug2\IPlug\IPlug_include_in_plug_hdr.h" />
<ClInclude Include="..\..\iPlug2\IPlug\IPlug_include_in_plug_src.h" />
+ <ClInclude Include="..\Colors.h" />
<ClInclude Include="..\dsp\activations.h" />
<ClInclude Include="..\dsp\cnpy.h" />
<ClInclude Include="..\dsp\dsp.h" />
diff --git a/NeuralAmpModeler/projects/NeuralAmpModeler-app.vcxproj.filters b/NeuralAmpModeler/projects/NeuralAmpModeler-app.vcxproj.filters
@@ -303,6 +303,7 @@
<ClInclude Include="..\dsp\util.h">
<Filter>dsp</Filter>
</ClInclude>
+ <ClInclude Include="..\Colors.h" />
</ItemGroup>
<ItemGroup>
<Filter Include="resources">
diff --git a/NeuralAmpModeler/projects/NeuralAmpModeler-macOS.xcodeproj/project.pbxproj b/NeuralAmpModeler/projects/NeuralAmpModeler-macOS.xcodeproj/project.pbxproj
@@ -389,6 +389,8 @@
4FFBB93020863B0E00DDD0E7 /* fbuffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F8158C1205D50EB00393585 /* fbuffer.cpp */; };
4FFBB93420863B0E00DDD0E7 /* coreiids.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F8158E0205D50EB00393585 /* coreiids.cpp */; };
4FFBB93520863B0E00DDD0E7 /* vstnoteexpressiontypes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F81588E205D50EB00393585 /* vstnoteexpressiontypes.cpp */; };
+ AA355E2D295B688F0061AA3D /* Colors.h in Headers */ = {isa = PBXBuildFile; fileRef = AA355E2C295B688F0061AA3D /* Colors.h */; };
+ AA355E2E295B688F0061AA3D /* Colors.h in Headers */ = {isa = PBXBuildFile; fileRef = AA355E2C295B688F0061AA3D /* Colors.h */; };
B885CBC52304AE7300D73128 /* IPlugProcessor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F8F61A8202807B9003F2573 /* IPlugProcessor.cpp */; };
B8E22A0C220268C4007CBF4C /* IPlugVST3_ProcessorBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B8E22A0A220268C4007CBF4C /* IPlugVST3_ProcessorBase.cpp */; };
B8E22A0D220268C4007CBF4C /* IPlugVST3_ProcessorBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B8E22A0A220268C4007CBF4C /* IPlugVST3_ProcessorBase.cpp */; };
@@ -936,6 +938,7 @@
4FFBB94120863E9300DDD0E7 /* IPlugVST3_Parameter.h */ = {isa = PBXFileReference; indentWidth = 2; lastKnownFileType = sourcecode.c.h; name = IPlugVST3_Parameter.h; path = ../../iPlug2/IPlug/VST3/IPlugVST3_Parameter.h; sourceTree = "<group>"; tabWidth = 2; };
4FFF72B8214BB71400839091 /* main.rc */ = {isa = PBXFileReference; lastKnownFileType = text; name = main.rc; path = ../resources/main.rc; sourceTree = "<group>"; };
52FBBED30D0CF143001C8B8A /* config.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.c.h; name = config.h; path = ../config.h; sourceTree = "<group>"; tabWidth = 2; usesTabs = 0; };
+ AA355E2C295B688F0061AA3D /* Colors.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = Colors.h; path = ../Colors.h; sourceTree = "<group>"; };
AAD2484E29542F2800F55DD4 /* APPRelease.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = APPRelease.entitlements; sourceTree = "<group>"; };
AAD2484F2954325200F55DD4 /* AUv3Release.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = AUv3Release.entitlements; sourceTree = "<group>"; };
AAD248502954339400F55DD4 /* AUv3AppRelease.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = AUv3AppRelease.entitlements; sourceTree = "<group>"; };
@@ -1017,6 +1020,7 @@
089C166AFE841209C02AAC07 /* IPlugExample */ = {
isa = PBXGroup;
children = (
+ AA355E2C295B688F0061AA3D /* Colors.h */,
AAD248502954339400F55DD4 /* AUv3AppRelease.entitlements */,
AAD2484F2954325200F55DD4 /* AUv3Release.entitlements */,
AAD2484E29542F2800F55DD4 /* APPRelease.entitlements */,
@@ -1872,6 +1876,7 @@
4F3EF8E128DE03ED002972F2 /* util.h in Headers */,
4F3EF8EC28DE03ED002972F2 /* activations.h in Headers */,
4F3EF8D728DE03ED002972F2 /* wavenet.h in Headers */,
+ AA355E2E295B688F0061AA3D /* Colors.h in Headers */,
4F3EF90028DE03ED002972F2 /* cnpy.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
@@ -1880,6 +1885,7 @@
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
files = (
+ AA355E2D295B688F0061AA3D /* Colors.h in Headers */,
4FC3EFF02086CE5700BD11FA /* eventlist.h in Headers */,
4FC3EFF42086CE5700BD11FA /* module.h in Headers */,
4F03A58C20A4621100EBDFFB /* IGraphicsNanoVG.h in Headers */,
diff --git a/NeuralAmpModeler/projects/NeuralAmpModeler-macOS.xcodeproj/xcshareddata/xcschemes/macOS-VST3.xcscheme b/NeuralAmpModeler/projects/NeuralAmpModeler-macOS.xcodeproj/xcshareddata/xcschemes/macOS-VST3.xcscheme
@@ -31,7 +31,7 @@
</Testables>
</TestAction>
<LaunchAction
- buildConfiguration = "Release"
+ buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
diff --git a/NeuralAmpModeler/projects/NeuralAmpModeler-vst2.vcxproj b/NeuralAmpModeler/projects/NeuralAmpModeler-vst2.vcxproj
@@ -38,41 +38,41 @@
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v142</PlatformToolset>
+ <PlatformToolset>v143</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v142</PlatformToolset>
+ <PlatformToolset>v143</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v142</PlatformToolset>
+ <PlatformToolset>v143</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v142</PlatformToolset>
+ <PlatformToolset>v143</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Tracer|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v142</PlatformToolset>
+ <PlatformToolset>v143</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Tracer|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v142</PlatformToolset>
+ <PlatformToolset>v143</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
@@ -294,6 +294,7 @@
<ClInclude Include="..\..\iPlug2\IPlug\IPlug_include_in_plug_hdr.h" />
<ClInclude Include="..\..\iPlug2\IPlug\IPlug_include_in_plug_src.h" />
<ClInclude Include="..\..\iPlug2\IPlug\VST2\IPlugVST2.h" />
+ <ClInclude Include="..\Colors.h" />
<ClInclude Include="..\dsp\activations.h" />
<ClInclude Include="..\dsp\cnpy.h" />
<ClInclude Include="..\dsp\dsp.h" />
diff --git a/NeuralAmpModeler/projects/NeuralAmpModeler-vst2.vcxproj.filters b/NeuralAmpModeler/projects/NeuralAmpModeler-vst2.vcxproj.filters
@@ -238,6 +238,7 @@
<ClInclude Include="..\dsp\util.h">
<Filter>dsp</Filter>
</ClInclude>
+ <ClInclude Include="..\Colors.h" />
</ItemGroup>
<ItemGroup>
<Filter Include="IPlug">
diff --git a/NeuralAmpModeler/projects/NeuralAmpModeler-vst3.vcxproj b/NeuralAmpModeler/projects/NeuralAmpModeler-vst3.vcxproj
@@ -38,41 +38,41 @@
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v142</PlatformToolset>
+ <PlatformToolset>v143</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v142</PlatformToolset>
+ <PlatformToolset>v143</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v142</PlatformToolset>
+ <PlatformToolset>v143</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v142</PlatformToolset>
+ <PlatformToolset>v143</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Tracer|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v142</PlatformToolset>
+ <PlatformToolset>v143</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Tracer|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v142</PlatformToolset>
+ <PlatformToolset>v143</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
@@ -326,6 +326,7 @@
<ClInclude Include="..\..\iPlug2\IPlug\VST3\IPlugVST3_Parameter.h" />
<ClInclude Include="..\..\iPlug2\IPlug\VST3\IPlugVST3_ProcessorBase.h" />
<ClInclude Include="..\..\iPlug2\IPlug\VST3\IPlugVST3_View.h" />
+ <ClInclude Include="..\Colors.h" />
<ClInclude Include="..\dsp\activations.h" />
<ClInclude Include="..\dsp\cnpy.h" />
<ClInclude Include="..\dsp\dsp.h" />
diff --git a/NeuralAmpModeler/projects/NeuralAmpModeler-vst3.vcxproj.filters b/NeuralAmpModeler/projects/NeuralAmpModeler-vst3.vcxproj.filters
@@ -402,6 +402,7 @@
<ClInclude Include="..\dsp\util.h">
<Filter>dsp</Filter>
</ClInclude>
+ <ClInclude Include="..\Colors.h" />
</ItemGroup>
<ItemGroup>
<Filter Include="resources">
