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

new chan osc, part 3

Browse source 
fix the jerkiness!
This commit is contained in:
tildearrow 2025-03-01 18:46:11 -05:00
parent 10e60ec8c1
commit c0e4552c52
2 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/gui/chanOsc.cpp
View file

@ -550,8 +550,11 @@ void FurnaceGUI::drawChanOsc() {
double dft[2]; double dft[2];
dft[0]=0.0; dft[0]=0.0;
dft[1]=0.0; dft[1]=0.0;
for (int j=fft->needle-1-(displaySize>>1)-(int)fft->waveLen, k=0; k<fft->waveLen; j++, k++) { lastSample=0;
double one=((double)buf->data[j&0xffff]/32768.0); for (int j=fft->needle-1-displaySize-(int)fft->waveLen, k=-(displaySize>>1); k<fft->waveLen; j++, k++) {
if (buf->data[j&0xffff]!=-1) lastSample=buf->data[j&0xffff];
if (k<0) continue;
double one=((double)lastSample/32768.0);
double two=(double)k*(-2.0*M_PI)/fft->waveLen; double two=(double)k*(-2.0*M_PI)/fft->waveLen;
dft[0]+=one*cos(two); dft[0]+=one*cos(two);
dft[1]+=one*sin(two); dft[1]+=one*sin(two);
@ -560,6 +563,8 @@ void FurnaceGUI::drawChanOsc() {
// calculate and lock into phase // calculate and lock into phase
phase=(0.5+(atan2(dft[1],dft[0])/(2.0*M_PI))); phase=(0.5+(atan2(dft[1],dft[0])/(2.0*M_PI)));
fft->debugPhase=phase;
if (fft->waveCorr) { if (fft->waveCorr) {
fft->needle-=(phase+(fft->phaseOff*2))*fft->waveLen; fft->needle-=(phase+(fft->phaseOff*2))*fft->waveLen;
} }
@ -675,7 +680,7 @@ void FurnaceGUI::drawChanOsc() {
} }
} }
if (fft->loudEnough) { if (fft->loudEnough) {
String cPhase=fmt::sprintf("\n%.1f (b: %d t: %d)\nSIZES: %d, %d, %d",fft->waveLen,fft->waveLenBottom,fft->waveLenTop,displaySize,displaySize2,FURNACE_FFT_SIZE); String cPhase=fmt::sprintf("\n%.1f (b: %d t: %d)\nSIZES: %d, %d, %d\nPHASE %f",fft->waveLen,fft->waveLenBottom,fft->waveLenTop,displaySize,displaySize2,FURNACE_FFT_SIZE,fft->debugPhase);
dl->AddText(inRect.Min,0xffffffff,cPhase.c_str()); dl->AddText(inRect.Min,0xffffffff,cPhase.c_str());
dl->AddLine( dl->AddLine(
@ -688,13 +693,18 @@ void FurnaceGUI::drawChanOsc() {
ImLerp(inRect.Min,inRect.Max,ImVec2((double)fft->waveLenTop/(double)FURNACE_FFT_SIZE,1.0)), ImLerp(inRect.Min,inRect.Max,ImVec2((double)fft->waveLenTop/(double)FURNACE_FFT_SIZE,1.0)),
0xff00ff00 0xff00ff00
); );
dl->AddLine(
ImLerp(inRect.Min,inRect.Max,ImVec2(0.75-(fft->debugPhase*0.25),0.0)),
ImLerp(inRect.Min,inRect.Max,ImVec2(0.75-(fft->debugPhase*0.25),1.0)),
0xff00ffff
);
} else { } else {
if (debugFFT) { if (debugFFT) {
dl->AddText(inRect.Min,0xffffffff,"\nquiet"); dl->AddText(inRect.Min,0xffffffff,"\nquiet");
} }
} }
} else { } else {
String dStr=fmt::sprintf("DS: %d P: %d\nMAX: %d",displaySize,precision,(short)((fft->needle+displaySize)-fft->relatedBuf->needle)); String dStr=fmt::sprintf("DS: %d P: %d\nMAX: %d\nPHASE %f",displaySize,precision,(short)((fft->needle+displaySize)-fft->relatedBuf->needle),fft->debugPhase);
dl->AddText(inRect.Min,0xffffffff,dStr.c_str()); dl->AddText(inRect.Min,0xffffffff,dStr.c_str());
if (displaySize<precision) { if (displaySize<precision) {
float y=0; float y=0;

3
src/gui/gui.h
View file

@ -2636,7 +2636,7 @@ class FurnaceGUI {
double inBufPosFrac; double inBufPosFrac;
double waveLen; double waveLen;
int waveLenBottom, waveLenTop, relatedCh; int waveLenBottom, waveLenTop, relatedCh;
float pitch, windowSize, phaseOff; float pitch, windowSize, phaseOff, debugPhase;
unsigned short needle; unsigned short needle;
bool ready, loudEnough, waveCorr; bool ready, loudEnough, waveCorr;
fftw_plan plan; fftw_plan plan;
@ -2657,6 +2657,7 @@ class FurnaceGUI {
pitch(0.0f), pitch(0.0f),
windowSize(1.0f), windowSize(1.0f),
phaseOff(0.0f), phaseOff(0.0f),
debugPhase(0.0f),
needle(0), needle(0),
ready(false), ready(false),
loudEnough(false), loudEnough(false),