otomatalabs/furnace
7
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

memory composition, part 2

Browse source
This commit is contained in:
tildearrow 2024-03-05 03:38:55 -05:00
parent 7a41461883
commit 2d48390eab
3 changed files with 68 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/engine/platform/snes.cpp
View file

@ -827,6 +827,13 @@ void DivPlatformSNES::initEcho() {
rWrite(0x7d,0);
rWrite(0x6d,0xff);
}
for (DivMemoryEntry& i: memCompo.entries) {
if (i.type==DIV_MEMORY_ECHO) {
i.begin=(65536-echoDelay*2048);
}
}
memCompo.used=sampleMemLen+echoDelay*2048;
}
void DivPlatformSNES::reset() {
@ -953,6 +960,10 @@ void DivPlatformSNES::renderSamples(int sysID) {
memCompo=DivMemoryComposition();
memCompo.name="SPC/DSP Memory";
memCompo.entries.push_back(DivMemoryEntry(DIV_MEMORY_RESERVED,"State",-1,0,sampleTableBase));
memCompo.entries.push_back(DivMemoryEntry(DIV_MEMORY_RESERVED,"Sample Directory",-1,sampleTableBase,sampleTableBase+8*4));
memCompo.entries.push_back(DivMemoryEntry(DIV_MEMORY_WAVE_RAM,"Wave RAM",-1,sampleTableBase+8*4,sampleTableBase+8*4+8*9*16));
// skip past sample table and wavetable buffer
size_t memPos=sampleTableBase+8*4+8*9*16;
for (int i=0; i<parent->song.sampleLen; i++) {
@ -983,8 +994,11 @@ void DivPlatformSNES::renderSamples(int sysID) {
sampleLoaded[i]=true;
}
sampleMemLen=memPos;
memCompo.entries.push_back(DivMemoryEntry(DIV_MEMORY_ECHO,"Echo Buffer",-1,(65536-echoDelay*2048),65536));
memCompo.capacity=65536;
memCompo.used=sampleMemLen;
memCompo.used=sampleMemLen+echoDelay*2048;
memcpy(sampleMem,copyOfSampleMem,65536);
}

14
src/gui/guiConst.cpp
View file

@ -1107,16 +1107,10 @@ const FurnaceGUIColorDef guiColors[GUI_COLOR_MAX]={
D(GUI_COLOR_PATCHBAY_CONNECTION_BG,"",ImVec4(0.1f,0.25f,0.3f,1.0f)),
D(GUI_COLOR_PATCHBAY_CONNECTION_HI,"",ImVec4(0.2f,1.0f,1.0f,1.0f)),
D(GUI_COLOR_LOGLEVEL_ERROR,"",ImVec4(1.0f,0.2f,0.2f,1.0f)),
D(GUI_COLOR_LOGLEVEL_WARNING,"",ImVec4(1.0f,1.0f,0.2f,1.0f)),
D(GUI_COLOR_LOGLEVEL_INFO,"",ImVec4(0.4f,1.0f,0.4f,1.0f)),
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_RESERVED,"",ImVec4(0.5f,0.5f,0.6f,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)),
@ -1133,6 +1127,12 @@ const FurnaceGUIColorDef guiColors[GUI_COLOR_MAX]={
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_LOGLEVEL_ERROR,"",ImVec4(1.0f,0.2f,0.2f,1.0f)),
D(GUI_COLOR_LOGLEVEL_WARNING,"",ImVec4(1.0f,1.0f,0.2f,1.0f)),
D(GUI_COLOR_LOGLEVEL_INFO,"",ImVec4(0.4f,1.0f,0.4f,1.0f)),
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_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)),
};

48
src/gui/memory.cpp
View file

