diff --git a/.vs/Switch_Toolbox/v15/.suo b/.vs/Switch_Toolbox/v15/.suo index 29b11781..288754f9 100644 Binary files a/.vs/Switch_Toolbox/v15/.suo and b/.vs/Switch_Toolbox/v15/.suo differ diff --git a/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide b/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide index 0326f8ba..059a09a1 100644 Binary files a/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide and b/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide differ diff --git a/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide-wal b/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide-wal index bc7c2eb0..c8930877 100644 Binary files a/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide-wal and b/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide-wal differ diff --git a/Switch_FileFormatsMain/GUI/BFRES/Materials/ShaderParams/vector3SliderPanel.cs b/Switch_FileFormatsMain/GUI/BFRES/Materials/ShaderParams/vector3SliderPanel.cs index 5276dd37..d79b8090 100644 --- a/Switch_FileFormatsMain/GUI/BFRES/Materials/ShaderParams/vector3SliderPanel.cs +++ b/Switch_FileFormatsMain/GUI/BFRES/Materials/ShaderParams/vector3SliderPanel.cs @@ -132,16 +132,14 @@ namespace FirstPlugin.Forms colorDialog.Color = pictureBox1.BackColor; if (colorDialog.ShowDialog() == DialogResult.OK) { - activeParam.ValueFloat = new float[] - { - colorDialog.Color.R / 255, - colorDialog.Color.G / 255, - colorDialog.Color.B / 255, - }; - barSlider1.Value = colorDialog.Color.R / 255; - barSlider2.Value = colorDialog.Color.G / 255; - barSlider3.Value = colorDialog.Color.B / 255; - SetColor(activeParam.Name, activeParam.ValueFloat); + barSlider1.Value = colorDialog.Color.R / 255f; + barSlider2.Value = colorDialog.Color.G / 255f; + barSlider3.Value = colorDialog.Color.B / 255f; + + ApplyValueSingles(); + + if (OnPanelChanged != null) + OnPanelChanged(activeParam, this); } } } diff --git a/Switch_FileFormatsMain/GUI/BFRES/Materials/ShaderParams/vector4SliderPanel.cs b/Switch_FileFormatsMain/GUI/BFRES/Materials/ShaderParams/vector4SliderPanel.cs index 16f4ad64..646a2678 100644 --- a/Switch_FileFormatsMain/GUI/BFRES/Materials/ShaderParams/vector4SliderPanel.cs +++ b/Switch_FileFormatsMain/GUI/BFRES/Materials/ShaderParams/vector4SliderPanel.cs @@ -192,9 +192,14 @@ namespace FirstPlugin.Forms colorDialog.Color = colorPB.BackColor; if (colorDialog.ShowDialog() == DialogResult.OK) { - barSlider1.Value = colorDialog.Color.R / 255; - barSlider2.Value = colorDialog.Color.G / 255; - barSlider3.Value = colorDialog.Color.B / 255; + barSlider1.Value = colorDialog.Color.R / 255f; + barSlider2.Value = colorDialog.Color.G / 255f; + barSlider3.Value = colorDialog.Color.B / 255f; + + ApplyValueSingles(); + + if (OnPanelChanged != null) + OnPanelChanged(activeParam, this); } } @@ -204,7 +209,12 @@ namespace FirstPlugin.Forms colorDialog.Color = alphaPB.BackColor; if (colorDialog.ShowDialog() == DialogResult.OK) { - barSlider4.Value = colorDialog.Color.R / 255; + barSlider4.Value = colorDialog.Color.R / 255f; + + ApplyValueSingles(); + + if (OnPanelChanged != null) + OnPanelChanged(activeParam, this); } } diff --git a/Switch_FileFormatsMain/obj/Release/AxInterop.WMPLib.dll b/Switch_FileFormatsMain/obj/Release/AxInterop.WMPLib.dll index 87f0ddca..7da5f303 100644 Binary files a/Switch_FileFormatsMain/obj/Release/AxInterop.WMPLib.dll and b/Switch_FileFormatsMain/obj/Release/AxInterop.WMPLib.dll differ diff --git a/Switch_FileFormatsMain/obj/Release/DesignTimeResolveAssemblyReferences.cache b/Switch_FileFormatsMain/obj/Release/DesignTimeResolveAssemblyReferences.cache index 73dce5e3..cec104e3 100644 Binary files a/Switch_FileFormatsMain/obj/Release/DesignTimeResolveAssemblyReferences.cache and b/Switch_FileFormatsMain/obj/Release/DesignTimeResolveAssemblyReferences.cache differ diff --git a/Switch_FileFormatsMain/obj/Release/FirstPlugin.Plg.dll b/Switch_FileFormatsMain/obj/Release/FirstPlugin.Plg.dll index b8ea3bd5..e1320192 100644 Binary files a/Switch_FileFormatsMain/obj/Release/FirstPlugin.Plg.dll and b/Switch_FileFormatsMain/obj/Release/FirstPlugin.Plg.dll differ diff --git a/Switch_FileFormatsMain/obj/Release/FirstPlugin.Plg.pdb b/Switch_FileFormatsMain/obj/Release/FirstPlugin.Plg.pdb index 1c0eb891..c2027b9b 100644 Binary files a/Switch_FileFormatsMain/obj/Release/FirstPlugin.Plg.pdb and b/Switch_FileFormatsMain/obj/Release/FirstPlugin.Plg.pdb differ diff --git a/Switch_FileFormatsMain/obj/Release/Interop.WMPLib.dll b/Switch_FileFormatsMain/obj/Release/Interop.WMPLib.dll index ec3e59fb..42a4a830 100644 Binary files a/Switch_FileFormatsMain/obj/Release/Interop.WMPLib.dll and b/Switch_FileFormatsMain/obj/Release/Interop.WMPLib.dll differ diff --git a/Switch_FileFormatsMain/obj/Release/Switch_FileFormatsMain.csproj.GenerateResource.cache b/Switch_FileFormatsMain/obj/Release/Switch_FileFormatsMain.csproj.GenerateResource.cache index dd5d30e6..95301e5a 100644 Binary files a/Switch_FileFormatsMain/obj/Release/Switch_FileFormatsMain.csproj.GenerateResource.cache and b/Switch_FileFormatsMain/obj/Release/Switch_FileFormatsMain.csproj.GenerateResource.cache differ diff --git a/Switch_FileFormatsMain/obj/Release/Switch_FileFormatsMain.csprojAssemblyReference.cache b/Switch_FileFormatsMain/obj/Release/Switch_FileFormatsMain.csprojAssemblyReference.cache index 9c4b58ab..64c2eaf9 100644 Binary files a/Switch_FileFormatsMain/obj/Release/Switch_FileFormatsMain.csprojAssemblyReference.cache and b/Switch_FileFormatsMain/obj/Release/Switch_FileFormatsMain.csprojAssemblyReference.cache differ