6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2025-01-13 07:30:21 +00:00
Code Issues Projects Releases Wiki Activity

Tries to be a little neater in spelling out the work here.

Browse Source 
I think I'm somewhat circling here now; I need to think of a way of getting clean comparison data.
This commit is contained in:
Thomas Harte 2020-04-14 21:55:42 -04:00
parent d805e9a8f0
commit d8380dc3e2
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Components/OPL2/OPL2.hpp
View File

@ -204,11 +204,8 @@ class Channel {
// TODO: almost everything. This is a quick test. // TODO: almost everything. This is a quick test.
// Specifically: use lookup tables. // Specifically: use lookup tables.
const float modulator_output = 0.0f;//expf(logf(float(M_PI) * sinf(float(modulator_state_.phase) / 512.0f)) + (float(modulator_state_.attenuation) / 1023.0f)); const auto modulator_level = 0.0f;//level(modulator_state_, 0.0f) * 0.25f;
const float carrier_phase = modulator_output + float(carrier_state_.phase) / 1024.0f; return int(level(carrier_state_, modulator_level) * 20'000.0f);
const float carrier_output = expf(logf(sinf(float(M_PI) * 2.0f * carrier_phase)) + (float(carrier_state_.attenuation) / 1023.0f));
return int(carrier_output * 20'000.0f);
} }
/// @returns @c true if this channel is currently producing any audio; @c false otherwise; /// @returns @c true if this channel is currently producing any audio; @c false otherwise;
@ -217,6 +214,13 @@ class Channel {
} }
private: private:
float level(OperatorState &state, float modulator_level) {
const float phase = modulator_level + float(state.phase) / 1024.0f;
const float phase_attenuation = logf(1.0f + sinf(float(M_PI) * 2.0f * phase));
const float total_attenuation = phase_attenuation + float(state.attenuation) / 1023.0f;
return expf(total_attenuation);
}
/// 'F-Num' in the spec; this plus the current octave determines channel frequency. /// 'F-Num' in the spec; this plus the current octave determines channel frequency.
int period_ = 0; int period_ = 0;