@ -22,6 +22,9 @@
#include "imgui.h"
#include "imgui_internal.h"
#define CENTER_TEXT(text) \
ImGui::SetCursorPosX(ImGui::GetCursorPosX()+0.5*(ImGui::GetContentRegionAvail().x-ImGui::CalcTextSize(text).x));
void FurnaceGUI::drawMemory() {
if (nextWindow==GUI_WINDOW_MEMORY) {
memoryOpen=true;
@ -33,18 +36,20 @@ void FurnaceGUI::drawMemory() {
ImDrawList* dl=ImGui::GetWindowDrawList();
ImGuiWindow* window=ImGui::GetCurrentWindow();
char tempID[1024];
bool have=false;
for (int i=0; i<e->song.systemLen; i++) {
DivDispatch* dispatch=e->getDispatch(i);
for (int j=0; j<4; j++) {
const DivMemoryComposition* mc=dispatch->getMemCompo(j);
if (mc==NULL) break;
have=true;
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);
ImGui::Text("%d/%d (%.1f%%)",(int)mc->used,(int)mc->capacity,100.0*(double)mc->used/(double)mc->capacity);
ImVec2 size=ImVec2(ImGui::GetContentRegionAvail().x,48.0f*dpiScale);
ImVec2 size=ImVec2(ImGui::GetContentRegionAvail().x,36.0f*dpiScale);
ImVec2 minArea=window->DC.CursorPos;
ImVec2 maxArea=ImVec2(
minArea.x+size.x,
@ -57,15 +62,54 @@ void FurnaceGUI::drawMemory() {
if (ImGui::ItemAdd(rect,ImGui::GetID(tempID))) {
dl->AddRectFilled(rect.Min,rect.Max,ImGui::GetColorU32(uiColors[GUI_COLOR_MEMORY_BG]));
int curHover=-1;
int kIndex=0;
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));
ImVec2 linePos=pos1;
linePos.y=rect.Max.y;
dl->AddRectFilled(pos1,pos2,ImGui::GetColorU32(uiColors[GUI_COLOR_MEMORY_FREE+(int)k.type]));
dl->AddLine(pos1,linePos,ImGui::GetColorU32(ImGuiCol_Border),dpiScale);
if (ImGui::GetMousePos().x>=pos1.x && ImGui::GetMousePos().x<=pos2.x) {
curHover=kIndex;
}
kIndex++;
}
if (ImGui::ItemHoverable(rect,ImGui::GetID(tempID),0)) {
if (curHover>=0 && curHover<(int)mc->entries.size()) {
const DivMemoryEntry& entry=mc->entries[curHover];
if (ImGui::BeginTooltip()) {
switch (entry.type) {
case DIV_MEMORY_SAMPLE: {
DivSample* sample=e->getSample(entry.asset);
ImGui::Text("%d: %s",curHover,sample->name.c_str());
ImGui::Text("%d-%d ($%x-$%x): %d bytes ($%x)",(int)entry.begin,(int)entry.end-1,(int)entry.begin,(int)entry.end-1,(int)(entry.end-entry.begin),(int)(entry.end-entry.begin));
ImGui::Text("click to open sample editor");
break;
}
default:
ImGui::Text("%d: %s",curHover,entry.name.c_str());
ImGui::Text("%d-%d ($%x-$%x): %d bytes ($%x)",(int)entry.begin,(int)entry.end-1,(int)entry.begin,(int)entry.end-1,(int)(entry.end-entry.begin),(int)(entry.end-entry.begin));
break;
}
ImGui::EndTooltip();
}
}
}
}
}
}
if (!have) {
ImGui::SetCursorPosY(ImGui::GetCursorPosY()+(ImGui::GetContentRegionAvail().y-ImGui::GetFrameHeight()+ImGui::GetStyle().ItemSpacing.y)*0.5f);
CENTER_TEXT("no chips with memory");
ImGui::Text("no chips with memory");
}
}
if (ImGui::IsWindowFocused(ImGuiFocusedFlags_ChildWindows)) curWindow=GUI_WINDOW_MEMORY;
ImGui::End();