etc/furnace
0
0
Fork 0
mirror of https://github.com/tildearrow/furnace.git synced 2024-11-05 20:35:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

GUI: new sample editor work

Browse source
This commit is contained in:
tildearrow 2022-03-17 18:08:59 -05:00
parent 8ee7efc8a0
commit b31ab408db
3 changed files with 58 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/gui/gui.cpp
View file

@ -1364,6 +1364,7 @@ void FurnaceGUI::actualSampleList() {
ImGui::TableNextColumn(); ImGui::TableNextColumn();
if (ImGui::Selectable(fmt::sprintf("%d: %s##_SAM%d",i,sample->name,i).c_str(),curSample==i)) { if (ImGui::Selectable(fmt::sprintf("%d: %s##_SAM%d",i,sample->name,i).c_str(),curSample==i)) {
curSample=i; curSample=i;
updateSampleTex=true;
} }
if (ImGui::IsItemHovered()) { if (ImGui::IsItemHovered()) {
ImGui::SetTooltip("Bank %d: %s",i/12,sampleNote[i%12]); ImGui::SetTooltip("Bank %d: %s",i/12,sampleNote[i%12]);
@ -7094,7 +7095,9 @@ FurnaceGUI::FurnaceGUI():
scaleMax(100.0f), scaleMax(100.0f),
fadeMode(false), fadeMode(false),
randomMode(false), randomMode(false),
oldOrdersLen(0) { oldOrdersLen(0),
sampleZoom(1.0),
samplePos(0) {
// octave 1 // octave 1
/* /*

5
src/gui/gui.h
View file

@ -714,6 +714,11 @@ class FurnaceGUI {
std::deque<UndoStep> undoHist; std::deque<UndoStep> undoHist;
std::deque<UndoStep> redoHist; std::deque<UndoStep> redoHist;
// sample editor specific
double sampleZoom;
int samplePos;
// visualizer
float keyHit[DIV_MAX_CHANS]; float keyHit[DIV_MAX_CHANS];
int lastIns[DIV_MAX_CHANS]; int lastIns[DIV_MAX_CHANS];

57
src/gui/sampleEdit.cpp
View file

@ -45,6 +45,7 @@ void FurnaceGUI::drawSampleEdit() {
} }
} }
ImGui::Text("Name"); ImGui::Text("Name");
ImGui::SameLine();
ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x); ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
ImGui::InputText("##SampleName",&sample->name); ImGui::InputText("##SampleName",&sample->name);
@ -97,6 +98,18 @@ void FurnaceGUI::drawSampleEdit() {
ImGui::EndTable(); ImGui::EndTable();
} }
if (ImGui::InputDouble("Zoom",&sampleZoom,0.1,2.0)) {
if (sampleZoom<0.01) sampleZoom=0.01;
updateSampleTex=true;
}
if (ImGui::InputInt("Pos",&samplePos,1,10)) {
if (samplePos>=(int)sample->samples) samplePos=sample->samples-1;
if (samplePos<0) samplePos=0;
updateSampleTex=true;
}
/* /*
if (ImGui::Button("Apply")) { if (ImGui::Button("Apply")) {
e->renderSamplesP(); e->renderSamplesP();
@ -112,7 +125,7 @@ void FurnaceGUI::drawSampleEdit() {
ImGui::Separator(); ImGui::Separator();
ImVec2 avail=ImGui::GetContentRegionAvail(); ImVec2 avail=ImGui::GetContentRegionAvail();
//int availX=avail.x; int availX=avail.x;
int availY=avail.y; int availY=avail.y;
if (sampleTex==NULL || sampleTexW!=avail.x || sampleTexH!=avail.y) { if (sampleTex==NULL || sampleTexW!=avail.x || sampleTexH!=avail.y) {
@ -122,7 +135,7 @@ void FurnaceGUI::drawSampleEdit() {
} }
if (avail.x>=1 && avail.y>=1) { if (avail.x>=1 && avail.y>=1) {
logD("recreating sample texture.\n"); logD("recreating sample texture.\n");
sampleTex=SDL_CreateTexture(sdlRend,SDL_PIXELFORMAT_ARGB8888,SDL_TEXTUREACCESS_STREAMING,avail.x,avail.y); sampleTex=SDL_CreateTexture(sdlRend,SDL_PIXELFORMAT_ABGR8888,SDL_TEXTUREACCESS_STREAMING,avail.x,avail.y);
sampleTexW=avail.x; sampleTexW=avail.x;
sampleTexH=avail.y; sampleTexH=avail.y;
if (sampleTex==NULL) { if (sampleTex==NULL) {
@ -135,17 +148,45 @@ void FurnaceGUI::drawSampleEdit() {
if (sampleTex!=NULL) { if (sampleTex!=NULL) {
if (updateSampleTex) { if (updateSampleTex) {
unsigned char* data=NULL; unsigned int* data=NULL;
int pitch=0; int pitch=0;
logD("updating sample texture.\n"); logD("updating sample texture.\n");
if (SDL_LockTexture(sampleTex,NULL,(void**)&data,&pitch)!=0) { if (SDL_LockTexture(sampleTex,NULL,(void**)&data,&pitch)!=0) {
logE("error while locking sample texture! %s\n",SDL_GetError()); logE("error while locking sample texture! %s\n",SDL_GetError());
} else { } else {
for (int i=0; i<pitch*availY; i+=4) { ImU32 bgColor=ImGui::GetColorU32(ImGuiCol_FrameBg);
data[i]=255; ImU32 lineColor=ImGui::GetColorU32(ImGuiCol_PlotLines);
data[i+1]=255; for (int i=0; i<availX*availY; i++) {
data[i+2]=255; data[i]=bgColor;
data[i+3]=255; }
unsigned int xCoarse=samplePos;
unsigned int xFine=0;
unsigned int xAdvanceCoarse=sampleZoom;
unsigned int xAdvanceFine=fmod(sampleZoom,1.0)*16777216;
for (unsigned int i=0; i<(unsigned int)availX; i++) {
if (xCoarse>=sample->samples) break;
int y1, y2;
int totalAdvance=0;
y1=((unsigned short)sample->data16[xCoarse]^0x8000)*availY/65536;
xFine+=xAdvanceFine;
if (xFine>=16777216) {
xFine-=16777216;
totalAdvance++;
}
totalAdvance+=xAdvanceCoarse;
if (xCoarse>=sample->samples) break;
do {
y2=((unsigned short)sample->data16[xCoarse]^0x8000)*availY/65536;
if (y1>y2) {
y2^=y1;
y1^=y2;
y2^=y1;
}
for (int j=y1; j<=y2; j++) {
data[i+availX*j]=lineColor;
}
if (totalAdvance>0) xCoarse++;
} while ((totalAdvance--)>0);
} }
SDL_UnlockTexture(sampleTex); SDL_UnlockTexture(sampleTex);
} }