mirror of
https://github.com/tildearrow/furnace.git
synced 2024-11-01 10:32:40 +00:00
dev222 - Merge branch 'SID3'
This commit is contained in:
tildearrow
commit
d838224d94
65 changed files with 10466 additions and 2376 deletions
|
|
@ -670,6 +670,8 @@ src/engine/platform/sound/sid2/wave8580_P_T.cc
|
||||||
src/engine/platform/sound/sid2/wave8580__ST.cc
|
src/engine/platform/sound/sid2/wave8580__ST.cc
|
||||||
src/engine/platform/sound/sid2/wave.cc
|
src/engine/platform/sound/sid2/wave.cc
|
||||||
|
|
||||||
|
src/engine/platform/sound/sid3.c
|
||||||
|
|
||||||
src/engine/platform/oplAInterface.cpp
|
src/engine/platform/oplAInterface.cpp
|
||||||
src/engine/platform/ym2608Interface.cpp
|
src/engine/platform/ym2608Interface.cpp
|
||||||
src/engine/platform/ym2610Interface.cpp
|
src/engine/platform/ym2610Interface.cpp
|
||||||
|
|
@ -796,6 +798,7 @@ src/engine/platform/gbaminmod.cpp
|
||||||
src/engine/platform/nds.cpp
|
src/engine/platform/nds.cpp
|
||||||
src/engine/platform/bifurcator.cpp
|
src/engine/platform/bifurcator.cpp
|
||||||
src/engine/platform/sid2.cpp
|
src/engine/platform/sid2.cpp
|
||||||
|
src/engine/platform/sid3.cpp
|
||||||
src/engine/platform/pcmdac.cpp
|
src/engine/platform/pcmdac.cpp
|
||||||
src/engine/platform/dummy.cpp
|
src/engine/platform/dummy.cpp
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -197,22 +197,22 @@ additionally, [each chip has its own effects](../7-systems/README.md).
|
||||||
|
|
||||||
the interpretation of duty, wave and extra macros depends on chip/instrument type:
|
the interpretation of duty, wave and extra macros depends on chip/instrument type:
|
||||||
|
|
||||||
ex | FM | OPM | OPZ | OPLL | AY-3-8910 | AY8930 | Lynx | C64 |
|
ex | FM | OPM | OPZ | OPLL | AY-3-8910 | AY8930 | Lynx | C64 |
|
||||||
---|--------|-----------|-----------|-------|------------|------------|----------|------------|
|
---|--------|-----------|-----------|-------|------------|------------|----------|---------------|
|
||||||
D | NoiseF | NoiseFreq | | | NoiseFreq | NoiseFreq | Duty/Int | Duty |
|
D | NoiseF | NoiseFreq | | | NoiseFreq | NoiseFreq | Duty/Int | Duty |
|
||||||
W | | LFO Shape | LFO Shape | Patch | Waveform | Waveform | | Waveform |
|
W | | LFO Shape | LFO Shape | Patch | Waveform | Waveform | | Waveform |
|
||||||
1 | | AMD | AMD | | | Duty | | FilterMode |
|
1 | | AMD | AMD | | | Duty | | FilterMode |
|
||||||
2 | | PMD | PMD | | Envelope | Envelope | | Resonance |
|
2 | | PMD | PMD | | Envelope | Envelope | | Resonance |
|
||||||
3 | LFOSpd | LFO Speed | LFO Speed | | AutoEnvNum | AutoEnvNum | | |
|
3 | LFOSpd | LFO Speed | LFO Speed | | AutoEnvNum | AutoEnvNum | | Filter Toggle |
|
||||||
A | ALG | ALG | ALG | | AutoEnvDen | AutoEnvDen | | Cutoff |
|
A | ALG | ALG | ALG | | AutoEnvDen | AutoEnvDen | | Cutoff |
|
||||||
B | FB | FB | FB | | | Noise AND | | |
|
B | FB | FB | FB | | | Noise AND | | |
|
||||||
C | FMS | FMS | FMS | | | Noise OR | | |
|
C | FMS | FMS | FMS | | | Noise OR | | |
|
||||||
D | AMS | AMS | AMS | | | | | |
|
D | AMS | AMS | AMS | | | | | |
|
||||||
4 | OpMask | OpMask | | | | | | Special |
|
4 | OpMask | OpMask | | | | | | Special |
|
||||||
5 | | | AMD2 | | | | | Attack |
|
5 | | | AMD2 | | | | | Attack |
|
||||||
6 | | | PMD2 | | | | | Decay |
|
6 | | | PMD2 | | | | | Decay |
|
||||||
7 | | | LFO2Speed | | | | | Sustain |
|
7 | | | LFO2Speed | | | | | Sustain |
|
||||||
8 | | | LFO2Shape | | | | | Release |
|
8 | | | LFO2Shape | | | | | Release |
|
||||||
|
|
||||||
ex | SAA1099 | X1-010 | Namco 163 | FDS | Sound Unit | ES5506 | MSM6258 |
|
ex | SAA1099 | X1-010 | Namco 163 | FDS | Sound Unit | ES5506 | MSM6258 |
|
||||||
---|----------|------------|------------|-----------|------------|-----------|----------|
|
---|----------|------------|------------|-----------|------------|-----------|----------|
|
||||||
|
|
@ -231,19 +231,61 @@ ex | SAA1099 | X1-010 | Namco 163 | FDS | Sound Unit | ES5506 | M
|
||||||
7 | | | | | | EnvRampK2 | |
|
7 | | | | | | EnvRampK2 | |
|
||||||
8 | | | | | | Env Mode | |
|
8 | | | | | | Env Mode | |
|
||||||
|
|
||||||
ex | QSound | SNES | MSM5232 |
|
ex | QSound | SNES | MSM5232 | SID2 |
|
||||||
---|--------------|-----------|-----------|
|
---|--------------|-----------|-----------|---------------|
|
||||||
D | Echo Level | NoiseFreq | GroupCtrl |
|
D | Echo Level | NoiseFreq | GroupCtrl | Duty |
|
||||||
W | | Waveform | |
|
W | | Waveform | | Waveform |
|
||||||
1 | EchoFeedback | Special | GroupAtk |
|
1 | EchoFeedback | Special | GroupAtk | Filter mode |
|
||||||
2 | Echo Length | Gain | GroupDec |
|
2 | Echo Length | Gain | GroupDec | Resonance |
|
||||||
3 | | | Noise |
|
3 | | | Noise | Filter toggle |
|
||||||
A | | | |
|
A | | | | Filter cutoff |
|
||||||
B | | | |
|
B | | | | |
|
||||||
C | | | |
|
C | | | | Noise mode |
|
||||||
D | | | |
|
D | | | | Wave mix mode |
|
||||||
4 | | | |
|
4 | | | | Special |
|
||||||
5 | | | |
|
5 | | | | Attack |
|
||||||
6 | | | |
|
6 | | | | Decay |
|
||||||
7 | | | |
|
7 | | | | Sustain |
|
||||||
8 | | | |
|
8 | | | | Release |
|
||||||
|
|
||||||
|
|
||||||
|
SID3 instrument also uses some of the FM operators macros in main macros list:
|
||||||
|
|
||||||
|
ex | SID3 |
|
||||||
|
------|-------------------------------|
|
||||||
|
D | Duty |
|
||||||
|
W | Waveform |
|
||||||
|
1 | Special |
|
||||||
|
2 | Attack |
|
||||||
|
3 | Decay |
|
||||||
|
A | Special wave |
|
||||||
|
B | Phase Mod source |
|
||||||
|
C | Ring Mod source |
|
||||||
|
D | Hard sync source |
|
||||||
|
4 | Sustain |
|
||||||
|
5 | Sustain rate |
|
||||||
|
6 | Release |
|
||||||
|
7 | LFSR feedback bits |
|
||||||
|
8 | Wave mix mode |
|
||||||
|
OP1 AM| Key On/Off |
|
||||||
|
OP2 AM| Noise phase reset |
|
||||||
|
OP3 AM| Envelope reset |
|
||||||
|
OP4 AM| Noise Arpeggio |
|
||||||
|
OP1 AR| Noise Pitch |
|
||||||
|
OP2 AR| 1-bit noise/PCM mode |
|
||||||
|
OP3 AR| Channel signal inversion |
|
||||||
|
OP4 AR| Feedback |
|
||||||
|
|
||||||
|
SID3 instrument uses FM operators macros for filters:
|
||||||
|
|
||||||
|
ex | SID3 |
|
||||||
|
-----|-------------------------------|
|
||||||
|
D2R | Cutoff |
|
||||||
|
DAM | Resonance |
|
||||||
|
DR | Filter toggle |
|
||||||
|
DT2 | Distortion level |
|
||||||
|
DT | Output volume |
|
||||||
|
DVB | Connect to channel input |
|
||||||
|
EGT | Connect to channel output |
|
||||||
|
KSL | Connection matrix row |
|
||||||
|
KSR | Filter mode |
|
||||||
|
|
|
||||||
|
|
@ -67,6 +67,7 @@ the following instrument types are available:
|
||||||
- [SegaPCM](segapcm.md) - for use with SegaPCM sample chip.
|
- [SegaPCM](segapcm.md) - for use with SegaPCM sample chip.
|
||||||
- [Seta/Allumer X1-010](x1_010.md) - for use with Wavetable portion in Seta/Allumer X1-010.
|
- [Seta/Allumer X1-010](x1_010.md) - for use with Wavetable portion in Seta/Allumer X1-010.
|
||||||
- [SID2](sid2.md) - for use with SID2 fantasy chip.
|
- [SID2](sid2.md) - for use with SID2 fantasy chip.
|
||||||
|
- [SID3](sid3.md) - for use with SID3 fantasy chip.
|
||||||
- [SM8521](sm8521.md) - for use with SM8521 chip, used in Tiger Game.com.
|
- [SM8521](sm8521.md) - for use with SM8521 chip, used in Tiger Game.com.
|
||||||
- [SN76489/Sega PSG](psg.md) - for use with TI SN76489 and derivatives like Sega Master System's PSG.
|
- [SN76489/Sega PSG](psg.md) - for use with TI SN76489 and derivatives like Sega Master System's PSG.
|
||||||
- [SNES](snes.md) - for use with SNES.
|
- [SNES](snes.md) - for use with SNES.
|
||||||
|
|
|
||||||
|
|
@ -13,6 +13,8 @@ the C64 instrument editor consists of two tabs: "C64" to control various paramet
|
||||||
- **Sustain**: sets the volume level at which the sound stops decaying and holds steady (0 to 15).
|
- **Sustain**: sets the volume level at which the sound stops decaying and holds steady (0 to 15).
|
||||||
- **Release**: determines the rate at which the sound fades out after note off. the higher the value, the longer the release (0 to 15).
|
- **Release**: determines the rate at which the sound fades out after note off. the higher the value, the longer the release (0 to 15).
|
||||||
- **Duty**: specifies the width of a pulse wave (0 to 4095).
|
- **Duty**: specifies the width of a pulse wave (0 to 4095).
|
||||||
|
- **Reset duty on new note**: overwrite current duty value with the one that is specified in the instrument on new note.
|
||||||
|
- only useful when using relative duty macro.
|
||||||
- **Ring Modulation**: when enabled, the channel's output will be multiplied with the previous channel's.
|
- **Ring Modulation**: when enabled, the channel's output will be multiplied with the previous channel's.
|
||||||
- **Oscillator Sync**: enables oscillator hard sync. as the previous channel's oscillator finishes a cycle, it resets the period of the channel's oscillator, forcing the latter to have the same base frequency. this can produce a harmonically rich sound, the timbre of which can be altered by varying the synchronized oscillator's frequency.
|
- **Oscillator Sync**: enables oscillator hard sync. as the previous channel's oscillator finishes a cycle, it resets the period of the channel's oscillator, forcing the latter to have the same base frequency. this can produce a harmonically rich sound, the timbre of which can be altered by varying the synchronized oscillator's frequency.
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -14,6 +14,8 @@ the SID2 instrument editor consists of two tabs: "SID2" to control various param
|
||||||
- **Sustain**: sets the volume level at which the sound stops decaying and holds steady (0 to 15).
|
- **Sustain**: sets the volume level at which the sound stops decaying and holds steady (0 to 15).
|
||||||
- **Release**: determines the rate at which the sound fades out after note off. the higher the value, the longer the release (0 to 15).
|
- **Release**: determines the rate at which the sound fades out after note off. the higher the value, the longer the release (0 to 15).
|
||||||
- **Duty**: specifies the width of a pulse wave (0 to 4095).
|
- **Duty**: specifies the width of a pulse wave (0 to 4095).
|
||||||
|
- **Reset duty on new note**: overwrite current duty value with the one that is specified in the instrument on new note.
|
||||||
|
- only useful when using relative duty macro.
|
||||||
- **Ring Modulation**: when enabled, the channel's output will be multiplied with the previous channel's.
|
- **Ring Modulation**: when enabled, the channel's output will be multiplied with the previous channel's.
|
||||||
- **Oscillator Sync**: enables oscillator hard sync. as the previous channel's oscillator finishes a cycle, it resets the period of the channel's oscillator, forcing the latter to have the same base frequency. this can produce a harmonically rich sound, the timbre of which can be altered by varying the synchronized oscillator's frequency.
|
- **Oscillator Sync**: enables oscillator hard sync. as the previous channel's oscillator finishes a cycle, it resets the period of the channel's oscillator, forcing the latter to have the same base frequency. this can produce a harmonically rich sound, the timbre of which can be altered by varying the synchronized oscillator's frequency.
|
||||||
|
|
||||||
|
|
|
||||||
142
doc/4-instrument/sid3.md
Normal file
142
doc/4-instrument/sid3.md
Normal file
|
|
@ -0,0 +1,142 @@
|
||||||
|
# SID3 instrument editor
|
||||||
|
|
||||||
|
the SID3 editor is divided into 8 tabs:
|
||||||
|
|
||||||
|
- **SID3**: for controlling the basic parameters of SID3 sound source.
|
||||||
|
- **Wavetable**: for controlling the wavetable synth.
|
||||||
|
- **Sample**: for various sample settings.
|
||||||
|
- **Macros (Filter 1)**: for macros controlling parameters of filter 1.
|
||||||
|
- **Macros (Filter 2)**: for macros controlling parameters of filter 2.
|
||||||
|
- **Macros (Filter 3)**: for macros controlling parameters of filter 3.
|
||||||
|
- **Macros (Filter 4)**: for macros controlling parameters of filter 4.
|
||||||
|
- **Macros**: for other macros.
|
||||||
|
|
||||||
|
## Wavetable
|
||||||
|
|
||||||
|
this allows you to enable and configure the Furnace wavetable synthesizer. see [this page](wavesynth.md) for more information.
|
||||||
|
|
||||||
|
## Sample
|
||||||
|
|
||||||
|
for sample settings, see [the Sample instrument editor](sample.md).
|
||||||
|
|
||||||
|
the only differences are the lack of an "Use wavetable" option, and the presence of a "Use sample" one.
|
||||||
|
|
||||||
|
## SID3
|
||||||
|
|
||||||
|
- **Waveform**: allows selecting a waveform.
|
||||||
|
- more than one waveform can be selected at once. in that case a logical AND mix of waves will occur...
|
||||||
|
- although with default mix mode it does occur a bit wrong (like on 8580 SID chip). see below what happens when other modes are in use.
|
||||||
|
- **Special wave**: allows selecting a special wave. the wave preview is to the right.
|
||||||
|
- **Wavetable channel**: replaces and hides some macros and UI elements, and makes instrument operate with last wavetable/sample channel:
|
||||||
|
- **Waveform** macro now selects a wavetable
|
||||||
|
- **Duty**, **Special Wave**, **Feedback**, **Noise Phase Reset**, **Noise LFSR bits** and **Wave Mix** macros are hidden
|
||||||
|
- **1-Bit Noise** macro now controls wavetable/PCM mode (it becomes **Sample Mode** macro)
|
||||||
|
- **Inv. left** and **Inv. right**: invert the signal of corresponding stereo channels.
|
||||||
|
- **Attack**: determines the rising time for the sound. the bigger the value, the slower the attack. (0 to 255).
|
||||||
|
- **Decay**: determines the diminishing time for the sound. the higher the value, the longer the decay (0 to 255).
|
||||||
|
- **Sustain**: sets the volume level at which the sound stops decaying and holds or also decays, but with different speed (0 to 255).
|
||||||
|
- **Sustain rate**: sets the speed at which the sound decays after reaching sustain volume level. (0 to 255).
|
||||||
|
- **Release**: determines the rate at which the sound fades out after note off. the higher the value, the longer the release (0 to 255).
|
||||||
|
- **Wave Mix Mode**: dictates how different waves on the same channel are mixed together.
|
||||||
|
- **Duty**: specifies the width of a pulse wave (0 to 65535).
|
||||||
|
- **Feedback**: specifies the feedback level (0 to 255).
|
||||||
|
- **Reset duty on new note**: overwrite current duty value with the one that is specified in the instrument on new note.
|
||||||
|
- only useful when using relative duty macro.
|
||||||
|
- **Absolute Duty Macro**: when enabled, the duty macro will go from 0 to 65535 (in other words, control the duty directly rather than being relative).
|
||||||
|
- **Ring Modulation**: when enabled, the channel's output will be multiplied with the source channel's.
|
||||||
|
- **Oscillator Sync**: enables oscillator hard sync. as the source channel's oscillator finishes a cycle, it resets the period of the channel's oscillator, forcing the latter to have the same base frequency. this can produce a harmonically rich sound, the timbre of which can be altered by varying the synchronized oscillator's frequency.
|
||||||
|
- **Phase Modulation**: when enabled, the channel's phase will be modified with the source channel's signal (signal is taken from filtered channel's output if filters are enabled).
|
||||||
|
- **Separate noise pitch**: when enabled, the noise frequency/pitch will be controllable via special macros: **Noise Arpeggio** and **Noise Pitch**.
|
||||||
|
|
||||||
|
Then follow controls for each of the 4 filters:
|
||||||
|
|
||||||
|
- **Enable filter**: when enabled, this instrument will go through the filter.
|
||||||
|
- **Initialize filter**: initializes the filter with the specified parameters:
|
||||||
|
- **Cutoff**: the filter's point in where frequencies are cut off (0 to 65535).
|
||||||
|
- **Resonance**: amplifies or focuses on the cutoff frequency, creating a secondary peak forms and colors the original pitch (0 to 255).
|
||||||
|
- **Filter mode**: sets the filter mode. you may pick one or more of the following:
|
||||||
|
- **low**: a low-pass filter. the lower the cutoff, the darker the sound.
|
||||||
|
- **high**: a high-pass filter. higher cutoff values result in a less "bassy" sound.
|
||||||
|
- **band**: a band-pass filter. cutoff determines which part of the sound is heard (from bass to treble).
|
||||||
|
- multiple filter modes can be selected simultaneously. for example, selecting both "low" and "high" results in a bandstop (notch) filter.
|
||||||
|
- **Output volume**: sets the filter output volume (0 to 255).
|
||||||
|
- **Distortion level**: dictates how hard the signal is distorted (soft clipping). distortion is slightly asymmetrical (0 to 255).
|
||||||
|
- **Absolute Cutoff Macro**: when enabled, the cutoff macro will go from 0 to 65535, and it will be absolute.
|
||||||
|
- **Change cutoff with pitch**: when enabled, the cutoff will be scaled according to the frequency offset from specified note.
|
||||||
|
- **Decrease cutoff when pitch increases**: if this is enabled, filter cutoff will decrease if you increase the pitch. if this is disabled, filter cutoff will increase if you increase the pitch.
|
||||||
|
- **Cutoff change center note**: this note marks the center frequency at which no cutoff scaling is happening. the further you go from it in each direction, the more the cutoff scaling will be.
|
||||||
|
- **Cutoff change strength**: how much cutoff will be scaled.
|
||||||
|
- **Change resonance with pitch**: when enabled, the resonance will be scaled according to the frequency offset from specified note.
|
||||||
|
- **Decrease resonance when pitch increases**: if this is enabled, filter resonance will decrease if you increase the pitch. if this is disabled, filter resonance will increase if you increase the pitch.
|
||||||
|
- **Resonance change center note**: this note marks the center frequency at which no resonance scaling is happening. the further you go from it in each direction, the more the resonance scaling will be.
|
||||||
|
- **Resonance change strength**: how much resonance will be scaled.
|
||||||
|
- **Filters connection matrix**: controls routing of the filters' signals.
|
||||||
|
- **In**: this column connects the filters to ADSR sound output.
|
||||||
|
- next 4 columns make up the inter-filters connection matrix.
|
||||||
|
- **Out**: this column connects the filters' output to final channel output.
|
||||||
|
|
||||||
|
|
||||||
|
### special noise LFSR configurations
|
||||||
|
|
||||||
|
this table contains a list of LFSR configurations that are automatically detected and brought to tune by Furnace. a short description is given. number needs to be pasted into **Noise LFSR bits** macro. it is recommended to place a single bar in **Noise Phase Reset** macro for the consistency of the wave.
|
||||||
|
|
||||||
|
| LFSR config | Description |
|
||||||
|
|--------------|:---------------------------------------------------------------------------------------------------------------------------------------------------------:|
|
||||||
|
| 524288 | wave very close to [SID2](sid2.md) noise mode 1 wave. tonal, without very harsh overtones. |
|
||||||
|
| 541065280 | wave resembling vocals, has two main tones at least 2 octaves apart |
|
||||||
|
| 2068 | wave very close to SID2 noise mode 3 wave. tonal but with harsh timbre. |
|
||||||
|
| 66 | wave very close to SID2 noise mode 2 wave. timbre is somewhere in-between SID2's noise mode 1 and noise mode 3 waves. |
|
||||||
|
|
||||||
|
if you find more interesting waves, please contact LTVA or tildearrow, so they can be added to Furnace frequency correction routine and to this table.
|
||||||
|
|
||||||
|
## Filter `x` macros
|
||||||
|
|
||||||
|
- **Cutoff**: filter `x` cutoff sequence.
|
||||||
|
- **Resonance**: filter `x` resonance sequence.
|
||||||
|
- **Filter toggle**: turns filter `x` on and off.
|
||||||
|
- **Filter mode**: select filter `x` mode.
|
||||||
|
- **Distortion level**: filter `x` distortion level sequence.
|
||||||
|
- **Output Volume**: filter `x` output volume sequence.
|
||||||
|
- **Channel Input Connection**: connect filter `x` to channel ADSR output.
|
||||||
|
- **Channel Output Connection**: connect filter `x` output to final channel output.
|
||||||
|
- **Connection Matrix Row**: connect other filters' outputs to filter `x` input.
|
||||||
|
|
||||||
|
## Macros
|
||||||
|
|
||||||
|
- **Volume**: volume sequence.
|
||||||
|
- **Arpeggio**: pitch sequence.
|
||||||
|
- **Pitch**: fine pitch.
|
||||||
|
- **Duty**: pulse width sequence.
|
||||||
|
- **Waveform**: select the waveform used by instrument.
|
||||||
|
- in wavetable channel mode controls the wavetable index.
|
||||||
|
- **Special Wave**: select the special wave used by instrument.
|
||||||
|
- **Noise Arpeggio**: noise pitch sequence.
|
||||||
|
- this macro is visible only if **Separate noise pitch** option is enabled. otherwise noise pitch is controlled by **Arpeggio** and **Pitch** macros.
|
||||||
|
- **Noise Pitch**: fine pitch.
|
||||||
|
- this macro is visible only if **Separate noise pitch** option is enabled.
|
||||||
|
- **Panning (left)**: output level for left channel.
|
||||||
|
- **Panning (right)**: output level for right channel.
|
||||||
|
- **Channel Inversion**: invert signal of left and right channels.
|
||||||
|
- **Key On/Off**: envelope release/start again control.
|
||||||
|
- **Special**: ring, oscillator sync and phase modulation selector.
|
||||||
|
- **Ring Mod Source**: ring modulation source channel.
|
||||||
|
- **Hard Sync Source**: oscillator sync source channel.
|
||||||
|
- **Phase Mod Source**: phase modulation source channel.
|
||||||
|
- **Feedback**: feedback sequence
|
||||||
|
- **Phase Reset**: trigger restart of waveform.
|
||||||
|
- **Noise Phase Reset**: trigger restart of noise accumulator and LFSR.
|
||||||
|
- **Envelope Reset**: trigger restart of envelope (unlike key on/off, envelope is forced to restart from 0 volume level no matter which volume it is outputting now).
|
||||||
|
- **Attack**: sets envelope attack speed.
|
||||||
|
- if you modify attack speed when the envelope is in attack phase it immediately changes.
|
||||||
|
- **Decay**: sets envelope decay speed.
|
||||||
|
- if you modify decay speed when envelope is in decay phase it immediately changes.
|
||||||
|
- **Sustain**: sets envelope sustain level.
|
||||||
|
- if you modify sustain level when envelope is in sustain phase it immediately changes.
|
||||||
|
- **Sustain Rate**: sets envelope sustain rate.
|
||||||
|
- if you modify sustain rate when envelope is in sustain phase it immediately changes.
|
||||||
|
- **Release**: sets envelope release speed.
|
||||||
|
- if you modify release speed when envelope is in release phase it immediately changes.
|
||||||
|
- **Noise LFSR bits**: sets feedback bits of noise LFSR.
|
||||||
|
- **1-Bit Noise**: controls noise mode.
|
||||||
|
- in wavetable channel mode it's called **Sample Mode**, and macro controls wave/PCM mode of the last channel.
|
||||||
|
- **Wave Mix**: select the waveform mix mode.
|
||||||
|
|
@ -102,6 +102,7 @@ this is the full list of chips that Furnace supports.
|
||||||
- [SAA1099](saa1099.md)
|
- [SAA1099](saa1099.md)
|
||||||
- [SegaPCM](segapcm.md)
|
- [SegaPCM](segapcm.md)
|
||||||
- [SID2](sid2.md)
|
- [SID2](sid2.md)
|
||||||
|
- [SID3](sid3.md)
|
||||||
- [SM8521](sm8521.md)
|
- [SM8521](sm8521.md)
|
||||||
- [SN76489/Sega PSG](sms.md)
|
- [SN76489/Sega PSG](sms.md)
|
||||||
- [SNES](snes.md)
|
- [SNES](snes.md)
|
||||||
|
|
|
||||||
|
|
@ -62,6 +62,14 @@ two versions of aforementioned chip exist - 6581 (original chip) and 8580 (impro
|
||||||
- `21xy`: **set sustain/release.**
|
- `21xy`: **set sustain/release.**
|
||||||
- `x` is the sustain.
|
- `x` is the sustain.
|
||||||
- `y` is the release.
|
- `y` is the release.
|
||||||
|
- `22xx`: **pulse width slide up.**
|
||||||
|
- `xx` is speed. if it is `00`, the slide is stopped.
|
||||||
|
- `23xx`: **pulse width slide down.**
|
||||||
|
- `xx` is speed. if it is `00`, the slide is stopped.
|
||||||
|
- `24xx`: **filter cutoff slide up.**
|
||||||
|
- `xx` is speed. if it is `00`, the slide is stopped.
|
||||||
|
- `25xx`: **filter cutoff slide down.**
|
||||||
|
- `xx` is speed. if it is `00`, the slide is stopped.
|
||||||
- `3xxx`: **set duty cycle.** `xxx` range is `000` to `FFF`.
|
- `3xxx`: **set duty cycle.** `xxx` range is `000` to `FFF`.
|
||||||
- `4xxx`: **set cutoff.** `xxx` range is `000` to `7FF`.
|
- `4xxx`: **set cutoff.** `xxx` range is `000` to `7FF`.
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,10 +1,10 @@
|
||||||
# SID2
|
# SID2
|
||||||
|
|
||||||
a fictional chip created by LTVA. the idea is to fix SID flaws and add more features, but not too much.
|
a fictional chip created by LTVA. the idea is to fix [SID](c64.md) flaws and add more features, but not too much.
|
||||||
|
|
||||||
unlike SID, it has per-channel volume control, better ADSR envelope which doesn't have bugs, more waveform mixing modes and the ability to play tonal noise waves.
|
unlike SID, it has per-channel volume control, better ADSR envelope which doesn't have bugs, more waveform mixing modes and the ability to play tonal noise waves.
|
||||||
|
|
||||||
filter cutoff and resonance ranges were extended, as well as the frequency - finally the chip can hit B-7 note with default clock speed!
|
each channel now has its own independent filter. filter cutoff and resonance ranges were extended, as well as the frequency - finally the chip can hit B-7 note with default clock speed!
|
||||||
|
|
||||||
## effects
|
## effects
|
||||||
|
|
||||||
|
|
@ -46,6 +46,14 @@ filter cutoff and resonance ranges were extended, as well as the frequency - fin
|
||||||
- `9`: phase reset (`y` is a discarded parameter and does not matter)
|
- `9`: phase reset (`y` is a discarded parameter and does not matter)
|
||||||
- `A`: envelope key on/key off (`y` is `0` (trigger envelope release) or `1` (restart envelope again))
|
- `A`: envelope key on/key off (`y` is `0` (trigger envelope release) or `1` (restart envelope again))
|
||||||
- `B`: filter on/off (`y` is `0` (disable filter) or `1` (enable filter))
|
- `B`: filter on/off (`y` is `0` (disable filter) or `1` (enable filter))
|
||||||
|
- `17xx`: **pulse width slide up.**
|
||||||
|
- `xx` is speed. if it is `00`, the slide is stopped.
|
||||||
|
- `18xx`: **pulse width slide down.**
|
||||||
|
- `xx` is speed. if it is `00`, the slide is stopped.
|
||||||
|
- `19xx`: **filter cutoff slide up.**
|
||||||
|
- `xx` is speed. if it is `00`, the slide is stopped.
|
||||||
|
- `1Axx`: **filter cutoff slide down.**
|
||||||
|
- `xx` is speed. if it is `00`, the slide is stopped.
|
||||||
- `3xxx`: **set duty cycle.** `xxx` range is `000` to `FFF`.
|
- `3xxx`: **set duty cycle.** `xxx` range is `000` to `FFF`.
|
||||||
- `4xxx`: **set cutoff.** `xxx` range is `000` to `FFF`.
|
- `4xxx`: **set cutoff.** `xxx` range is `000` to `FFF`.
|
||||||
|
|
||||||
|
|
|
||||||
123
doc/7-systems/sid3.md
Normal file
123
doc/7-systems/sid3.md
Normal file
|
|
@ -0,0 +1,123 @@
|
||||||
|
# SID3
|
||||||
|
|
||||||
|
a fictional chip created by LTVA. the idea is to stay vaguely in [SID](c64.md)-like category of chips, but add a lot of features and more channels.
|
||||||
|
|
||||||
|
chip has 6 synth channels and one channel capable of playing wavetable or streamed samples.
|
||||||
|
|
||||||
|
each of synth channels has the following:
|
||||||
|
|
||||||
|
- two phase accumulator based oscillators, one for tone and one for noise LFSR clocking; frequency range is from 0.001Hz to around 15kHz at default clock speed.
|
||||||
|
- 5 waveform types which can be enabled in any combination: pulse (with 16-bit pulse width control), triangle, sawtooth, noise and so called special wave.
|
||||||
|
- there are 58 different special waves, including all [OPL3](opl.md) and [OPZ](opz.md) waveforms, their clipped versions, cubed sawtooth and triangle variations, and more...
|
||||||
|
- noise is generated from 30-bit LFSR. like in C64, eight of the bits are used to form 8-bit noise signal. user can adjust feedback freely, any bit can be feedback bit. some feedback bits configurations produce very short looped noise which is perceived as tone. see SID3 instrument description for notable feedback bits configurations which are automatically detected by Furnace: upon detection noise frequency is adjusted in such a way that fundamental frequency of such tonal noise becomes the note frequency the channel is currently playing (noise stays in tune).
|
||||||
|
- 1-bit noise mode is available for [AY](ay8910.md) fans. it this mode the highest LFSR bit is read as output. by rapidly switching between usual and 1-bit noise modes one can produce interesting rattling-like percussive sound.
|
||||||
|
- 5 waveform mixing modes: 8580 SID (C64's combined waves; mode does bitwise AND with noise and special wave), bitwise AND, bitwise OR, bitwise XOR and sum of oscillators' signals.
|
||||||
|
- hard sync between channels. each channel can have any other channel as sync source, even itself.
|
||||||
|
- ring modulation between channels. each channel can have any other channel as modulation source, even itself. when you self-modulate, you effectively square the signal, but the behavior is a bit different.
|
||||||
|
- phase modulation between channels. each channel can have any other channel as modulation source, even itself. when you self-modulate, you have an effect similar to enabling strong feedback. channel output after filters is used as modulation source.
|
||||||
|
- ADSR envelope with sustain rate setting (how fast sound decays when envelope is in sustain phase).
|
||||||
|
- 4 independent filters. each filter has its own cutoff, resonance, output volume, mode, on/off and distortion setting. each filter can be connected to channel's ADSR output. each filter's output can be routed to the final channel output. each filter output can be connected to each filter's input (full connection matrix).
|
||||||
|
- distortion is a simple asymmetrical distortion with hyperbolic tangent function for positive half of the wave and exponential function for negative half.
|
||||||
|
- several filters can be chained for flexible subtractive synth or to increase filter's slope (which is 12 dB/octave for a single filter).
|
||||||
|
- multiple filter modes can be selected simultaneously. for example, selecting both "low" and "high" results in a bandstop (notch) filter.
|
||||||
|
- adjustable feedback. feedback saves two previous channel's outputs and adds them to accumulator on the next step before computing waveform signal.
|
||||||
|
- fine control over left and right channel panning.
|
||||||
|
- left and right channels' signals can be inverted to create simple "surround" sound.
|
||||||
|
|
||||||
|
ADSR can be reset to the start of attack phase. phase of tone and noise oscillators can also be reset, and with noise oscillator reset noise LFSR is also reset to initial state.
|
||||||
|
|
||||||
|
wave channel has all these features, except, obviously, waveform generation stage, as well as feedback and noise generator.
|
||||||
|
|
||||||
|
## effects
|
||||||
|
|
||||||
|
- `1xxx`: **set filter 1 cutoff.** `xxx` range is `000` to `FFF`.
|
||||||
|
- `2xxx`: **set filter 2 cutoff.** `xxx` range is `000` to `FFF`.
|
||||||
|
- `3xxx`: **set filter 3 cutoff.** `xxx` range is `000` to `FFF`.
|
||||||
|
- `4xxx`: **set filter 4 cutoff.** `xxx` range is `000` to `FFF`.
|
||||||
|
- `5xxx`: **set duty cycle.** `xxx` range is `000` to `FFF`.
|
||||||
|
- `60xx`: **change wave.** lower 5 bits specify the wave:
|
||||||
|
- `bit 0`: triangle
|
||||||
|
- `bit 1`: saw
|
||||||
|
- `bit 2`: pulse
|
||||||
|
- `bit 3`: noise
|
||||||
|
- `bit 4`: special wave
|
||||||
|
- `61xx`: **change special wave.** `xx` range is `00` to `39`.
|
||||||
|
- `62xx`: **modulation control.** lower 3 bits control the modulation:
|
||||||
|
- `bit 0`: ring modulation
|
||||||
|
- `bit 1`: oscillator sync
|
||||||
|
- `bit 2`: phase modulation
|
||||||
|
- `63xy`: **reset duty cycle**:
|
||||||
|
- if `x` is not 0: on new note
|
||||||
|
- if `y` is not 0: now
|
||||||
|
- `64xx`: **set ring modulation source channel.** `xx` range is `00` to `07` where `07` means self-modulation and lower values specify a source channel.
|
||||||
|
- `65xx`: **set hard sync source channel.** `xx` is `00` to `06`.
|
||||||
|
- `66xx`: **set phase modulation source channel.** `xx` is `00` to `06`.
|
||||||
|
- `67xx`: **set attack.** `xx` range is `00` to `FF`.
|
||||||
|
- `68xx`: **set decay.** `xx` range is `00` to `FF`.
|
||||||
|
- `69xx`: **set sustain level.** `xx` range is `00` to `FF`.
|
||||||
|
- `6Axx`: **set sustain rate.** `xx` range is `00` to `FF`.
|
||||||
|
- `6Bxx`: **set release.** `xx` range is `00` to `FF`.
|
||||||
|
- `6Cxx`: **set waveform mix mode.** `xx` range is `00` to `04`.
|
||||||
|
- `6Dxx`: **set noise LFSR feedback bits (lower byte).** `xx` range is `00` to `FF`.
|
||||||
|
- `6Exx`: **set noise LFSR feedback bits (medium byte).** `xx` range is `00` to `FF`.
|
||||||
|
- `6Fxx`: **set noise LFSR feedback bits (higher byte).** `xx` range is `00` to `FF`.
|
||||||
|
- `70xx`: **set noise LFSR feedback bits (highest bits).** `xx` range is `00` to `3F`.
|
||||||
|
- `71xx`: **set filter 1 resonance.** `xx` range is `00` to `FF`.
|
||||||
|
- `72xx`: **set filter 2 resonance.** `xx` range is `00` to `FF`.
|
||||||
|
- `73xx`: **set filter 3 resonance.** `xx` range is `00` to `FF`.
|
||||||
|
- `74xx`: **set filter 4 resonance.** `xx` range is `00` to `FF`.
|
||||||
|
- `75xx`: **set noise/wave channel mode.** `xx` range is `00` to `01`. on synth channels `00` sets usual noise mode and `01` sets 1-bit noise mode. on wave channel `00` sets wavetable mode and `01` sets streamed PCM sample playback mode.
|
||||||
|
- `76xx`: **set filter 1 output volume.** `xx` range is `00` to `FF`.
|
||||||
|
- `77xx`: **set filter 2 output volume.** `xx` range is `00` to `FF`.
|
||||||
|
- `78xx`: **set filter 3 output volume.** `xx` range is `00` to `FF`.
|
||||||
|
- `79xx`: **set filter 4 output volume.** `xx` range is `00` to `FF`.
|
||||||
|
- `7Axx`: **set filter 1 distortion.** `xx` range is `00` to `FF`.
|
||||||
|
- `7Bxx`: **set filter 2 distortion.** `xx` range is `00` to `FF`.
|
||||||
|
- `7Cxx`: **set filter 3 distortion.** `xx` range is `00` to `FF`.
|
||||||
|
- `7Dxx`: **set filter 4 distortion.** `xx` range is `00` to `FF`.
|
||||||
|
- `7Exx`: **set feedback.** `xx` range is `00` to `FF`.
|
||||||
|
- `7Fxx`: **channel inversion control.** lower 2 bits control the channel signal inversion:
|
||||||
|
- `bit 0`: invert right channel
|
||||||
|
- `bit 1`: invert left channel
|
||||||
|
- `A0xy`: **set filter mode.** `x` is the filter (`0-3`), and lower 3 bits of `y` control the mode:
|
||||||
|
- `bit 0`: low pass
|
||||||
|
- `bit 1`: band pass
|
||||||
|
- `bit 2`: high pass
|
||||||
|
- `A1xy`: **set filter connection.** `x` is the filter (`0-3`), and lower 2 bits of `y` control the connection:
|
||||||
|
- `bit 0`: connect filter input to channel's ADSR output
|
||||||
|
- `bit 1`: connect filter's output to final channel output
|
||||||
|
- `A2xy`: **set filter connection matrix row.** `x` is the filter (`0-3`), and lower 4 bits of `y` control the inter-filter connections:
|
||||||
|
- `bit 0`: connect filter input to filter 1 output
|
||||||
|
- `bit 1`: connect filter input to filter 2 output
|
||||||
|
- `bit 2`: connect filter input to filter 3 output
|
||||||
|
- `bit 3`: connect filter input to filter 4 output
|
||||||
|
- `A3xy`: **enable filter.** `x` is the filter (`0-3`), `y` is either `0` (filter disabled) or `1` (filter enabled).
|
||||||
|
- `A4xx`: **pulse width slide up.** `xx` is speed. `A400` stops the slide.
|
||||||
|
- `A5xx`: **pulse width slide down.** `xx` is speed. `A500` stops the slide.
|
||||||
|
- `A6xx`: **filter 1 cutoff slide up.** `xx` is speed. `A600` stops the slide.
|
||||||
|
- `A7xx`: **filter 1 cutoff slide down.** `xx` is speed. `A700` stops the slide.
|
||||||
|
- `A8xx`: **filter 2 cutoff slide up.** `xx` is speed. `A800` stops the slide.
|
||||||
|
- `A9xx`: **filter 2 cutoff slide down.** `xx` is speed. `A900` stops the slide.
|
||||||
|
- `AAxx`: **filter 3 cutoff slide up.** `xx` is speed. `AA00` stops the slide.
|
||||||
|
- `ABxx`: **filter 3 cutoff slide down.** `xx` is speed. `AB00` stops the slide.
|
||||||
|
- `ACxx`: **filter 4 cutoff slide up.** `xx` is speed. `AC00` stops the slide.
|
||||||
|
- `ADxx`: **filter 4 cutoff slide down.** `xx` is speed. `AD00` stops the slide.
|
||||||
|
- `AExx`: **tone phase reset.** `xx` is the tick on which the phase reset happens.
|
||||||
|
- `AFxx`: **noise phase reset.** `xx` is the tick on which the phase reset happens.
|
||||||
|
- `B0xx`: **envelope reset.** `xx` is the tick on which the envelope reset happens.
|
||||||
|
- `B1xy`: **filter cutoff scaling control.** `x` is the filter (`0-3`), and lower 2 bits of `y` control the scaling:
|
||||||
|
- `bit 0`: enable cutoff scaling
|
||||||
|
- `bit 1`: inverse cutoff scaling
|
||||||
|
- `B2xy`: **filter resonance scaling control.** `x` is the filter (`0-3`), and lower 2 bits of `y` control the scaling:
|
||||||
|
- `bit 0`: enable resonance scaling
|
||||||
|
- `bit 1`: inverse resonance scaling
|
||||||
|
|
||||||
|
## info
|
||||||
|
|
||||||
|
this chip uses the [SID3](../4-instrument/sid3.md) instrument editor.
|
||||||
|
|
||||||
|
## chip config
|
||||||
|
|
||||||
|
the following options are available in the Chip Manager window:
|
||||||
|
|
||||||
|
- **Quarter clock speed**: make chip run on quarter the default clock rate (1MHz is default). this lowers CPU load almost 4 times at the cost of filters becoming unstable or having different timbre at high cutoff and resonance settings. option affects the chip only in playback mode. when you render module into audio file, option is not applied.
|
||||||
|
|
@ -158,9 +158,10 @@ the following feature codes are recognized:
|
||||||
- `EF`: ESFM ins data
|
- `EF`: ESFM ins data
|
||||||
- `PN`: PowerNoise ins data
|
- `PN`: PowerNoise ins data
|
||||||
- `S2`: SID2 ins data
|
- `S2`: SID2 ins data
|
||||||
|
- `S3`: SID3 ins data
|
||||||
- `EN`: end of features
|
- `EN`: end of features
|
||||||
- if you find this feature code, stop reading the instrument.
|
- if you find this feature code, stop reading the instrument.
|
||||||
- it will usually appear only when there sample/wave lists.
|
- it will usually appear only when there are sample/wave lists.
|
||||||
- instruments in a .fur shall end with this feature code.
|
- instruments in a .fur shall end with this feature code.
|
||||||
|
|
||||||
# instrument name (NA)
|
# instrument name (NA)
|
||||||
|
|
@ -335,6 +336,8 @@ size | description
|
||||||
| - bit 12-15: resonance
|
| - bit 12-15: resonance
|
||||||
| - bit 0-10: cutoff (0-11 on SID2)
|
| - bit 0-10: cutoff (0-11 on SID2)
|
||||||
1 | upper nibble of resonance (for SID2) (>=199)
|
1 | upper nibble of resonance (for SID2) (>=199)
|
||||||
|
| - bits 0-3 hold this upper nibble
|
||||||
|
| - bit 4: reset duty on new note (>=222)
|
||||||
```
|
```
|
||||||
|
|
||||||
## C64 compatibility note (>=187)
|
## C64 compatibility note (>=187)
|
||||||
|
|
@ -691,3 +694,78 @@ size | description
|
||||||
| - bit 4-5: wave mix mode
|
| - bit 4-5: wave mix mode
|
||||||
| - bit 0-3: volume
|
| - bit 0-3: volume
|
||||||
```
|
```
|
||||||
|
|
||||||
|
# SID3 data (S3)
|
||||||
|
|
||||||
|
```
|
||||||
|
size | description
|
||||||
|
-----|------------------------------------
|
||||||
|
1 | flags 1
|
||||||
|
| - bit 7: dutyIsAbs
|
||||||
|
| - bit 3: noise on
|
||||||
|
| - bit 2: pulse on
|
||||||
|
| - bit 1: saw on
|
||||||
|
| - bit 0: triangle on
|
||||||
|
1 | attack
|
||||||
|
1 | decay
|
||||||
|
1 | sustain
|
||||||
|
1 | sustain rate
|
||||||
|
1 | release
|
||||||
|
1 | wave mix mode
|
||||||
|
2 | duty
|
||||||
|
1 | flags 2
|
||||||
|
| - bit 7: phase modulation
|
||||||
|
| - bit 6: enable special wave
|
||||||
|
| - bit 5: 1-bit noise
|
||||||
|
| - bit 4: separate noise pitch
|
||||||
|
| - bit 3: do wavetable
|
||||||
|
| - bit 2: reset duty on new note
|
||||||
|
| - bit 1: osc sync
|
||||||
|
| - bit 0: ring mod
|
||||||
|
1 | phase modulation source channel
|
||||||
|
1 | ring modulation source channel
|
||||||
|
1 | hard sync source channel
|
||||||
|
1 | special wave
|
||||||
|
1 | flags 3
|
||||||
|
| - bit 1: left channel signal inversion
|
||||||
|
| - bit 0: right channel signal inversion
|
||||||
|
1 | feedback
|
||||||
|
1 | number of filters
|
||||||
|
```
|
||||||
|
|
||||||
|
then, `number of filters` times, come settings for each filter:
|
||||||
|
|
||||||
|
```
|
||||||
|
size | description
|
||||||
|
-----|------------------------------------
|
||||||
|
1 | parameters
|
||||||
|
| - bit 7: enable filter
|
||||||
|
| - bit 6: initialize filter
|
||||||
|
| - bit 5: absolute cutoff macro
|
||||||
|
| - bit 4: enable cutoff scaling
|
||||||
|
| - bit 3: decrease cutoff when pitch increases (for cutoff scaling)
|
||||||
|
| - bit 2: scale cutoff only once, on new note
|
||||||
|
| - bit 1: enable resonance scaling
|
||||||
|
| - bit 0: decrease resonance when pitch increases (for resonance scaling)
|
||||||
|
1 | parameters
|
||||||
|
| - bit 7: scale resonance only once, on new note
|
||||||
|
2 | filter cutoff
|
||||||
|
1 | filter resonance
|
||||||
|
1 | filter output volume
|
||||||
|
1 | filter distortion level
|
||||||
|
1 | filter mode:
|
||||||
|
| - bit 5: connect filter output to channel master output
|
||||||
|
| - bit 4: connect filter input to channel ADSR output
|
||||||
|
| - bit 2: band pass
|
||||||
|
| - bit 1: high pass
|
||||||
|
| - bit 0: low pass
|
||||||
|
1 | matrix connection:
|
||||||
|
| - bit 3: connect output of filter 4 to input
|
||||||
|
| - bit 2: connect output of filter 3 to input
|
||||||
|
| - bit 1: connect output of filter 2 to input
|
||||||
|
| - bit 0: connect output of filter 1 to input
|
||||||
|
1 | cutoff scaling level
|
||||||
|
1 | cutoff scaling center note: `0` is `c_5`, `1` is `c+5`, ..., `179` is `B-9`
|
||||||
|
1 | resonance scaling level
|
||||||
|
1 | resonance scaling center note: `0` is `c_5`, `1` is `c+5`, ..., `179` is `B-9`
|
||||||
|
```
|
||||||
|
|
|
||||||
240
res/icons.sfd
240
res/icons.sfd
|
|
@ -21,7 +21,7 @@ OS2Version: 0
|
||||||
OS2_WeightWidthSlopeOnly: 0
|
OS2_WeightWidthSlopeOnly: 0
|
||||||
OS2_UseTypoMetrics: 0
|
OS2_UseTypoMetrics: 0
|
||||||
CreationTime: 1691897631
|
CreationTime: 1691897631
|
||||||
ModificationTime: 1714372595
|
ModificationTime: 1726291788
|
||||||
PfmFamily: 81
|
PfmFamily: 81
|
||||||
TTFWeight: 400
|
TTFWeight: 400
|
||||||
TTFWidth: 5
|
TTFWidth: 5
|
||||||
|
|
@ -53,7 +53,7 @@ FitToEm: 0
|
||||||
WinInfo: 57540 21 12
|
WinInfo: 57540 21 12
|
||||||
BeginPrivate: 0
|
BeginPrivate: 0
|
||||||
EndPrivate
|
EndPrivate
|
||||||
BeginChars: 65536 104
|
BeginChars: 65536 107
|
||||||
|
|
||||||
StartChar: space
|
StartChar: space
|
||||||
Encoding: 32 32 0
|
Encoding: 32 32 0
|
||||||
|
|
@ -7381,7 +7381,7 @@ EndChar
|
||||||
StartChar: uniE161
|
StartChar: uniE161
|
||||||
Encoding: 57697 57697 103
|
Encoding: 57697 57697 103
|
||||||
Width: 1792
|
Width: 1792
|
||||||
Flags: HWO
|
Flags: HW
|
||||||
LayerCount: 2
|
LayerCount: 2
|
||||||
Fore
|
Fore
|
||||||
SplineSet
|
SplineSet
|
||||||
|
|
@ -7483,5 +7483,239 @@ SplineSet
|
||||||
1289.22949219 805.58984375 1332.14550781 805.58984375 1375.0625 805.58984375 c 1
|
1289.22949219 805.58984375 1332.14550781 805.58984375 1375.0625 805.58984375 c 1
|
||||||
EndSplineSet
|
EndSplineSet
|
||||||
EndChar
|
EndChar
|
||||||
|
|
||||||
|
StartChar: uniE162
|
||||||
|
Encoding: 57698 57698 104
|
||||||
|
Width: 1792
|
||||||
|
Flags: HW
|
||||||
|
LayerCount: 2
|
||||||
|
Fore
|
||||||
|
SplineSet
|
||||||
|
509.96484375 84.8447265625 m 0
|
||||||
|
439.5546875 84.8447265625 379.7890625 97.6376953125 330.5703125 123.223632812 c 128
|
||||||
|
281.3515625 148.809570312 239.1640625 183.184570312 204.0078125 226.446289062 c 1
|
||||||
|
235.192382812 255.645507812 266.377929688 284.844726562 297.5625 314.043945312 c 1
|
||||||
|
327.15234375 278.008789062 359.76953125 250.762695312 395.31640625 232.403320312 c 128
|
||||||
|
430.9609375 214.043945312 471.5859375 204.766601562 517.19140625 204.766601562 c 0
|
||||||
|
570.8046875 204.766601562 611.13671875 216.778320312 638.3828125 240.801757812 c 128
|
||||||
|
665.53125 264.825195312 679.203125 297.247070312 679.203125 337.969726562 c 0
|
||||||
|
679.203125 370.782226562 669.53515625 396.758789062 650.39453125 415.997070312 c 128
|
||||||
|
631.15625 435.235351562 597.171875 449.590820312 548.34375 459.161132812 c 1
|
||||||
|
523.5390625 463.587890625 498.734375 468.014648438 473.9296875 472.442382812 c 1
|
||||||
|
392.38671875 487.579101562 331.15625 514.434570312 290.3359375 552.813476562 c 128
|
||||||
|
249.515625 591.192382812 229.203125 644.024414062 229.203125 711.211914062 c 0
|
||||||
|
229.203125 748.028320312 236.13671875 781.426757812 250.19921875 811.407226562 c 128
|
||||||
|
264.1640625 841.387695312 283.79296875 866.583007812 308.98828125 886.993164062 c 128
|
||||||
|
334.18359375 907.403320312 364.75 923.223632812 400.78515625 934.356445312 c 128
|
||||||
|
436.72265625 945.586914062 477.15234375 951.153320312 521.9765625 951.153320312 c 0
|
||||||
|
585.16015625 951.153320312 639.9453125 940.215820312 686.33203125 918.243164062 c 128
|
||||||
|
732.71875 896.172851562 772.3671875 864.434570312 805.1796875 822.833007812 c 1
|
||||||
|
773.571289062 794.837890625 741.963867188 766.842773438 710.35546875 738.848632812 c 1
|
||||||
|
688.7734375 766.778320312 662.40625 789.239257812 631.15625 806.036132812 c 128
|
||||||
|
600.00390625 822.833007812 561.13671875 831.231445312 514.75 831.231445312 c 0
|
||||||
|
466.80078125 831.231445312 429.59375 821.563476562 403.12890625 802.422851562 c 128
|
||||||
|
376.76171875 783.184570312 363.578125 755.157226562 363.578125 718.438476562 c 0
|
||||||
|
363.578125 683.184570312 374.3203125 657.012695312 396 639.825195312 c 128
|
||||||
|
417.58203125 622.637695312 451.17578125 609.551757812 496.78125 600.762695312 c 1
|
||||||
|
521.5859375 595.586914062 546.390625 590.411132812 571.1953125 585.235351562 c 1
|
||||||
|
655.1796875 569.219726562 716.60546875 541.973632812 755.375 503.594726562 c 128
|
||||||
|
794.14453125 465.215820312 813.578125 412.383789062 813.578125 345.196289062 c 0
|
||||||
|
813.578125 306.036132812 806.7421875 270.391601562 793.16796875 238.360351562 c 128
|
||||||
|
779.59375 206.426757812 759.76953125 178.985351562 733.79296875 156.231445312 c 128
|
||||||
|
707.71875 133.379882812 675.98046875 115.801757812 638.3828125 103.399414062 c 128
|
||||||
|
600.78515625 90.9970703125 557.9140625 84.8447265625 509.96484375 84.8447265625 c 0
|
||||||
|
1152.34765625 99.2001953125 m 1
|
||||||
|
1060.74609375 378.399414062 969.14453125 657.598632812 877.54296875 936.797851562 c 1
|
||||||
|
924.352539062 936.797851562 971.163085938 936.797851562 1017.97265625 936.797851562 c 1
|
||||||
|
1062.37402344 798.809570312 1106.77441406 660.821289062 1151.17578125 522.833007812 c 1
|
||||||
|
1177.96582031 425.631835938 1204.75683594 328.431640625 1231.546875 231.231445312 c 1
|
||||||
|
1233.14160156 231.231445312 1234.73730469 231.231445312 1236.33203125 231.231445312 c 1
|
||||||
|
1263.54589844 328.431640625 1290.75878906 425.631835938 1317.97265625 522.833007812 c 1
|
||||||
|
1362.37402344 660.821289062 1406.77441406 798.809570312 1451.17578125 936.797851562 c 1
|
||||||
|
1496.78125 936.797851562 1542.38671875 936.797851562 1587.9921875 936.797851562 c 1
|
||||||
|
1495.18652344 657.598632812 1402.37988281 378.399414062 1309.57421875 99.2001953125 c 1
|
||||||
|
1257.16503906 99.2001953125 1204.75683594 99.2001953125 1152.34765625 99.2001953125 c 1
|
||||||
|
EndSplineSet
|
||||||
|
EndChar
|
||||||
|
|
||||||
|
StartChar: uniE163
|
||||||
|
Encoding: 57699 57699 105
|
||||||
|
Width: 1792
|
||||||
|
Flags: HW
|
||||||
|
LayerCount: 2
|
||||||
|
Fore
|
||||||
|
SplineSet
|
||||||
|
232.71875 -140.838867188 m 1
|
||||||
|
232.71875 147.181640625 232.71875 435.202148438 232.71875 723.223632812 c 1
|
||||||
|
276.338867188 723.223632812 319.958007812 723.223632812 363.578125 723.223632812 c 1
|
||||||
|
363.578125 596.400390625 363.578125 469.577148438 363.578125 342.754882812 c 1
|
||||||
|
363.578125 245.977539062 403.6171875 197.637695312 483.6953125 197.637695312 c 0
|
||||||
|
500.4921875 197.637695312 516.8984375 199.786132812 532.71875 204.180664062 c 128
|
||||||
|
548.734375 208.575195312 562.9921875 215.215820312 575.4921875 224.004882812 c 128
|
||||||
|
587.796875 232.793945312 597.7578125 244.024414062 605.375 257.598632812 c 128
|
||||||
|
612.9921875 271.172851562 616.8984375 287.188476562 616.8984375 305.645507812 c 1
|
||||||
|
616.8984375 444.837890625 616.8984375 584.030273438 616.8984375 723.223632812 c 1
|
||||||
|
660.453125 723.223632812 704.0078125 723.223632812 747.5625 723.223632812 c 1
|
||||||
|
747.5625 515.215820312 747.5625 307.208007812 747.5625 99.2001953125 c 1
|
||||||
|
704.0078125 99.2001953125 660.453125 99.2001953125 616.8984375 99.2001953125 c 1
|
||||||
|
616.8984375 133.607421875 616.8984375 168.014648438 616.8984375 202.422851562 c 1
|
||||||
|
615.270507812 202.422851562 613.643554688 202.422851562 612.015625 202.422851562 c 1
|
||||||
|
606.3515625 187.188476562 599.125 172.442382812 590.3359375 157.989257812 c 128
|
||||||
|
581.546875 143.633789062 570.8046875 131.036132812 558.109375 120.196289062 c 128
|
||||||
|
545.21875 109.356445312 530.1796875 100.762695312 512.9921875 94.4150390625 c 128
|
||||||
|
495.8046875 87.9697265625 476.46875 84.8447265625 454.7890625 84.8447265625 c 0
|
||||||
|
402.8359375 84.8447265625 367.6796875 103.985351562 349.125 142.364257812 c 1
|
||||||
|
347.5625 142.364257812 346 142.364257812 344.4375 142.364257812 c 1
|
||||||
|
350.817382812 99.5908203125 357.198242188 56.8173828125 363.578125 14.0439453125 c 1
|
||||||
|
363.578125 -37.583984375 363.578125 -89.2119140625 363.578125 -140.838867188 c 1
|
||||||
|
319.958007812 -140.838867188 276.338867188 -140.838867188 232.71875 -140.838867188 c 1
|
||||||
|
1256.7421875 84.8447265625 m 0
|
||||||
|
1147.171875 84.8447265625 1061.234375 121.758789062 998.734375 195.782226562 c 128
|
||||||
|
936.4296875 269.805664062 905.1796875 377.227539062 905.1796875 518.047851562 c 0
|
||||||
|
905.1796875 588.360351562 913.1875 650.372070312 929.203125 703.985351562 c 128
|
||||||
|
945.21875 757.598632812 968.4609375 802.813476562 998.734375 839.629882812 c 128
|
||||||
|
1029.203125 876.446289062 1066.1171875 904.180664062 1109.8671875 923.028320312 c 128
|
||||||
|
1153.421875 941.778320312 1202.4453125 951.153320312 1256.7421875 951.153320312 c 0
|
||||||
|
1329.59375 951.153320312 1390.53125 935.235351562 1439.75 903.204101562 c 128
|
||||||
|
1488.96875 871.172851562 1527.640625 824.004882812 1555.5703125 761.602539062 c 1
|
||||||
|
1517.61425781 740.801757812 1479.65917969 720.000976562 1441.703125 699.200195312 c 1
|
||||||
|
1427.25 739.239257812 1404.984375 770.977539062 1375.1015625 794.610351562 c 128
|
||||||
|
1345.0234375 818.243164062 1305.5703125 829.961914062 1256.7421875 829.961914062 c 0
|
||||||
|
1192.09375 829.961914062 1141.1171875 807.989257812 1104.3984375 764.043945312 c 128
|
||||||
|
1067.6796875 720.000976562 1049.125 659.161132812 1049.125 581.622070312 c 1
|
||||||
|
1049.125 539.206054688 1049.125 496.791015625 1049.125 454.375976562 c 1
|
||||||
|
1049.125 376.836914062 1067.6796875 315.997070312 1104.3984375 271.954101562 c 128
|
||||||
|
1141.1171875 228.008789062 1192.09375 206.036132812 1256.7421875 206.036132812 c 0
|
||||||
|
1307.1328125 206.036132812 1348.1484375 219.024414062 1379.7890625 245.000976562 c 128
|
||||||
|
1411.4296875 270.977539062 1434.8671875 304.375976562 1450.1015625 345.196289062 c 1
|
||||||
|
1486.49511719 323.190429688 1522.88769531 301.185546875 1559.28125 279.180664062 c 1
|
||||||
|
1531.15625 218.438476562 1492.09375 170.782226562 1441.703125 136.407226562 c 128
|
||||||
|
1391.1171875 102.032226562 1329.59375 84.8447265625 1256.7421875 84.8447265625 c 0
|
||||||
|
EndSplineSet
|
||||||
|
EndChar
|
||||||
|
|
||||||
|
StartChar: uniE164
|
||||||
|
Encoding: 57700 57700 106
|
||||||
|
Width: 1792
|
||||||
|
Flags: HW
|
||||||
|
LayerCount: 2
|
||||||
|
Fore
|
||||||
|
SplineSet
|
||||||
|
876.9375 252.015625 m 1
|
||||||
|
918.578125 252.015625 949.28125 260.84375 969.125 278.421875 c 128
|
||||||
|
988.96875 296.078125 998.890625 318.578125 998.890625 346.15625 c 1
|
||||||
|
998.890625 348.395507812 998.890625 350.635742188 998.890625 352.875 c 1
|
||||||
|
998.890625 383.578125 989.28125 407.09375 970.0625 423.421875 c 128
|
||||||
|
950.921875 439.75 924.984375 447.875 892.328125 447.875 c 0
|
||||||
|
860.296875 447.875 833.109375 440.6875 810.765625 426.3125 c 128
|
||||||
|
788.34375 411.859375 769.4375 391.859375 754.125 366.3125 c 1
|
||||||
|
730.114257812 387.09375 706.104492188 407.875 682.09375 428.65625 c 1
|
||||||
|
692.328125 443.421875 703.890625 457.484375 716.625 470.921875 c 128
|
||||||
|
729.4375 484.359375 744.515625 496.078125 761.78125 506 c 128
|
||||||
|
779.046875 515.921875 798.578125 523.890625 820.296875 529.984375 c 128
|
||||||
|
842.09375 536.078125 867.015625 539.046875 895.21875 539.046875 c 0
|
||||||
|
926.546875 539.046875 955.6875 535.21875 982.5625 527.5625 c 128
|
||||||
|
1009.4375 519.90625 1032.484375 508.5 1051.703125 493.5 c 128
|
||||||
|
1070.921875 478.421875 1085.921875 460.21875 1096.78125 438.734375 c 128
|
||||||
|
1107.71875 417.328125 1113.109375 393.1875 1113.109375 366.3125 c 0
|
||||||
|
1113.109375 345.140625 1109.75 326 1103.03125 308.65625 c 128
|
||||||
|
1096.3125 291.390625 1087.015625 276.234375 1075.21875 263.109375 c 128
|
||||||
|
1063.34375 249.984375 1049.59375 239.28125 1033.96875 230.921875 c 128
|
||||||
|
1018.265625 222.640625 1001.78125 216.546875 984.515625 212.71875 c 1
|
||||||
|
984.515625 211.104492188 984.515625 209.489257812 984.515625 207.875 c 1
|
||||||
|
1003.65625 204.046875 1021.78125 197.796875 1038.734375 189.203125 c 128
|
||||||
|
1055.6875 180.53125 1070.609375 169.359375 1083.34375 155.53125 c 128
|
||||||
|
1096.15625 141.78125 1106.234375 125.453125 1113.578125 106.625 c 128
|
||||||
|
1121 87.71875 1124.671875 66.15625 1124.671875 41.78125 c 0
|
||||||
|
1124.671875 12.328125 1118.890625 -14.390625 1107.40625 -38.375 c 128
|
||||||
|
1095.84375 -62.359375 1079.671875 -82.984375 1058.890625 -100.25 c 128
|
||||||
|
1038.109375 -117.59375 1012.953125 -130.796875 983.5 -140.09375 c 128
|
||||||
|
954.125 -149.390625 921.46875 -154 885.609375 -154 c 0
|
||||||
|
854.28125 -154 826.703125 -150.640625 803.03125 -143.921875 c 128
|
||||||
|
779.359375 -137.203125 758.421875 -128.296875 740.140625 -117.046875 c 128
|
||||||
|
721.9375 -105.875 705.921875 -93.0625 692.171875 -78.6875 c 128
|
||||||
|
678.421875 -64.3125 666.390625 -49.390625 656.15625 -34 c 1
|
||||||
|
682.71875 -13.21875 709.28125 7.5625 735.84375 28.34375 c 1
|
||||||
|
744.203125 14.90625 752.953125 2.640625 762.25 -8.609375 c 128
|
||||||
|
771.546875 -19.78125 782.09375 -29.390625 793.96875 -37.359375 c 128
|
||||||
|
805.765625 -45.40625 819.203125 -51.65625 834.28125 -56.109375 c 128
|
||||||
|
849.28125 -60.5625 866.390625 -62.828125 885.609375 -62.828125 c 0
|
||||||
|
926.546875 -62.828125 957.953125 -53.0625 979.671875 -33.53125 c 128
|
||||||
|
1001.46875 -14 1012.328125 13.03125 1012.328125 47.5625 c 1
|
||||||
|
1012.328125 49.8017578125 1012.328125 52.0419921875 1012.328125 54.28125 c 1
|
||||||
|
1012.328125 88.8125 1000.84375 115.0625 977.796875 133.03125 c 128
|
||||||
|
954.75 150.921875 922.09375 159.90625 879.828125 159.90625 c 1
|
||||||
|
856.15625 159.90625 832.484375 159.90625 808.8125 159.90625 c 1
|
||||||
|
808.8125 190.609375 808.8125 221.3125 808.8125 252.015625 c 1
|
||||||
|
831.520507812 252.015625 854.229492188 252.015625 876.9375 252.015625 c 1
|
||||||
|
378.5 712.015625 m 0
|
||||||
|
322.25 712.015625 274.4375 722.25 235.0625 742.71875 c 128
|
||||||
|
195.6875 763.1875 161.9375 790.6875 133.8125 825.296875 c 1
|
||||||
|
158.760742188 848.65625 183.708007812 872.015625 208.65625 895.375 c 1
|
||||||
|
232.25 866.546875 258.34375 844.75 286.78125 830.0625 c 128
|
||||||
|
315.375 815.375 347.875 807.953125 384.28125 807.953125 c 0
|
||||||
|
427.25 807.953125 459.4375 817.5625 481.3125 836.78125 c 128
|
||||||
|
503.03125 856 513.96875 881.9375 513.96875 914.515625 c 0
|
||||||
|
513.96875 940.765625 506.15625 961.546875 490.84375 976.9375 c 128
|
||||||
|
475.53125 992.328125 448.34375 1003.8125 409.28125 1011.46875 c 1
|
||||||
|
389.4375 1015.01074219 369.59375 1018.55175781 349.75 1022.09375 c 1
|
||||||
|
284.4375 1034.203125 235.53125 1055.6875 202.875 1086.390625 c 128
|
||||||
|
170.21875 1117.09375 153.96875 1159.359375 153.96875 1213.109375 c 0
|
||||||
|
153.96875 1242.5625 159.4375 1269.28125 170.6875 1293.265625 c 128
|
||||||
|
181.9375 1317.25 197.5625 1337.40625 217.71875 1353.734375 c 128
|
||||||
|
237.875 1370.0625 262.40625 1382.71875 291.15625 1391.625 c 128
|
||||||
|
319.90625 1400.609375 352.25 1405.0625 388.1875 1405.0625 c 0
|
||||||
|
438.65625 1405.0625 482.5625 1396.3125 519.59375 1378.734375 c 128
|
||||||
|
556.78125 1361.078125 588.5 1335.6875 614.75 1302.40625 c 1
|
||||||
|
589.4375 1280.01074219 564.125 1257.61425781 538.8125 1235.21875 c 1
|
||||||
|
521.625 1257.5625 500.53125 1275.53125 475.53125 1288.96875 c 128
|
||||||
|
450.53125 1302.40625 419.4375 1309.125 382.40625 1309.125 c 0
|
||||||
|
343.96875 1309.125 314.28125 1301.390625 293.03125 1286.078125 c 128
|
||||||
|
271.9375 1270.6875 261.46875 1248.265625 261.46875 1218.890625 c 0
|
||||||
|
261.46875 1190.6875 270.0625 1169.75 287.40625 1156 c 128
|
||||||
|
304.59375 1142.25 331.46875 1131.78125 368.03125 1124.75 c 1
|
||||||
|
387.875 1120.609375 407.71875 1116.46875 427.5625 1112.328125 c 1
|
||||||
|
494.75 1099.515625 543.8125 1077.71875 574.90625 1047.015625 c 128
|
||||||
|
605.84375 1016.3125 621.46875 974.046875 621.46875 920.296875 c 0
|
||||||
|
621.46875 888.96875 616 860.453125 605.0625 834.828125 c 128
|
||||||
|
594.28125 809.28125 578.34375 787.328125 557.5625 769.125 c 128
|
||||||
|
536.78125 750.84375 511.3125 736.78125 481.3125 726.859375 c 128
|
||||||
|
451.15625 716.9375 416.9375 712.015625 378.5 712.015625 c 0
|
||||||
|
709.125 723.5 m 1
|
||||||
|
709.125 752.926757812 709.125 782.354492188 709.125 811.78125 c 1
|
||||||
|
739.489257812 811.78125 769.854492188 811.78125 800.21875 811.78125 c 1
|
||||||
|
800.21875 976.286132812 800.21875 1140.79199219 800.21875 1305.296875 c 1
|
||||||
|
769.854492188 1305.296875 739.489257812 1305.296875 709.125 1305.296875 c 1
|
||||||
|
709.125 1334.72363281 709.125 1364.15136719 709.125 1393.578125 c 1
|
||||||
|
806.416992188 1393.578125 903.708007812 1393.578125 1001 1393.578125 c 1
|
||||||
|
1001 1364.15136719 1001 1334.72363281 1001 1305.296875 c 1
|
||||||
|
970.270507812 1305.296875 939.541992188 1305.296875 908.8125 1305.296875 c 1
|
||||||
|
908.8125 1140.79199219 908.8125 976.286132812 908.8125 811.78125 c 1
|
||||||
|
939.541992188 811.78125 970.270507812 811.78125 1001 811.78125 c 1
|
||||||
|
1001 782.354492188 1001 752.926757812 1001 723.5 c 1
|
||||||
|
903.708007812 723.5 806.416992188 723.5 709.125 723.5 c 1
|
||||||
|
1137.875 1393.578125 m 1
|
||||||
|
1216.9375 1393.578125 1296 1393.578125 1375.0625 1393.578125 c 1
|
||||||
|
1417.875 1393.578125 1456.78125 1386.546875 1491.625 1372.484375 c 128
|
||||||
|
1526.46875 1358.34375 1556.3125 1337.40625 1581 1309.59375 c 128
|
||||||
|
1605.53125 1281.703125 1624.59375 1246.859375 1638.03125 1204.90625 c 128
|
||||||
|
1651.46875 1163.03125 1658.1875 1114.203125 1658.1875 1058.578125 c 256
|
||||||
|
1658.1875 1002.875 1651.46875 954.046875 1638.03125 912.171875 c 128
|
||||||
|
1624.59375 870.21875 1605.53125 835.375 1581 807.484375 c 128
|
||||||
|
1556.3125 779.671875 1526.46875 758.734375 1491.625 744.59375 c 128
|
||||||
|
1456.78125 730.53125 1417.875 723.5 1375.0625 723.5 c 1
|
||||||
|
1296 723.5 1216.9375 723.5 1137.875 723.5 c 1
|
||||||
|
1137.875 946.859375 1137.875 1170.21875 1137.875 1393.578125 c 1
|
||||||
|
1375.0625 819.515625 m 1
|
||||||
|
1424.90625 819.515625 1465.21875 835.21875 1496 866.546875 c 128
|
||||||
|
1526.625 897.875 1542.09375 943.96875 1542.09375 1004.75 c 1
|
||||||
|
1542.09375 1040.609375 1542.09375 1076.46875 1542.09375 1112.328125 c 1
|
||||||
|
1542.09375 1173.109375 1526.625 1219.203125 1496 1250.53125 c 128
|
||||||
|
1465.21875 1281.9375 1424.90625 1297.5625 1375.0625 1297.5625 c 1
|
||||||
|
1332.14550781 1297.5625 1289.22949219 1297.5625 1246.3125 1297.5625 c 1
|
||||||
|
1246.3125 1138.21386719 1246.3125 978.864257812 1246.3125 819.515625 c 1
|
||||||
|
1289.22949219 819.515625 1332.14550781 819.515625 1375.0625 819.515625 c 1
|
||||||
|
EndSplineSet
|
||||||
|
EndChar
|
||||||
EndChars
|
EndChars
|
||||||
EndSplineFont
|
EndSplineFont
|
||||||
|
|
|
||||||
BIN
res/icons.ttf
BIN
res/icons.ttf
Binary file not shown.
|
|
@ -284,6 +284,30 @@ enum DivDispatchCmds {
|
||||||
DIV_CMD_MULTIPCM_LFO_RESET, // (value)
|
DIV_CMD_MULTIPCM_LFO_RESET, // (value)
|
||||||
DIV_CMD_MULTIPCM_LEVEL_DIRECT, // (value)
|
DIV_CMD_MULTIPCM_LEVEL_DIRECT, // (value)
|
||||||
|
|
||||||
|
DIV_CMD_SID3_SPECIAL_WAVE,
|
||||||
|
DIV_CMD_SID3_RING_MOD_SRC,
|
||||||
|
DIV_CMD_SID3_HARD_SYNC_SRC,
|
||||||
|
DIV_CMD_SID3_PHASE_MOD_SRC,
|
||||||
|
DIV_CMD_SID3_WAVE_MIX,
|
||||||
|
DIV_CMD_SID3_LFSR_FEEDBACK_BITS,
|
||||||
|
DIV_CMD_SID3_1_BIT_NOISE,
|
||||||
|
DIV_CMD_SID3_FILTER_DISTORTION,
|
||||||
|
DIV_CMD_SID3_FILTER_OUTPUT_VOLUME,
|
||||||
|
DIV_CMD_SID3_CHANNEL_INVERSION,
|
||||||
|
DIV_CMD_SID3_FILTER_CONNECTION,
|
||||||
|
DIV_CMD_SID3_FILTER_MATRIX,
|
||||||
|
DIV_CMD_SID3_FILTER_ENABLE,
|
||||||
|
|
||||||
|
DIV_CMD_C64_PW_SLIDE,
|
||||||
|
DIV_CMD_C64_CUTOFF_SLIDE,
|
||||||
|
|
||||||
|
DIV_CMD_SID3_PHASE_RESET,
|
||||||
|
DIV_CMD_SID3_NOISE_PHASE_RESET,
|
||||||
|
DIV_CMD_SID3_ENVELOPE_RESET,
|
||||||
|
|
||||||
|
DIV_CMD_SID3_CUTOFF_SCALING,
|
||||||
|
DIV_CMD_SID3_RESONANCE_SCALING,
|
||||||
|
|
||||||
DIV_CMD_MAX
|
DIV_CMD_MAX
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -601,10 +625,10 @@ class DivDispatch {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* get "paired" channels.
|
* get "paired" channels.
|
||||||
* @param chan the channel to query.
|
* @param ch the channel to query.
|
||||||
* @return a DivChannelPair.
|
* @param ret the DivChannelPair vector of pairs.
|
||||||
*/
|
*/
|
||||||
virtual DivChannelPair getPaired(int chan);
|
virtual void getPaired(int ch, std::vector<DivChannelPair>& ret);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* get channel mode hints.
|
* get channel mode hints.
|
||||||
|
|
|
||||||
|
|
@ -92,6 +92,7 @@
|
||||||
#include "platform/nds.h"
|
#include "platform/nds.h"
|
||||||
#include "platform/bifurcator.h"
|
#include "platform/bifurcator.h"
|
||||||
#include "platform/sid2.h"
|
#include "platform/sid2.h"
|
||||||
|
#include "platform/sid3.h"
|
||||||
#include "platform/dummy.h"
|
#include "platform/dummy.h"
|
||||||
#include "../ta-log.h"
|
#include "../ta-log.h"
|
||||||
#include "song.h"
|
#include "song.h"
|
||||||
|
|
@ -768,6 +769,9 @@ void DivDispatchContainer::init(DivSystem sys, DivEngine* eng, int chanCount, do
|
||||||
case DIV_SYSTEM_SID2:
|
case DIV_SYSTEM_SID2:
|
||||||
dispatch=new DivPlatformSID2;
|
dispatch=new DivPlatformSID2;
|
||||||
break;
|
break;
|
||||||
|
case DIV_SYSTEM_SID3:
|
||||||
|
dispatch=new DivPlatformSID3;
|
||||||
|
break;
|
||||||
case DIV_SYSTEM_OPL4:
|
case DIV_SYSTEM_OPL4:
|
||||||
dispatch=new DivPlatformOPL;
|
dispatch=new DivPlatformOPL;
|
||||||
((DivPlatformOPL*)dispatch)->setOPLType(4,false);
|
((DivPlatformOPL*)dispatch)->setOPLType(4,false);
|
||||||
|
|
|
||||||
|
|
@ -1575,9 +1575,9 @@ void* DivEngine::getDispatchChanState(int ch) {
|
||||||
return disCont[dispatchOfChan[ch]].dispatch->getChanState(dispatchChanOfChan[ch]);
|
return disCont[dispatchOfChan[ch]].dispatch->getChanState(dispatchChanOfChan[ch]);
|
||||||
}
|
}
|
||||||
|
|
||||||
DivChannelPair DivEngine::getChanPaired(int ch) {
|
void DivEngine::getChanPaired(int ch, std::vector<DivChannelPair>& ret) {
|
||||||
if (ch<0 || ch>=chans) return DivChannelPair();
|
if (ch<0 || ch>=chans) return;
|
||||||
return disCont[dispatchOfChan[ch]].dispatch->getPaired(dispatchChanOfChan[ch]);
|
disCont[dispatchOfChan[ch]].dispatch->getPaired(dispatchChanOfChan[ch],ret);
|
||||||
}
|
}
|
||||||
|
|
||||||
DivChannelModeHints DivEngine::getChanModeHints(int ch) {
|
DivChannelModeHints DivEngine::getChanModeHints(int ch) {
|
||||||
|
|
|
||||||
|
|
@ -54,8 +54,8 @@ class DivWorkPool;
|
||||||
|
|
||||||
#define DIV_UNSTABLE
|
#define DIV_UNSTABLE
|
||||||
|
|
||||||
#define DIV_VERSION "dev221"
|
#define DIV_VERSION "dev222"
|
||||||
#define DIV_ENGINE_VERSION 221
|
#define DIV_ENGINE_VERSION 222
|
||||||
// for imports
|
// for imports
|
||||||
#define DIV_VERSION_MOD 0xff01
|
#define DIV_VERSION_MOD 0xff01
|
||||||
#define DIV_VERSION_FC 0xff02
|
#define DIV_VERSION_FC 0xff02
|
||||||
|
|
@ -1151,7 +1151,7 @@ class DivEngine {
|
||||||
void* getDispatchChanState(int chan);
|
void* getDispatchChanState(int chan);
|
||||||
|
|
||||||
// get channel pairs
|
// get channel pairs
|
||||||
DivChannelPair getChanPaired(int chan);
|
void getChanPaired(int chan, std::vector<DivChannelPair>& ret);
|
||||||
|
|
||||||
// get channel mode hints
|
// get channel mode hints
|
||||||
DivChannelModeHints getChanModeHints(int chan);
|
DivChannelModeHints getChanModeHints(int chan);
|
||||||
|
|
|
||||||
|
|
@ -106,6 +106,7 @@ bool DivInstrumentC64::operator==(const DivInstrumentC64& other) {
|
||||||
_C(dutyIsAbs) &&
|
_C(dutyIsAbs) &&
|
||||||
_C(filterIsAbs) &&
|
_C(filterIsAbs) &&
|
||||||
_C(noTest) &&
|
_C(noTest) &&
|
||||||
|
_C(resetDuty) &&
|
||||||
_C(res) &&
|
_C(res) &&
|
||||||
_C(cut) &&
|
_C(cut) &&
|
||||||
_C(hp) &&
|
_C(hp) &&
|
||||||
|
|
@ -258,6 +259,65 @@ bool DivInstrumentESFM::Operator::operator==(const DivInstrumentESFM::Operator&
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool DivInstrumentSID3::operator==(const DivInstrumentSID3& other) {
|
||||||
|
return (
|
||||||
|
_C(triOn) &&
|
||||||
|
_C(sawOn) &&
|
||||||
|
_C(pulseOn) &&
|
||||||
|
_C(noiseOn) &&
|
||||||
|
_C(a) &&
|
||||||
|
_C(d) &&
|
||||||
|
_C(s) &&
|
||||||
|
_C(r) &&
|
||||||
|
_C(sr) &&
|
||||||
|
_C(duty) &&
|
||||||
|
_C(ringMod) &&
|
||||||
|
_C(oscSync) &&
|
||||||
|
_C(phase_mod) &&
|
||||||
|
_C(phase_mod_source) &&
|
||||||
|
_C(ring_mod_source) &&
|
||||||
|
_C(sync_source) &&
|
||||||
|
_C(specialWaveOn) &&
|
||||||
|
_C(oneBitNoise) &&
|
||||||
|
_C(separateNoisePitch) &&
|
||||||
|
_C(special_wave) &&
|
||||||
|
_C(doWavetable) &&
|
||||||
|
_C(dutyIsAbs) &&
|
||||||
|
_C(resetDuty) &&
|
||||||
|
_C(phaseInv) &&
|
||||||
|
_C(feedback) &&
|
||||||
|
_C(mixMode) &&
|
||||||
|
_C(filt[0]) &&
|
||||||
|
_C(filt[1]) &&
|
||||||
|
_C(filt[2]) &&
|
||||||
|
_C(filt[3])
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
bool DivInstrumentSID3::Filter::operator==(const DivInstrumentSID3::Filter& other) {
|
||||||
|
return (
|
||||||
|
_C(cutoff) &&
|
||||||
|
_C(resonance) &&
|
||||||
|
_C(output_volume) &&
|
||||||
|
_C(distortion_level) &&
|
||||||
|
_C(mode) &&
|
||||||
|
_C(enabled) &&
|
||||||
|
_C(init) &&
|
||||||
|
_C(filter_matrix) &&
|
||||||
|
_C(absoluteCutoff) &&
|
||||||
|
_C(bindCutoffToNote) &&
|
||||||
|
_C(bindCutoffToNoteStrength) &&
|
||||||
|
_C(bindCutoffToNoteCenter) &&
|
||||||
|
_C(bindCutoffToNoteDir) &&
|
||||||
|
_C(bindCutoffOnNote) &&
|
||||||
|
_C(bindResonanceToNote) &&
|
||||||
|
_C(bindResonanceToNoteStrength) &&
|
||||||
|
_C(bindResonanceToNoteCenter) &&
|
||||||
|
_C(bindResonanceToNoteDir) &&
|
||||||
|
_C(bindResonanceOnNote)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
bool DivInstrumentPowerNoise::operator==(const DivInstrumentPowerNoise& other) {
|
bool DivInstrumentPowerNoise::operator==(const DivInstrumentPowerNoise& other) {
|
||||||
return _C(octave);
|
return _C(octave);
|
||||||
}
|
}
|
||||||
|
|
@ -622,7 +682,7 @@ void DivInstrument::writeFeature64(SafeWriter* w) {
|
||||||
w->writeS(c64.duty);
|
w->writeS(c64.duty);
|
||||||
w->writeS((unsigned short)((c64.cut&4095)|((c64.res&15)<<12)));
|
w->writeS((unsigned short)((c64.cut&4095)|((c64.res&15)<<12)));
|
||||||
|
|
||||||
w->writeC((c64.res>>4)&15);
|
w->writeC(((c64.res>>4)&15)|(c64.resetDuty?0x10:0));
|
||||||
|
|
||||||
FEATURE_END;
|
FEATURE_END;
|
||||||
}
|
}
|
||||||
|
|
@ -995,6 +1055,80 @@ void DivInstrument::writeFeatureS2(SafeWriter* w) {
|
||||||
FEATURE_END;
|
FEATURE_END;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void DivInstrument::writeFeatureS3(SafeWriter* w) {
|
||||||
|
FEATURE_BEGIN("S3");
|
||||||
|
|
||||||
|
w->writeC(
|
||||||
|
(sid3.dutyIsAbs?0x80:0)|
|
||||||
|
(sid3.noiseOn?8:0)|
|
||||||
|
(sid3.pulseOn?4:0)|
|
||||||
|
(sid3.sawOn?2:0)|
|
||||||
|
(sid3.triOn?1:0)
|
||||||
|
);
|
||||||
|
|
||||||
|
w->writeC(sid3.a);
|
||||||
|
w->writeC(sid3.d);
|
||||||
|
w->writeC(sid3.s);
|
||||||
|
w->writeC(sid3.sr);
|
||||||
|
w->writeC(sid3.r);
|
||||||
|
|
||||||
|
w->writeC(sid3.mixMode);
|
||||||
|
|
||||||
|
w->writeS(sid3.duty);
|
||||||
|
|
||||||
|
w->writeC(
|
||||||
|
(sid3.phase_mod?0x80:0)|
|
||||||
|
(sid3.specialWaveOn?0x40:0)|
|
||||||
|
(sid3.oneBitNoise?0x20:0)|
|
||||||
|
(sid3.separateNoisePitch?0x10:0)|
|
||||||
|
(sid3.doWavetable?8:0)|
|
||||||
|
(sid3.resetDuty?4:0)|
|
||||||
|
(sid3.oscSync?2:0)|
|
||||||
|
(sid3.ringMod?1:0)
|
||||||
|
);
|
||||||
|
|
||||||
|
w->writeC(sid3.phase_mod_source);
|
||||||
|
w->writeC(sid3.ring_mod_source);
|
||||||
|
w->writeC(sid3.sync_source);
|
||||||
|
w->writeC(sid3.special_wave);
|
||||||
|
w->writeC(sid3.phaseInv);
|
||||||
|
w->writeC(sid3.feedback);
|
||||||
|
|
||||||
|
w->writeC(4); // number of filters
|
||||||
|
|
||||||
|
for (int i=0; i<4; i++) {
|
||||||
|
w->writeC(
|
||||||
|
(sid3.filt[i].enabled?0x80:0)|
|
||||||
|
(sid3.filt[i].init?0x40:0)|
|
||||||
|
(sid3.filt[i].absoluteCutoff?0x20:0)|
|
||||||
|
(sid3.filt[i].bindCutoffToNote?0x10:0)|
|
||||||
|
(sid3.filt[i].bindCutoffToNoteDir?8:0)|
|
||||||
|
(sid3.filt[i].bindCutoffOnNote?4:0)|
|
||||||
|
(sid3.filt[i].bindResonanceToNote?2:0)|
|
||||||
|
(sid3.filt[i].bindResonanceToNoteDir?1:0)
|
||||||
|
);
|
||||||
|
|
||||||
|
w->writeC(
|
||||||
|
(sid3.filt[i].bindResonanceOnNote?0x80:0)
|
||||||
|
);
|
||||||
|
|
||||||
|
w->writeS(sid3.filt[i].cutoff);
|
||||||
|
|
||||||
|
w->writeC(sid3.filt[i].resonance);
|
||||||
|
w->writeC(sid3.filt[i].output_volume);
|
||||||
|
w->writeC(sid3.filt[i].distortion_level);
|
||||||
|
w->writeC(sid3.filt[i].mode);
|
||||||
|
w->writeC(sid3.filt[i].filter_matrix);
|
||||||
|
|
||||||
|
w->writeC(sid3.filt[i].bindCutoffToNoteStrength);
|
||||||
|
w->writeC(sid3.filt[i].bindCutoffToNoteCenter);
|
||||||
|
w->writeC(sid3.filt[i].bindResonanceToNoteStrength);
|
||||||
|
w->writeC(sid3.filt[i].bindResonanceToNoteCenter);
|
||||||
|
}
|
||||||
|
|
||||||
|
FEATURE_END;
|
||||||
|
}
|
||||||
|
|
||||||
void DivInstrument::putInsData2(SafeWriter* w, bool fui, const DivSong* song, bool insName) {
|
void DivInstrument::putInsData2(SafeWriter* w, bool fui, const DivSong* song, bool insName) {
|
||||||
size_t blockStartSeek=0;
|
size_t blockStartSeek=0;
|
||||||
size_t blockEndSeek=0;
|
size_t blockEndSeek=0;
|
||||||
|
|
@ -1041,6 +1175,7 @@ void DivInstrument::putInsData2(SafeWriter* w, bool fui, const DivSong* song, bo
|
||||||
bool featureEF=false;
|
bool featureEF=false;
|
||||||
bool featurePN=false;
|
bool featurePN=false;
|
||||||
bool featureS2=false;
|
bool featureS2=false;
|
||||||
|
bool featureS3=false;
|
||||||
|
|
||||||
bool checkForWL=false;
|
bool checkForWL=false;
|
||||||
|
|
||||||
|
|
@ -1284,6 +1419,11 @@ void DivInstrument::putInsData2(SafeWriter* w, bool fui, const DivSong* song, bo
|
||||||
feature64=true;
|
feature64=true;
|
||||||
featureS2=true;
|
featureS2=true;
|
||||||
break;
|
break;
|
||||||
|
case DIV_INS_SID3:
|
||||||
|
feature64=true;
|
||||||
|
featureS2=true;
|
||||||
|
featureS3=true;
|
||||||
|
break;
|
||||||
case DIV_INS_SUPERVISION:
|
case DIV_INS_SUPERVISION:
|
||||||
featureSM=true;
|
featureSM=true;
|
||||||
if (amiga.useSample) featureSL=true;
|
if (amiga.useSample) featureSL=true;
|
||||||
|
|
@ -1346,6 +1486,9 @@ void DivInstrument::putInsData2(SafeWriter* w, bool fui, const DivSong* song, bo
|
||||||
if (sid2!=defaultIns.sid2) {
|
if (sid2!=defaultIns.sid2) {
|
||||||
featureS2=true;
|
featureS2=true;
|
||||||
}
|
}
|
||||||
|
if (sid3!=defaultIns.sid3) {
|
||||||
|
featureS3=true;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// check ins name
|
// check ins name
|
||||||
|
|
@ -1497,6 +1640,9 @@ void DivInstrument::putInsData2(SafeWriter* w, bool fui, const DivSong* song, bo
|
||||||
if (featureS2) {
|
if (featureS2) {
|
||||||
writeFeatureS2(w);
|
writeFeatureS2(w);
|
||||||
}
|
}
|
||||||
|
if (featureS3) {
|
||||||
|
writeFeatureS3(w);
|
||||||
|
}
|
||||||
|
|
||||||
if (fui && (featureSL || featureWL)) {
|
if (fui && (featureSL || featureWL)) {
|
||||||
w->write("EN",2);
|
w->write("EN",2);
|
||||||
|
|
@ -1812,7 +1958,12 @@ void DivInstrument::readFeature64(SafeReader& reader, bool& volIsCutoff, short v
|
||||||
c64.res=cr>>12;
|
c64.res=cr>>12;
|
||||||
|
|
||||||
if (version>=199) {
|
if (version>=199) {
|
||||||
c64.res|=((unsigned char)reader.readC())<<4;
|
next=(unsigned char)reader.readC();
|
||||||
|
c64.res|=(next&15)<<4;
|
||||||
|
|
||||||
|
if (version>=222) {
|
||||||
|
c64.resetDuty=next&0x10;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
READ_FEAT_END;
|
READ_FEAT_END;
|
||||||
|
|
@ -2345,6 +2496,82 @@ void DivInstrument::readFeatureS2(SafeReader& reader, short version) {
|
||||||
READ_FEAT_END;
|
READ_FEAT_END;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void DivInstrument::readFeatureS3(SafeReader& reader, short version) {
|
||||||
|
READ_FEAT_BEGIN;
|
||||||
|
|
||||||
|
unsigned char next=reader.readC();
|
||||||
|
|
||||||
|
sid3.dutyIsAbs=next&0x80;
|
||||||
|
sid3.noiseOn=next&8;
|
||||||
|
sid3.pulseOn=next&4;
|
||||||
|
sid3.sawOn=next&2;
|
||||||
|
sid3.triOn=next&1;
|
||||||
|
|
||||||
|
sid3.a=reader.readC();
|
||||||
|
sid3.d=reader.readC();
|
||||||
|
sid3.s=reader.readC();
|
||||||
|
sid3.sr=reader.readC();
|
||||||
|
sid3.r=reader.readC();
|
||||||
|
|
||||||
|
sid3.mixMode=reader.readC();
|
||||||
|
|
||||||
|
sid3.duty=reader.readS();
|
||||||
|
|
||||||
|
next=reader.readC();
|
||||||
|
|
||||||
|
sid3.phase_mod=next&0x80;
|
||||||
|
sid3.specialWaveOn=next&0x40;
|
||||||
|
sid3.oneBitNoise=next&0x20;
|
||||||
|
sid3.separateNoisePitch=next&0x10;
|
||||||
|
sid3.doWavetable=next&8;
|
||||||
|
sid3.resetDuty=next&4;
|
||||||
|
sid3.oscSync=next&2;
|
||||||
|
sid3.ringMod=next&1;
|
||||||
|
|
||||||
|
sid3.phase_mod_source=reader.readC();
|
||||||
|
sid3.ring_mod_source=reader.readC();
|
||||||
|
sid3.sync_source=reader.readC();
|
||||||
|
sid3.special_wave=reader.readC();
|
||||||
|
sid3.phaseInv=reader.readC();
|
||||||
|
sid3.feedback=reader.readC();
|
||||||
|
|
||||||
|
unsigned char numFilters=reader.readC();
|
||||||
|
|
||||||
|
for (int i=0; i<numFilters; i++) {
|
||||||
|
if (i>=4) break;
|
||||||
|
|
||||||
|
next=reader.readC();
|
||||||
|
|
||||||
|
sid3.filt[i].enabled=next&0x80;
|
||||||
|
sid3.filt[i].init=next&0x40;
|
||||||
|
sid3.filt[i].absoluteCutoff=next&0x20;
|
||||||
|
sid3.filt[i].bindCutoffToNote=next&0x10;
|
||||||
|
sid3.filt[i].bindCutoffToNoteDir=next&8;
|
||||||
|
sid3.filt[i].bindCutoffOnNote=next&4;
|
||||||
|
sid3.filt[i].bindResonanceToNote=next&2;
|
||||||
|
sid3.filt[i].bindResonanceToNoteDir=next&1;
|
||||||
|
|
||||||
|
next=reader.readC();
|
||||||
|
|
||||||
|
sid3.filt[i].bindResonanceOnNote=next&0x80;
|
||||||
|
|
||||||
|
sid3.filt[i].cutoff=reader.readS();
|
||||||
|
|
||||||
|
sid3.filt[i].resonance=reader.readC();
|
||||||
|
sid3.filt[i].output_volume=reader.readC();
|
||||||
|
sid3.filt[i].distortion_level=reader.readC();
|
||||||
|
sid3.filt[i].mode=reader.readC();
|
||||||
|
sid3.filt[i].filter_matrix=reader.readC();
|
||||||
|
|
||||||
|
sid3.filt[i].bindCutoffToNoteStrength=reader.readC();
|
||||||
|
sid3.filt[i].bindCutoffToNoteCenter=reader.readC();
|
||||||
|
sid3.filt[i].bindResonanceToNoteStrength=reader.readC();
|
||||||
|
sid3.filt[i].bindResonanceToNoteCenter=reader.readC();
|
||||||
|
}
|
||||||
|
|
||||||
|
READ_FEAT_END;
|
||||||
|
}
|
||||||
|
|
||||||
DivDataErrors DivInstrument::readInsDataNew(SafeReader& reader, short version, bool fui, DivSong* song) {
|
DivDataErrors DivInstrument::readInsDataNew(SafeReader& reader, short version, bool fui, DivSong* song) {
|
||||||
unsigned char featCode[2];
|
unsigned char featCode[2];
|
||||||
bool volIsCutoff=false;
|
bool volIsCutoff=false;
|
||||||
|
|
@ -2419,6 +2646,8 @@ DivDataErrors DivInstrument::readInsDataNew(SafeReader& reader, short version, b
|
||||||
readFeaturePN(reader,version);
|
readFeaturePN(reader,version);
|
||||||
} else if (memcmp(featCode,"S2",2)==0) { // SID2
|
} else if (memcmp(featCode,"S2",2)==0) { // SID2
|
||||||
readFeatureS2(reader,version);
|
readFeatureS2(reader,version);
|
||||||
|
} else if (memcmp(featCode,"S3",2)==0) { // SID3
|
||||||
|
readFeatureS3(reader,version);
|
||||||
} else {
|
} else {
|
||||||
if (song==NULL && (memcmp(featCode,"SL",2)==0 || (memcmp(featCode,"WL",2)==0))) {
|
if (song==NULL && (memcmp(featCode,"SL",2)==0 || (memcmp(featCode,"WL",2)==0))) {
|
||||||
// nothing
|
// nothing
|
||||||
|
|
|
||||||
|
|
@ -98,6 +98,7 @@ enum DivInstrumentType: unsigned short {
|
||||||
DIV_INS_SID2=63, // coincidence!
|
DIV_INS_SID2=63, // coincidence!
|
||||||
DIV_INS_SUPERVISION=64,
|
DIV_INS_SUPERVISION=64,
|
||||||
DIV_INS_UPD1771C=65,
|
DIV_INS_UPD1771C=65,
|
||||||
|
DIV_INS_SID3=66,
|
||||||
DIV_INS_MAX,
|
DIV_INS_MAX,
|
||||||
DIV_INS_NULL
|
DIV_INS_NULL
|
||||||
};
|
};
|
||||||
|
|
@ -429,7 +430,7 @@ struct DivInstrumentC64 {
|
||||||
unsigned char a, d, s, r;
|
unsigned char a, d, s, r;
|
||||||
unsigned short duty;
|
unsigned short duty;
|
||||||
unsigned char ringMod, oscSync;
|
unsigned char ringMod, oscSync;
|
||||||
bool toFilter, initFilter, dutyIsAbs, filterIsAbs, noTest;
|
bool toFilter, initFilter, dutyIsAbs, filterIsAbs, noTest, resetDuty;
|
||||||
unsigned char res;
|
unsigned char res;
|
||||||
unsigned short cut;
|
unsigned short cut;
|
||||||
bool hp, lp, bp, ch3off;
|
bool hp, lp, bp, ch3off;
|
||||||
|
|
@ -456,6 +457,7 @@ struct DivInstrumentC64 {
|
||||||
dutyIsAbs(false),
|
dutyIsAbs(false),
|
||||||
filterIsAbs(false),
|
filterIsAbs(false),
|
||||||
noTest(false),
|
noTest(false),
|
||||||
|
resetDuty(true),
|
||||||
res(0),
|
res(0),
|
||||||
cut(0),
|
cut(0),
|
||||||
hp(false),
|
hp(false),
|
||||||
|
|
@ -869,6 +871,111 @@ struct DivInstrumentSID2 {
|
||||||
noiseMode(0) {}
|
noiseMode(0) {}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
struct DivInstrumentSID3 {
|
||||||
|
bool triOn, sawOn, pulseOn, noiseOn;
|
||||||
|
unsigned char a, d, s, r;
|
||||||
|
unsigned char sr;
|
||||||
|
unsigned short duty;
|
||||||
|
unsigned char ringMod, oscSync;
|
||||||
|
bool phase_mod;
|
||||||
|
unsigned char phase_mod_source, ring_mod_source, sync_source;
|
||||||
|
bool specialWaveOn;
|
||||||
|
bool oneBitNoise;
|
||||||
|
bool separateNoisePitch;
|
||||||
|
unsigned char special_wave;
|
||||||
|
bool doWavetable;
|
||||||
|
bool dutyIsAbs;
|
||||||
|
bool resetDuty;
|
||||||
|
unsigned char phaseInv;
|
||||||
|
unsigned char feedback;
|
||||||
|
unsigned char mixMode;
|
||||||
|
|
||||||
|
struct Filter {
|
||||||
|
unsigned short cutoff;
|
||||||
|
unsigned char resonance;
|
||||||
|
unsigned char output_volume;
|
||||||
|
unsigned char distortion_level;
|
||||||
|
unsigned char mode;
|
||||||
|
bool enabled;
|
||||||
|
bool init;
|
||||||
|
unsigned char filter_matrix;
|
||||||
|
|
||||||
|
// this is done purely in software
|
||||||
|
bool absoluteCutoff;
|
||||||
|
bool bindCutoffToNote;
|
||||||
|
unsigned char bindCutoffToNoteStrength; // how much cutoff changes over e.g. 1 semitone
|
||||||
|
unsigned char bindCutoffToNoteCenter; // central note of the cutoff change
|
||||||
|
bool bindCutoffToNoteDir; // if we decrease or increase cutoff if e.g. we go upper in note space
|
||||||
|
bool bindCutoffOnNote; // only do cutoff scaling once, on new note
|
||||||
|
|
||||||
|
bool bindResonanceToNote;
|
||||||
|
unsigned char bindResonanceToNoteStrength; // how much resonance changes over e.g. 1 semitone
|
||||||
|
unsigned char bindResonanceToNoteCenter; // central note of the resonance change
|
||||||
|
bool bindResonanceToNoteDir; // if we decrease or increase resonance if e.g. we go upper in note space
|
||||||
|
bool bindResonanceOnNote; // only do resonance scaling once, on new note
|
||||||
|
|
||||||
|
bool operator==(const Filter& other);
|
||||||
|
bool operator!=(const Filter& other) {
|
||||||
|
return !(*this==other);
|
||||||
|
}
|
||||||
|
Filter():
|
||||||
|
cutoff(0),
|
||||||
|
resonance(0),
|
||||||
|
output_volume(0),
|
||||||
|
distortion_level(0),
|
||||||
|
mode(0),
|
||||||
|
enabled(false),
|
||||||
|
init(false),
|
||||||
|
filter_matrix(0),
|
||||||
|
absoluteCutoff(false),
|
||||||
|
bindCutoffToNote(false),
|
||||||
|
bindCutoffToNoteStrength(0),
|
||||||
|
bindCutoffToNoteCenter(0),
|
||||||
|
bindCutoffToNoteDir(false),
|
||||||
|
bindCutoffOnNote(false),
|
||||||
|
bindResonanceToNote(false),
|
||||||
|
bindResonanceToNoteStrength(0),
|
||||||
|
bindResonanceToNoteCenter(0),
|
||||||
|
bindResonanceToNoteDir(false),
|
||||||
|
bindResonanceOnNote(false) {}
|
||||||
|
} filt[4];
|
||||||
|
|
||||||
|
bool operator==(const DivInstrumentSID3& other);
|
||||||
|
bool operator!=(const DivInstrumentSID3& other) {
|
||||||
|
return !(*this==other);
|
||||||
|
}
|
||||||
|
DivInstrumentSID3():
|
||||||
|
triOn(false),
|
||||||
|
sawOn(true),
|
||||||
|
pulseOn(false),
|
||||||
|
noiseOn(false),
|
||||||
|
a(0),
|
||||||
|
d(64),
|
||||||
|
s(0),
|
||||||
|
r(0),
|
||||||
|
sr(0),
|
||||||
|
duty(32768),
|
||||||
|
ringMod(0),
|
||||||
|
oscSync(0),
|
||||||
|
phase_mod(false),
|
||||||
|
phase_mod_source(0),
|
||||||
|
ring_mod_source(0),
|
||||||
|
sync_source(0),
|
||||||
|
specialWaveOn(false),
|
||||||
|
oneBitNoise(false),
|
||||||
|
separateNoisePitch(false),
|
||||||
|
special_wave(0),
|
||||||
|
doWavetable(false),
|
||||||
|
dutyIsAbs(true),
|
||||||
|
resetDuty(false),
|
||||||
|
phaseInv(0),
|
||||||
|
feedback(0),
|
||||||
|
mixMode(0) {
|
||||||
|
filt[0].mode=16|32; // default settings so filter just works, connect to input and channel output
|
||||||
|
filt[0].output_volume=0xff;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
struct DivInstrumentPOD {
|
struct DivInstrumentPOD {
|
||||||
DivInstrumentType type;
|
DivInstrumentType type;
|
||||||
DivInstrumentFM fm;
|
DivInstrumentFM fm;
|
||||||
|
|
@ -887,6 +994,7 @@ struct DivInstrumentPOD {
|
||||||
DivInstrumentESFM esfm;
|
DivInstrumentESFM esfm;
|
||||||
DivInstrumentPowerNoise powernoise;
|
DivInstrumentPowerNoise powernoise;
|
||||||
DivInstrumentSID2 sid2;
|
DivInstrumentSID2 sid2;
|
||||||
|
DivInstrumentSID3 sid3;
|
||||||
|
|
||||||
DivInstrumentPOD() :
|
DivInstrumentPOD() :
|
||||||
type(DIV_INS_FM) {
|
type(DIV_INS_FM) {
|
||||||
|
|
@ -985,6 +1093,7 @@ struct DivInstrument : DivInstrumentPOD {
|
||||||
void writeFeatureEF(SafeWriter* w);
|
void writeFeatureEF(SafeWriter* w);
|
||||||
void writeFeaturePN(SafeWriter* w);
|
void writeFeaturePN(SafeWriter* w);
|
||||||
void writeFeatureS2(SafeWriter* w);
|
void writeFeatureS2(SafeWriter* w);
|
||||||
|
void writeFeatureS3(SafeWriter* w);
|
||||||
|
|
||||||
void readFeatureNA(SafeReader& reader, short version);
|
void readFeatureNA(SafeReader& reader, short version);
|
||||||
void readFeatureFM(SafeReader& reader, short version);
|
void readFeatureFM(SafeReader& reader, short version);
|
||||||
|
|
@ -1008,6 +1117,7 @@ struct DivInstrument : DivInstrumentPOD {
|
||||||
void readFeatureEF(SafeReader& reader, short version);
|
void readFeatureEF(SafeReader& reader, short version);
|
||||||
void readFeaturePN(SafeReader& reader, short version);
|
void readFeaturePN(SafeReader& reader, short version);
|
||||||
void readFeatureS2(SafeReader& reader, short version);
|
void readFeatureS2(SafeReader& reader, short version);
|
||||||
|
void readFeatureS3(SafeReader& reader, short version);
|
||||||
|
|
||||||
DivDataErrors readInsDataOld(SafeReader& reader, short version);
|
DivDataErrors readInsDataOld(SafeReader& reader, short version);
|
||||||
DivDataErrors readInsDataNew(SafeReader& reader, short version, bool fui, DivSong* song);
|
DivDataErrors readInsDataNew(SafeReader& reader, short version, bool fui, DivSong* song);
|
||||||
|
|
|
||||||
|
|
@ -37,8 +37,7 @@ unsigned short DivDispatch::getPan(int chan) {
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
DivChannelPair DivDispatch::getPaired(int chan) {
|
void DivDispatch::getPaired(int ch, std::vector<DivChannelPair>& ret) {
|
||||||
return DivChannelPair();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
DivChannelModeHints DivDispatch::getModeHints(int chan) {
|
DivChannelModeHints DivDispatch::getModeHints(int chan) {
|
||||||
|
|
|
||||||
|
|
@ -561,12 +561,11 @@ float DivPlatformC140::getPostAmp() {
|
||||||
return 3.0f;
|
return 3.0f;
|
||||||
}
|
}
|
||||||
|
|
||||||
DivChannelPair DivPlatformC140::getPaired(int ch) {
|
void DivPlatformC140::getPaired(int ch, std::vector<DivChannelPair>& ret) {
|
||||||
if (!is219) return DivChannelPair();
|
if (!is219) return;
|
||||||
if ((ch&3)==0) {
|
if ((ch&3)==0) {
|
||||||
return DivChannelPair(bankLabel[ch>>2],ch+1,ch+2,ch+3,-1,-1,-1,-1,-1);
|
ret.push_back(DivChannelPair(bankLabel[ch>>2],ch+1,ch+2,ch+3,-1,-1,-1,-1,-1));
|
||||||
}
|
}
|
||||||
return DivChannelPair();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const void* DivPlatformC140::getSampleMem(int index) {
|
const void* DivPlatformC140::getSampleMem(int index) {
|
||||||
|
|
|
||||||
|
|
@ -89,7 +89,7 @@ class DivPlatformC140: public DivDispatch {
|
||||||
void* getChanState(int chan);
|
void* getChanState(int chan);
|
||||||
DivMacroInt* getChanMacroInt(int ch);
|
DivMacroInt* getChanMacroInt(int ch);
|
||||||
unsigned short getPan(int chan);
|
unsigned short getPan(int chan);
|
||||||
DivChannelPair getPaired(int chan);
|
void getPaired(int ch, std::vector<DivChannelPair>& ret);
|
||||||
DivDispatchOscBuffer* getOscBuffer(int chan);
|
DivDispatchOscBuffer* getOscBuffer(int chan);
|
||||||
unsigned char* getRegisterPool();
|
unsigned char* getRegisterPool();
|
||||||
int getRegisterPoolSize();
|
int getRegisterPoolSize();
|
||||||
|
|
|
||||||
|
|
@ -158,6 +158,21 @@ void DivPlatformC64::tick(bool sysTick) {
|
||||||
int i=chanOrder[_i];
|
int i=chanOrder[_i];
|
||||||
|
|
||||||
chan[i].std.next();
|
chan[i].std.next();
|
||||||
|
|
||||||
|
if (sysTick) {
|
||||||
|
if (chan[i].pw_slide!=0) {
|
||||||
|
chan[i].duty-=chan[i].pw_slide;
|
||||||
|
chan[i].duty=CLAMP(chan[i].duty,0,0xfff);
|
||||||
|
rWrite(i*7+2,chan[i].duty&0xff);
|
||||||
|
rWrite(i*7+3,(chan[i].duty>>8)|(chan[i].outVol<<4));
|
||||||
|
}
|
||||||
|
if (cutoff_slide!=0) {
|
||||||
|
filtCut+=cutoff_slide;
|
||||||
|
filtCut=CLAMP(filtCut,0,0x7ff);
|
||||||
|
updateFilter();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (chan[i].std.vol.had) {
|
if (chan[i].std.vol.had) {
|
||||||
vol=MIN(15,chan[i].std.vol.val);
|
vol=MIN(15,chan[i].std.vol.val);
|
||||||
willUpdateFilter=true;
|
willUpdateFilter=true;
|
||||||
|
|
@ -305,7 +320,7 @@ int DivPlatformC64::dispatch(DivCommand c) {
|
||||||
chan[c.chan].active=true;
|
chan[c.chan].active=true;
|
||||||
chan[c.chan].keyOn=true;
|
chan[c.chan].keyOn=true;
|
||||||
chan[c.chan].test=false;
|
chan[c.chan].test=false;
|
||||||
if (chan[c.chan].insChanged || chan[c.chan].resetDuty || ins->std.waveMacro.len>0) {
|
if (((chan[c.chan].insChanged || chan[c.chan].resetDuty || ins->std.waveMacro.len>0) && ins->c64.resetDuty) || chan[c.chan].resetDuty) {
|
||||||
chan[c.chan].duty=ins->c64.duty;
|
chan[c.chan].duty=ins->c64.duty;
|
||||||
rWrite(c.chan*7+2,chan[c.chan].duty&0xff);
|
rWrite(c.chan*7+2,chan[c.chan].duty&0xff);
|
||||||
rWrite(c.chan*7+3,chan[c.chan].duty>>8);
|
rWrite(c.chan*7+3,chan[c.chan].duty>>8);
|
||||||
|
|
@ -535,6 +550,12 @@ int DivPlatformC64::dispatch(DivCommand c) {
|
||||||
chan[c.chan].release=c.value&15;
|
chan[c.chan].release=c.value&15;
|
||||||
rWrite(c.chan*7+6,(chan[c.chan].sustain<<4)|(chan[c.chan].release));
|
rWrite(c.chan*7+6,(chan[c.chan].sustain<<4)|(chan[c.chan].release));
|
||||||
break;
|
break;
|
||||||
|
case DIV_CMD_C64_PW_SLIDE:
|
||||||
|
chan[c.chan].pw_slide=c.value*c.value2;
|
||||||
|
break;
|
||||||
|
case DIV_CMD_C64_CUTOFF_SLIDE:
|
||||||
|
cutoff_slide=c.value*c.value2;
|
||||||
|
break;
|
||||||
case DIV_CMD_MACRO_OFF:
|
case DIV_CMD_MACRO_OFF:
|
||||||
chan[c.chan].std.mask(c.value,true);
|
chan[c.chan].std.mask(c.value,true);
|
||||||
break;
|
break;
|
||||||
|
|
@ -600,6 +621,23 @@ DivMacroInt* DivPlatformC64::getChanMacroInt(int ch) {
|
||||||
return &chan[ch].std;
|
return &chan[ch].std;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void DivPlatformC64::getPaired(int ch, std::vector<DivChannelPair>& ret) {
|
||||||
|
if (chan[ch].ring) {
|
||||||
|
if (ch==0){
|
||||||
|
ret.push_back(DivChannelPair(_("ring"),2));
|
||||||
|
} else {
|
||||||
|
ret.push_back(DivChannelPair(_("ring"),(ch-1)%3));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (chan[ch].sync) {
|
||||||
|
if (ch==0) {
|
||||||
|
ret.push_back(DivChannelPair(_("sync"),2));
|
||||||
|
} else {
|
||||||
|
ret.push_back(DivChannelPair(_("sync"),(ch-1)%3));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
DivChannelModeHints DivPlatformC64::getModeHints(int ch) {
|
DivChannelModeHints DivPlatformC64::getModeHints(int ch) {
|
||||||
DivChannelModeHints ret;
|
DivChannelModeHints ret;
|
||||||
ret.count=1;
|
ret.count=1;
|
||||||
|
|
@ -653,8 +691,11 @@ void DivPlatformC64::reset() {
|
||||||
chan[i].std.setEngine(parent);
|
chan[i].std.setEngine(parent);
|
||||||
fakeLow[i]=0;
|
fakeLow[i]=0;
|
||||||
fakeBand[i]=0;
|
fakeBand[i]=0;
|
||||||
|
chan[i].pw_slide=0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
cutoff_slide=0;
|
||||||
|
|
||||||
if (sidCore==2) {
|
if (sidCore==2) {
|
||||||
dSID_init(sid_d,chipClock,rate,sidIs6581?6581:8580,needInitTables);
|
dSID_init(sid_d,chipClock,rate,sidIs6581?6581:8580,needInitTables);
|
||||||
dSID_setMuteMask(
|
dSID_setMuteMask(
|
||||||
|
|
|
||||||
|
|
@ -37,6 +37,7 @@ class DivPlatformC64: public DivDispatch {
|
||||||
short duty;
|
short duty;
|
||||||
bool sweepChanged, filter;
|
bool sweepChanged, filter;
|
||||||
bool resetMask, resetFilter, resetDuty, gate, ring, sync, test;
|
bool resetMask, resetFilter, resetDuty, gate, ring, sync, test;
|
||||||
|
short pw_slide;
|
||||||
Channel():
|
Channel():
|
||||||
SharedChannel<signed char>(15),
|
SharedChannel<signed char>(15),
|
||||||
prevFreq(65535),
|
prevFreq(65535),
|
||||||
|
|
@ -56,7 +57,8 @@ class DivPlatformC64: public DivDispatch {
|
||||||
gate(true),
|
gate(true),
|
||||||
ring(false),
|
ring(false),
|
||||||
sync(false),
|
sync(false),
|
||||||
test(false) {}
|
test(false),
|
||||||
|
pw_slide(0) {}
|
||||||
};
|
};
|
||||||
Channel chan[3];
|
Channel chan[3];
|
||||||
DivDispatchOscBuffer* oscBuf[3];
|
DivDispatchOscBuffer* oscBuf[3];
|
||||||
|
|
@ -76,6 +78,7 @@ class DivPlatformC64: public DivDispatch {
|
||||||
unsigned char writeOscBuf;
|
unsigned char writeOscBuf;
|
||||||
unsigned char sidCore;
|
unsigned char sidCore;
|
||||||
int filtCut, resetTime, initResetTime;
|
int filtCut, resetTime, initResetTime;
|
||||||
|
short cutoff_slide;
|
||||||
|
|
||||||
bool keyPriority, sidIs6581, needInitTables, no1EUpdate, multiplyRel, macroRace;
|
bool keyPriority, sidIs6581, needInitTables, no1EUpdate, multiplyRel, macroRace;
|
||||||
unsigned char chanOrder[3];
|
unsigned char chanOrder[3];
|
||||||
|
|
@ -114,6 +117,7 @@ class DivPlatformC64: public DivDispatch {
|
||||||
bool isVolGlobal();
|
bool isVolGlobal();
|
||||||
float getPostAmp();
|
float getPostAmp();
|
||||||
DivMacroInt* getChanMacroInt(int ch);
|
DivMacroInt* getChanMacroInt(int ch);
|
||||||
|
void getPaired(int ch, std::vector<DivChannelPair>& ret);
|
||||||
DivChannelModeHints getModeHints(int chan);
|
DivChannelModeHints getModeHints(int chan);
|
||||||
void notifyInsDeletion(void* ins);
|
void notifyInsDeletion(void* ins);
|
||||||
void poke(unsigned int addr, unsigned short val);
|
void poke(unsigned int addr, unsigned short val);
|
||||||
|
|
|
||||||
|
|
@ -524,12 +524,16 @@ unsigned short DivPlatformDave::getPan(int ch) {
|
||||||
return (chan[ch].panL<<8)|chan[ch].panR;
|
return (chan[ch].panL<<8)|chan[ch].panR;
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO: the rest
|
void DivPlatformDave::getPaired(int ch, std::vector<DivChannelPair>& ret) {
|
||||||
DivChannelPair DivPlatformDave::getPaired(int ch) {
|
|
||||||
if (chan[ch].highPass) {
|
if (chan[ch].highPass) {
|
||||||
DivChannelPair("high",(ch+1)&3);
|
ret.push_back(DivChannelPair(_("high"),(ch+1)&3));
|
||||||
|
}
|
||||||
|
if (chan[ch].ringMod) {
|
||||||
|
ret.push_back(DivChannelPair(_("ring"),(ch+2)&3));
|
||||||
|
}
|
||||||
|
if (chan[ch].lowPass && ch==3) {
|
||||||
|
ret.push_back(DivChannelPair(_("low"),2));
|
||||||
}
|
}
|
||||||
return DivChannelPair();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
DivChannelModeHints DivPlatformDave::getModeHints(int ch) {
|
DivChannelModeHints DivPlatformDave::getModeHints(int ch) {
|
||||||
|
|
|
||||||
|
|
@ -76,7 +76,7 @@ class DivPlatformDave: public DivDispatch {
|
||||||
void* getChanState(int chan);
|
void* getChanState(int chan);
|
||||||
DivMacroInt* getChanMacroInt(int ch);
|
DivMacroInt* getChanMacroInt(int ch);
|
||||||
unsigned short getPan(int chan);
|
unsigned short getPan(int chan);
|
||||||
DivChannelPair getPaired(int chan);
|
void getPaired(int ch, std::vector<DivChannelPair>& ret);
|
||||||
DivChannelModeHints getModeHints(int chan);
|
DivChannelModeHints getModeHints(int chan);
|
||||||
DivSamplePos getSamplePos(int ch);
|
DivSamplePos getSamplePos(int ch);
|
||||||
DivDispatchOscBuffer* getOscBuffer(int chan);
|
DivDispatchOscBuffer* getOscBuffer(int chan);
|
||||||
|
|
|
||||||
|
|
@ -771,6 +771,8 @@ int DivPlatformGBAMinMod::init(DivEngine* p, int channels, int sugRate, const Di
|
||||||
setFlags(flags);
|
setFlags(flags);
|
||||||
reset();
|
reset();
|
||||||
|
|
||||||
|
maxCPU=0.0; // initialize!
|
||||||
|
|
||||||
return 16;
|
return 16;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -2646,13 +2646,12 @@ unsigned short DivPlatformOPL::getPan(int ch) {
|
||||||
return ((chan[ch].pan&1)<<8)|((chan[ch].pan&2)>>1);
|
return ((chan[ch].pan&1)<<8)|((chan[ch].pan&2)>>1);
|
||||||
}
|
}
|
||||||
|
|
||||||
DivChannelPair DivPlatformOPL::getPaired(int ch) {
|
void DivPlatformOPL::getPaired(int ch, std::vector<DivChannelPair>& ret) {
|
||||||
if (oplType==3 && ch<12 && !(ch&1)) {
|
if (oplType==3 && ch<12 && !(ch&1)) {
|
||||||
if (chan[ch].fourOp) {
|
if (chan[ch].fourOp) {
|
||||||
return DivChannelPair("4OP",ch+1);
|
ret.push_back(DivChannelPair(_("4OP"),ch+1));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return DivChannelPair();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
DivDispatchOscBuffer* DivPlatformOPL::getOscBuffer(int ch) {
|
DivDispatchOscBuffer* DivPlatformOPL::getOscBuffer(int ch) {
|
||||||
|
|
|
||||||
|
|
@ -191,7 +191,7 @@ class DivPlatformOPL: public DivDispatch {
|
||||||
void* getChanState(int chan);
|
void* getChanState(int chan);
|
||||||
DivMacroInt* getChanMacroInt(int ch);
|
DivMacroInt* getChanMacroInt(int ch);
|
||||||
unsigned short getPan(int chan);
|
unsigned short getPan(int chan);
|
||||||
DivChannelPair getPaired(int chan);
|
void getPaired(int ch, std::vector<DivChannelPair>& ret);
|
||||||
DivDispatchOscBuffer* getOscBuffer(int chan);
|
DivDispatchOscBuffer* getOscBuffer(int chan);
|
||||||
int mapVelocity(int ch, float vel);
|
int mapVelocity(int ch, float vel);
|
||||||
float getGain(int ch, int vol);
|
float getGain(int ch, int vol);
|
||||||
|
|
|
||||||
|
|
@ -538,11 +538,10 @@ unsigned short DivPlatformPCE::getPan(int ch) {
|
||||||
return ((chan[ch].pan&0xf0)<<4)|(chan[ch].pan&15);
|
return ((chan[ch].pan&0xf0)<<4)|(chan[ch].pan&15);
|
||||||
}
|
}
|
||||||
|
|
||||||
DivChannelPair DivPlatformPCE::getPaired(int ch) {
|
void DivPlatformPCE::getPaired(int ch, std::vector<DivChannelPair>& ret) {
|
||||||
if (ch==1 && lfoMode>0) {
|
if (ch==1 && lfoMode>0) {
|
||||||
return DivChannelPair("mod",0);
|
ret.push_back(DivChannelPair(_("mod"),0));
|
||||||
}
|
}
|
||||||
return DivChannelPair();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
DivChannelModeHints DivPlatformPCE::getModeHints(int ch) {
|
DivChannelModeHints DivPlatformPCE::getModeHints(int ch) {
|
||||||
|
|
|
||||||
|
|
@ -85,7 +85,7 @@ class DivPlatformPCE: public DivDispatch {
|
||||||
void* getChanState(int chan);
|
void* getChanState(int chan);
|
||||||
DivMacroInt* getChanMacroInt(int ch);
|
DivMacroInt* getChanMacroInt(int ch);
|
||||||
unsigned short getPan(int chan);
|
unsigned short getPan(int chan);
|
||||||
DivChannelPair getPaired(int chan);
|
void getPaired(int ch, std::vector<DivChannelPair>& ret);
|
||||||
DivChannelModeHints getModeHints(int chan);
|
DivChannelModeHints getModeHints(int chan);
|
||||||
DivSamplePos getSamplePos(int ch);
|
DivSamplePos getSamplePos(int ch);
|
||||||
DivDispatchOscBuffer* getOscBuffer(int chan);
|
DivDispatchOscBuffer* getOscBuffer(int chan);
|
||||||
|
|
|
||||||
|
|
@ -407,22 +407,21 @@ DivMacroInt* DivPlatformPOKEY::getChanMacroInt(int ch) {
|
||||||
return &chan[ch].std;
|
return &chan[ch].std;
|
||||||
}
|
}
|
||||||
|
|
||||||
DivChannelPair DivPlatformPOKEY::getPaired(int ch) {
|
void DivPlatformPOKEY::getPaired(int ch, std::vector<DivChannelPair>& ret) {
|
||||||
switch (ch) {
|
switch (ch) {
|
||||||
case 0:
|
case 0:
|
||||||
if (audctl&4) return DivChannelPair("filter",2);
|
if (audctl&4) ret.push_back(DivChannelPair(_("filter"),2));
|
||||||
break;
|
break;
|
||||||
case 1:
|
case 1:
|
||||||
if (audctl&16) return DivChannelPair("16-bit",0);
|
if (audctl&16) ret.push_back(DivChannelPair(_("16-bit"),0));
|
||||||
break;
|
break;
|
||||||
case 2:
|
case 2:
|
||||||
if (audctl&8) return DivChannelPair("16-bit",3);
|
if (audctl&8) ret.push_back(DivChannelPair(_("16-bit"),3));
|
||||||
break;
|
break;
|
||||||
case 3:
|
case 3:
|
||||||
if (audctl&2) return DivChannelPair("filter",1);
|
if (audctl&2) ret.push_back(DivChannelPair(_("filter"),1));
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
return DivChannelPair();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
DivDispatchOscBuffer* DivPlatformPOKEY::getOscBuffer(int ch) {
|
DivDispatchOscBuffer* DivPlatformPOKEY::getOscBuffer(int ch) {
|
||||||
|
|
|
||||||
|
|
@ -65,7 +65,7 @@ class DivPlatformPOKEY: public DivDispatch {
|
||||||
int dispatch(DivCommand c);
|
int dispatch(DivCommand c);
|
||||||
void* getChanState(int chan);
|
void* getChanState(int chan);
|
||||||
DivMacroInt* getChanMacroInt(int ch);
|
DivMacroInt* getChanMacroInt(int ch);
|
||||||
DivChannelPair getPaired(int chan);
|
void getPaired(int ch, std::vector<DivChannelPair>& ret);
|
||||||
DivDispatchOscBuffer* getOscBuffer(int chan);
|
DivDispatchOscBuffer* getOscBuffer(int chan);
|
||||||
unsigned char* getRegisterPool();
|
unsigned char* getRegisterPool();
|
||||||
int getRegisterPoolSize();
|
int getRegisterPoolSize();
|
||||||
|
|
|
||||||
|
|
@ -113,6 +113,21 @@ void DivPlatformSID2::tick(bool sysTick) {
|
||||||
bool willUpdateFilter = false;
|
bool willUpdateFilter = false;
|
||||||
|
|
||||||
chan[i].std.next();
|
chan[i].std.next();
|
||||||
|
|
||||||
|
if (sysTick) {
|
||||||
|
if (chan[i].pw_slide!=0) {
|
||||||
|
chan[i].duty-=chan[i].pw_slide;
|
||||||
|
chan[i].duty=CLAMP(chan[i].duty,0,0xfff);
|
||||||
|
rWrite(i*7+2,chan[i].duty&0xff);
|
||||||
|
rWrite(i*7+3,(chan[i].duty>>8)|(chan[i].outVol<<4));
|
||||||
|
}
|
||||||
|
if (chan[i].cutoff_slide!=0) {
|
||||||
|
chan[i].filtCut+=chan[i].cutoff_slide;
|
||||||
|
chan[i].filtCut=CLAMP(chan[i].filtCut,0,0xfff);
|
||||||
|
updateFilter(i);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (chan[i].std.vol.had) {
|
if (chan[i].std.vol.had) {
|
||||||
chan[i].outVol=VOL_SCALE_LINEAR(chan[i].vol&15,MIN(15,chan[i].std.vol.val),15);
|
chan[i].outVol=VOL_SCALE_LINEAR(chan[i].vol&15,MIN(15,chan[i].std.vol.val),15);
|
||||||
rWrite(i*7+3,(chan[i].duty>>8) | (chan[i].outVol << 4));
|
rWrite(i*7+3,(chan[i].duty>>8) | (chan[i].outVol << 4));
|
||||||
|
|
@ -297,7 +312,7 @@ int DivPlatformSID2::dispatch(DivCommand c) {
|
||||||
chan[c.chan].keyOn=true;
|
chan[c.chan].keyOn=true;
|
||||||
chan[c.chan].test=false;
|
chan[c.chan].test=false;
|
||||||
|
|
||||||
if (chan[c.chan].insChanged || chan[c.chan].resetDuty || ins->std.waveMacro.len>0) {
|
if (((chan[c.chan].insChanged || chan[c.chan].resetDuty || ins->std.waveMacro.len>0) && ins->c64.resetDuty) || chan[c.chan].resetDuty) {
|
||||||
chan[c.chan].duty=ins->c64.duty;
|
chan[c.chan].duty=ins->c64.duty;
|
||||||
rWrite(c.chan*7+2,chan[c.chan].duty&0xff);
|
rWrite(c.chan*7+2,chan[c.chan].duty&0xff);
|
||||||
rWrite(c.chan*7+3,(chan[c.chan].duty>>8) | (chan[c.chan].outVol << 4));
|
rWrite(c.chan*7+3,(chan[c.chan].duty>>8) | (chan[c.chan].outVol << 4));
|
||||||
|
|
@ -521,6 +536,12 @@ int DivPlatformSID2::dispatch(DivCommand c) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
case DIV_CMD_C64_PW_SLIDE:
|
||||||
|
chan[c.chan].pw_slide=c.value*c.value2;
|
||||||
|
break;
|
||||||
|
case DIV_CMD_C64_CUTOFF_SLIDE:
|
||||||
|
chan[c.chan].cutoff_slide=c.value*c.value2;
|
||||||
|
break;
|
||||||
case DIV_CMD_MACRO_OFF:
|
case DIV_CMD_MACRO_OFF:
|
||||||
chan[c.chan].std.mask(c.value,true);
|
chan[c.chan].std.mask(c.value,true);
|
||||||
break;
|
break;
|
||||||
|
|
@ -574,15 +595,31 @@ DivMacroInt* DivPlatformSID2::getChanMacroInt(int ch) {
|
||||||
return &chan[ch].std;
|
return &chan[ch].std;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void DivPlatformSID2::getPaired(int ch, std::vector<DivChannelPair>& ret) {
|
||||||
|
if (chan[ch].ring) {
|
||||||
|
if (ch==0) {
|
||||||
|
ret.push_back(DivChannelPair(_("ring"),2));
|
||||||
|
} else {
|
||||||
|
ret.push_back(DivChannelPair(_("ring"),(ch-1)%3));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (chan[ch].sync) {
|
||||||
|
if (ch==0) {
|
||||||
|
ret.push_back(DivChannelPair(_("sync"),2));
|
||||||
|
} else {
|
||||||
|
ret.push_back(DivChannelPair(_("sync"),(ch-1)%3));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
DivChannelModeHints DivPlatformSID2::getModeHints(int ch) {
|
DivChannelModeHints DivPlatformSID2::getModeHints(int ch) {
|
||||||
DivChannelModeHints ret;
|
DivChannelModeHints ret;
|
||||||
ret.count=1;
|
ret.count=1;
|
||||||
ret.hint[0]=ICON_FA_BELL_SLASH_O;
|
ret.hint[0]=ICON_FA_BELL_SLASH_O;
|
||||||
ret.type[0]=0;
|
ret.type[0]=0;
|
||||||
if (ch == 2 && (chan[ch].filtControl & 8)) {
|
if (ch==2 && (chan[ch].filtControl & 8)) {
|
||||||
ret.type[0] = 7;
|
ret.type[0]=7;
|
||||||
}
|
} else if (!chan[ch].gate) {
|
||||||
else if (!chan[ch].gate) {
|
|
||||||
ret.type[0]=4;
|
ret.type[0]=4;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -633,6 +670,9 @@ void DivPlatformSID2::reset() {
|
||||||
chan[i].noise_mode = 0;
|
chan[i].noise_mode = 0;
|
||||||
|
|
||||||
rWrite(0x3 + 7 * i,0xf0);
|
rWrite(0x3 + 7 * i,0xf0);
|
||||||
|
|
||||||
|
chan[i].cutoff_slide = 0;
|
||||||
|
chan[i].pw_slide = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
sid2->reset();
|
sid2->reset();
|
||||||
|
|
|
||||||
|
|
@ -36,7 +36,8 @@ class DivPlatformSID2: public DivDispatch {
|
||||||
unsigned char noise_mode;
|
unsigned char noise_mode;
|
||||||
unsigned char mix_mode;
|
unsigned char mix_mode;
|
||||||
int filtCut;
|
int filtCut;
|
||||||
bool do_pw_sweep_writes, do_cutoff_sweep_writes;
|
short cutoff_slide;
|
||||||
|
short pw_slide;
|
||||||
Channel():
|
Channel():
|
||||||
SharedChannel<signed char>(15),
|
SharedChannel<signed char>(15),
|
||||||
prevFreq(0x1ffff),
|
prevFreq(0x1ffff),
|
||||||
|
|
@ -60,8 +61,8 @@ class DivPlatformSID2: public DivDispatch {
|
||||||
noise_mode(0),
|
noise_mode(0),
|
||||||
mix_mode(0),
|
mix_mode(0),
|
||||||
filtCut(0),
|
filtCut(0),
|
||||||
do_pw_sweep_writes(false),
|
cutoff_slide(0),
|
||||||
do_cutoff_sweep_writes(false) {}
|
pw_slide(0) {}
|
||||||
};
|
};
|
||||||
Channel chan[3];
|
Channel chan[3];
|
||||||
DivDispatchOscBuffer* oscBuf[3];
|
DivDispatchOscBuffer* oscBuf[3];
|
||||||
|
|
@ -108,6 +109,7 @@ class DivPlatformSID2: public DivDispatch {
|
||||||
bool isVolGlobal();
|
bool isVolGlobal();
|
||||||
float getPostAmp();
|
float getPostAmp();
|
||||||
DivMacroInt* getChanMacroInt(int ch);
|
DivMacroInt* getChanMacroInt(int ch);
|
||||||
|
void getPaired(int ch, std::vector<DivChannelPair>& ret);
|
||||||
DivChannelModeHints getModeHints(int chan);
|
DivChannelModeHints getModeHints(int chan);
|
||||||
void notifyInsDeletion(void* ins);
|
void notifyInsDeletion(void* ins);
|
||||||
void poke(unsigned int addr, unsigned short val);
|
void poke(unsigned int addr, unsigned short val);
|
||||||
|
|
|
||||||
1411
src/engine/platform/sid3.cpp
Normal file
1411
src/engine/platform/sid3.cpp
Normal file
File diff suppressed because it is too large
Load diff
276
src/engine/platform/sid3.h
Normal file
276
src/engine/platform/sid3.h
Normal file
|
|
@ -0,0 +1,276 @@
|
||||||
|
/**
|
||||||
|
* Furnace Tracker - multi-system chiptune tracker
|
||||||
|
* Copyright (C) 2021-2024 tildearrow and contributors
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation; either version 2 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License along
|
||||||
|
* with this program; if not, write to the Free Software Foundation, Inc.,
|
||||||
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef _SID3_H
|
||||||
|
#define _SID3_H
|
||||||
|
|
||||||
|
#include "../dispatch.h"
|
||||||
|
#include "../../fixedQueue.h"
|
||||||
|
#include "../waveSynth.h"
|
||||||
|
#include "sound/sid3.h"
|
||||||
|
|
||||||
|
class DivPlatformSID3: public DivDispatch {
|
||||||
|
struct Channel: public SharedChannel<signed short> {
|
||||||
|
int prevFreq;
|
||||||
|
unsigned char wave, special_wave, attack, decay, sustain, sr, release;
|
||||||
|
int duty;
|
||||||
|
bool resetMask, resetFilter, resetDuty, gate, ring, sync, phase, oneBitNoise;
|
||||||
|
bool phaseReset, envReset, phaseResetNoise;
|
||||||
|
bool noiseFreqChanged;
|
||||||
|
unsigned char vol;
|
||||||
|
unsigned char noise_mode;
|
||||||
|
unsigned char mix_mode;
|
||||||
|
unsigned char ringSrc, syncSrc, phaseSrc;
|
||||||
|
unsigned char panLeft, panRight;
|
||||||
|
int noiseFreq;
|
||||||
|
bool independentNoiseFreq;
|
||||||
|
unsigned int noiseLFSRMask;
|
||||||
|
|
||||||
|
struct Filter
|
||||||
|
{
|
||||||
|
int cutoff;
|
||||||
|
unsigned char resonance;
|
||||||
|
unsigned char output_volume;
|
||||||
|
unsigned char distortion_level;
|
||||||
|
unsigned char mode;
|
||||||
|
bool enabled;
|
||||||
|
unsigned char filter_matrix;
|
||||||
|
|
||||||
|
short cutoff_slide;
|
||||||
|
|
||||||
|
bool bindCutoffToNote; //cutoff scaling
|
||||||
|
unsigned char bindCutoffToNoteStrength; //how much cutoff changes over e.g. 1 semitone
|
||||||
|
unsigned char bindCutoffToNoteCenter; //central note of the cutoff change
|
||||||
|
bool bindCutoffToNoteDir; //if we decrease or increase cutoff if e.g. we go upper in note space
|
||||||
|
|
||||||
|
bool bindResonanceToNote;
|
||||||
|
unsigned char bindResonanceToNoteStrength; //how much resonance changes over e.g. 1 semitone
|
||||||
|
unsigned char bindResonanceToNoteCenter; //central note of the resonance change
|
||||||
|
bool bindResonanceToNoteDir; //if we decrease or increase resonance if e.g. we go upper in note space
|
||||||
|
|
||||||
|
Filter():
|
||||||
|
cutoff(0),
|
||||||
|
resonance(0),
|
||||||
|
output_volume(0),
|
||||||
|
distortion_level(0),
|
||||||
|
mode(0),
|
||||||
|
enabled(false),
|
||||||
|
filter_matrix(0),
|
||||||
|
cutoff_slide(0),
|
||||||
|
bindCutoffToNote(false),
|
||||||
|
bindCutoffToNoteStrength(0),
|
||||||
|
bindCutoffToNoteCenter(0),
|
||||||
|
bindCutoffToNoteDir(false),
|
||||||
|
bindResonanceToNote(false),
|
||||||
|
bindResonanceToNoteStrength(0),
|
||||||
|
bindResonanceToNoteCenter(0),
|
||||||
|
bindResonanceToNoteDir(false) {}
|
||||||
|
} filt[SID3_NUM_FILTERS];
|
||||||
|
|
||||||
|
int noise_baseNoteOverride;
|
||||||
|
bool noise_fixedArp;
|
||||||
|
int noise_arpOff;
|
||||||
|
int noise_pitch2;
|
||||||
|
bool noise_hasArp;
|
||||||
|
bool noise_hasPitch;
|
||||||
|
|
||||||
|
bool pcm;
|
||||||
|
int wavetable;
|
||||||
|
|
||||||
|
long long dacPeriod, dacRate, dacOut;
|
||||||
|
unsigned long long dacPos;
|
||||||
|
int dacSample;
|
||||||
|
|
||||||
|
unsigned char phaseInv;
|
||||||
|
unsigned char feedback;
|
||||||
|
|
||||||
|
short pw_slide;
|
||||||
|
|
||||||
|
short phase_reset_counter;
|
||||||
|
short noise_phase_reset_counter;
|
||||||
|
short envelope_reset_counter;
|
||||||
|
|
||||||
|
void handleArpNoise(int offset=0)
|
||||||
|
{
|
||||||
|
DivMacroStruct& m = this->std.op[3].am;
|
||||||
|
|
||||||
|
if (m.had) {
|
||||||
|
noise_hasArp=true;
|
||||||
|
|
||||||
|
if (m.val<0) {
|
||||||
|
if (!(m.val&0x40000000)) {
|
||||||
|
noise_baseNoteOverride=(m.val|0x40000000)+offset;
|
||||||
|
noise_fixedArp=true;
|
||||||
|
} else {
|
||||||
|
noise_arpOff=m.val;
|
||||||
|
noise_fixedArp=false;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if (m.val&0x40000000) {
|
||||||
|
noise_baseNoteOverride=(m.val&(~0x40000000))+offset;
|
||||||
|
noise_fixedArp=true;
|
||||||
|
} else {
|
||||||
|
noise_arpOff=m.val;
|
||||||
|
noise_fixedArp=false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
noiseFreqChanged=true;
|
||||||
|
}
|
||||||
|
|
||||||
|
else
|
||||||
|
{
|
||||||
|
noise_hasArp=false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void handlePitchNoise()
|
||||||
|
{
|
||||||
|
DivMacroStruct& m = this->std.op[0].ar;
|
||||||
|
|
||||||
|
if (m.had) {
|
||||||
|
noise_hasPitch=true;
|
||||||
|
|
||||||
|
if (m.mode) {
|
||||||
|
noise_pitch2+=m.val;
|
||||||
|
CLAMP_VAR(noise_pitch2,-131071,131071);
|
||||||
|
} else {
|
||||||
|
noise_pitch2=m.val;
|
||||||
|
}
|
||||||
|
noiseFreqChanged=true;
|
||||||
|
}
|
||||||
|
|
||||||
|
else
|
||||||
|
{
|
||||||
|
noise_hasPitch=false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Channel():
|
||||||
|
SharedChannel<signed short>(SID3_MAX_VOL),
|
||||||
|
prevFreq(0xffffff),
|
||||||
|
wave(0),
|
||||||
|
special_wave(0),
|
||||||
|
attack(0),
|
||||||
|
decay(0),
|
||||||
|
sustain(0),
|
||||||
|
sr(0),
|
||||||
|
release(0),
|
||||||
|
duty(0),
|
||||||
|
resetMask(false),
|
||||||
|
resetFilter(false),
|
||||||
|
resetDuty(false),
|
||||||
|
gate(true),
|
||||||
|
ring(false),
|
||||||
|
sync(false),
|
||||||
|
phase(false),
|
||||||
|
oneBitNoise(false),
|
||||||
|
phaseReset(false),
|
||||||
|
envReset(false),
|
||||||
|
phaseResetNoise(false),
|
||||||
|
noiseFreqChanged(false),
|
||||||
|
vol(SID3_MAX_VOL),
|
||||||
|
noise_mode(0),
|
||||||
|
mix_mode(0),
|
||||||
|
ringSrc(0),
|
||||||
|
syncSrc(0),
|
||||||
|
phaseSrc(0),
|
||||||
|
panLeft(0xff),
|
||||||
|
panRight(0xff),
|
||||||
|
noiseFreq(0),
|
||||||
|
independentNoiseFreq(false),
|
||||||
|
noiseLFSRMask((1 << 29) | (1 << 5) | (1 << 3) | 1), //https://docs.amd.com/v/u/en-US/xapp052 for 30 bits: 30, 6, 4, 1
|
||||||
|
pcm(false),
|
||||||
|
wavetable(-1),
|
||||||
|
dacPeriod(0),
|
||||||
|
dacRate(0),
|
||||||
|
dacOut(0),
|
||||||
|
dacPos(0),
|
||||||
|
dacSample(-1),
|
||||||
|
phaseInv(0),
|
||||||
|
feedback(0),
|
||||||
|
pw_slide(0),
|
||||||
|
phase_reset_counter(-1),
|
||||||
|
noise_phase_reset_counter(-1),
|
||||||
|
envelope_reset_counter(-1) {}
|
||||||
|
};
|
||||||
|
Channel chan[SID3_NUM_CHANNELS];
|
||||||
|
DivDispatchOscBuffer* oscBuf[SID3_NUM_CHANNELS];
|
||||||
|
struct QueuedWrite {
|
||||||
|
unsigned short addr;
|
||||||
|
unsigned char val;
|
||||||
|
QueuedWrite(): addr(0), val(0) {}
|
||||||
|
QueuedWrite(unsigned short a, unsigned char v): addr(a), val(v) {}
|
||||||
|
};
|
||||||
|
FixedQueue<QueuedWrite,SID3_NUM_REGISTERS * 4> writes;
|
||||||
|
DivWaveSynth ws;
|
||||||
|
|
||||||
|
unsigned char writeOscBuf;
|
||||||
|
|
||||||
|
SID3* sid3;
|
||||||
|
unsigned char regPool[SID3_NUM_REGISTERS];
|
||||||
|
|
||||||
|
bool isMuted[SID3_NUM_CHANNELS];
|
||||||
|
|
||||||
|
unsigned char sampleTick; //used to update streamed sample and not clash with other reg writes at high rate samples
|
||||||
|
bool updateSample;
|
||||||
|
bool quarterClock;
|
||||||
|
|
||||||
|
friend void putDispatchChip(void*,int);
|
||||||
|
friend void putDispatchChan(void*,int,int);
|
||||||
|
|
||||||
|
void updateFlags(int channel, bool gate);
|
||||||
|
void updateFilter(int channel, int filter);
|
||||||
|
void updateFreq(int channel);
|
||||||
|
void updateNoiseFreq(int channel);
|
||||||
|
void updateNoiseLFSRMask(int channel);
|
||||||
|
void updateDuty(int channel);
|
||||||
|
void updateEnvelope(int channel);
|
||||||
|
void updatePanning(int channel);
|
||||||
|
void updateWave();
|
||||||
|
|
||||||
|
public:
|
||||||
|
void acquire(short** buf, size_t len);
|
||||||
|
int dispatch(DivCommand c);
|
||||||
|
void* getChanState(int chan);
|
||||||
|
DivDispatchOscBuffer* getOscBuffer(int chan);
|
||||||
|
unsigned char* getRegisterPool();
|
||||||
|
int getRegisterPoolSize();
|
||||||
|
void reset();
|
||||||
|
void forceIns();
|
||||||
|
void tick(bool sysTick=true);
|
||||||
|
void muteChannel(int ch, bool mute);
|
||||||
|
void setFlags(const DivConfig& flags);
|
||||||
|
void notifyInsChange(int ins);
|
||||||
|
void notifyWaveChange(int wave);
|
||||||
|
float getPostAmp();
|
||||||
|
bool getDCOffRequired();
|
||||||
|
DivMacroInt* getChanMacroInt(int ch);
|
||||||
|
DivChannelModeHints getModeHints(int chan);
|
||||||
|
void notifyInsDeletion(void* ins);
|
||||||
|
void poke(unsigned int addr, unsigned short val);
|
||||||
|
void poke(std::vector<DivRegWrite>& wlist);
|
||||||
|
const char** getRegisterSheet();
|
||||||
|
int init(DivEngine* parent, int channels, int sugRate, const DivConfig& flags);
|
||||||
|
int getOutputCount();
|
||||||
|
void getPaired(int ch, std::vector<DivChannelPair>& ret);
|
||||||
|
void quit();
|
||||||
|
~DivPlatformSID3();
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
@ -723,11 +723,10 @@ unsigned short DivPlatformSNES::getPan(int ch) {
|
||||||
return (chan[ch].panL<<8)|chan[ch].panR;
|
return (chan[ch].panL<<8)|chan[ch].panR;
|
||||||
}
|
}
|
||||||
|
|
||||||
DivChannelPair DivPlatformSNES::getPaired(int ch) {
|
void DivPlatformSNES::getPaired(int ch, std::vector<DivChannelPair>& ret) {
|
||||||
if (chan[ch].pitchMod) {
|
if (chan[ch].pitchMod) {
|
||||||
return DivChannelPair("mod",(ch-1)&7);
|
ret.push_back(DivChannelPair(_("mod"),(ch-1)&7));
|
||||||
}
|
}
|
||||||
return DivChannelPair();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
DivChannelModeHints DivPlatformSNES::getModeHints(int ch) {
|
DivChannelModeHints DivPlatformSNES::getModeHints(int ch) {
|
||||||
|
|
|
||||||
|
|
@ -106,7 +106,7 @@ class DivPlatformSNES: public DivDispatch {
|
||||||
void* getChanState(int chan);
|
void* getChanState(int chan);
|
||||||
DivMacroInt* getChanMacroInt(int ch);
|
DivMacroInt* getChanMacroInt(int ch);
|
||||||
unsigned short getPan(int chan);
|
unsigned short getPan(int chan);
|
||||||
DivChannelPair getPaired(int chan);
|
void getPaired(int ch, std::vector<DivChannelPair>& ret);
|
||||||
DivChannelModeHints getModeHints(int chan);
|
DivChannelModeHints getModeHints(int chan);
|
||||||
DivSamplePos getSamplePos(int ch);
|
DivSamplePos getSamplePos(int ch);
|
||||||
DivDispatchOscBuffer* getOscBuffer(int chan);
|
DivDispatchOscBuffer* getOscBuffer(int chan);
|
||||||
|
|
|
||||||
3856
src/engine/platform/sound/sid3.c
Normal file
3856
src/engine/platform/sound/sid3.c
Normal file
File diff suppressed because it is too large
Load diff
285
src/engine/platform/sound/sid3.h
Normal file
285
src/engine/platform/sound/sid3.h
Normal file
|
|
@ -0,0 +1,285 @@
|
||||||
|
#ifndef SID3_H
|
||||||
|
#define SID3_H
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
extern "C" {
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#include <stdint.h>
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <string.h>
|
||||||
|
#include <stdbool.h>
|
||||||
|
|
||||||
|
#define SID3_NUM_CHANNELS 7
|
||||||
|
#define SID3_NUM_FILTERS 4
|
||||||
|
#define SID3_REGISTERS_PER_CHANNEL 64
|
||||||
|
#define SID3_REGISTERS_PER_FILTER 8
|
||||||
|
#define SID3_NUM_REGISTERS (SID3_NUM_CHANNELS * SID3_REGISTERS_PER_CHANNEL)
|
||||||
|
#define SID3_MAX_VOL 255
|
||||||
|
|
||||||
|
#define SID3_WAVETABLE_LENGTH 256
|
||||||
|
|
||||||
|
#define SID3_NUM_WAVEFORM_BITS 5
|
||||||
|
|
||||||
|
#define SID3_NUM_UNIQUE_SPECIAL_WAVES 28
|
||||||
|
#define SID3_NUM_SPECIAL_WAVES (SID3_NUM_UNIQUE_SPECIAL_WAVES * 2 + 2) /* usual and 2x vol clipped + 2x vol clipped tri and saw... */
|
||||||
|
#define SID3_SPECIAL_WAVE_LENGTH 16384
|
||||||
|
|
||||||
|
#define SID3_EXPONENTIAL_LUT_LENGTH ((0xff0000 >> 8) + 1)
|
||||||
|
|
||||||
|
#define SID3_ACC_BITS 30
|
||||||
|
#define SID3_ACC_MASK ((1UL << SID3_ACC_BITS) - 1)
|
||||||
|
|
||||||
|
enum Flags
|
||||||
|
{
|
||||||
|
SID3_CHAN_ENABLE_GATE = 1,
|
||||||
|
SID3_CHAN_ENABLE_RING_MOD = 2,
|
||||||
|
SID3_CHAN_ENABLE_HARD_SYNC = 4,
|
||||||
|
SID3_CHAN_ENABLE_PHASE_MOD = 8,
|
||||||
|
SID3_CHAN_PHASE_RESET = 16,
|
||||||
|
SID3_CHAN_ENV_RESET = 32,
|
||||||
|
SID3_CHAN_NOISE_PHASE_RESET = 64,
|
||||||
|
SID3_CHAN_1_BIT_NOISE = 128,
|
||||||
|
};
|
||||||
|
|
||||||
|
enum PhaseInversion
|
||||||
|
{
|
||||||
|
SID3_INV_SIGNAL_RIGHT = 1,
|
||||||
|
SID3_INV_SIGNAL_LEFT = 2,
|
||||||
|
};
|
||||||
|
|
||||||
|
enum Waveforms
|
||||||
|
{
|
||||||
|
SID3_WAVE_TRIANGLE = 1,
|
||||||
|
SID3_WAVE_SAW = 2,
|
||||||
|
SID3_WAVE_PULSE = 4,
|
||||||
|
SID3_WAVE_NOISE = 8,
|
||||||
|
SID3_WAVE_SPECIAL = 16,
|
||||||
|
};
|
||||||
|
|
||||||
|
enum Mixmodes
|
||||||
|
{
|
||||||
|
SID3_MIX_8580 = 0,
|
||||||
|
SID3_MIX_AND = 1,
|
||||||
|
SID3_MIX_OR = 2,
|
||||||
|
SID3_MIX_XOR = 3,
|
||||||
|
SID3_MIX_SUM = 4,
|
||||||
|
};
|
||||||
|
|
||||||
|
enum Filter_modes
|
||||||
|
{
|
||||||
|
SID3_FILTER_LP = 1,
|
||||||
|
SID3_FILTER_HP = 2,
|
||||||
|
SID3_FILTER_BP = 4,
|
||||||
|
|
||||||
|
SID3_FILTER_MODES_MASK = 7,
|
||||||
|
|
||||||
|
SID3_FILTER_ENABLE = 8,
|
||||||
|
SID3_FILTER_CHANNEL_INPUT = 16, //add channel input to filter input
|
||||||
|
SID3_FILTER_OUTPUT = 32, //output sound from this filter to channel output
|
||||||
|
};
|
||||||
|
|
||||||
|
enum Registers
|
||||||
|
{
|
||||||
|
SID3_REGISTER_FLAGS = 0,
|
||||||
|
|
||||||
|
SID3_REGISTER_ADSR_A = 1,
|
||||||
|
SID3_REGISTER_ADSR_D = 2,
|
||||||
|
SID3_REGISTER_ADSR_S = 3,
|
||||||
|
SID3_REGISTER_ADSR_SR = 4,
|
||||||
|
SID3_REGISTER_ADSR_R = 5,
|
||||||
|
|
||||||
|
SID3_REGISTER_WAVEFORM = 6,
|
||||||
|
|
||||||
|
SID3_REGISTER_PW_HIGH = 7,
|
||||||
|
SID3_REGISTER_PW_LOW = 8,
|
||||||
|
|
||||||
|
SID3_REGISTER_SPECIAL_WAVE = 9,
|
||||||
|
|
||||||
|
SID3_REGISTER_FREQ_HIGH = 10,
|
||||||
|
SID3_REGISTER_FREQ_MID = 11,
|
||||||
|
SID3_REGISTER_FREQ_LOW = 12,
|
||||||
|
|
||||||
|
SID3_REGISTER_ADSR_VOL = 13,
|
||||||
|
|
||||||
|
SID3_REGISTER_MIXMODE = 14,
|
||||||
|
|
||||||
|
SID3_REGISTER_RING_MOD_SRC = 15,
|
||||||
|
SID3_REGISTER_SYNC_SRC = 16,
|
||||||
|
|
||||||
|
SID3_REGISTER_FILT_BASE = 17,
|
||||||
|
SID3_REGISTER_FILT_MODE = 17,
|
||||||
|
SID3_REGISTER_FILT_CUTOFF_HIGH = 18,
|
||||||
|
SID3_REGISTER_FILT_CUTOFF_LOW = 19,
|
||||||
|
SID3_REGISTER_FILT_RESONANCE = 20,
|
||||||
|
SID3_REGISTER_FILT_DISTORTION = 21,
|
||||||
|
SID3_REGISTER_FILT_CONNECTION = 22,
|
||||||
|
SID3_REGISTER_FILT_OUTPUT_VOLUME = 23,
|
||||||
|
|
||||||
|
SID3_REGISTER_AFTER_FILT_1ST_REG = SID3_REGISTER_FILT_BASE + SID3_REGISTERS_PER_FILTER * SID3_NUM_FILTERS,
|
||||||
|
SID3_REGISTER_PHASE_MOD_SRC = SID3_REGISTER_AFTER_FILT_1ST_REG,
|
||||||
|
|
||||||
|
SID3_REGISTER_PAN_LEFT = SID3_REGISTER_AFTER_FILT_1ST_REG + 1,
|
||||||
|
SID3_REGISTER_PAN_RIGHT = SID3_REGISTER_AFTER_FILT_1ST_REG + 2,
|
||||||
|
|
||||||
|
SID3_REGISTER_NOISE_FREQ_HIGH = SID3_REGISTER_AFTER_FILT_1ST_REG + 3,
|
||||||
|
SID3_REGISTER_NOISE_FREQ_MID = SID3_REGISTER_AFTER_FILT_1ST_REG + 4,
|
||||||
|
SID3_REGISTER_NOISE_FREQ_LOW = SID3_REGISTER_AFTER_FILT_1ST_REG + 5,
|
||||||
|
|
||||||
|
SID3_REGISTER_NOISE_LFSR_HIGHEST = SID3_REGISTER_AFTER_FILT_1ST_REG + 6,
|
||||||
|
SID3_REGISTER_NOISE_LFSR_HIGH = SID3_REGISTER_AFTER_FILT_1ST_REG + 7,
|
||||||
|
SID3_REGISTER_NOISE_LFSR_MID = SID3_REGISTER_AFTER_FILT_1ST_REG + 8,
|
||||||
|
SID3_REGISTER_NOISE_LFSR_LOW = SID3_REGISTER_AFTER_FILT_1ST_REG + 9,
|
||||||
|
|
||||||
|
SID3_REGISTER_STREAMED_SAMPLE_HIGH = SID3_REGISTER_AFTER_FILT_1ST_REG + 10,
|
||||||
|
SID3_REGISTER_STREAMED_SAMPLE_LOW = SID3_REGISTER_AFTER_FILT_1ST_REG + 11,
|
||||||
|
|
||||||
|
SID3_REGISTER_PHASE_INVERSION = SID3_REGISTER_AFTER_FILT_1ST_REG + 12,
|
||||||
|
|
||||||
|
SID3_REGISTER_FEEDBACK = SID3_REGISTER_AFTER_FILT_1ST_REG + 13,
|
||||||
|
};
|
||||||
|
|
||||||
|
typedef struct
|
||||||
|
{
|
||||||
|
int32_t input;
|
||||||
|
int32_t output;
|
||||||
|
|
||||||
|
// State of filter.
|
||||||
|
float Vhp; // highpass
|
||||||
|
float Vbp; // bandpass
|
||||||
|
float Vlp; // lowpass
|
||||||
|
|
||||||
|
// Cutoff frequency, resonance.
|
||||||
|
float w0, w0_ceil_1;
|
||||||
|
float _1024_div_Q;
|
||||||
|
|
||||||
|
double distortion_multiplier; //pre-calculated distortion multiplier for tanh() simple distortion
|
||||||
|
double tanh_distortion_multiplier; //pre-calculated tanh(distortion multiplier)
|
||||||
|
|
||||||
|
uint16_t cutoff;
|
||||||
|
uint8_t resonance;
|
||||||
|
uint8_t distortion_level;
|
||||||
|
|
||||||
|
uint8_t mode;
|
||||||
|
|
||||||
|
uint8_t output_volume;
|
||||||
|
} sid3_filter;
|
||||||
|
|
||||||
|
typedef struct
|
||||||
|
{
|
||||||
|
sid3_filter filt[SID3_NUM_FILTERS];
|
||||||
|
uint8_t connection_matrix[SID3_NUM_FILTERS];
|
||||||
|
} sid3_filters_block;
|
||||||
|
|
||||||
|
typedef struct
|
||||||
|
{
|
||||||
|
uint8_t a, d, s, sr, r, vol, state;
|
||||||
|
|
||||||
|
uint32_t envelope_counter;
|
||||||
|
uint32_t envelope_speed;
|
||||||
|
bool hold_zero;
|
||||||
|
} sid3_channel_adsr;
|
||||||
|
|
||||||
|
typedef struct
|
||||||
|
{
|
||||||
|
uint32_t accumulator;
|
||||||
|
uint8_t sync_bit;
|
||||||
|
uint32_t frequency;
|
||||||
|
|
||||||
|
uint32_t noise_accumulator;
|
||||||
|
uint32_t noise_frequency;
|
||||||
|
|
||||||
|
uint32_t lfsr, lfsr_taps;
|
||||||
|
|
||||||
|
uint8_t waveform;
|
||||||
|
uint8_t special_wave;
|
||||||
|
|
||||||
|
uint16_t pw;
|
||||||
|
|
||||||
|
uint8_t mix_mode;
|
||||||
|
|
||||||
|
sid3_channel_adsr adsr;
|
||||||
|
|
||||||
|
uint8_t flags;
|
||||||
|
|
||||||
|
uint8_t ring_mod_src;
|
||||||
|
uint8_t hard_sync_src;
|
||||||
|
uint8_t phase_mod_source;
|
||||||
|
|
||||||
|
sid3_filters_block filt;
|
||||||
|
uint8_t clock_filter;
|
||||||
|
|
||||||
|
uint8_t panning_left, panning_right;
|
||||||
|
|
||||||
|
int32_t output_before_filter;
|
||||||
|
|
||||||
|
uint8_t phase_inv;
|
||||||
|
uint32_t feedback;
|
||||||
|
|
||||||
|
int32_t prev_output, prev_output2;
|
||||||
|
} sid3_channel;
|
||||||
|
|
||||||
|
typedef struct
|
||||||
|
{
|
||||||
|
uint32_t accumulator;
|
||||||
|
uint8_t sync_bit;
|
||||||
|
uint32_t frequency;
|
||||||
|
|
||||||
|
uint16_t streamed_sample;
|
||||||
|
uint8_t wavetable[SID3_WAVETABLE_LENGTH];
|
||||||
|
|
||||||
|
uint8_t wave_address;
|
||||||
|
|
||||||
|
sid3_channel_adsr adsr;
|
||||||
|
|
||||||
|
uint8_t flags;
|
||||||
|
uint8_t mode;
|
||||||
|
|
||||||
|
uint8_t ring_mod_src;
|
||||||
|
uint8_t hard_sync_src;
|
||||||
|
uint8_t phase_mod_source;
|
||||||
|
|
||||||
|
sid3_filters_block filt;
|
||||||
|
uint8_t clock_filter;
|
||||||
|
|
||||||
|
uint8_t panning_left, panning_right;
|
||||||
|
|
||||||
|
int32_t output_before_filter;
|
||||||
|
|
||||||
|
uint8_t phase_inv;
|
||||||
|
} sid3_wavetable_chan;
|
||||||
|
|
||||||
|
typedef struct
|
||||||
|
{
|
||||||
|
uint16_t special_waves[SID3_NUM_SPECIAL_WAVES][SID3_SPECIAL_WAVE_LENGTH]; //sine wave and OPL3-ish waves + OPZ and YMF825 waves!
|
||||||
|
|
||||||
|
uint16_t env_counter_to_exponential_output[SID3_EXPONENTIAL_LUT_LENGTH];
|
||||||
|
uint32_t exponential_output_to_envelope_counter[SID3_EXPONENTIAL_LUT_LENGTH];
|
||||||
|
|
||||||
|
sid3_channel chan[SID3_NUM_CHANNELS - 1];
|
||||||
|
sid3_wavetable_chan wave_chan;
|
||||||
|
|
||||||
|
int32_t output_l, output_r;
|
||||||
|
|
||||||
|
int32_t channel_signals_before_ADSR[SID3_NUM_CHANNELS];
|
||||||
|
int32_t channel_output[SID3_NUM_CHANNELS];
|
||||||
|
int32_t wave_channel_signal_before_ADSR;
|
||||||
|
int32_t wave_channel_output;
|
||||||
|
|
||||||
|
//emulation-only helpers
|
||||||
|
bool muted[SID3_NUM_CHANNELS];
|
||||||
|
uint32_t clock_rate; //in Hz. 1 MHz default
|
||||||
|
} SID3;
|
||||||
|
|
||||||
|
SID3* sid3_create();
|
||||||
|
void sid3_reset(SID3* sid3);
|
||||||
|
void sid3_write(SID3* sid3, uint16_t address, uint8_t data);
|
||||||
|
void sid3_clock(SID3* sid3);
|
||||||
|
void sid3_set_is_muted(SID3* sid3, uint8_t ch, bool mute);
|
||||||
|
void sid3_set_clock_rate(SID3* sid3, uint32_t clock);
|
||||||
|
void sid3_free(SID3* sid3);
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
};
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
|
@ -67,6 +67,22 @@ void DivPlatformSoundUnit::writeControlUpper(int ch) {
|
||||||
void DivPlatformSoundUnit::tick(bool sysTick) {
|
void DivPlatformSoundUnit::tick(bool sysTick) {
|
||||||
for (int i=0; i<8; i++) {
|
for (int i=0; i<8; i++) {
|
||||||
chan[i].std.next();
|
chan[i].std.next();
|
||||||
|
if (sysTick) {
|
||||||
|
if (chan[i].pw_slide!=0) {
|
||||||
|
chan[i].virtual_duty-=chan[i].pw_slide;
|
||||||
|
chan[i].virtual_duty=CLAMP(chan[i].virtual_duty,0,0xfff);
|
||||||
|
chan[i].duty=chan[i].virtual_duty>>5;
|
||||||
|
|
||||||
|
chWrite(i,0x08,chan[i].duty);
|
||||||
|
}
|
||||||
|
if (chan[i].cutoff_slide!=0) {
|
||||||
|
chan[i].cutoff+=chan[i].cutoff_slide*4;
|
||||||
|
chan[i].cutoff=CLAMP(chan[i].cutoff,0,0x3fff);
|
||||||
|
|
||||||
|
chWrite(i,0x06,chan[i].cutoff&0xff);
|
||||||
|
chWrite(i,0x07,chan[i].cutoff>>8);
|
||||||
|
}
|
||||||
|
}
|
||||||
if (chan[i].std.vol.had) {
|
if (chan[i].std.vol.had) {
|
||||||
DivInstrument* ins=parent->getIns(chan[i].ins,DIV_INS_SU);
|
DivInstrument* ins=parent->getIns(chan[i].ins,DIV_INS_SU);
|
||||||
if (ins->type==DIV_INS_AMIGA) {
|
if (ins->type==DIV_INS_AMIGA) {
|
||||||
|
|
@ -86,6 +102,7 @@ void DivPlatformSoundUnit::tick(bool sysTick) {
|
||||||
}
|
}
|
||||||
if (chan[i].std.duty.had) {
|
if (chan[i].std.duty.had) {
|
||||||
chan[i].duty=chan[i].std.duty.val;
|
chan[i].duty=chan[i].std.duty.val;
|
||||||
|
chan[i].virtual_duty=(unsigned short)chan[i].duty<<5;
|
||||||
chWrite(i,0x08,chan[i].duty);
|
chWrite(i,0x08,chan[i].duty);
|
||||||
}
|
}
|
||||||
if (chan[i].std.wave.had) {
|
if (chan[i].std.wave.had) {
|
||||||
|
|
@ -351,6 +368,7 @@ int DivPlatformSoundUnit::dispatch(DivCommand c) {
|
||||||
break;
|
break;
|
||||||
case DIV_CMD_STD_NOISE_MODE:
|
case DIV_CMD_STD_NOISE_MODE:
|
||||||
chan[c.chan].duty=c.value&127;
|
chan[c.chan].duty=c.value&127;
|
||||||
|
chan[c.chan].virtual_duty=(unsigned short)chan[c.chan].duty << 5;
|
||||||
chWrite(c.chan,0x08,chan[c.chan].duty);
|
chWrite(c.chan,0x08,chan[c.chan].duty);
|
||||||
break;
|
break;
|
||||||
case DIV_CMD_C64_RESONANCE:
|
case DIV_CMD_C64_RESONANCE:
|
||||||
|
|
@ -498,6 +516,12 @@ int DivPlatformSoundUnit::dispatch(DivCommand c) {
|
||||||
if (!chan[c.chan].inPorta && c.value && !parent->song.brokenPortaArp && chan[c.chan].std.arp.will && !NEW_ARP_STRAT) chan[c.chan].baseFreq=NOTE_SU(c.chan,chan[c.chan].note);
|
if (!chan[c.chan].inPorta && c.value && !parent->song.brokenPortaArp && chan[c.chan].std.arp.will && !NEW_ARP_STRAT) chan[c.chan].baseFreq=NOTE_SU(c.chan,chan[c.chan].note);
|
||||||
chan[c.chan].inPorta=c.value;
|
chan[c.chan].inPorta=c.value;
|
||||||
break;
|
break;
|
||||||
|
case DIV_CMD_C64_PW_SLIDE:
|
||||||
|
chan[c.chan].pw_slide=c.value*c.value2;
|
||||||
|
break;
|
||||||
|
case DIV_CMD_C64_CUTOFF_SLIDE:
|
||||||
|
chan[c.chan].cutoff_slide=c.value*c.value2;
|
||||||
|
break;
|
||||||
case DIV_CMD_GET_VOLMAX:
|
case DIV_CMD_GET_VOLMAX:
|
||||||
return 127;
|
return 127;
|
||||||
break;
|
break;
|
||||||
|
|
@ -564,6 +588,11 @@ void DivPlatformSoundUnit::reset() {
|
||||||
for (int i=0; i<8; i++) {
|
for (int i=0; i<8; i++) {
|
||||||
chan[i]=DivPlatformSoundUnit::Channel();
|
chan[i]=DivPlatformSoundUnit::Channel();
|
||||||
chan[i].std.setEngine(parent);
|
chan[i].std.setEngine(parent);
|
||||||
|
|
||||||
|
chan[i].cutoff_slide=0;
|
||||||
|
chan[i].pw_slide=0;
|
||||||
|
|
||||||
|
chan[i].virtual_duty=0x800; // for some reason duty by default is 50%
|
||||||
}
|
}
|
||||||
if (dumpWrites) {
|
if (dumpWrites) {
|
||||||
addWrite(0xffffffff,0);
|
addWrite(0xffffffff,0);
|
||||||
|
|
|
||||||
|
|
@ -38,6 +38,9 @@ class DivPlatformSoundUnit: public DivDispatch {
|
||||||
signed short wave;
|
signed short wave;
|
||||||
unsigned short hwSeqPos;
|
unsigned short hwSeqPos;
|
||||||
short hwSeqDelay;
|
short hwSeqDelay;
|
||||||
|
short cutoff_slide;
|
||||||
|
short pw_slide;
|
||||||
|
short virtual_duty;
|
||||||
Channel():
|
Channel():
|
||||||
SharedChannel<signed char>(127),
|
SharedChannel<signed char>(127),
|
||||||
cutoff(16383),
|
cutoff(16383),
|
||||||
|
|
@ -71,7 +74,10 @@ class DivPlatformSoundUnit: public DivDispatch {
|
||||||
syncTimer(0),
|
syncTimer(0),
|
||||||
wave(0),
|
wave(0),
|
||||||
hwSeqPos(0),
|
hwSeqPos(0),
|
||||||
hwSeqDelay(0) {}
|
hwSeqDelay(0),
|
||||||
|
cutoff_slide(0),
|
||||||
|
pw_slide(0),
|
||||||
|
virtual_duty(0) {}
|
||||||
};
|
};
|
||||||
Channel chan[8];
|
Channel chan[8];
|
||||||
DivDispatchOscBuffer* oscBuf[8];
|
DivDispatchOscBuffer* oscBuf[8];
|
||||||
|
|
|
||||||
|
|
@ -282,7 +282,30 @@ const char* cmdName[]={
|
||||||
"MULTIPCM_DAMP",
|
"MULTIPCM_DAMP",
|
||||||
"MULTIPCM_PSEUDO_REVERB",
|
"MULTIPCM_PSEUDO_REVERB",
|
||||||
"MULTIPCM_LFO_RESET",
|
"MULTIPCM_LFO_RESET",
|
||||||
"MULTIPCM_LEVEL_DIRECT"
|
"MULTIPCM_LEVEL_DIRECT",
|
||||||
|
|
||||||
|
"SID3_SPECIAL_WAVE",
|
||||||
|
"SID3_RING_MOD_SRC",
|
||||||
|
"SID3_HARD_SYNC_SRC",
|
||||||
|
"SID3_PHASE_MOD_SRC",
|
||||||
|
"SID3_WAVE_MIX",
|
||||||
|
"SID3_LFSR_FEEDBACK_BITS",
|
||||||
|
"SID3_1_BIT_NOISE",
|
||||||
|
"SID3_FILTER_DISTORTION",
|
||||||
|
"SID3_FILTER_OUTPUT_VOLUME",
|
||||||
|
"SID3_CHANNEL_INVERSION",
|
||||||
|
"SID3_FILTER_CONNECTION",
|
||||||
|
"SID3_FILTER_MATRIX",
|
||||||
|
"SID3_FILTER_ENABLE",
|
||||||
|
|
||||||
|
"C64_PW_SLIDE",
|
||||||
|
"C64_CUTOFF_SLIDE",
|
||||||
|
|
||||||
|
"SID3_PHASE_RESET",
|
||||||
|
"SID3_NOISE_PHASE_RESET",
|
||||||
|
"SID3_ENVELOPE_RESET",
|
||||||
|
"SID3_CUTOFF_SCALING",
|
||||||
|
"SID3_RESONANCE_SCALING"
|
||||||
};
|
};
|
||||||
|
|
||||||
static_assert((sizeof(cmdName)/sizeof(void*))==DIV_CMD_MAX,"update cmdName!");
|
static_assert((sizeof(cmdName)/sizeof(void*))==DIV_CMD_MAX,"update cmdName!");
|
||||||
|
|
|
||||||
|
|
@ -143,6 +143,7 @@ enum DivSystem {
|
||||||
DIV_SYSTEM_SID2,
|
DIV_SYSTEM_SID2,
|
||||||
DIV_SYSTEM_SUPERVISION,
|
DIV_SYSTEM_SUPERVISION,
|
||||||
DIV_SYSTEM_UPD1771C,
|
DIV_SYSTEM_UPD1771C,
|
||||||
|
DIV_SYSTEM_SID3,
|
||||||
|
|
||||||
DIV_SYSTEM_MAX
|
DIV_SYSTEM_MAX
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -634,6 +634,12 @@ void DivEngine::registerSystems() {
|
||||||
{0x1e, {DIV_CMD_C64_EXTENDED, _("1Exy: Change other parameters (LEGACY)")}},
|
{0x1e, {DIV_CMD_C64_EXTENDED, _("1Exy: Change other parameters (LEGACY)")}},
|
||||||
{0x20, {DIV_CMD_C64_AD, _("20xy: Set attack/decay (x: attack; y: decay)")}},
|
{0x20, {DIV_CMD_C64_AD, _("20xy: Set attack/decay (x: attack; y: decay)")}},
|
||||||
{0x21, {DIV_CMD_C64_SR, _("21xy: Set sustain/release (x: sustain; y: release)")}},
|
{0x21, {DIV_CMD_C64_SR, _("21xy: Set sustain/release (x: sustain; y: release)")}},
|
||||||
|
|
||||||
|
{0x22, {DIV_CMD_C64_PW_SLIDE, _("22xx: Pulse width slide up"), effectVal, constVal<1>}},
|
||||||
|
{0x23, {DIV_CMD_C64_PW_SLIDE, _("23xx: Pulse width slide down"), effectVal, constVal<-1>}},
|
||||||
|
|
||||||
|
{0x24, {DIV_CMD_C64_CUTOFF_SLIDE, _("24xx: Filter cutoff slide up"), effectVal, constVal<1>}},
|
||||||
|
{0x25, {DIV_CMD_C64_CUTOFF_SLIDE, _("25xx: Filter cutoff slide down"), effectVal, constVal<-1>}},
|
||||||
};
|
};
|
||||||
const EffectHandler c64FineDutyHandler(DIV_CMD_C64_FINE_DUTY, _("3xxx: Set pulse width (0 to FFF)"), effectValLong<12>);
|
const EffectHandler c64FineDutyHandler(DIV_CMD_C64_FINE_DUTY, _("3xxx: Set pulse width (0 to FFF)"), effectValLong<12>);
|
||||||
const EffectHandler c64FineCutoffHandler(DIV_CMD_C64_FINE_CUTOFF, _("4xxx: Set cutoff (0 to 7FF)"), effectValLong<11>);
|
const EffectHandler c64FineCutoffHandler(DIV_CMD_C64_FINE_CUTOFF, _("4xxx: Set cutoff (0 to 7FF)"), effectValLong<11>);
|
||||||
|
|
@ -706,12 +712,97 @@ void DivEngine::registerSystems() {
|
||||||
{0x14, {DIV_CMD_C64_FILTER_RESET, _("14xy: Reset cutoff (x: on new note; y: now)")}},
|
{0x14, {DIV_CMD_C64_FILTER_RESET, _("14xy: Reset cutoff (x: on new note; y: now)")}},
|
||||||
{0x15, {DIV_CMD_C64_DUTY_RESET, _("15xy: Reset pulse width (x: on new note; y: now)")}},
|
{0x15, {DIV_CMD_C64_DUTY_RESET, _("15xy: Reset pulse width (x: on new note; y: now)")}},
|
||||||
{0x16, {DIV_CMD_C64_EXTENDED, _("16xy: Change other parameters")}},
|
{0x16, {DIV_CMD_C64_EXTENDED, _("16xy: Change other parameters")}},
|
||||||
|
|
||||||
|
{0x17, {DIV_CMD_C64_PW_SLIDE, _("17xx: Pulse width slide up"), effectVal, constVal<1>}},
|
||||||
|
{0x18, {DIV_CMD_C64_PW_SLIDE, _("18xx: Pulse width slide down"), effectVal, constVal<-1>}},
|
||||||
|
|
||||||
|
{0x19, {DIV_CMD_C64_CUTOFF_SLIDE, _("19xx: Filter cutoff slide up"), effectVal, constVal<1>}},
|
||||||
|
{0x1A, {DIV_CMD_C64_CUTOFF_SLIDE, _("1Axx: Filter cutoff slide down"), effectVal, constVal<-1>}},
|
||||||
};
|
};
|
||||||
const EffectHandler SID2FineDutyHandler(DIV_CMD_C64_FINE_DUTY, _("3xxx: Set pulse width (0 to FFF)"), effectValLong<12>);
|
const EffectHandler SID2FineDutyHandler(DIV_CMD_C64_FINE_DUTY, _("3xxx: Set pulse width (0 to FFF)"), effectValLong<12>);
|
||||||
const EffectHandler SID2FineCutoffHandler(DIV_CMD_C64_FINE_CUTOFF, _("4xxx: Set cutoff (0 to FFF)"), effectValLong<11>);
|
const EffectHandler SID2FineCutoffHandler(DIV_CMD_C64_FINE_CUTOFF, _("4xxx: Set cutoff (0 to FFF)"), effectValLong<11>);
|
||||||
for (int i=0; i<16; i++) SID2PostEffectHandlerMap.emplace(0x30+i,SID2FineDutyHandler);
|
for (int i=0; i<16; i++) SID2PostEffectHandlerMap.emplace(0x30+i,SID2FineDutyHandler);
|
||||||
for (int i=0; i<16; i++) SID2PostEffectHandlerMap.emplace(0x40+i,SID2FineCutoffHandler);
|
for (int i=0; i<16; i++) SID2PostEffectHandlerMap.emplace(0x40+i,SID2FineCutoffHandler);
|
||||||
|
|
||||||
|
EffectHandlerMap SID3PostEffectHandlerMap={
|
||||||
|
{0x60, {DIV_CMD_WAVE, _("60xx: Set waveform (bit 0: triangle; bit 1: saw; bit 2: pulse; bit 3: noise; bit 4: special wave)")}},
|
||||||
|
{0x61, {DIV_CMD_SID3_SPECIAL_WAVE, _("61xx: Set special wave (00-39)")}},
|
||||||
|
{0x62, {DIV_CMD_C64_EXTENDED, _("62xx: Modulation control (bit 0: ring mod; bit 1: osc. sync; bit 2: phase mod)")}},
|
||||||
|
{0x63, {DIV_CMD_C64_DUTY_RESET, _("63xy: Reset pulse width (x: on new note; y: now)")}},
|
||||||
|
|
||||||
|
{0x64, {DIV_CMD_SID3_RING_MOD_SRC, _("64xx: Set ring modulation source channel (0-7)")}},
|
||||||
|
{0x65, {DIV_CMD_SID3_HARD_SYNC_SRC, _("65xx: Set hard sync source channel (0-6)")}},
|
||||||
|
{0x66, {DIV_CMD_SID3_PHASE_MOD_SRC, _("66xx: Set phase modulation source channel (0-6)")}},
|
||||||
|
|
||||||
|
{0x67, {DIV_CMD_FM_AR, _("67xx: Set attack")}},
|
||||||
|
{0x68, {DIV_CMD_FM_DR, _("68xx: Set decay")}},
|
||||||
|
{0x69, {DIV_CMD_FM_SL, _("69xx: Set sustain level")}},
|
||||||
|
{0x6A, {DIV_CMD_FM_D2R, _("6Axx: Set sustain rate")}},
|
||||||
|
{0x6B, {DIV_CMD_FM_RR, _("6Bxx: Set release")}},
|
||||||
|
|
||||||
|
{0x6C, {DIV_CMD_SID3_WAVE_MIX, _("6Cxx: Set wave mix mode (0-4)")}},
|
||||||
|
|
||||||
|
{0x6D, {DIV_CMD_SID3_LFSR_FEEDBACK_BITS, _("6Dxx: Set noise LFSR feedback bits (low byte)"), effectVal, constVal<0>}},
|
||||||
|
{0x6E, {DIV_CMD_SID3_LFSR_FEEDBACK_BITS, _("6Exx: Set noise LFSR feedback bits (medium byte)"), effectVal, constVal<1>}},
|
||||||
|
{0x6F, {DIV_CMD_SID3_LFSR_FEEDBACK_BITS, _("6Fxx: Set noise LFSR feedback bits (higher byte)"), effectVal, constVal<2>}},
|
||||||
|
{0x70, {DIV_CMD_SID3_LFSR_FEEDBACK_BITS, _("70xx: Set noise LFSR feedback bits (highest bits, 0-3F)"), effectVal, constVal<3>}},
|
||||||
|
|
||||||
|
{0x71, {DIV_CMD_C64_RESONANCE, _("71xx: Set filter 1 resonance"), effectVal, constVal<0>}},
|
||||||
|
{0x72, {DIV_CMD_C64_RESONANCE, _("72xx: Set filter 2 resonance"), effectVal, constVal<1>}},
|
||||||
|
{0x73, {DIV_CMD_C64_RESONANCE, _("73xx: Set filter 3 resonance"), effectVal, constVal<2>}},
|
||||||
|
{0x74, {DIV_CMD_C64_RESONANCE, _("74xx: Set filter 4 resonance"), effectVal, constVal<3>}},
|
||||||
|
|
||||||
|
{0x75, {DIV_CMD_SID3_1_BIT_NOISE, _("75xx: Set noise mode (0: usual noise, 1: 1-bit noise (PCM mode on wave channel))")}},
|
||||||
|
|
||||||
|
{0x76, {DIV_CMD_SID3_FILTER_OUTPUT_VOLUME, _("76xx: Set filter 1 output volume"), effectVal, constVal<0>}},
|
||||||
|
{0x77, {DIV_CMD_SID3_FILTER_OUTPUT_VOLUME, _("77xx: Set filter 2 output volume"), effectVal, constVal<1>}},
|
||||||
|
{0x78, {DIV_CMD_SID3_FILTER_OUTPUT_VOLUME, _("78xx: Set filter 3 output volume"), effectVal, constVal<2>}},
|
||||||
|
{0x79, {DIV_CMD_SID3_FILTER_OUTPUT_VOLUME, _("79xx: Set filter 4 output volume"), effectVal, constVal<3>}},
|
||||||
|
|
||||||
|
{0x7A, {DIV_CMD_SID3_FILTER_DISTORTION, _("7Axx: Set filter 1 distortion"), effectVal, constVal<0>}},
|
||||||
|
{0x7B, {DIV_CMD_SID3_FILTER_DISTORTION, _("7Bxx: Set filter 2 distortion"), effectVal, constVal<1>}},
|
||||||
|
{0x7C, {DIV_CMD_SID3_FILTER_DISTORTION, _("7Cxx: Set filter 3 distortion"), effectVal, constVal<2>}},
|
||||||
|
{0x7D, {DIV_CMD_SID3_FILTER_DISTORTION, _("7Dxx: Set filter 4 distortion"), effectVal, constVal<3>}},
|
||||||
|
|
||||||
|
{0x7E, {DIV_CMD_FM_FB, _("7Exx: Set feedback")}},
|
||||||
|
{0x7F, {DIV_CMD_SID3_CHANNEL_INVERSION, _("7Fxx: Set channel signal inversion (bit 0: right channel, bit 1: left channel)")}},
|
||||||
|
|
||||||
|
{0xA0, {DIV_CMD_C64_FILTER_MODE, _("A0xy: Set filter mode (x: filter (0-3); y: bit 0: low pass; bit 1: band pass; bit 2: high pass)")}},
|
||||||
|
{0xA1, {DIV_CMD_SID3_FILTER_CONNECTION, _("A1xy: Set filter connection (x: filter (0-3); y: bit 0: connect to channel input; bit 1: connect to channel output)")}},
|
||||||
|
{0xA2, {DIV_CMD_SID3_FILTER_MATRIX, _("A2xy: Set filter connection matrix (x: filter (0-3); y: bits 0-3: add filter 1-4 output to filter's input)")}},
|
||||||
|
{0xA3, {DIV_CMD_SID3_FILTER_ENABLE, _("A3xy: Enable filter (x: filter (0-3); y: enable)")}},
|
||||||
|
|
||||||
|
{0xA4, {DIV_CMD_C64_PW_SLIDE, _("A4xx: Pulse width slide up"), effectVal, constVal<1>}},
|
||||||
|
{0xA5, {DIV_CMD_C64_PW_SLIDE, _("A5xx: Pulse width slide down"), effectVal, constVal<-1>}},
|
||||||
|
|
||||||
|
{0xA6, {DIV_CMD_C64_CUTOFF_SLIDE, _("A6xx: Filter 1 cutoff slide up"), effectVal, constVal<1>}},
|
||||||
|
{0xA7, {DIV_CMD_C64_CUTOFF_SLIDE, _("A7xx: Filter 1 cutoff slide down"), effectVal, constVal<-1>}},
|
||||||
|
{0xA8, {DIV_CMD_C64_CUTOFF_SLIDE, _("A8xx: Filter 2 cutoff slide up"), effectVal, constVal<2>}},
|
||||||
|
{0xA9, {DIV_CMD_C64_CUTOFF_SLIDE, _("A9xx: Filter 2 cutoff slide down"), effectVal, constVal<-2>}},
|
||||||
|
{0xAA, {DIV_CMD_C64_CUTOFF_SLIDE, _("AAxx: Filter 3 cutoff slide up"), effectVal, constVal<3>}},
|
||||||
|
{0xAB, {DIV_CMD_C64_CUTOFF_SLIDE, _("ABxx: Filter 3 cutoff slide down"), effectVal, constVal<-3>}},
|
||||||
|
{0xAC, {DIV_CMD_C64_CUTOFF_SLIDE, _("ACxx: Filter 4 cutoff slide up"), effectVal, constVal<4>}},
|
||||||
|
{0xAD, {DIV_CMD_C64_CUTOFF_SLIDE, _("ADxx: Filter 4 cutoff slide down"), effectVal, constVal<-4>}},
|
||||||
|
|
||||||
|
{0xAE, {DIV_CMD_SID3_PHASE_RESET, _("AExx: Phase reset on tick xx")}},
|
||||||
|
{0xAF, {DIV_CMD_SID3_NOISE_PHASE_RESET, _("AFxx: Noise phase reset on tick xx")}},
|
||||||
|
{0xB0, {DIV_CMD_SID3_ENVELOPE_RESET, _("B0xx: Envelope reset on tick xx")}},
|
||||||
|
|
||||||
|
{0xB1, {DIV_CMD_SID3_CUTOFF_SCALING, _("B1xy: Cutoff scaling control (x: filter (0-3); y: bit 0: enable scaling; bit 1: invert scaling)")}},
|
||||||
|
{0xB2, {DIV_CMD_SID3_RESONANCE_SCALING, _("B2xy: Resonance scaling control (x: filter (0-3); y: bit 0: enable scaling; bit 1: invert scaling)")}},
|
||||||
|
};
|
||||||
|
|
||||||
|
const EffectHandler SID3FineDutyHandler(DIV_CMD_C64_FINE_DUTY, _("5xxx: Set pulse width (0 to FFF)"), effectValLong<12>);
|
||||||
|
const EffectHandler SID3FineCutoffHandler1(DIV_CMD_C64_FINE_CUTOFF, _("1xxx: Set cutoff of filter 1 (0 to FFF)"), effectValLong<12>, constVal<0>);
|
||||||
|
const EffectHandler SID3FineCutoffHandler2(DIV_CMD_C64_FINE_CUTOFF, _("2xxx: Set cutoff of filter 2 (0 to FFF)"), effectValLong<12>, constVal<1>);
|
||||||
|
const EffectHandler SID3FineCutoffHandler3(DIV_CMD_C64_FINE_CUTOFF, _("3xxx: Set cutoff of filter 3 (0 to FFF)"), effectValLong<12>, constVal<2>);
|
||||||
|
const EffectHandler SID3FineCutoffHandler4(DIV_CMD_C64_FINE_CUTOFF, _("4xxx: Set cutoff of filter 4 (0 to FFF)"), effectValLong<12>, constVal<3>);
|
||||||
|
for (int i=0; i<16; i++) SID3PostEffectHandlerMap.emplace(0x50+i,SID3FineDutyHandler);
|
||||||
|
for (int i=0; i<16; i++) SID3PostEffectHandlerMap.emplace(0x10+i,SID3FineCutoffHandler1);
|
||||||
|
for (int i=0; i<16; i++) SID3PostEffectHandlerMap.emplace(0x20+i,SID3FineCutoffHandler2);
|
||||||
|
for (int i=0; i<16; i++) SID3PostEffectHandlerMap.emplace(0x30+i,SID3FineCutoffHandler3);
|
||||||
|
for (int i=0; i<16; i++) SID3PostEffectHandlerMap.emplace(0x40+i,SID3FineCutoffHandler4);
|
||||||
|
|
||||||
// SysDefs
|
// SysDefs
|
||||||
|
|
||||||
// this chip uses YMZ ADPCM, but the emulator uses ADPCM-B because I got it wrong back then.
|
// this chip uses YMZ ADPCM, but the emulator uses ADPCM-B because I got it wrong back then.
|
||||||
|
|
@ -1500,7 +1591,7 @@ void DivEngine::registerSystems() {
|
||||||
|
|
||||||
sysDefs[DIV_SYSTEM_OPLL_DRUMS]=new DivSysDef(
|
sysDefs[DIV_SYSTEM_OPLL_DRUMS]=new DivSysDef(
|
||||||
_("Yamaha YM2413 (OPLL) with drums"), NULL, 0xa7, 0, 11, true, false, 0x150, false, 0, 0, 0,
|
_("Yamaha YM2413 (OPLL) with drums"), NULL, 0xa7, 0, 11, true, false, 0x150, false, 0, 0, 0,
|
||||||
_("the OPLL chips but with drums mode turned on."),
|
_("the OPLL chip but with drums mode turned on."),
|
||||||
{_("FM 1"), _("FM 2"), _("FM 3"), _("FM 4"), _("FM 5"), _("FM 6"), _("Kick"), _("Snare"), _("Tom"), _("Top"), _("HiHat")},
|
{_("FM 1"), _("FM 2"), _("FM 3"), _("FM 4"), _("FM 5"), _("FM 6"), _("Kick"), _("Snare"), _("Tom"), _("Top"), _("HiHat")},
|
||||||
{"F1", "F2", "F3", "F4", "F5", "F6", "BD", "SD", "TM", "TP", "HH"},
|
{"F1", "F2", "F3", "F4", "F5", "F6", "BD", "SD", "TM", "TP", "HH"},
|
||||||
{DIV_CH_FM, DIV_CH_FM, DIV_CH_FM, DIV_CH_FM, DIV_CH_FM, DIV_CH_FM, DIV_CH_NOISE, DIV_CH_NOISE, DIV_CH_NOISE, DIV_CH_NOISE, DIV_CH_NOISE},
|
{DIV_CH_FM, DIV_CH_FM, DIV_CH_FM, DIV_CH_FM, DIV_CH_FM, DIV_CH_FM, DIV_CH_NOISE, DIV_CH_NOISE, DIV_CH_NOISE, DIV_CH_NOISE, DIV_CH_NOISE},
|
||||||
|
|
@ -1756,6 +1847,12 @@ void DivEngine::registerSystems() {
|
||||||
{0x20, {DIV_CMD_SU_SWEEP_ENABLE, _("20xx: Toggle frequency sweep (bit 0-6: speed; bit 7: direction is up)"), constVal<0>, effectVal}},
|
{0x20, {DIV_CMD_SU_SWEEP_ENABLE, _("20xx: Toggle frequency sweep (bit 0-6: speed; bit 7: direction is up)"), constVal<0>, effectVal}},
|
||||||
{0x21, {DIV_CMD_SU_SWEEP_ENABLE, _("21xx: Toggle volume sweep (bit 0-4: speed; bit 5: direction is up; bit 6: loop; bit 7: alternate)"), constVal<1>, effectVal}},
|
{0x21, {DIV_CMD_SU_SWEEP_ENABLE, _("21xx: Toggle volume sweep (bit 0-4: speed; bit 5: direction is up; bit 6: loop; bit 7: alternate)"), constVal<1>, effectVal}},
|
||||||
{0x22, {DIV_CMD_SU_SWEEP_ENABLE, _("22xx: Toggle cutoff sweep (bit 0-6: speed; bit 7: direction is up)"), constVal<2>, effectVal}},
|
{0x22, {DIV_CMD_SU_SWEEP_ENABLE, _("22xx: Toggle cutoff sweep (bit 0-6: speed; bit 7: direction is up)"), constVal<2>, effectVal}},
|
||||||
|
|
||||||
|
{0x23, {DIV_CMD_C64_PW_SLIDE, _("23xx: Pulse width slide up"), effectVal, constVal<1>}},
|
||||||
|
{0x24, {DIV_CMD_C64_PW_SLIDE, _("24xx: Pulse width slide down"), effectVal, constVal<-1>}},
|
||||||
|
|
||||||
|
{0x25, {DIV_CMD_C64_CUTOFF_SLIDE, _("25xx: Filter cutoff slide up"), effectVal, constVal<1>}},
|
||||||
|
{0x26, {DIV_CMD_C64_CUTOFF_SLIDE, _("26xx: Filter cutoff slide down"), effectVal, constVal<-1>}},
|
||||||
};
|
};
|
||||||
const EffectHandler suCutoffHandler(DIV_CMD_C64_FINE_CUTOFF, _("4xxx: Set cutoff (0 to FFF)"), effectValLong<12>);
|
const EffectHandler suCutoffHandler(DIV_CMD_C64_FINE_CUTOFF, _("4xxx: Set cutoff (0 to FFF)"), effectValLong<12>);
|
||||||
for (int i=0; i<16; i++) {
|
for (int i=0; i<16; i++) {
|
||||||
|
|
@ -2198,6 +2295,18 @@ void DivEngine::registerSystems() {
|
||||||
SID2PostEffectHandlerMap
|
SID2PostEffectHandlerMap
|
||||||
);
|
);
|
||||||
|
|
||||||
|
sysDefs[DIV_SYSTEM_SID3]=new DivSysDef(
|
||||||
|
_("SID3"), NULL, 0xf5, 0, 7, false, true, 0, false, (1U<<DIV_SAMPLE_DEPTH_8BIT)|(1U<<DIV_SAMPLE_DEPTH_16BIT), 256, 256,
|
||||||
|
_("a fantasy sound chip created by LTVA. it is a big rework of SID chip with probably too many features added on top."),
|
||||||
|
{_("Channel 1"), _("Channel 2"), _("Channel 3"), _("Channel 4"), _("Channel 5"), _("Channel 6"), _("Wave")},
|
||||||
|
{"CH1", "CH2", "CH3", "CH4", "CH5", "CH6", "WA"},
|
||||||
|
{DIV_CH_NOISE, DIV_CH_NOISE, DIV_CH_NOISE, DIV_CH_NOISE, DIV_CH_NOISE, DIV_CH_NOISE, DIV_CH_WAVE},
|
||||||
|
{DIV_INS_SID3, DIV_INS_SID3, DIV_INS_SID3, DIV_INS_SID3, DIV_INS_SID3, DIV_INS_SID3, DIV_INS_SID3},
|
||||||
|
{},
|
||||||
|
{},
|
||||||
|
SID3PostEffectHandlerMap
|
||||||
|
);
|
||||||
|
|
||||||
sysDefs[DIV_SYSTEM_DUMMY]=new DivSysDef(
|
sysDefs[DIV_SYSTEM_DUMMY]=new DivSysDef(
|
||||||
_("Dummy System"), NULL, 0xfd, 0, 8, false, true, 0, false, 0, 0, 0,
|
_("Dummy System"), NULL, 0xfd, 0, 8, false, true, 0, false, 0, 0, 0,
|
||||||
_("this is a system designed for testing purposes."),
|
_("this is a system designed for testing purposes."),
|
||||||
|
|
|
||||||
|
|
@ -301,6 +301,8 @@ const char* aboutLine[]={
|
||||||
_N("ep128emu by Istvan Varga"),
|
_N("ep128emu by Istvan Varga"),
|
||||||
_N("NDS sound emulator by cam900"),
|
_N("NDS sound emulator by cam900"),
|
||||||
_N("openMSX YMF278 emulator (modified version) by the openMSX developers"),
|
_N("openMSX YMF278 emulator (modified version) by the openMSX developers"),
|
||||||
|
_N("SID2 emulator by LTVA (modification of reSID emulator)"),
|
||||||
|
_N("SID3 emulator by LTVA"),
|
||||||
"",
|
"",
|
||||||
_N("greetings to:"),
|
_N("greetings to:"),
|
||||||
"floxy!",
|
"floxy!",
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load diff
|
|
@ -356,6 +356,7 @@ enum FurnaceGUIColors {
|
||||||
GUI_COLOR_INSTR_SID2,
|
GUI_COLOR_INSTR_SID2,
|
||||||
GUI_COLOR_INSTR_SUPERVISION,
|
GUI_COLOR_INSTR_SUPERVISION,
|
||||||
GUI_COLOR_INSTR_UPD1771C,
|
GUI_COLOR_INSTR_UPD1771C,
|
||||||
|
GUI_COLOR_INSTR_SID3,
|
||||||
GUI_COLOR_INSTR_UNKNOWN,
|
GUI_COLOR_INSTR_UNKNOWN,
|
||||||
|
|
||||||
GUI_COLOR_CHANNEL_BG,
|
GUI_COLOR_CHANNEL_BG,
|
||||||
|
|
@ -2747,9 +2748,11 @@ class FurnaceGUI {
|
||||||
|
|
||||||
void drawSSGEnv(unsigned char type, const ImVec2& size);
|
void drawSSGEnv(unsigned char type, const ImVec2& size);
|
||||||
void drawWaveform(unsigned char type, bool opz, const ImVec2& size);
|
void drawWaveform(unsigned char type, bool opz, const ImVec2& size);
|
||||||
|
void drawWaveformSID3(unsigned char type, const ImVec2& size);
|
||||||
void drawAlgorithm(unsigned char alg, FurnaceGUIFMAlgs algType, const ImVec2& size);
|
void drawAlgorithm(unsigned char alg, FurnaceGUIFMAlgs algType, const ImVec2& size);
|
||||||
void drawESFMAlgorithm(DivInstrumentESFM& esfm, const ImVec2& size);
|
void drawESFMAlgorithm(DivInstrumentESFM& esfm, const ImVec2& size);
|
||||||
void drawFMEnv(unsigned char tl, unsigned char ar, unsigned char dr, unsigned char d2r, unsigned char rr, unsigned char sl, unsigned char sus, unsigned char egt, unsigned char algOrGlobalSus, float maxTl, float maxArDr, float maxRr, const ImVec2& size, unsigned short instType);
|
void drawFMEnv(unsigned char tl, unsigned char ar, unsigned char dr, unsigned char d2r, unsigned char rr, unsigned char sl, unsigned char sus, unsigned char egt, unsigned char algOrGlobalSus, float maxTl, float maxArDr, float maxRr, const ImVec2& size, unsigned short instType);
|
||||||
|
void drawSID3Env(unsigned char tl, unsigned char ar, unsigned char dr, unsigned char d2r, unsigned char rr, unsigned char sl, unsigned char sus, unsigned char egt, unsigned char algOrGlobalSus, float maxTl, float maxArDr, float maxRr, const ImVec2& size, unsigned short instType);
|
||||||
void drawGBEnv(unsigned char vol, unsigned char len, unsigned char sLen, bool dir, const ImVec2& size);
|
void drawGBEnv(unsigned char vol, unsigned char len, unsigned char sLen, bool dir, const ImVec2& size);
|
||||||
bool drawSysConf(int chan, int sysPos, DivSystem type, DivConfig& flags, bool modifyOnChange, bool fromMenu=false);
|
bool drawSysConf(int chan, int sysPos, DivSystem type, DivConfig& flags, bool modifyOnChange, bool fromMenu=false);
|
||||||
void kvsConfig(DivInstrument* ins, bool supportsKVS=true);
|
void kvsConfig(DivInstrument* ins, bool supportsKVS=true);
|
||||||
|
|
@ -2813,6 +2816,7 @@ class FurnaceGUI {
|
||||||
|
|
||||||
void insTabFMModernHeader(DivInstrument* ins);
|
void insTabFMModernHeader(DivInstrument* ins);
|
||||||
void insTabFM(DivInstrument* ins);
|
void insTabFM(DivInstrument* ins);
|
||||||
|
void insTabWavetable(DivInstrument* ins);
|
||||||
void insTabSample(DivInstrument* ins);
|
void insTabSample(DivInstrument* ins);
|
||||||
|
|
||||||
void drawOrderButtons();
|
void drawOrderButtons();
|
||||||
|
|
@ -2849,6 +2853,7 @@ class FurnaceGUI {
|
||||||
void drawPattern();
|
void drawPattern();
|
||||||
void drawInsList(bool asChild=false);
|
void drawInsList(bool asChild=false);
|
||||||
void drawInsEdit();
|
void drawInsEdit();
|
||||||
|
void drawInsSID3(DivInstrument* ins);
|
||||||
void drawWaveList(bool asChild=false);
|
void drawWaveList(bool asChild=false);
|
||||||
void drawWaveEdit();
|
void drawWaveEdit();
|
||||||
void drawSampleList(bool asChild=false);
|
void drawSampleList(bool asChild=false);
|
||||||
|
|
|
||||||
|
|
@ -186,6 +186,7 @@ const char* insTypes[DIV_INS_MAX+1][3]={
|
||||||
{"SID2",ICON_FA_KEYBOARD_O,ICON_FUR_INS_SID2},
|
{"SID2",ICON_FA_KEYBOARD_O,ICON_FUR_INS_SID2},
|
||||||
{"Watara Supervision",ICON_FA_GAMEPAD,ICON_FUR_INS_SUPERVISION},
|
{"Watara Supervision",ICON_FA_GAMEPAD,ICON_FUR_INS_SUPERVISION},
|
||||||
{"NEC μPD1771C",ICON_FA_BAR_CHART,ICON_FUR_INS_UPD1771C},
|
{"NEC μPD1771C",ICON_FA_BAR_CHART,ICON_FUR_INS_UPD1771C},
|
||||||
|
{"SID3",ICON_FA_KEYBOARD_O,ICON_FUR_INS_SID3},
|
||||||
{NULL,ICON_FA_QUESTION,ICON_FA_QUESTION}
|
{NULL,ICON_FA_QUESTION,ICON_FA_QUESTION}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -346,40 +347,40 @@ const FurnaceGUIColors fxColors[256]={
|
||||||
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
|
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
|
||||||
|
|
||||||
// 60-6F
|
// 60-6F
|
||||||
GUI_COLOR_PATTERN_EFFECT_INVALID,
|
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
|
||||||
GUI_COLOR_PATTERN_EFFECT_INVALID,
|
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
|
||||||
GUI_COLOR_PATTERN_EFFECT_INVALID,
|
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
|
||||||
GUI_COLOR_PATTERN_EFFECT_INVALID,
|
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
|
||||||
GUI_COLOR_PATTERN_EFFECT_INVALID,
|
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
|
||||||
GUI_COLOR_PATTERN_EFFECT_INVALID,
|
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
|
||||||
GUI_COLOR_PATTERN_EFFECT_INVALID,
|
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
|
||||||
GUI_COLOR_PATTERN_EFFECT_INVALID,
|
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
|
||||||
GUI_COLOR_PATTERN_EFFECT_INVALID,
|
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
|
||||||
GUI_COLOR_PATTERN_EFFECT_INVALID,
|
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
|
||||||
GUI_COLOR_PATTERN_EFFECT_INVALID,
|
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
|
||||||
GUI_COLOR_PATTERN_EFFECT_INVALID,
|
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
|
||||||
GUI_COLOR_PATTERN_EFFECT_INVALID,
|
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
|
||||||
GUI_COLOR_PATTERN_EFFECT_INVALID,
|
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
|
||||||
GUI_COLOR_PATTERN_EFFECT_INVALID,
|
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
|
||||||
GUI_COLOR_PATTERN_EFFECT_INVALID,
|
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
|
||||||
|
|
||||||
// 70-7F
|
// 70-7F
|
||||||
GUI_COLOR_PATTERN_EFFECT_INVALID,
|
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
|
||||||
GUI_COLOR_PATTERN_EFFECT_INVALID,
|
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
|
||||||
GUI_COLOR_PATTERN_EFFECT_INVALID,
|
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
|
||||||
GUI_COLOR_PATTERN_EFFECT_INVALID,
|
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
|
||||||
GUI_COLOR_PATTERN_EFFECT_INVALID,
|
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
|
||||||
GUI_COLOR_PATTERN_EFFECT_INVALID,
|
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
|
||||||
GUI_COLOR_PATTERN_EFFECT_INVALID,
|
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
|
||||||
GUI_COLOR_PATTERN_EFFECT_INVALID,
|
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
|
||||||
GUI_COLOR_PATTERN_EFFECT_INVALID,
|
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
|
||||||
GUI_COLOR_PATTERN_EFFECT_INVALID,
|
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
|
||||||
GUI_COLOR_PATTERN_EFFECT_INVALID,
|
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
|
||||||
GUI_COLOR_PATTERN_EFFECT_INVALID,
|
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
|
||||||
GUI_COLOR_PATTERN_EFFECT_INVALID,
|
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
|
||||||
GUI_COLOR_PATTERN_EFFECT_INVALID,
|
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
|
||||||
GUI_COLOR_PATTERN_EFFECT_INVALID,
|
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
|
||||||
GUI_COLOR_PATTERN_EFFECT_INVALID,
|
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
|
||||||
|
|
||||||
// 80-8F
|
// 80-8F
|
||||||
GUI_COLOR_PATTERN_EFFECT_PANNING,
|
GUI_COLOR_PATTERN_EFFECT_PANNING,
|
||||||
|
|
@ -418,27 +419,27 @@ const FurnaceGUIColors fxColors[256]={
|
||||||
GUI_COLOR_PATTERN_EFFECT_MISC,
|
GUI_COLOR_PATTERN_EFFECT_MISC,
|
||||||
|
|
||||||
// A0-AF
|
// A0-AF
|
||||||
GUI_COLOR_PATTERN_EFFECT_INVALID,
|
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
|
||||||
GUI_COLOR_PATTERN_EFFECT_INVALID,
|
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
|
||||||
GUI_COLOR_PATTERN_EFFECT_INVALID,
|
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
|
||||||
GUI_COLOR_PATTERN_EFFECT_INVALID,
|
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
|
||||||
GUI_COLOR_PATTERN_EFFECT_INVALID,
|
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
|
||||||
GUI_COLOR_PATTERN_EFFECT_INVALID,
|
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
|
||||||
GUI_COLOR_PATTERN_EFFECT_INVALID,
|
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
|
||||||
GUI_COLOR_PATTERN_EFFECT_INVALID,
|
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
|
||||||
GUI_COLOR_PATTERN_EFFECT_INVALID,
|
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
|
||||||
GUI_COLOR_PATTERN_EFFECT_INVALID,
|
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
|
||||||
GUI_COLOR_PATTERN_EFFECT_INVALID,
|
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
|
||||||
GUI_COLOR_PATTERN_EFFECT_INVALID,
|
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
|
||||||
GUI_COLOR_PATTERN_EFFECT_INVALID,
|
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
|
||||||
GUI_COLOR_PATTERN_EFFECT_INVALID,
|
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
|
||||||
GUI_COLOR_PATTERN_EFFECT_INVALID,
|
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
|
||||||
GUI_COLOR_PATTERN_EFFECT_INVALID,
|
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
|
||||||
|
|
||||||
// B0-BF
|
// B0-BF
|
||||||
GUI_COLOR_PATTERN_EFFECT_INVALID,
|
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
|
||||||
GUI_COLOR_PATTERN_EFFECT_INVALID,
|
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
|
||||||
GUI_COLOR_PATTERN_EFFECT_INVALID,
|
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
|
||||||
GUI_COLOR_PATTERN_EFFECT_INVALID,
|
GUI_COLOR_PATTERN_EFFECT_INVALID,
|
||||||
GUI_COLOR_PATTERN_EFFECT_INVALID,
|
GUI_COLOR_PATTERN_EFFECT_INVALID,
|
||||||
GUI_COLOR_PATTERN_EFFECT_INVALID,
|
GUI_COLOR_PATTERN_EFFECT_INVALID,
|
||||||
|
|
@ -1022,6 +1023,7 @@ const FurnaceGUIColorDef guiColors[GUI_COLOR_MAX]={
|
||||||
D(GUI_COLOR_INSTR_SID2,"",ImVec4(0.6f,0.75f,1.0f,1.0f)),
|
D(GUI_COLOR_INSTR_SID2,"",ImVec4(0.6f,0.75f,1.0f,1.0f)),
|
||||||
D(GUI_COLOR_INSTR_SUPERVISION,"",ImVec4(0.52f,1.0f,0.6f,1.0f)),
|
D(GUI_COLOR_INSTR_SUPERVISION,"",ImVec4(0.52f,1.0f,0.6f,1.0f)),
|
||||||
D(GUI_COLOR_INSTR_UPD1771C,"",ImVec4(0.94f,0.52f,0.6f,1.0f)),
|
D(GUI_COLOR_INSTR_UPD1771C,"",ImVec4(0.94f,0.52f,0.6f,1.0f)),
|
||||||
|
D(GUI_COLOR_INSTR_SID3,"",ImVec4(0.6f,0.75f,0.6f,1.0f)),
|
||||||
D(GUI_COLOR_INSTR_UNKNOWN,"",ImVec4(0.3f,0.3f,0.3f,1.0f)),
|
D(GUI_COLOR_INSTR_UNKNOWN,"",ImVec4(0.3f,0.3f,0.3f,1.0f)),
|
||||||
|
|
||||||
D(GUI_COLOR_CHANNEL_BG,"",ImVec4(0.4f,0.6f,0.8f,1.0f)),
|
D(GUI_COLOR_CHANNEL_BG,"",ImVec4(0.4f,0.6f,0.8f,1.0f)),
|
||||||
|
|
@ -1274,6 +1276,7 @@ const int availableSystems[]={
|
||||||
DIV_SYSTEM_OPL4_DRUMS,
|
DIV_SYSTEM_OPL4_DRUMS,
|
||||||
DIV_SYSTEM_SUPERVISION,
|
DIV_SYSTEM_SUPERVISION,
|
||||||
DIV_SYSTEM_UPD1771C,
|
DIV_SYSTEM_UPD1771C,
|
||||||
|
DIV_SYSTEM_SID3,
|
||||||
0 // don't remove this last one!
|
0 // don't remove this last one!
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -1373,6 +1376,7 @@ const int chipsSpecial[]={
|
||||||
DIV_SYSTEM_SID2,
|
DIV_SYSTEM_SID2,
|
||||||
DIV_SYSTEM_SUPERVISION,
|
DIV_SYSTEM_SUPERVISION,
|
||||||
DIV_SYSTEM_UPD1771C,
|
DIV_SYSTEM_UPD1771C,
|
||||||
|
DIV_SYSTEM_SID3,
|
||||||
0 // don't remove this last one!
|
0 // don't remove this last one!
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
1410
src/gui/insEdit.cpp
1410
src/gui/insEdit.cpp
File diff suppressed because it is too large
Load diff
|
|
@ -33,6 +33,7 @@ const int _THIRTY_ONE=31;
|
||||||
const int _SIXTY_FOUR=64;
|
const int _SIXTY_FOUR=64;
|
||||||
const int _ONE_HUNDRED=100;
|
const int _ONE_HUNDRED=100;
|
||||||
const int _ONE_HUNDRED_TWENTY_SEVEN=127;
|
const int _ONE_HUNDRED_TWENTY_SEVEN=127;
|
||||||
|
const int _ONE_HUNDRED_SEVENTY_NINE=179;
|
||||||
const int _TWO_HUNDRED_FIFTY_FIVE=255;
|
const int _TWO_HUNDRED_FIFTY_FIVE=255;
|
||||||
const int _FIVE_HUNDRED_ELEVEN=511;
|
const int _FIVE_HUNDRED_ELEVEN=511;
|
||||||
const int _TWO_THOUSAND_FORTY_SEVEN=2047;
|
const int _TWO_THOUSAND_FORTY_SEVEN=2047;
|
||||||
|
|
|
||||||
|
|
@ -35,6 +35,7 @@ extern const int _THIRTY_ONE;
|
||||||
extern const int _SIXTY_FOUR;
|
extern const int _SIXTY_FOUR;
|
||||||
extern const int _ONE_HUNDRED;
|
extern const int _ONE_HUNDRED;
|
||||||
extern const int _ONE_HUNDRED_TWENTY_SEVEN;
|
extern const int _ONE_HUNDRED_TWENTY_SEVEN;
|
||||||
|
extern const int _ONE_HUNDRED_SEVENTY_NINE;
|
||||||
extern const int _TWO_HUNDRED_FIFTY_FIVE;
|
extern const int _TWO_HUNDRED_FIFTY_FIVE;
|
||||||
extern const int _FIVE_HUNDRED_ELEVEN;
|
extern const int _FIVE_HUNDRED_ELEVEN;
|
||||||
extern const int _TWO_THOUSAND_FORTY_SEVEN;
|
extern const int _TWO_THOUSAND_FORTY_SEVEN;
|
||||||
|
|
|
||||||
|
|
@ -37,7 +37,7 @@ void FurnaceGUI::drawSysDefs(std::vector<FurnaceGUISysDef>& category, bool& acce
|
||||||
ImGui::TableNextColumn();
|
ImGui::TableNextColumn();
|
||||||
if (!i.subDefs.empty()) {
|
if (!i.subDefs.empty()) {
|
||||||
if (i.orig.empty()) {
|
if (i.orig.empty()) {
|
||||||
sysDefID=fmt::sprintf("%s%s/%dS",i.name,sysDefIDLeader,index);
|
sysDefID=fmt::sprintf("%s%s/%dS",_(i.name.c_str()),sysDefIDLeader,index);
|
||||||
} else {
|
} else {
|
||||||
sysDefID=fmt::sprintf("%s/%dS",sysDefIDLeader,index);
|
sysDefID=fmt::sprintf("%s/%dS",sysDefIDLeader,index);
|
||||||
}
|
}
|
||||||
|
|
@ -45,7 +45,7 @@ void FurnaceGUI::drawSysDefs(std::vector<FurnaceGUISysDef>& category, bool& acce
|
||||||
ImGui::SameLine();
|
ImGui::SameLine();
|
||||||
}
|
}
|
||||||
if (!i.orig.empty()) {
|
if (!i.orig.empty()) {
|
||||||
sysDefID=fmt::sprintf("%s%s/%d",i.name,sysDefIDLeader,index);
|
sysDefID=fmt::sprintf("%s%s/%d",_(i.name.c_str()),sysDefIDLeader,index);
|
||||||
if (ImGui::Selectable(sysDefID.c_str(),false,ImGuiSelectableFlags_DontClosePopups)) {
|
if (ImGui::Selectable(sysDefID.c_str(),false,ImGuiSelectableFlags_DontClosePopups)) {
|
||||||
nextDesc=i.definition;
|
nextDesc=i.definition;
|
||||||
nextDescName=i.name;
|
nextDescName=i.name;
|
||||||
|
|
|
||||||
|
|
@ -1282,116 +1282,120 @@ void FurnaceGUI::drawPattern() {
|
||||||
memset(floors,0,4*4*sizeof(unsigned int));
|
memset(floors,0,4*4*sizeof(unsigned int));
|
||||||
|
|
||||||
for (int i=0; i<chans; i++) {
|
for (int i=0; i<chans; i++) {
|
||||||
bool isPaired=false;
|
std::vector<DivChannelPair> pairs;
|
||||||
int numPairs=0;
|
e->getChanPaired(i,pairs);
|
||||||
unsigned int pairMin=i;
|
|
||||||
unsigned int pairMax=i;
|
|
||||||
unsigned char curFloor=0;
|
|
||||||
if (!e->curSubSong->chanShow[i]) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
DivChannelPair pairs=e->getChanPaired(i);
|
for (DivChannelPair pair: pairs) {
|
||||||
for (int j=0; j<8; j++) {
|
bool isPaired=false;
|
||||||
if (pairs.pairs[j]==-1) continue;
|
int numPairs=0;
|
||||||
int pairCh=e->dispatchFirstChan[i]+pairs.pairs[j];
|
unsigned int pairMin=i;
|
||||||
if (!e->curSubSong->chanShow[pairCh]) {
|
unsigned int pairMax=i;
|
||||||
|
unsigned char curFloor=0;
|
||||||
|
if (!e->curSubSong->chanShow[i]) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
isPaired=true;
|
|
||||||
if ((unsigned int)pairCh<pairMin) pairMin=pairCh;
|
|
||||||
if ((unsigned int)pairCh>pairMax) pairMax=pairCh;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!isPaired) continue;
|
for (int j=0; j<8; j++) {
|
||||||
|
if (pair.pairs[j]==-1) continue;
|
||||||
float posY=chanHeadBottom;
|
int pairCh=e->dispatchFirstChan[i]+pair.pairs[j];
|
||||||
|
if (!e->curSubSong->chanShow[pairCh]) {
|
||||||
// find a free floor
|
continue;
|
||||||
while (curFloor<4) {
|
|
||||||
bool free=true;
|
|
||||||
for (unsigned int j=pairMin; j<=pairMax; j++) {
|
|
||||||
const unsigned int j0=j>>5;
|
|
||||||
const unsigned int j1=1U<<(j&31);
|
|
||||||
if (floors[curFloor][j0]&j1) {
|
|
||||||
free=false;
|
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
}
|
isPaired=true;
|
||||||
if (free) break;
|
if ((unsigned int)pairCh<pairMin) pairMin=pairCh;
|
||||||
curFloor++;
|
if ((unsigned int)pairCh>pairMax) pairMax=pairCh;
|
||||||
}
|
|
||||||
if (curFloor<4) {
|
|
||||||
// occupy floor
|
|
||||||
floors[curFloor][pairMin>>5]|=1U<<(pairMin&31);
|
|
||||||
floors[curFloor][pairMax>>5]|=1U<<(pairMax&31);
|
|
||||||
}
|
|
||||||
|
|
||||||
pos=(patChanX[i+1]+patChanX[i])*0.5;
|
|
||||||
posCenter=pos;
|
|
||||||
posMin=pos;
|
|
||||||
posMax=pos;
|
|
||||||
numPairs++;
|
|
||||||
|
|
||||||
if (pairs.label==NULL) {
|
|
||||||
textSize=ImGui::CalcTextSize("???");
|
|
||||||
} else {
|
|
||||||
textSize=ImGui::CalcTextSize(pairs.label);
|
|
||||||
}
|
|
||||||
|
|
||||||
posY+=(textSize.y+ImGui::GetStyle().ItemSpacing.y)*curFloor;
|
|
||||||
|
|
||||||
tdl->AddLine(
|
|
||||||
ImVec2(pos,chanHeadBottom),
|
|
||||||
ImVec2(pos,posY+textSize.y),
|
|
||||||
ImGui::GetColorU32(uiColors[GUI_COLOR_PATTERN_PAIR]),
|
|
||||||
2.0f*dpiScale
|
|
||||||
);
|
|
||||||
|
|
||||||
for (int j=0; j<8; j++) {
|
|
||||||
if (pairs.pairs[j]==-1) continue;
|
|
||||||
int pairCh=e->dispatchFirstChan[i]+pairs.pairs[j];
|
|
||||||
if (!e->curSubSong->chanShow[pairCh]) {
|
|
||||||
continue;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
pos=(patChanX[pairCh+1]+patChanX[pairCh])*0.5;
|
if (!isPaired) continue;
|
||||||
posCenter+=pos;
|
|
||||||
|
float posY=chanHeadBottom;
|
||||||
|
|
||||||
|
// find a free floor
|
||||||
|
while (curFloor<4) {
|
||||||
|
bool free=true;
|
||||||
|
for (unsigned int j=pairMin; j<=pairMax; j++) {
|
||||||
|
const unsigned int j0=j>>5;
|
||||||
|
const unsigned int j1=1U<<(j&31);
|
||||||
|
if (floors[curFloor][j0]&j1) {
|
||||||
|
free=false;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (free) break;
|
||||||
|
curFloor++;
|
||||||
|
}
|
||||||
|
if (curFloor<4) {
|
||||||
|
// occupy floor
|
||||||
|
floors[curFloor][pairMin>>5]|=1U<<(pairMin&31);
|
||||||
|
floors[curFloor][pairMax>>5]|=1U<<(pairMax&31);
|
||||||
|
}
|
||||||
|
|
||||||
|
pos=(patChanX[i+1]+patChanX[i])*0.5;
|
||||||
|
posCenter=pos;
|
||||||
|
posMin=pos;
|
||||||
|
posMax=pos;
|
||||||
numPairs++;
|
numPairs++;
|
||||||
if (pos<posMin) posMin=pos;
|
|
||||||
if (pos>posMax) posMax=pos;
|
if (pair.label==NULL) {
|
||||||
|
textSize=ImGui::CalcTextSize("???");
|
||||||
|
} else {
|
||||||
|
textSize=ImGui::CalcTextSize(pair.label);
|
||||||
|
}
|
||||||
|
|
||||||
|
posY+=(textSize.y+ImGui::GetStyle().ItemSpacing.y)*curFloor;
|
||||||
|
|
||||||
tdl->AddLine(
|
tdl->AddLine(
|
||||||
ImVec2(pos,chanHeadBottom),
|
ImVec2(pos,chanHeadBottom),
|
||||||
ImVec2(pos,posY+textSize.y),
|
ImVec2(pos,posY+textSize.y),
|
||||||
ImGui::GetColorU32(uiColors[GUI_COLOR_PATTERN_PAIR]),
|
ImGui::GetColorU32(uiColors[GUI_COLOR_PATTERN_PAIR]),
|
||||||
2.0f*dpiScale
|
2.0f*dpiScale
|
||||||
);
|
);
|
||||||
}
|
|
||||||
|
|
||||||
posCenter/=numPairs;
|
for (int j=0; j<8; j++) {
|
||||||
|
if (pair.pairs[j]==-1) continue;
|
||||||
|
int pairCh=e->dispatchFirstChan[i]+pair.pairs[j];
|
||||||
|
if (!e->curSubSong->chanShow[pairCh]) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
if (pairs.label==NULL) {
|
pos=(patChanX[pairCh+1]+patChanX[pairCh])*0.5;
|
||||||
tdl->AddLine(
|
posCenter+=pos;
|
||||||
ImVec2(posMin,posY+textSize.y),
|
numPairs++;
|
||||||
ImVec2(posMax,posY+textSize.y),
|
if (pos<posMin) posMin=pos;
|
||||||
ImGui::GetColorU32(uiColors[GUI_COLOR_PATTERN_PAIR]),
|
if (pos>posMax) posMax=pos;
|
||||||
2.0f*dpiScale
|
tdl->AddLine(
|
||||||
);
|
ImVec2(pos,chanHeadBottom),
|
||||||
} else {
|
ImVec2(pos,posY+textSize.y),
|
||||||
tdl->AddLine(
|
ImGui::GetColorU32(uiColors[GUI_COLOR_PATTERN_PAIR]),
|
||||||
ImVec2(posMin,posY+textSize.y),
|
2.0f*dpiScale
|
||||||
ImVec2(posCenter-textSize.x*0.5-6.0f*dpiScale,posY+textSize.y),
|
);
|
||||||
ImGui::GetColorU32(uiColors[GUI_COLOR_PATTERN_PAIR]),
|
}
|
||||||
2.0f*dpiScale
|
|
||||||
);
|
|
||||||
tdl->AddLine(
|
|
||||||
ImVec2(posCenter+textSize.x*0.5+6.0f*dpiScale,posY+textSize.y),
|
|
||||||
ImVec2(posMax,posY+textSize.y),
|
|
||||||
ImGui::GetColorU32(uiColors[GUI_COLOR_PATTERN_PAIR]),
|
|
||||||
2.0f*dpiScale
|
|
||||||
);
|
|
||||||
|
|
||||||
delayedLabels.push_back(DelayedLabel(posCenter,posY,textSize,pairs.label));
|
posCenter/=numPairs;
|
||||||
|
|
||||||
|
if (pair.label==NULL) {
|
||||||
|
tdl->AddLine(
|
||||||
|
ImVec2(posMin,posY+textSize.y),
|
||||||
|
ImVec2(posMax,posY+textSize.y),
|
||||||
|
ImGui::GetColorU32(uiColors[GUI_COLOR_PATTERN_PAIR]),
|
||||||
|
2.0f*dpiScale
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
tdl->AddLine(
|
||||||
|
ImVec2(posMin,posY+textSize.y),
|
||||||
|
ImVec2(posCenter-textSize.x*0.5-6.0f*dpiScale,posY+textSize.y),
|
||||||
|
ImGui::GetColorU32(uiColors[GUI_COLOR_PATTERN_PAIR]),
|
||||||
|
2.0f*dpiScale
|
||||||
|
);
|
||||||
|
tdl->AddLine(
|
||||||
|
ImVec2(posCenter+textSize.x*0.5+6.0f*dpiScale,posY+textSize.y),
|
||||||
|
ImVec2(posMax,posY+textSize.y),
|
||||||
|
ImGui::GetColorU32(uiColors[GUI_COLOR_PATTERN_PAIR]),
|
||||||
|
2.0f*dpiScale
|
||||||
|
);
|
||||||
|
|
||||||
|
delayedLabels.push_back(DelayedLabel(posCenter,posY,textSize,pair.label));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -185,7 +185,7 @@ void PlotNoLerp(const char* label, const float* values, int values_count, int va
|
||||||
PlotNoLerpEx(ImGuiPlotType_Lines, label, &Plot_ArrayGetter, (void*)&data, values_count, values_offset, overlay_text, scale_min, scale_max, graph_size);
|
PlotNoLerpEx(ImGuiPlotType_Lines, label, &Plot_ArrayGetter, (void*)&data, values_count, values_offset, overlay_text, scale_min, scale_max, graph_size);
|
||||||
}
|
}
|
||||||
|
|
||||||
int PlotBitfieldEx(const char* label, int (*values_getter)(void* data, int idx), void* data, int values_count, int values_offset, const char** overlay_text, int bits, ImVec2 frame_size, const bool* values_highlight, ImVec4 highlightColor, ImVec4 color)
|
int PlotBitfieldEx(const char* label, int (*values_getter)(void* data, int idx), void* data, int values_count, int values_offset, const char** overlay_text, int bits, ImVec2 frame_size, const bool* values_highlight, ImVec4 highlightColor, ImVec4 color, std::string (*hoverFunc)(int,float,void*), void* hoverFuncUser)
|
||||||
{
|
{
|
||||||
ImGuiContext& g = *GImGui;
|
ImGuiContext& g = *GImGui;
|
||||||
ImGuiWindow* window = ImGui::GetCurrentWindow();
|
ImGuiWindow* window = ImGui::GetCurrentWindow();
|
||||||
|
|
@ -225,8 +225,18 @@ int PlotBitfieldEx(const char* label, int (*values_getter)(void* data, int idx),
|
||||||
const int v_idx = (int)(t * item_count);
|
const int v_idx = (int)(t * item_count);
|
||||||
IM_ASSERT(v_idx >= 0 && v_idx < values_count);
|
IM_ASSERT(v_idx >= 0 && v_idx < values_count);
|
||||||
|
|
||||||
//const float v0 = values_getter(data, (v_idx + values_offset) % values_count);
|
const float v0 = values_getter(data, (v_idx + values_offset) % values_count);
|
||||||
//ImGui::SetTooltip("%d: %8.4g", v_idx, v0);
|
//ImGui::SetTooltip("%d: %8.4g", v_idx, v0);
|
||||||
|
|
||||||
|
if (hoverFunc) {
|
||||||
|
std::string hoverText=hoverFunc(v_idx,v0,hoverFuncUser);
|
||||||
|
if (!hoverText.empty()) {
|
||||||
|
ImGui::SetTooltip("%s",hoverText.c_str());
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
ImGui::SetTooltip("%d: %d (%X)", v_idx, (int)v0, (int)v0);
|
||||||
|
}
|
||||||
|
|
||||||
idx_hovered = v_idx;
|
idx_hovered = v_idx;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -290,10 +300,10 @@ int PlotBitfieldEx(const char* label, int (*values_getter)(void* data, int idx),
|
||||||
return idx_hovered;
|
return idx_hovered;
|
||||||
}
|
}
|
||||||
|
|
||||||
void PlotBitfield(const char* label, const int* values, int values_count, int values_offset, const char** overlay_text, int bits, ImVec2 graph_size, int stride, const bool* values_highlight, ImVec4 highlightColor, ImVec4 color)
|
void PlotBitfield(const char* label, const int* values, int values_count, int values_offset, const char** overlay_text, int bits, ImVec2 graph_size, int stride, const bool* values_highlight, ImVec4 highlightColor, ImVec4 color, std::string (*hoverFunc)(int,float,void*), void* hoverFuncUser)
|
||||||
{
|
{
|
||||||
FurnacePlotIntArrayGetterData data(values, stride);
|
FurnacePlotIntArrayGetterData data(values, stride);
|
||||||
PlotBitfieldEx(label, &Plot_IntArrayGetter, (void*)&data, values_count, values_offset, overlay_text, bits, graph_size, values_highlight, highlightColor, color);
|
PlotBitfieldEx(label, &Plot_IntArrayGetter, (void*)&data, values_count, values_offset, overlay_text, bits, graph_size, values_highlight, highlightColor, color, hoverFunc, hoverFuncUser);
|
||||||
}
|
}
|
||||||
|
|
||||||
int PlotCustomEx(ImGuiPlotType plot_type, const char* label, float (*values_getter)(void* data, int idx), void* data, int values_count, int values_display_offset, const char* overlay_text, float scale_min, float scale_max, ImVec2 frame_size, ImVec4 color, int highlight, std::string (*hoverFunc)(int,float,void*), void* hoverFuncUser, bool blockMode, std::string (*guideFunc)(float), const bool* values_highlight, ImVec4 highlightColor)
|
int PlotCustomEx(ImGuiPlotType plot_type, const char* label, float (*values_getter)(void* data, int idx), void* data, int values_count, int values_display_offset, const char* overlay_text, float scale_min, float scale_max, ImVec2 frame_size, ImVec4 color, int highlight, std::string (*hoverFunc)(int,float,void*), void* hoverFuncUser, bool blockMode, std::string (*guideFunc)(float), const bool* values_highlight, ImVec4 highlightColor)
|
||||||
|
|
|
||||||
|
|
@ -21,5 +21,5 @@
|
||||||
#include "../pch.h"
|
#include "../pch.h"
|
||||||
|
|
||||||
void PlotNoLerp(const char* label, const float* values, int values_count, int values_offset = 0, const char* overlay_text = NULL, float scale_min = FLT_MAX, float scale_max = FLT_MAX, ImVec2 graph_size = ImVec2(0, 0), int stride = sizeof(float));
|
void PlotNoLerp(const char* label, const float* values, int values_count, int values_offset = 0, const char* overlay_text = NULL, float scale_min = FLT_MAX, float scale_max = FLT_MAX, ImVec2 graph_size = ImVec2(0, 0), int stride = sizeof(float));
|
||||||
void PlotBitfield(const char* label, const int* values, int values_count, int values_offset = 0, const char** overlay_text = NULL, int bits = 8, ImVec2 graph_size = ImVec2(0, 0), int stride = sizeof(float), const bool* values_highlight = NULL, ImVec4 highlightColor = ImVec4(1.0f,1.0f,1.0f,1.0f), ImVec4 color = ImVec4(1.0f,1.0f,1.0f,1.0f));
|
void PlotBitfield(const char* label, const int* values, int values_count, int values_offset = 0, const char** overlay_text = NULL, int bits = 8, ImVec2 graph_size = ImVec2(0, 0), int stride = sizeof(float), const bool* values_highlight = NULL, ImVec4 highlightColor = ImVec4(1.0f,1.0f,1.0f,1.0f), ImVec4 color = ImVec4(1.0f,1.0f,1.0f,1.0f), std::string (*hoverFunc)(int,float,void*) = NULL, void* hoverFuncUser = NULL);
|
||||||
void PlotCustom(const char* label, const float* values, int values_count, int values_offset = 0, const char* overlay_text = NULL, float scale_min = FLT_MAX, float scale_max = FLT_MAX, ImVec2 graph_size = ImVec2(0, 0), int stride = sizeof(float), ImVec4 fgColor = ImVec4(1.0f,1.0f,1.0f,1.0f), int highlight = 0, std::string (*hoverFunc)(int,float,void*) = NULL, void* hoverFuncUser=NULL, bool blockMode=false, std::string (*guideFunc)(float) = NULL, const bool* values_highlight = NULL, ImVec4 highlightColor = ImVec4(1.0f,1.0f,1.0f,1.0f));
|
void PlotCustom(const char* label, const float* values, int values_count, int values_offset = 0, const char* overlay_text = NULL, float scale_min = FLT_MAX, float scale_max = FLT_MAX, ImVec2 graph_size = ImVec2(0, 0), int stride = sizeof(float), ImVec4 fgColor = ImVec4(1.0f,1.0f,1.0f,1.0f), int highlight = 0, std::string (*hoverFunc)(int,float,void*) = NULL, void* hoverFuncUser=NULL, bool blockMode=false, std::string (*guideFunc)(float) = NULL, const bool* values_highlight = NULL, ImVec4 highlightColor = ImVec4(1.0f,1.0f,1.0f,1.0f));
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load diff
|
|
@ -83,7 +83,7 @@ const char* locales[][3]={
|
||||||
//{"Nederlands (4%)", "nl_NL", "start Furnace opnieuw op om deze instelling effectief te maken."},
|
//{"Nederlands (4%)", "nl_NL", "start Furnace opnieuw op om deze instelling effectief te maken."},
|
||||||
{"Polski (95%)", "pl_PL", "aby to ustawienie było skuteczne, należy ponownie uruchomić program."},
|
{"Polski (95%)", "pl_PL", "aby to ustawienie było skuteczne, należy ponownie uruchomić program."},
|
||||||
{"Português (Brasil) (90%)", "pt_BR", "reinicie o Furnace para que essa configuração entre em vigor."},
|
{"Português (Brasil) (90%)", "pt_BR", "reinicie o Furnace para que essa configuração entre em vigor."},
|
||||||
{"Русский (90%)", "ru_RU", "перезапустите программу, чтобы эта настройка вступила в силу."},
|
{"Русский", "ru_RU", "перезапустите программу, чтобы эта настройка вступила в силу."},
|
||||||
{"Slovenčina (15%)", "sk_SK", "???"},
|
{"Slovenčina (15%)", "sk_SK", "???"},
|
||||||
{"Svenska", "sv_SE", "starta om programmet för att denna inställning ska träda i kraft."},
|
{"Svenska", "sv_SE", "starta om programmet för att denna inställning ska träda i kraft."},
|
||||||
//{"ไทย (0%)", "th_TH", "???"},
|
//{"ไทย (0%)", "th_TH", "???"},
|
||||||
|
|
@ -4167,6 +4167,7 @@ void FurnaceGUI::drawSettings() {
|
||||||
UI_COLOR_CONFIG(GUI_COLOR_INSTR_SID2,_("SID2"));
|
UI_COLOR_CONFIG(GUI_COLOR_INSTR_SID2,_("SID2"));
|
||||||
UI_COLOR_CONFIG(GUI_COLOR_INSTR_SUPERVISION,_("Supervision"));
|
UI_COLOR_CONFIG(GUI_COLOR_INSTR_SUPERVISION,_("Supervision"));
|
||||||
UI_COLOR_CONFIG(GUI_COLOR_INSTR_UPD1771C,_("μPD1771C"));
|
UI_COLOR_CONFIG(GUI_COLOR_INSTR_UPD1771C,_("μPD1771C"));
|
||||||
|
UI_COLOR_CONFIG(GUI_COLOR_INSTR_SID3,_("SID3"));
|
||||||
UI_COLOR_CONFIG(GUI_COLOR_INSTR_UNKNOWN,_("Other/Unknown"));
|
UI_COLOR_CONFIG(GUI_COLOR_INSTR_UNKNOWN,_("Other/Unknown"));
|
||||||
ImGui::TreePop();
|
ImGui::TreePop();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -2619,6 +2619,28 @@ bool FurnaceGUI::drawSysConf(int chan, int sysPos, DivSystem type, DivConfig& fl
|
||||||
supportsCustomRate=false;
|
supportsCustomRate=false;
|
||||||
ImGui::Text(_("nothing to configure"));
|
ImGui::Text(_("nothing to configure"));
|
||||||
break;
|
break;
|
||||||
|
case DIV_SYSTEM_SID3: {
|
||||||
|
bool quarterClock=flags.getBool("quarterClock",false);
|
||||||
|
if (ImGui::Checkbox(_("Quarter clock speed"),&quarterClock)) {
|
||||||
|
altered=true;
|
||||||
|
}
|
||||||
|
if (ImGui::IsItemHovered()) {
|
||||||
|
ImGui::SetTooltip(_("Decreases clock speed and CPU audio load by 4 times.\nCan be used if your CPU is too slow for the chip."
|
||||||
|
"\nDoes not affect clock speed during export!\n\n"
|
||||||
|
|
||||||
|
"Warning! Filters may become unstable at high cutoff and resonance\nif this option or lower clock speed are used!\n"
|
||||||
|
"Also filters' timbre may be different near these values.\n\n"
|
||||||
|
|
||||||
|
"Default clock speed is 1MHz (1000000Hz)."));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (altered) {
|
||||||
|
e->lockSave([&]() {
|
||||||
|
flags.set("quarterClock",(int)quarterClock);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
default: {
|
default: {
|
||||||
bool sysPal=flags.getInt("clockSel",0);
|
bool sysPal=flags.getInt("clockSel",0);
|
||||||
|
|
||||||
|
|
|
||||||
106
src/gui/util.cpp
106
src/gui/util.cpp
|
|
@ -112,3 +112,109 @@ String getKeyName(int key, bool emptyNone) {
|
||||||
}
|
}
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
double sinus(double x) {
|
||||||
|
return sin(x);
|
||||||
|
}
|
||||||
|
double rectSin(double x) {
|
||||||
|
return sin(x) > 0 ? sin(x) : 0;
|
||||||
|
}
|
||||||
|
double absSin(double x) {
|
||||||
|
return fabs(sin(x));
|
||||||
|
}
|
||||||
|
|
||||||
|
double square(double x) {
|
||||||
|
return fmod(x, (2 * M_PI)) >= M_PI ? -1 : 1;
|
||||||
|
}
|
||||||
|
double rectSquare(double x) {
|
||||||
|
return square(x) > 0 ? square(x) : 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
double quartSin(double x) {
|
||||||
|
return absSin(x) * rectSquare(2 * x);
|
||||||
|
}
|
||||||
|
double squiSin(double x) {
|
||||||
|
return sin(x) >= 0 ? sin(2 * x) : 0;
|
||||||
|
}
|
||||||
|
double squiAbsSin(double x) {
|
||||||
|
return fabs(squiSin(x));
|
||||||
|
}
|
||||||
|
|
||||||
|
double saw(double x) {
|
||||||
|
return atan(tan(x / 2)) / (M_PI / 2);
|
||||||
|
}
|
||||||
|
double rectSaw(double x) {
|
||||||
|
return saw(x) > 0 ? saw(x) : 0;
|
||||||
|
}
|
||||||
|
double absSaw(double x) {
|
||||||
|
return saw(x) < 0 ? saw(x) + 1 : saw(x);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
double cubSaw(double x) {
|
||||||
|
return pow(saw(x), 3);
|
||||||
|
}
|
||||||
|
double rectCubSaw(double x) {
|
||||||
|
return pow(rectSaw(x), 3);
|
||||||
|
}
|
||||||
|
double absCubSaw(double x) {
|
||||||
|
return pow(absSaw(x), 3);
|
||||||
|
}
|
||||||
|
|
||||||
|
double cubSine(double x) {
|
||||||
|
return pow(sin(x), 3);
|
||||||
|
}
|
||||||
|
double rectCubSin(double x) {
|
||||||
|
return pow(rectSin(x), 3);
|
||||||
|
}
|
||||||
|
double absCubSin(double x) {
|
||||||
|
return pow(absSin(x), 3);
|
||||||
|
}
|
||||||
|
double quartCubSin(double x) {
|
||||||
|
return pow(quartSin(x), 3);
|
||||||
|
}
|
||||||
|
double squishCubSin(double x) {
|
||||||
|
return pow(squiSin(x), 3);
|
||||||
|
}
|
||||||
|
double squishAbsCubSin(double x) {
|
||||||
|
return pow(squiAbsSin(x), 3);
|
||||||
|
}
|
||||||
|
|
||||||
|
double triangle(double x) {
|
||||||
|
return asin(sin(x)) / (M_PI / 2);
|
||||||
|
}
|
||||||
|
double rectTri(double x) {
|
||||||
|
return triangle(x) > 0 ? triangle(x) : 0;
|
||||||
|
}
|
||||||
|
double absTri(double x) {
|
||||||
|
return fabs(triangle(x));
|
||||||
|
}
|
||||||
|
double quartTri(double x) {
|
||||||
|
return absTri(x) * rectSquare(2 * x);
|
||||||
|
}
|
||||||
|
double squiTri(double x) {
|
||||||
|
return sin(x) >= 0 ? triangle(2 * x) : 0;
|
||||||
|
}
|
||||||
|
double absSquiTri(double x) {
|
||||||
|
return fabs(squiTri(x));
|
||||||
|
}
|
||||||
|
|
||||||
|
double cubTriangle(double x) {
|
||||||
|
return pow(triangle(x), 3);
|
||||||
|
}
|
||||||
|
double cubRectTri(double x) {
|
||||||
|
return pow(rectTri(x), 3);
|
||||||
|
}
|
||||||
|
double cubAbsTri(double x) {
|
||||||
|
return pow(absTri(x), 3);
|
||||||
|
}
|
||||||
|
double cubQuartTri(double x) {
|
||||||
|
return pow(quartTri(x), 3);
|
||||||
|
}
|
||||||
|
double cubSquiTri(double x) {
|
||||||
|
return pow(squiTri(x), 3);
|
||||||
|
}
|
||||||
|
double absCubSquiTri(double x) {
|
||||||
|
return fabs(cubSquiTri(x));
|
||||||
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -31,3 +31,36 @@
|
||||||
|
|
||||||
String getHomeDir();
|
String getHomeDir();
|
||||||
String getKeyName(int key, bool emptyNone=false);
|
String getKeyName(int key, bool emptyNone=false);
|
||||||
|
|
||||||
|
double sinus(double x);
|
||||||
|
double rectSin(double x);
|
||||||
|
double absSin(double x);
|
||||||
|
double square(double x);
|
||||||
|
double rectSquare(double x);
|
||||||
|
double quartSin(double x);
|
||||||
|
double squiSin(double x);
|
||||||
|
double squiAbsSin(double x);
|
||||||
|
double saw(double x);
|
||||||
|
double rectSaw(double x);
|
||||||
|
double absSaw(double x);
|
||||||
|
double cubSaw(double x);
|
||||||
|
double rectCubSaw(double x);
|
||||||
|
double absCubSaw(double x);
|
||||||
|
double cubSine(double x);
|
||||||
|
double rectCubSin(double x);
|
||||||
|
double absCubSin(double x);
|
||||||
|
double quartCubSin(double x);
|
||||||
|
double squishCubSin(double x);
|
||||||
|
double squishAbsCubSin(double x);
|
||||||
|
double triangle(double x);
|
||||||
|
double rectTri(double x);
|
||||||
|
double absTri(double x);
|
||||||
|
double quartTri(double x);
|
||||||
|
double squiTri(double x);
|
||||||
|
double absSquiTri(double x);
|
||||||
|
double cubTriangle(double x);
|
||||||
|
double cubRectTri(double x);
|
||||||
|
double cubAbsTri(double x);
|
||||||
|
double cubQuartTri(double x);
|
||||||
|
double cubSquiTri(double x);
|
||||||
|
double absCubSquiTri(double x);
|
||||||
|
|
@ -19,6 +19,7 @@
|
||||||
|
|
||||||
#define _USE_MATH_DEFINES
|
#define _USE_MATH_DEFINES
|
||||||
#include "gui.h"
|
#include "gui.h"
|
||||||
|
#include "util.h"
|
||||||
#include "plot_nolerp.h"
|
#include "plot_nolerp.h"
|
||||||
#include "IconsFontAwesome4.h"
|
#include "IconsFontAwesome4.h"
|
||||||
#include "misc/cpp/imgui_stdlib.h"
|
#include "misc/cpp/imgui_stdlib.h"
|
||||||
|
|
@ -40,111 +41,6 @@ const char* waveInterpolations[4]={
|
||||||
_N("Cubic")
|
_N("Cubic")
|
||||||
};
|
};
|
||||||
|
|
||||||
double sinus(double x) {
|
|
||||||
return sin(x);
|
|
||||||
}
|
|
||||||
double rectSin(double x) {
|
|
||||||
return sin(x) > 0 ? sin(x) : 0;
|
|
||||||
}
|
|
||||||
double absSin(double x) {
|
|
||||||
return fabs(sin(x));
|
|
||||||
}
|
|
||||||
|
|
||||||
double square(double x) {
|
|
||||||
return fmod(x, (2 * M_PI)) >= M_PI ? -1 : 1;
|
|
||||||
}
|
|
||||||
double rectSquare(double x) {
|
|
||||||
return square(x) > 0 ? square(x) : 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
double quartSin(double x) {
|
|
||||||
return absSin(x) * rectSquare(2 * x);
|
|
||||||
}
|
|
||||||
double squiSin(double x) {
|
|
||||||
return sin(x) >= 0 ? sin(2 * x) : 0;
|
|
||||||
}
|
|
||||||
double squiAbsSin(double x) {
|
|
||||||
return fabs(squiSin(x));
|
|
||||||
}
|
|
||||||
|
|
||||||
double saw(double x) {
|
|
||||||
return atan(tan(x / 2)) / (M_PI / 2);
|
|
||||||
}
|
|
||||||
double rectSaw(double x) {
|
|
||||||
return saw(x) > 0 ? saw(x) : 0;
|
|
||||||
}
|
|
||||||
double absSaw(double x) {
|
|
||||||
return saw(x) < 0 ? saw(x) + 1 : saw(x);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
double cubSaw(double x) {
|
|
||||||
return pow(saw(x), 3);
|
|
||||||
}
|
|
||||||
double rectCubSaw(double x) {
|
|
||||||
return pow(rectSaw(x), 3);
|
|
||||||
}
|
|
||||||
double absCubSaw(double x) {
|
|
||||||
return pow(absSaw(x), 3);
|
|
||||||
}
|
|
||||||
|
|
||||||
double cubSine(double x) {
|
|
||||||
return pow(sin(x), 3);
|
|
||||||
}
|
|
||||||
double rectCubSin(double x) {
|
|
||||||
return pow(rectSin(x), 3);
|
|
||||||
}
|
|
||||||
double absCubSin(double x) {
|
|
||||||
return pow(absSin(x), 3);
|
|
||||||
}
|
|
||||||
double quartCubSin(double x) {
|
|
||||||
return pow(quartSin(x), 3);
|
|
||||||
}
|
|
||||||
double squishCubSin(double x) {
|
|
||||||
return pow(squiSin(x), 3);
|
|
||||||
}
|
|
||||||
double squishAbsCubSin(double x) {
|
|
||||||
return pow(squiAbsSin(x), 3);
|
|
||||||
}
|
|
||||||
|
|
||||||
double triangle(double x) {
|
|
||||||
return asin(sin(x)) / (M_PI / 2);
|
|
||||||
}
|
|
||||||
double rectTri(double x) {
|
|
||||||
return triangle(x) > 0 ? triangle(x) : 0;
|
|
||||||
}
|
|
||||||
double absTri(double x) {
|
|
||||||
return fabs(triangle(x));
|
|
||||||
}
|
|
||||||
double quartTri(double x) {
|
|
||||||
return absTri(x) * rectSquare(2 * x);
|
|
||||||
}
|
|
||||||
double squiTri(double x) {
|
|
||||||
return sin(x) >= 0 ? triangle(2 * x) : 0;
|
|
||||||
}
|
|
||||||
double absSquiTri(double x) {
|
|
||||||
return fabs(squiTri(x));
|
|
||||||
}
|
|
||||||
|
|
||||||
double cubTriangle(double x) {
|
|
||||||
return pow(triangle(x), 3);
|
|
||||||
}
|
|
||||||
double cubRectTri(double x) {
|
|
||||||
return pow(rectTri(x), 3);
|
|
||||||
}
|
|
||||||
double cubAbsTri(double x) {
|
|
||||||
return pow(absTri(x), 3);
|
|
||||||
}
|
|
||||||
double cubQuartTri(double x) {
|
|
||||||
return pow(quartTri(x), 3);
|
|
||||||
}
|
|
||||||
double cubSquiTri(double x) {
|
|
||||||
return pow(squiTri(x), 3);
|
|
||||||
}
|
|
||||||
double absCubSquiTri(double x) {
|
|
||||||
return fabs(cubSquiTri(x));
|
|
||||||
}
|
|
||||||
|
|
||||||
typedef double (*WaveFunc) (double a);
|
typedef double (*WaveFunc) (double a);
|
||||||
|
|
||||||
WaveFunc waveFuncs[]={
|
WaveFunc waveFuncs[]={
|
||||||
|
|
@ -495,7 +391,7 @@ void FurnaceGUI::drawWaveEdit() {
|
||||||
ImGui::TableNextColumn();
|
ImGui::TableNextColumn();
|
||||||
ImGui::Text(_("Width"));
|
ImGui::Text(_("Width"));
|
||||||
if (ImGui::IsItemHovered()) {
|
if (ImGui::IsItemHovered()) {
|
||||||
ImGui::SetTooltip(_("use a width of:\n- any on Amiga/N163\n- 32 on Game Boy, PC Engine, SCC, Konami Bubble System, Namco WSG, Virtual Boy and WonderSwan\n- 64 on FDS\n- 128 on X1-010\nany other widths will be scaled during playback."));
|
ImGui::SetTooltip(_("use a width of:\n- any on Amiga/N163\n- 32 on Game Boy, PC Engine, SCC, Konami Bubble System, Namco WSG, Virtual Boy and WonderSwan\n- 64 on FDS\n- 128 on X1-010\n- 256 on SID3\nany other widths will be scaled during playback."));
|
||||||
}
|
}
|
||||||
ImGui::SameLine();
|
ImGui::SameLine();
|
||||||
ImGui::SetNextItemWidth(96.0f*dpiScale);
|
ImGui::SetNextItemWidth(96.0f*dpiScale);
|
||||||
|
|
@ -509,7 +405,7 @@ void FurnaceGUI::drawWaveEdit() {
|
||||||
ImGui::SameLine();
|
ImGui::SameLine();
|
||||||
ImGui::Text(_("Height"));
|
ImGui::Text(_("Height"));
|
||||||
if (ImGui::IsItemHovered()) {
|
if (ImGui::IsItemHovered()) {
|
||||||
ImGui::SetTooltip(_("use a height of:\n- 16 for Game Boy, WonderSwan, Namco WSG, Konami Bubble System, X1-010 Envelope shape and N163\n- 32 for PC Engine\n- 64 for FDS and Virtual Boy\n- 256 for X1-010 and SCC\nany other heights will be scaled during playback."));
|
ImGui::SetTooltip(_("use a height of:\n- 16 for Game Boy, WonderSwan, Namco WSG, Konami Bubble System, X1-010 Envelope shape and N163\n- 32 for PC Engine\n- 64 for FDS and Virtual Boy\n- 256 for X1-010, SCC and SID3\nany other heights will be scaled during playback."));
|
||||||
}
|
}
|
||||||
ImGui::SameLine();
|
ImGui::SameLine();
|
||||||
ImGui::SetNextItemWidth(96.0f*dpiScale);
|
ImGui::SetNextItemWidth(96.0f*dpiScale);
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
// not auto-generated. update every time you change icons.ttf!
|
// not auto-generated. update every time you change icons.ttf!
|
||||||
|
|
||||||
#define ICON_MIN_FUR 0xe0f0
|
#define ICON_MIN_FUR 0xe0f0
|
||||||
#define ICON_MAX_FUR 0xe161
|
#define ICON_MAX_FUR 0xe164
|
||||||
|
|
||||||
// test
|
// test
|
||||||
#define ICON_FUR_TEST0 u8"\ue0f0"
|
#define ICON_FUR_TEST0 u8"\ue0f0"
|
||||||
|
|
@ -77,6 +77,7 @@
|
||||||
#define ICON_FUR_INS_SID2 u8"\ue161"
|
#define ICON_FUR_INS_SID2 u8"\ue161"
|
||||||
#define ICON_FUR_INS_SUPERVISION u8"\ue162"
|
#define ICON_FUR_INS_SUPERVISION u8"\ue162"
|
||||||
#define ICON_FUR_INS_UPD1771C u8"\ue163"
|
#define ICON_FUR_INS_UPD1771C u8"\ue163"
|
||||||
|
#define ICON_FUR_INS_SID3 u8"\ue164"
|
||||||
|
|
||||||
// sample editor
|
// sample editor
|
||||||
#define ICON_FUR_SAMPLE_APPLY_SILENCE u8"\ue136"
|
#define ICON_FUR_SAMPLE_APPLY_SILENCE u8"\ue136"
|
||||||
|
|
|
||||||
|
|
@ -339,6 +339,8 @@ TAParamResult pVersion(String) {
|
||||||
printf("- PowerNoise emulator by scratchminer (MIT)\n");
|
printf("- PowerNoise emulator by scratchminer (MIT)\n");
|
||||||
printf("- ep128emu by Istvan Varga (GPLv2)\n");
|
printf("- ep128emu by Istvan Varga (GPLv2)\n");
|
||||||
printf("- NDS sound emulator by cam900 (zlib license)\n");
|
printf("- NDS sound emulator by cam900 (zlib license)\n");
|
||||||
|
printf("- SID2 emulator by LTVA (GPLv2, modification of reSID emulator)\n");
|
||||||
|
printf("- SID3 emulator by LTVA (MIT)\n");
|
||||||
printf("- openMSX YMF278 emulator (modified version) by the openMSX developers (GPLv2)\n");
|
printf("- openMSX YMF278 emulator (modified version) by the openMSX developers (GPLv2)\n");
|
||||||
return TA_PARAM_QUIT;
|
return TA_PARAM_QUIT;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue