GUI: redesign FM editor layout, part 1

thanks Raijin for the concept

src/gui/about.cpp

@@ -47,6 +47,7 @@ const char* aboutLine[]={
   "-- graphics/UI design --",
   "tildearrow",
   "BlastBrothers",
+  "Raijin",
   "",
   "-- documentation --",
   "tildearrow",

src/gui/gui.h

@@ -622,6 +622,7 @@ class FurnaceGUI {
     int roundedButtons;
     int roundedMenus;
     int loadJapanese;
+    int fmLayout;
     unsigned int maxUndoSteps;
     String mainFontPath;
     String patFontPath;
@@ -672,6 +673,7 @@ class FurnaceGUI {
       roundedButtons(1),
       roundedMenus(0),
       loadJapanese(0),
+      fmLayout(0),
       maxUndoSteps(100),
       mainFontPath(""),
       patFontPath(""),

src/gui/insEdit.cpp

@@ -1053,10 +1053,184 @@ void FurnaceGUI::drawInsEdit() {
               ins->fm.op[1].tl&=15;
               P(ImGui::SliderScalar("Volume##TL",ImGuiDataType_U8,&ins->fm.op[1].tl,&_FIFTEEN,&_ZERO)); rightClickable
             }
-            if (willDisplayOps) if (ImGui::BeginTable("FMOperators",2,ImGuiTableFlags_SizingStretchSame)) {
+            if (willDisplayOps) {
+              if (settings.fmLayout==0) {
+                if (ImGui::BeginTable("FMOperators",14,ImGuiTableFlags_SizingStretchProp|ImGuiTableFlags_Borders)) {
+                  // header
+                  ImGui::TableNextRow(ImGuiTableRowFlags_Headers);
+                  ImGui::TableNextColumn();
+
+                  ImGui::TableNextColumn();
+                  ImGui::TextUnformatted(FM_NAME(FM_AR));
+                  ImGui::TableNextColumn();
+                  ImGui::TextUnformatted(FM_NAME(FM_DR));
+                  ImGui::TableNextColumn();
+                  ImGui::TextUnformatted(FM_NAME(FM_SL));
+                  if (ins->type==DIV_INS_FM || ins->type==DIV_INS_OPZ) {
+                    ImGui::TableNextColumn();
+                    ImGui::TextUnformatted(FM_NAME(FM_D2R));
+                  }
+                  ImGui::TableNextColumn();
+                  ImGui::TextUnformatted(FM_NAME(FM_RR));
+                  ImGui::TableNextColumn();
+                  ImGui::TextUnformatted(FM_NAME(FM_TL));
+                  ImGui::TableNextColumn();
+                  if (ins->type==DIV_INS_FM || ins->type==DIV_INS_OPZ) {
+                    ImGui::TextUnformatted(FM_NAME(FM_RS));
+                  } else {
+                    ImGui::TextUnformatted(FM_NAME(FM_KSR));
+                  }
+                  ImGui::TableNextColumn();
+                  ImGui::TextUnformatted(FM_NAME(FM_MULT));
+                  ImGui::TableNextColumn();
+                  ImGui::TextUnformatted(FM_NAME(FM_DT));
+                  ImGui::TableNextColumn();
+                  ImGui::TextUnformatted(FM_NAME(FM_DT2));
+                  ImGui::TableNextColumn();
+                  ImGui::TextUnformatted(FM_NAME(FM_SSG));
+                  ImGui::TableNextColumn();
+                  ImGui::TextUnformatted("Envelope");
+                  ImGui::TableNextColumn();
+                  ImGui::TextUnformatted(FM_NAME(FM_AM));
+
+                  float sliderHeight=32.0f*dpiScale;
+
                   for (int i=0; i<opCount; i++) {
                     DivInstrumentFM::Operator& op=ins->fm.op[(opCount==4)?opOrder[i]:i];
-                if ((i+1)&1) ImGui::TableNextRow();
+                    ImGui::TableNextRow();
+                    ImGui::TableNextColumn();
+
+                    if (i==0) sliderHeight=(ImGui::GetContentRegionAvail().y/opCount)-ImGui::GetStyle().ItemSpacing.y;
+
+                    ImGui::PushID(fmt::sprintf("op%d",i).c_str());
+                    if (ins->type==DIV_INS_OPL && ins->fm.opllPreset==16) {
+                      if (i==1) {
+                        ImGui::Text("Kick");
+                      } else {
+                        ImGui::Text("Env");
+                      }
+                    } else {
+                      ImGui::Text("OP%d",i+1);
+                    }
+
+                    int maxTl=127;
+                    if (ins->type==DIV_INS_OPLL) {
+                      if (i==1) {
+                        maxTl=15;
+                      } else {
+                        maxTl=63;
+                      }
+                    }
+                    if (ins->type==DIV_INS_OPL) {
+                      maxTl=63;
+                    }
+                    int maxArDr=(ins->type==DIV_INS_FM || ins->type==DIV_INS_OPZ)?31:15;
+                    bool ssgOn=op.ssgEnv&8;
+                    /*bool ksrOn=op.ksr;
+                    bool vibOn=op.vib;
+                    bool susOn=op.sus;*/
+                    unsigned char ssgEnv=op.ssgEnv&7;
+
+                    ImGui::TableNextColumn();
+                    op.ar&=maxArDr;
+                    P(ImGui::VSliderScalar("##AR",ImVec2(20.0f*dpiScale,sliderHeight),ImGuiDataType_U8,&op.ar,&_ZERO,&maxArDr));
+
+                    ImGui::TableNextColumn();
+                    op.dr&=maxArDr;
+                    P(ImGui::VSliderScalar("##DR",ImVec2(20.0f*dpiScale,sliderHeight),ImGuiDataType_U8,&op.dr,&_ZERO,&maxArDr));
+
+                    ImGui::TableNextColumn();
+                    op.sl&=15;
+                    P(ImGui::VSliderScalar("##SL",ImVec2(20.0f*dpiScale,sliderHeight),ImGuiDataType_U8,&op.sl,&_FIFTEEN,&_ZERO));
+
+                    if (ins->type==DIV_INS_FM || ins->type==DIV_INS_OPZ) {
+                      ImGui::TableNextColumn();
+                      op.d2r&=31;
+                      P(ImGui::VSliderScalar("##D2R",ImVec2(20.0f*dpiScale,sliderHeight),ImGuiDataType_U8,&op.d2r,&_ZERO,&_THIRTY_ONE));
+                    }
+
+                    ImGui::TableNextColumn();
+                    op.rr&=15;
+                    P(ImGui::VSliderScalar("##RR",ImVec2(20.0f*dpiScale,sliderHeight),ImGuiDataType_U8,&op.rr,&_ZERO,&_FIFTEEN));
+
+                    ImGui::TableNextColumn();
+                    op.tl&=maxTl;
+                    P(ImGui::VSliderScalar("##TL",ImVec2(20.0f*dpiScale,sliderHeight),ImGuiDataType_U8,&op.tl,&maxTl,&_ZERO));
+
+                    ImGui::TableNextColumn();
+                    if (ins->type==DIV_INS_FM || ins->type==DIV_INS_OPZ) {
+                      P(ImGui::VSliderScalar("##RS",ImVec2(20.0f*dpiScale,sliderHeight),ImGuiDataType_U8,&op.rs,&_ZERO,&_THREE));
+                    } else {
+                      P(ImGui::VSliderScalar("##KSL",ImVec2(20.0f*dpiScale,sliderHeight),ImGuiDataType_U8,&op.ksl,&_ZERO,&_THREE));
+                    }
+
+                    ImGui::TableNextColumn();
+                    P(ImGui::VSliderScalar("##MULT",ImVec2(20.0f*dpiScale,sliderHeight),ImGuiDataType_U8,&op.mult,&_ZERO,&_FIFTEEN));
+
+                    if (ins->type==DIV_INS_FM || ins->type==DIV_INS_OPZ) {
+                      int detune=(op.dt&7)-3;
+                      ImGui::TableNextColumn();
+                      if (ImGui::VSliderInt("##DT",ImVec2(20.0f*dpiScale,sliderHeight),&detune,-3,4)) { PARAMETER
+                        op.dt=detune+3;
+                      }
+
+                      ImGui::TableNextColumn();
+                      P(ImGui::VSliderScalar("##DT2",ImVec2(20.0f*dpiScale,sliderHeight),ImGuiDataType_U8,&op.dt2,&_ZERO,&_THREE)); rightClickable
+                      if (ImGui::IsItemHovered()) {
+                        ImGui::SetTooltip("Only on YM2151 (OPM)");
+                      }
+
+                      ImGui::TableNextColumn();
+                      ImGui::Text("Preview here");
+
+                      if (ins->type!=DIV_INS_OPL && ins->type!=DIV_INS_OPZ) {
+                        if (ImGui::Checkbox((ins->type==DIV_INS_OPLL)?FM_NAME(FM_EGS):"SSG On",&ssgOn)) { PARAMETER
+                          op.ssgEnv=(op.ssgEnv&7)|(ssgOn<<3);
+                        }
+                        if (ins->type==DIV_INS_FM) {
+                          if (ImGui::IsItemHovered()) {
+                            ImGui::SetTooltip("Only for OPN family chips");
+                          }
+                        }
+                      }
+
+                      ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
+                      if (ImGui::SliderScalar("##SSG",ImGuiDataType_U8,&ssgEnv,&_ZERO,&_SEVEN,ssgEnvTypes[ssgEnv])) { PARAMETER
+                        op.ssgEnv=(op.ssgEnv&8)|(ssgEnv&7);
+                      }
+                    }
+
+                    ImGui::TableNextColumn();
+                    drawFMEnv(op.tl&maxTl,op.ar&maxArDr,op.dr&maxArDr,(ins->type==DIV_INS_OPL || ins->type==DIV_INS_OPLL)?((op.rr&15)*2):op.d2r&31,op.rr&15,op.sl&15,maxTl,maxArDr,ImVec2(ImGui::GetContentRegionAvail().x,sliderHeight));
+
+                    ImGui::TableNextColumn();
+                    bool amOn=op.am;
+                    if (ImGui::Checkbox("##AM",&amOn)) { PARAMETER
+                      op.am=amOn;
+                    }
+
+                    ImGui::PopID();
+                  }
+
+                  ImGui::EndTable();
+                }
+              } else {
+                int columns=2;
+                switch (settings.fmLayout) {
+                  case 1: // 2x2
+                    columns=2;
+                    break;
+                  case 2: // 1x4
+                    columns=1;
+                    break;
+                  case 3: // 4x1
+                    columns=opCount;
+                    break;
+                }
+                if (ImGui::BeginTable("FMOperators",columns,ImGuiTableFlags_SizingStretchSame)) {
+                  for (int i=0; i<opCount; i++) {
+                    DivInstrumentFM::Operator& op=ins->fm.op[(opCount==4)?opOrder[i]:i];
+                    if ((settings.fmLayout!=3 && ((i+1)&1)) || i==0 || settings.fmLayout==2) ImGui::TableNextRow();
                     ImGui::TableNextColumn();
                     ImGui::Separator();
                     ImGui::PushID(fmt::sprintf("op%d",i).c_str());
@@ -1104,7 +1278,7 @@ void FurnaceGUI::drawInsEdit() {
                       }
                       if (ins->type==DIV_INS_FM) {
                         if (ImGui::IsItemHovered()) {
-                      ImGui::SetTooltip("Only for Genesis and Neo Geo systems");
+                          ImGui::SetTooltip("Only for OPN family chips");
                         }
                       }
                     }
@@ -1211,7 +1385,7 @@ void FurnaceGUI::drawInsEdit() {
                         ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
                         P(ImGui::SliderScalar("##DT2",ImGuiDataType_U8,&op.dt2,&_ZERO,&_THREE)); rightClickable
                         if (ImGui::IsItemHovered()) {
-                      ImGui::SetTooltip("Only for Arcade system");
+                          ImGui::SetTooltip("Only on YM2151 (OPM)");
                         }
                         ImGui::TableNextColumn();
                         ImGui::Text("%s",FM_NAME(FM_DT2));
@@ -1255,6 +1429,8 @@ void FurnaceGUI::drawInsEdit() {
                   }
                   ImGui::EndTable();
                 }
+              }
+            }
             ImGui::EndTabItem();
           }
           if (ImGui::BeginTabItem("FM Macros")) {

src/gui/settings.cpp

@@ -419,6 +419,20 @@ void FurnaceGUI::drawSettings() {
           settings.controlLayout=3;
         }
 
+        ImGui::Text("FM parameter editor layout:");
+        if (ImGui::RadioButton("Modern##fml0",settings.fmLayout==0)) {
+          settings.fmLayout=0;
+        }
+        if (ImGui::RadioButton("Compact (2x2, classic)##fml1",settings.fmLayout==1)) {
+          settings.fmLayout=1;
+        }
+        if (ImGui::RadioButton("Compact (1x4)##fml2",settings.fmLayout==2)) {
+          settings.fmLayout=2;
+        }
+        if (ImGui::RadioButton("Compact (4x1)##fml3",settings.fmLayout==3)) {
+          settings.fmLayout=3;
+        }
+
         bool macroViewB=settings.macroView;
         if (ImGui::Checkbox("Classic macro view (standard macros only; deprecated!)",&macroViewB)) {
           settings.macroView=macroViewB;
@@ -990,6 +1004,7 @@ void FurnaceGUI::syncSettings() {
   settings.roundedButtons=e->getConfInt("roundedButtons",1);
   settings.roundedMenus=e->getConfInt("roundedMenus",0);
   settings.loadJapanese=e->getConfInt("loadJapanese",0);
+  settings.fmLayout=e->getConfInt("fmLayout",0);
 
   clampSetting(settings.mainFontSize,2,96);
   clampSetting(settings.patFontSize,2,96);
@@ -1034,6 +1049,7 @@ void FurnaceGUI::syncSettings() {
   clampSetting(settings.roundedButtons,0,1);
   clampSetting(settings.roundedMenus,0,1);
   clampSetting(settings.loadJapanese,0,1);
+  clampSetting(settings.fmLayout,0,3);
 
   // keybinds
   LOAD_KEYBIND(GUI_ACTION_OPEN,FURKMOD_CMD|SDLK_o);
@@ -1268,6 +1284,7 @@ void FurnaceGUI::commitSettings() {
   e->setConf("roundedButtons",settings.roundedButtons);
   e->setConf("roundedMenus",settings.roundedMenus);
   e->setConf("loadJapanese",settings.loadJapanese);
+  e->setConf("fmLayout",settings.fmLayout);
 
   PUT_UI_COLOR(GUI_COLOR_BACKGROUND);
   PUT_UI_COLOR(GUI_COLOR_FRAME_BACKGROUND);