Skip to content

Commit

Permalink
xMerge branch 'main' of github.com:ccrma/chuck
Browse files Browse the repository at this point in the history
  • Loading branch information
gewang committed Jul 16, 2024
2 parents d752a16 + 21a81ae commit 112b006
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions VERSIONS
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ ChucK VERSIONS log
within Type documentation generation (thanks azaday)
- (fixed) globals events system synchronization (FYI this fixes a long-running,
elusive Chunity crashing bug involving various syncers)
- (fixed) STK Moog parameters now consistent (should sound more Moog-y)
- (fixed) local non-control structure local scope Objects now correctly cleaned
up at the end of local scope

Expand Down
4 changes: 2 additions & 2 deletions src/core/ugen_stk.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -11802,7 +11802,7 @@ Moog :: Moog()
adsr->setAllTimes((MY_FLOAT) 0.001,(MY_FLOAT) 1.5,(MY_FLOAT) 0.6,(MY_FLOAT) 0.250);
filterQ = (MY_FLOAT) 0.85;
filterRate = (MY_FLOAT) 0.0001;
filterStartFreq = (MY_FLOAT) 0.0;
filterStartFreq = (MY_FLOAT) 2000.0; // 1.5.2.5 (prc) updated to 2000.0; was 0.0;
modDepth = (MY_FLOAT) 0.0;

// chuck
Expand Down Expand Up @@ -11916,7 +11916,7 @@ void Moog :: controlChange(int number, MY_FLOAT value)
if (number == __SK_FilterQ_) // 2
filterQ = 0.80 + ( 0.1 * norm );
else if (number == __SK_FilterSweepRate_) // 4
filterRate = norm * 0.002; // 1.4.1.0 (prc) was .0002
filterRate = norm * 0.0002; // 1.5.2.5 (prc) was .002 // 1.4.1.0 (prc) was .0002
else if (number == __SK_ModFrequency_) { // 11
this->setModulationSpeed( norm * 12.0 );
}
Expand Down

0 comments on commit 112b006

Please sign in to comment.