revert MB oscs to int casts for negative freq handling

Matthew Wang committed 5 years ago

Commit da54fcd1 parent 5a5d9903 files · +40 −16Browse files

Unified · Split

3 files

TestPlugin/Source/MyTest.cpp +7 −6
leaf/Inc/leaf-oscillators.h +6 −3
leaf/Src/leaf-oscillators.c +27 −7

@@ -102,11 +102,12 @@ inline double getSawFall(double angle) { · 101 unmodified lines
102		102
103	float LEAFTest_tick (float input)	103	float LEAFTest_tick (float input)
104	{	104	{
105	float out = 0.0f;	105	float out = tMBSaw_tick(&bsaw);
106	for (int i = 0; i < numWavetables; ++i)	106
107	{	107	// for (int i = 0; i < numWavetables; ++i)
108	out += tWaveOsc_tick(&ws);	108	// {
109	}	109	// out += tWaveOsc_tick(&ws);
		110	// }
110	return out;	111	return out;
111	}	112	}
112		113
@@ -117,7 +118,7 @@ void LEAFTest_block (void) · 4 unmodified lines
117	float val = getSliderValue("slider1");	118	float val = getSliderValue("slider1");
118	tMBTriangle_setFreq(&btri, val * 440.f);	119	tMBTriangle_setFreq(&btri, val * 440.f);
119	tMBPulse_setFreq(&bpulse, val * 160000.f - 80000.0f);	120	tMBPulse_setFreq(&bpulse, val * 160000.f - 80000.0f);
120	tMBSaw_setFreq(&bsaw, val * 10000.f);	121	tMBSaw_setFreq(&bsaw, -val * 2000.f + 1000.0f);
121	// tWaveTable_setFreq(&wt, val * 160000.f - 80000.0f);	122	// tWaveTable_setFreq(&wt, val * 160000.f - 80000.0f);
122	// tWaveTableS_setFreq(&cwt, val * 10000.);	123	// tWaveTableS_setFreq(&cwt, val * 10000.);
123	tWaveOsc_setFreq(&ws, val * 2000.f);	124	tWaveOsc_setFreq(&ws, val * 2000.f);

leaf/Inc/leaf-oscillators.h+6−3

     void tMBPulse_setFreq(tMBPulse* const osc, float f);
     void tMBPulse_setWidth(tMBPulse* const osc, float w);
     float tMBPulse_sync(tMBPulse* const osc, float sync);
+    void tMBPulse_setPhase(tMBPulse* const osc, float phase);
     void tMBPulse_setSyncMode(tMBPulse* const osc, int hardOrSoft);
-    void    tMBPulse_setSampleRate (tMBPulse* const osc, float sr);
+    void tMBPulse_setSampleRate (tMBPulse* const osc, float sr);
     /*!
      @defgroup tmbtriangle tMBTriangle
     void tMBTriangle_setFreq(tMBTriangle* const osc, float f);
     void tMBTriangle_setWidth(tMBTriangle* const osc, float w);
     float tMBTriangle_sync(tMBTriangle* const osc, float sync);
+    void tMBTriangle_setPhase(tMBTriangle* const osc, float phase);
     void tMBTriangle_setSyncMode(tMBTriangle* const osc, int hardOrSoft);
-    void   tMBTriangle_setSampleRate (tMBTriangle* const osc, float sr);
+    void tMBTriangle_setSampleRate (tMBTriangle* const osc, float sr);
     /*!
     float tMBSaw_tick(tMBSaw* const osc);
     void tMBSaw_setFreq(tMBSaw* const osc, float f);
     float tMBSaw_sync(tMBSaw* const osc, float sync);
+    void tMBSaw_setPhase(tMBSaw* const osc, float phase);
     void tMBSaw_setSyncMode(tMBSaw* const osc, int hardOrSoft);
-    void    tMBSaw_setSampleRate (tMBSaw* const osc, float sr);
+    void tMBSaw_setSampleRate (tMBSaw* const osc, float sr);
     //==============================================================================

leaf/Src/leaf-oscillators.c+27−7

     if (sync > 0.0f && c->softsync > 0) c->syncdir = -c->syncdir;
     sw = w * c->syncdir;
-    p += sw - rintf(sw - 0.5f);
+    p += sw - (int)sw;
     if (sync > 0.0f && c->softsync == 0) {  /* sync to master */
         float eof_offset = sync * sw;
     return value;
 }
+void tMBPulse_setPhase(tMBPulse* const osc, float phase)
+{
+    _tMBPulse* c = *osc;
+    c->_p = phase;
+}
 void tMBPulse_setSyncMode(tMBPulse* const osc, int hardOrSoft)
 {
     _tMBPulse* c = *osc;
         //                + 1e3 * linm[1] * vco->_port[LING]) / SAMPLERATE;
         w = freq * c->invSampleRate;
         b = 0.5f * (1.0f + c->waveform);
-        p = 0.5f * b;
+//        p = 0.5f * b;
+        p = 0.f;
         /* if we valued alias-free startup over low startup time, we could do:
          *   p -= w;
          *   place_slope_dd(_f, j, 0.0f, w, 1.0f / b); */
     if (sync > 0.0f && c->softsync > 0) c->syncdir = -c->syncdir;
     sw = w * c->syncdir;
-    p += sw - rintf(sw - 0.5f);
+    p += sw - (int)sw;
     if (sync > 0.0f && c->softsync == 0) {  /* sync to master */
         float eof_offset = sync * sw;
     return value;
 }
+void tMBTriangle_setPhase(tMBTriangle* const osc, float phase)
+{
+    _tMBTriangle* c = *osc;
+    c->_p = phase;
+}
 void tMBTriangle_setSyncMode(tMBTriangle* const osc, int hardOrSoft)
 {
     _tMBTriangle* c = *osc;
     c->invSampleRate = 1.0f/sr;
 }
-//==========================================================================================================
+//==================================================================================================
-//==========================================================================================================
+//==================================================================================================
 void tMBSaw_init(tMBSaw* const osc, LEAF* const leaf)
 {
     j = c->_j;  /* index into buffer _f */
     if (c->_init) {
-        p = 0.5f;
+//        p = 0.5f;
+        p = 0.f;
         w = freq * c->invSampleRate;
         /* if we valued alias-free startup over low startup time, we could do:
     //            else if (sw < 0) place_slope_dd(c->_f, j, 1.0f - p, -sw, -2.0f);
     sw = w * c->syncdir;
-    p += sw - rintf(sw - 0.5f);
+    p += sw - (int)sw;
     if (sync > 0.0f && c->softsync == 0) {  /* sync to master */
         float eof_offset = sync * sw;
     return value;
 }
+void tMBSaw_setPhase(tMBSaw* const osc, float phase)
+{
+    _tMBSaw* c = *osc;
+    c->_p = phase;
+}
 void tMBSaw_setSyncMode(tMBSaw* const osc, int hardOrSoft)
 {
     _tMBSaw* c = *osc;

revert MB oscs to int casts for negative freq handling

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code