memory composition, part 1

src/engine/platform/snes.cpp

@@ -971,6 +971,7 @@ void DivPlatformSNES::renderSamples(int sysID) {
       if (s->loop) {
         copyOfSampleMem[memPos+actualLength-9]|=3;
       }
+      memCompo.entries.push_back(DivMemoryEntry(DIV_MEMORY_SAMPLE,"Sample",i,memPos,memPos+actualLength));
       memPos+=actualLength;
     }
     if (actualLength<length) {
@@ -982,6 +983,8 @@ void DivPlatformSNES::renderSamples(int sysID) {
     sampleLoaded[i]=true;
   }
   sampleMemLen=memPos;
+  memCompo.capacity=65536;
+  memCompo.used=sampleMemLen;
   memcpy(sampleMem,copyOfSampleMem,65536);
 }
 

src/gui/editControls.cpp

@@ -587,6 +587,10 @@ void FurnaceGUI::drawMobileControls() {
         if (ImGui::Button("Meter")) {
           volMeterOpen=!volMeterOpen;
         }
+        ImGui::SameLine();
+        if (ImGui::Button("Memory")) {
+          memoryOpen=!memoryOpen;
+        }
 
         ImGui::Separator();
 

src/gui/gui.h

@@ -410,6 +410,26 @@ enum FurnaceGUIColors {
   GUI_COLOR_PATCHBAY_CONNECTION_BG,
   GUI_COLOR_PATCHBAY_CONNECTION_HI,
 
+  GUI_COLOR_MEMORY_BG,
+  GUI_COLOR_MEMORY_FREE,
+  GUI_COLOR_MEMORY_PADDING,
+  GUI_COLOR_MEMORY_RESERVED,
+  GUI_COLOR_MEMORY_SAMPLE,
+  GUI_COLOR_MEMORY_SAMPLE_ALT1,
+  GUI_COLOR_MEMORY_SAMPLE_ALT2,
+  GUI_COLOR_MEMORY_SAMPLE_ALT3,
+  GUI_COLOR_MEMORY_WAVE_RAM,
+  GUI_COLOR_MEMORY_WAVE_STATIC,
+  GUI_COLOR_MEMORY_ECHO,
+  GUI_COLOR_MEMORY_BANK0,
+  GUI_COLOR_MEMORY_BANK1,
+  GUI_COLOR_MEMORY_BANK2,
+  GUI_COLOR_MEMORY_BANK3,
+  GUI_COLOR_MEMORY_BANK4,
+  GUI_COLOR_MEMORY_BANK5,
+  GUI_COLOR_MEMORY_BANK6,
+  GUI_COLOR_MEMORY_BANK7,
+
   GUI_COLOR_LOGLEVEL_ERROR,
   GUI_COLOR_LOGLEVEL_WARNING,
   GUI_COLOR_LOGLEVEL_INFO,

src/gui/guiConst.cpp

@@ -1113,6 +1113,26 @@ const FurnaceGUIColorDef guiColors[GUI_COLOR_MAX]={
   D(GUI_COLOR_LOGLEVEL_DEBUG,"",ImVec4(0.3f,0.5f,1.0f,1.0f)),
   D(GUI_COLOR_LOGLEVEL_TRACE,"",ImVec4(0.8f,0.8f,0.8f,1.0f)),
 
+  D(GUI_COLOR_MEMORY_BG,"",ImVec4(0.12f,0.12f,0.12f,1.0f)),
+  D(GUI_COLOR_MEMORY_FREE,"",ImVec4(0.25f,0.25f,0.25f,1.0f)),
+  D(GUI_COLOR_MEMORY_PADDING,"",ImVec4(0.25f,0.25f,0.25f,1.0f)),
+  D(GUI_COLOR_MEMORY_RESERVED,"",ImVec4(1.0f,1.0f,1.0f,1.0f)),
+  D(GUI_COLOR_MEMORY_SAMPLE,"",ImVec4(1.0f,1.0f,0.2f,1.0f)),
+  D(GUI_COLOR_MEMORY_SAMPLE_ALT1,"",ImVec4(0.5f,1.0f,0.2f,1.0f)),
+  D(GUI_COLOR_MEMORY_SAMPLE_ALT2,"",ImVec4(0.2f,1.0f,0.2f,1.0f)),
+  D(GUI_COLOR_MEMORY_SAMPLE_ALT3,"",ImVec4(0.2f,1.0f,0.5f,1.0f)),
+  D(GUI_COLOR_MEMORY_WAVE_RAM,"",ImVec4(1.0f,0.5f,0.1f,1.0f)),
+  D(GUI_COLOR_MEMORY_WAVE_STATIC,"",ImVec4(1.0f,0.3f,0.1f,1.0f)),
+  D(GUI_COLOR_MEMORY_ECHO,"",ImVec4(0.2f,1.0f,1.0f,1.0f)),
+  D(GUI_COLOR_MEMORY_BANK0,"",ImVec4(1.0f,1.0f,1.0f,1.0f)),
+  D(GUI_COLOR_MEMORY_BANK1,"",ImVec4(1.0f,1.0f,1.0f,1.0f)),
+  D(GUI_COLOR_MEMORY_BANK2,"",ImVec4(1.0f,1.0f,1.0f,1.0f)),
+  D(GUI_COLOR_MEMORY_BANK3,"",ImVec4(1.0f,1.0f,1.0f,1.0f)),
+  D(GUI_COLOR_MEMORY_BANK4,"",ImVec4(1.0f,1.0f,1.0f,1.0f)),
+  D(GUI_COLOR_MEMORY_BANK5,"",ImVec4(1.0f,1.0f,1.0f,1.0f)),
+  D(GUI_COLOR_MEMORY_BANK6,"",ImVec4(1.0f,1.0f,1.0f,1.0f)),
+  D(GUI_COLOR_MEMORY_BANK7,"",ImVec4(1.0f,1.0f,1.0f,1.0f)),
+
   D(GUI_COLOR_EE_VALUE,"",ImVec4(0.0f,1.0f,1.0f,1.0f)),
   D(GUI_COLOR_PLAYBACK_STAT,"",ImVec4(0.6f,0.6f,0.6f,1.0f)),
 };

src/gui/memory.cpp

@@ -19,7 +19,8 @@
 
 #include "gui.h"
 #include <fmt/printf.h>
-#include <imgui.h>
+#include "imgui.h"
+#include "imgui_internal.h"
 
 void FurnaceGUI::drawMemory() {
   if (nextWindow==GUI_WINDOW_MEMORY) {
@@ -29,6 +30,10 @@ void FurnaceGUI::drawMemory() {
   }
   if (!memoryOpen) return;
   if (ImGui::Begin("Memory Composition",&memoryOpen,globalWinFlags)) {
+    ImDrawList* dl=ImGui::GetWindowDrawList();
+    ImGuiWindow* window=ImGui::GetCurrentWindow();
+    char tempID[1024];
+
     for (int i=0; i<e->song.systemLen; i++) {
       DivDispatch* dispatch=e->getDispatch(i);
       for (int j=0; j<4; j++) {
@@ -36,6 +41,29 @@ void FurnaceGUI::drawMemory() {
         if (mc==NULL) break;
 
         ImGui::Text("%s: %s",e->getSystemName(e->song.system[i]),mc->name.c_str());
+        ImGui::SameLine();
+        ImGui::Text("%d/%d",(int)mc->used,(int)mc->capacity);
+
+        ImVec2 size=ImVec2(ImGui::GetContentRegionAvail().x,48.0f*dpiScale);
+        ImVec2 minArea=window->DC.CursorPos;
+        ImVec2 maxArea=ImVec2(
+          minArea.x+size.x,
+          minArea.y+size.y
+        );
+        ImRect rect=ImRect(minArea,maxArea);
+        ImGuiStyle& style=ImGui::GetStyle();
+        ImGui::ItemSize(size,style.FramePadding.y);
+        snprintf(tempID,1023,"MC%d_%d",i,j);
+        if (ImGui::ItemAdd(rect,ImGui::GetID(tempID))) {
+          dl->AddRectFilled(rect.Min,rect.Max,ImGui::GetColorU32(uiColors[GUI_COLOR_MEMORY_BG]));
+
+          if (mc->capacity>0) for (const DivMemoryEntry& k: mc->entries) {
+            ImVec2 pos1=ImLerp(rect.Min,rect.Max,ImVec2((double)k.begin/(double)mc->capacity,0.0f));
+            ImVec2 pos2=ImLerp(rect.Min,rect.Max,ImVec2((double)k.end/(double)mc->capacity,1.0f));
+
+            dl->AddRectFilled(pos1,pos2,ImGui::GetColorU32(uiColors[GUI_COLOR_MEMORY_FREE+(int)k.type]));
+          }
+        }
       }
     }
   }