clean interface
This commit is contained in:
@ -1,4 +1,4 @@
|
||||
import type { SynthEngine } from './SynthEngine';
|
||||
import type { SynthEngine, PitchLock } from './SynthEngine';
|
||||
|
||||
enum EnvCurve {
|
||||
Linear,
|
||||
@ -420,12 +420,14 @@ export class FourOpFM implements SynthEngine<FourOpFMParams> {
|
||||
}
|
||||
}
|
||||
|
||||
randomParams(): FourOpFMParams {
|
||||
randomParams(pitchLock?: PitchLock): FourOpFMParams {
|
||||
const algorithm = this.randomInt(0, 5) as Algorithm;
|
||||
|
||||
// More musical frequency ratios including inharmonic ones
|
||||
const baseFreqChoices = [55, 82.4, 110, 146.8, 220, 293.7, 440, 587.3, 880];
|
||||
const baseFreq = this.randomChoice(baseFreqChoices) * this.randomRange(0.9, 1.1);
|
||||
const baseFreq = pitchLock?.enabled
|
||||
? pitchLock.frequency
|
||||
: this.randomChoice(baseFreqChoices) * this.randomRange(0.9, 1.1);
|
||||
|
||||
return {
|
||||
baseFreq,
|
||||
@ -481,9 +483,11 @@ export class FourOpFM implements SynthEngine<FourOpFMParams> {
|
||||
};
|
||||
}
|
||||
|
||||
mutateParams(params: FourOpFMParams, mutationAmount: number = 0.15): FourOpFMParams {
|
||||
mutateParams(params: FourOpFMParams, mutationAmount: number = 0.15, pitchLock?: PitchLock): FourOpFMParams {
|
||||
const baseFreq = pitchLock?.enabled ? pitchLock.frequency : params.baseFreq;
|
||||
|
||||
return {
|
||||
baseFreq: params.baseFreq,
|
||||
baseFreq,
|
||||
algorithm: Math.random() < 0.08 ? this.randomInt(0, 5) as Algorithm : params.algorithm,
|
||||
operators: params.operators.map((op, i) =>
|
||||
this.mutateOperator(op, mutationAmount, i === 3, params.algorithm)
|
||||
|
||||
Reference in New Issue
Block a user