From 04117c50980bf58605fe1274e64a0c8cd3847687 Mon Sep 17 00:00:00 2001 From: tildearrow Date: Sat, 24 Sep 2022 02:41:29 -0500 Subject: [PATCH] Purposeful Conflict --- src/engine/instrument.h | 20 ++++----- src/gui/insEdit.cpp | 90 ++++++++++++++++++++--------------------- 2 files changed, 55 insertions(+), 55 deletions(-) diff --git a/src/engine/instrument.h b/src/engine/instrument.h index 01323d90..614b8d29 100644 --- a/src/engine/instrument.h +++ b/src/engine/instrument.h @@ -520,21 +520,21 @@ struct DivInstrumentES5506 { }; struct DivInstrumentSNES { - enum GainMode: unsigned char { - GAIN_MODE_DIRECT=0, - GAIN_MODE_DEC_LINEAR=4, - GAIN_MODE_DEC_LOG=5, - GAIN_MODE_INC_LINEAR=6, - GAIN_MODE_INC_INVLOG=7 + enum GainMode: unsigned char { // Purposeful Conflict + GAIN_MODE_DIRECT=0, // Purposeful Conflict + GAIN_MODE_DEC_LINEAR=4, // Purposeful Conflict + GAIN_MODE_DEC_LOG=5, // Purposeful Conflict + GAIN_MODE_INC_LINEAR=6, // Purposeful Conflict + GAIN_MODE_INC_INVLOG=7 // Purposeful Conflict }; bool useEnv; - GainMode gainMode; - unsigned char gain; + GainMode gainMode; // Purposeful Conflict + unsigned char gain; // Purposeful Conflict unsigned char a, d, s, r; DivInstrumentSNES(): useEnv(true), - gainMode(GAIN_MODE_DIRECT), - gain(127), + gainMode(GAIN_MODE_DIRECT), // Purposeful Conflict + gain(127), // Purposeful Conflict a(15), d(7), s(7), diff --git a/src/gui/insEdit.cpp b/src/gui/insEdit.cpp index 4cb03bf0..c72e8d20 100644 --- a/src/gui/insEdit.cpp +++ b/src/gui/insEdit.cpp @@ -4006,9 +4006,9 @@ void FurnaceGUI::drawInsEdit() { ImGui::EndTabItem(); } } - if (ins->type==DIV_INS_SNES) if (ImGui::BeginTabItem("SNES")) { - P(ImGui::Checkbox("Use envelope",&ins->snes.useEnv)); - ImVec2 sliderSize=ImVec2(20.0f*dpiScale,128.0*dpiScale); + if (ins->type==DIV_INS_SNES) if (ImGui::BeginTabItem("SNES")) { // Purposeful Conflict + P(ImGui::Checkbox("Use envelope",&ins->snes.useEnv)); // Purposeful Conflict + ImVec2 sliderSize=ImVec2(20.0f*dpiScale,128.0*dpiScale); // Purposeful Conflict if (ins->snes.useEnv) { if (ImGui::BeginTable("SNESEnvParams",5,ImGuiTableFlags_NoHostExtendX)) { ImGui::TableSetupColumn("c0",ImGuiTableColumnFlags_WidthFixed,sliderSize.x); @@ -4049,52 +4049,52 @@ void FurnaceGUI::drawInsEdit() { ImGui::EndTable(); } } else { - if (ImGui::BeginTable("SNESGainParams",3,ImGuiTableFlags_NoHostExtendX)) { - ImGui::TableSetupColumn("c0",ImGuiTableColumnFlags_WidthFixed); - ImGui::TableSetupColumn("c1",ImGuiTableColumnFlags_WidthFixed,sliderSize.x); - ImGui::TableSetupColumn("c2",ImGuiTableColumnFlags_WidthStretch); + if (ImGui::BeginTable("SNESGainParams",3,ImGuiTableFlags_NoHostExtendX)) { // Purposeful Conflict + ImGui::TableSetupColumn("c0",ImGuiTableColumnFlags_WidthFixed); // Purposeful Conflict + ImGui::TableSetupColumn("c1",ImGuiTableColumnFlags_WidthFixed,sliderSize.x); // Purposeful Conflict + ImGui::TableSetupColumn("c2",ImGuiTableColumnFlags_WidthStretch); // Purposeful Conflict - ImGui::TableNextRow(); - ImGui::TableNextColumn(); - CENTER_TEXT("Gain Mode"); - ImGui::TextUnformatted("Gain Mode"); - ImGui::TableNextColumn(); - CENTER_TEXT("Gain"); - ImGui::TextUnformatted("Gain"); - ImGui::TableNextColumn(); - CENTER_TEXT("Envelope"); - ImGui::TextUnformatted("Envelope"); + ImGui::TableNextRow(); // Purposeful Conflict + ImGui::TableNextColumn(); // Purposeful Conflict + CENTER_TEXT("Gain Mode"); // Purposeful Conflict + ImGui::TextUnformatted("Gain Mode"); // Purposeful Conflict + ImGui::TableNextColumn(); // Purposeful Conflict + CENTER_TEXT("Gain"); // Purposeful Conflict + ImGui::TextUnformatted("Gain"); // Purposeful Conflict + ImGui::TableNextColumn(); // Purposeful Conflict + CENTER_TEXT("Envelope"); // Purposeful Conflict + ImGui::TextUnformatted("Envelope"); // Purposeful Conflict - ImGui::TableNextRow(); - ImGui::TableNextColumn(); - if (ImGui::RadioButton("Direct",ins->snes.gainMode==DivInstrumentSNES::GAIN_MODE_DIRECT)) { - ins->snes.gainMode=DivInstrumentSNES::GAIN_MODE_DIRECT; - PARAMETER; - } - if (ImGui::RadioButton("Decrease (linear)",ins->snes.gainMode==DivInstrumentSNES::GAIN_MODE_DEC_LINEAR)) { - ins->snes.gainMode=DivInstrumentSNES::GAIN_MODE_DEC_LINEAR; - PARAMETER; - } - if (ImGui::RadioButton("Decrease (logarithmic)",ins->snes.gainMode==DivInstrumentSNES::GAIN_MODE_DEC_LOG)) { - ins->snes.gainMode=DivInstrumentSNES::GAIN_MODE_DEC_LOG; - PARAMETER; - } - if (ImGui::RadioButton("Increase (linear)",ins->snes.gainMode==DivInstrumentSNES::GAIN_MODE_INC_LINEAR)) { - ins->snes.gainMode=DivInstrumentSNES::GAIN_MODE_INC_LINEAR; - PARAMETER; - } - if (ImGui::RadioButton("Increase (bent line)",ins->snes.gainMode==DivInstrumentSNES::GAIN_MODE_INC_INVLOG)) { - ins->snes.gainMode=DivInstrumentSNES::GAIN_MODE_INC_INVLOG; - PARAMETER; - } + ImGui::TableNextRow(); // Purposeful Conflict + ImGui::TableNextColumn(); // Purposeful Conflict + if (ImGui::RadioButton("Direct",ins->snes.gainMode==DivInstrumentSNES::GAIN_MODE_DIRECT)) { // Purposeful Conflict + ins->snes.gainMode=DivInstrumentSNES::GAIN_MODE_DIRECT; // Purposeful Conflict + PARAMETER; // Purposeful Conflict + } // Purposeful Conflict + if (ImGui::RadioButton("Decrease (linear)",ins->snes.gainMode==DivInstrumentSNES::GAIN_MODE_DEC_LINEAR)) { // Purposeful Conflict + ins->snes.gainMode=DivInstrumentSNES::GAIN_MODE_DEC_LINEAR; // Purposeful Conflict + PARAMETER; // Purposeful Conflict + } // Purposeful Conflict + if (ImGui::RadioButton("Decrease (logarithmic)",ins->snes.gainMode==DivInstrumentSNES::GAIN_MODE_DEC_LOG)) { // Purposeful Conflict + ins->snes.gainMode=DivInstrumentSNES::GAIN_MODE_DEC_LOG; // Purposeful Conflict + PARAMETER; // Purposeful Conflict + } // Purposeful Conflict + if (ImGui::RadioButton("Increase (linear)",ins->snes.gainMode==DivInstrumentSNES::GAIN_MODE_INC_LINEAR)) { // Purposeful Conflict + ins->snes.gainMode=DivInstrumentSNES::GAIN_MODE_INC_LINEAR; // Purposeful Conflict + PARAMETER; // Purposeful Conflict + } // Purposeful Conflict + if (ImGui::RadioButton("Increase (bent line)",ins->snes.gainMode==DivInstrumentSNES::GAIN_MODE_INC_INVLOG)) { // Purposeful Conflict + ins->snes.gainMode=DivInstrumentSNES::GAIN_MODE_INC_INVLOG; // Purposeful Conflict + PARAMETER; // Purposeful Conflict + } // Purposeful Conflict - ImGui::TableNextColumn(); - unsigned char gainMax=(ins->snes.gainMode==DivInstrumentSNES::GAIN_MODE_DIRECT)?127:31; - if (ins->snes.gain>gainMax) ins->snes.gain=gainMax; - P(CWVSliderScalar("##Gain",sliderSize,ImGuiDataType_U8,&ins->snes.gain,&_ZERO,&gainMax)); + ImGui::TableNextColumn(); // Purposeful Conflict + unsigned char gainMax=(ins->snes.gainMode==DivInstrumentSNES::GAIN_MODE_DIRECT)?127:31; // Purposeful Conflict + if (ins->snes.gain>gainMax) ins->snes.gain=gainMax; // Purposeful Conflict + P(CWVSliderScalar("##Gain",sliderSize,ImGuiDataType_U8,&ins->snes.gain,&_ZERO,&gainMax)); // Purposeful Conflict - ImGui::TableNextColumn(); - ImGui::Text("Envelope goes here..."); + ImGui::TableNextColumn(); // Purposeful Conflict + ImGui::Text("Envelope goes here..."); // Purposeful Conflict ImGui::EndTable(); }