Skip to content

Fix sinoscfb phase #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix sinoscfb phase #13

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions src/OscilUGens.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1257,27 +1257,28 @@ struct FSinOsc : public ZeroInputUGen<FSinOsc>



struct SinOscPMFB : public TwoInputUGen<SinOscPMFB>
struct SinOscPMFB : public ThreeInputUGen<SinOscPMFB>
{
Z phase;
Z freqmul;
Z y1;

SinOscPMFB(Thread& th, Arg freq, Z iphase, Arg phasefb) : TwoInputUGen<SinOscPMFB>(th, freq, phasefb), phase(sc_wrap(iphase, 0., 1.) * kTwoPi), freqmul(th.rate.radiansPerSample)
SinOscPMFB(Thread& th, Arg freq, Arg modphase, Arg phasefb) : ThreeInputUGen<SinOscPMFB>(th, freq, modphase, phasefb), freqmul(th.rate.radiansPerSample)
{
freqmul = th.rate.radiansPerSample;
}

virtual const char* TypeName() const override { return "SinOscPMFB"; }

void calc(int n, Z* out, Z* freq, Z* phasefb, int freqStride, int phasefbStride)
void calc(int n, Z* out, Z* freq, Z* modPhase, Z* phasefb, int freqStride, int modPhaseStride, int phasefbStride)
{
for (int i = 0; i < n; ++i) {
Z y0 = sin(phase + *phasefb * y1);
Z y0 = sin(phase + *phasefb * y1 + *modPhase);
out[i] = y0;
y1 = y0;
phase += *freq * freqmul;
freq += freqStride;
modPhase += modPhaseStride;
phasefb += phasefbStride;
if (phase >= kTwoPi) phase -= kTwoPi;
else if (phase < 0.) phase += kTwoPi;
Expand Down Expand Up @@ -1405,10 +1406,10 @@ static void sinoscm_(Thread& th, Prim* prim)
static void sinoscfb_(Thread& th, Prim* prim)
{
V fb = th.popZIn("sinoscfb : fb");
Z iphase = th.popFloat("sinoscfb : phase");
V phase = th.popZIn("sinoscfb : phase");
V freq = th.popZIn("sinoscfb : freq");

th.push(new List(new SinOscPMFB(th, freq, iphase, fb)));
th.push(new List(new SinOscPMFB(th, freq, phase, fb)));
}

////////////////////////////////////////////////////////////////////////////////////////////////////////
Expand Down