etc/furnace
0
0
Fork 0
mirror of https://github.com/tildearrow/furnace.git synced 2024-11-30 16:33:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

GUI: implement sample draw

Browse source
This commit is contained in:
tildearrow 2022-03-20 18:25:48 -05:00
parent 1941ca3616
commit b04e1f2870
4 changed files with 71 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/engine/playback.cpp
View file

@ -1560,7 +1560,7 @@ void DivEngine::nextBuf(float** in, float** out, int inChans, int outChans, unsi
return;
}
logD("attempts: %d\n",attempts);
//logD("attempts: %d\n",attempts);
if (attempts>=100) {
logE("hang detected! stopping! at %d seconds %d micro\n",totalSeconds,totalTicks);
freelance=false;

45
src/gui/gui.cpp
View file

@ -5038,6 +5038,34 @@ void FurnaceGUI::processDrags(int dragX, int dragY) {
modified=true;
}
}
if (sampleDragActive) {
int x=samplePos+(int)(double(dragX-sampleDragStart.x)*sampleZoom);
int x1=samplePos+(int)(double(dragX-sampleDragStart.x+1)*sampleZoom);
if (x<0) x=0;
if (x>=(int)sampleDragLen) x=sampleDragLen-1;
if (x1<0) x1=0;
if (x1>=(int)sampleDragLen) x1=sampleDragLen-1;
double y=0.5-double(dragY-sampleDragStart.y)/sampleDragAreaSize.y;
if (sampleDragMode) { // draw
if (sampleDrag16) {
int val=y*65536;
if (val<-32768) val=-32768;
if (val>32767) val=32767;
for (int i=x; i<=x1; i++) ((short*)sampleDragTarget)[i]=val;
} else {
int val=y*256;
if (val<-128) val=-128;
if (val>127) val=127;
for (int i=x; i<=x1; i++) ((signed char*)sampleDragTarget)[i]=val;
}
updateSampleTex=true;
} else { // select
if (sampleSelStart<0) {
sampleSelStart=x;
}
sampleSelEnd=x;
}
}
}
#define sysAddOption(x) \
@ -5287,7 +5315,7 @@ bool FurnaceGUI::loop() {
addScroll(1);
}
}
if (macroDragActive || macroLoopDragActive || waveDragActive) {
if (macroDragActive || macroLoopDragActive || waveDragActive || sampleDragActive) {
int distance=fabs(motionXrel);
if (distance<1) distance=1;
float start=motionX-motionXrel;
@ -5304,7 +5332,7 @@ bool FurnaceGUI::loop() {
break;
}
case SDL_MOUSEBUTTONUP:
if (macroDragActive || macroLoopDragActive || waveDragActive) modified=true;
if (macroDragActive || macroLoopDragActive || waveDragActive || (sampleDragActive && sampleDragMode)) modified=true;
macroDragActive=false;
macroDragBitMode=false;
macroDragInitialValue=false;
@ -5313,6 +5341,19 @@ bool FurnaceGUI::loop() {
macroDragLastY=-1;
macroLoopDragActive=false;
waveDragActive=false;
if (sampleDragActive) {
logD("stopping sample drag\n");
if (sampleDragMode) {
e->renderSamplesP();
} else {
if (sampleSelStart>sampleSelEnd) {
sampleSelStart^=sampleSelEnd;
sampleSelEnd^=sampleSelStart;
sampleSelStart^=sampleSelEnd;
}
}
}
sampleDragActive=false;
if (selecting) {
cursor=selEnd;
finishSelection();

1
src/gui/gui.h
View file

@ -747,6 +747,7 @@ class FurnaceGUI {
void* sampleDragTarget;
ImVec2 sampleDragStart;
ImVec2 sampleDragAreaSize;
unsigned int sampleDragLen;
// visualizer
float keyHit[DIV_MAX_CHANS];

26
src/gui/sampleEdit.cpp
View file

@ -320,7 +320,11 @@ void FurnaceGUI::drawSampleEdit() {
if (xCoarse>=sample->samples) break;
int y1, y2;
int totalAdvance=0;
if (sample->depth==8) {
y1=((unsigned char)sample->data8[xCoarse]^0x80)*availY/256;
} else {
y1=((unsigned short)sample->data16[xCoarse]^0x8000)*availY/65536;
}
xFine+=xAdvanceFine;
if (xFine>=16777216) {
xFine-=16777216;
@ -329,14 +333,22 @@ void FurnaceGUI::drawSampleEdit() {
totalAdvance+=xAdvanceCoarse;
if (xCoarse>=sample->samples) break;
do {
if (sample->depth==8) {
y2=((unsigned char)sample->data8[xCoarse]^0x80)*availY/256;
} else {
y2=((unsigned short)sample->data16[xCoarse]^0x8000)*availY/65536;
}
if (y1>y2) {
y2^=y1;
y1^=y2;
y2^=y1;
}
if (y1<0) y1=0;
if (y1>=availY) y1=availY-1;
if (y2<0) y2=0;
if (y2>=availY) y2=availY-1;
for (int j=y1; j<=y2; j++) {
data[i+availX*j]=lineColor;
data[i+availX*(availY-j-1)]=lineColor;
}
if (totalAdvance>0) xCoarse++;
} while ((totalAdvance--)>0);
@ -348,7 +360,17 @@ void FurnaceGUI::drawSampleEdit() {
ImGui::ImageButton(sampleTex,avail,ImVec2(0,0),ImVec2(1,1),0);
if (ImGui::IsItemClicked()) {
logD("drawing\n");
if (sample->samples>0 && (sample->depth==16 || sample->depth==8)) {
sampleDragStart=ImGui::GetItemRectMin();
sampleDragAreaSize=ImGui::GetItemRectSize();
sampleDrag16=(sample->depth==16);
sampleDragTarget=(sample->depth==16)?((void*)sample->data16):((void*)sample->data8);
sampleDragLen=sample->samples;
sampleDragActive=true;
sampleSelStart=-1;
sampleSelEnd=-1;
processDrags(ImGui::GetMousePos().x,ImGui::GetMousePos().y);
}
}
String statusBar=sampleDragMode?"Draw":"Select";