etc/furnace
0
0
Fork 0
mirror of https://github.com/tildearrow/furnace.git synced 2024-11-30 08:23:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

add stop song effect! finally!

Browse source
This commit is contained in:
tildearrow 2022-02-17 03:15:51 -05:00
parent 09144b95f9
commit bacf57bb65
3 changed files with 24 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/engine/engine.cpp
View file

@ -1458,7 +1458,7 @@ const char* DivEngine::getEffectDesc(unsigned char effect, int chan) {
case 0xef: case 0xef:
return "EFxx: Set global tuning (quirky!)"; return "EFxx: Set global tuning (quirky!)";
case 0xff: case 0xff:
return "FFxx: Stop song (not implemented yet)"; return "FFxx: Stop song";
default: default:
if (chan>=0 && chan<chans) { if (chan>=0 && chan<chans) {
const char* ret=disCont[dispatchOfChan[chan]].dispatch->getEffectName(effect); const char* ret=disCont[dispatchOfChan[chan]].dispatch->getEffectName(effect);

10
src/engine/playback.cpp
View file

@ -738,7 +738,15 @@ void DivEngine::processRow(int i, bool afterDelay) {
case 0xef: // global pitch case 0xef: // global pitch
globalPitch+=(signed char)(effectVal-0x80); globalPitch+=(signed char)(effectVal-0x80);
break; break;
case 0xff: // stop song TODO case 0xff: // stop song
freelance=false;
playing=false;
extValuePresent=false;
stepPlay=0;
remainingLoops=-1;
sPreview.sample=-1;
sPreview.wave=-1;
sPreview.pos=0;
break; break;
} }
} }

19
src/gui/gui.cpp
View file

@ -3575,9 +3575,12 @@ void FurnaceGUI::drawPattern() {
if (i.cmd==DIV_CMD_PITCH) continue; if (i.cmd==DIV_CMD_PITCH) continue;
if (i.cmd==DIV_CMD_NOTE_PORTA) continue; if (i.cmd==DIV_CMD_NOTE_PORTA) continue;
//if (i.cmd==DIV_CMD_NOTE_ON) continue; //if (i.cmd==DIV_CMD_NOTE_ON) continue;
if (i.cmd==DIV_CMD_PRE_PORTA) continue;
if (i.cmd==DIV_CMD_PRE_NOTE) continue; if (i.cmd==DIV_CMD_PRE_NOTE) continue;
if (i.cmd==DIV_CMD_INSTRUMENT) continue; if (i.cmd==DIV_CMD_INSTRUMENT) continue;
if (i.cmd==DIV_CMD_SAMPLE_BANK) continue; if (i.cmd==DIV_CMD_SAMPLE_BANK) continue;
if (i.cmd==DIV_CMD_GET_VOLUME) continue;
if (i.cmd==DIV_ALWAYS_SET_VOLUME) continue;
float width=patChanX[i.chan+1]-patChanX[i.chan]; float width=patChanX[i.chan+1]-patChanX[i.chan];
float speedX=0.0f; float speedX=0.0f;
@ -3613,12 +3616,16 @@ void FurnaceGUI::drawPattern() {
life=24.0f; life=24.0f;
lifeSpeed=4.0f; lifeSpeed=4.0f;
break; break;
case DIV_CMD_VOLUME: case DIV_CMD_VOLUME: {
speedY=-18.0f-(10.0f*((float)i.value/(float)e->getMaxVolumeChan(i.chan))); float scaledVol=(float)i.value/(float)e->getMaxVolumeChan(i.chan);
if (scaledVol>1.0f) scaledVol=1.0f;
speedY=-18.0f-(10.0f*scaledVol);
life=128+scaledVol*127;
partIcon=ICON_FA_VOLUME_UP; partIcon=ICON_FA_VOLUME_UP;
num=12.0f*((float)i.value/(float)e->getMaxVolumeChan(i.chan)); num=12.0f*pow(scaledVol,2.0);
color=volGrad; color=volGrad;
break; break;
}
case DIV_CMD_PANNING: { case DIV_CMD_PANNING: {
if (i.value==0) { if (i.value==0) {
num=0; num=0;
@ -3653,6 +3660,7 @@ void FurnaceGUI::drawPattern() {
num=10+pow(i.value,0.6); num=10+pow(i.value,0.6);
break; break;
default: default:
//printf("unhandled %d\n",i.cmd);
color=sysCmd1Grad; color=sysCmd1Grad;
break; break;
} }
@ -3663,8 +3671,8 @@ void FurnaceGUI::drawPattern() {
partIcon, partIcon,
off.x+patChanX[i.chan]+fmod(rand(),width), off.x+patChanX[i.chan]+fmod(rand(),width),
off.y+(ImGui::GetWindowHeight()*0.5f)+randRange(0,patFont->FontSize), off.y+(ImGui::GetWindowHeight()*0.5f)+randRange(0,patFont->FontSize),
speedX+randRange(-spread,spread), (speedX+randRange(-spread,spread))*0.5*dpiScale,
speedY+randRange(-spread,spread), (speedY+randRange(-spread,spread))*0.5*dpiScale,
grav, grav,
frict, frict,
life-randRange(0,8), life-randRange(0,8),
@ -3736,6 +3744,7 @@ void FurnaceGUI::drawPattern() {
for (size_t i=0; i<particles.size(); i++) { for (size_t i=0; i<particles.size(); i++) {
Particle& part=particles[i]; Particle& part=particles[i];
if (part.update()) { if (part.update()) {
if (part.life>255) part.life=255;
fdl->AddText( fdl->AddText(
iconFont, iconFont,
iconFont->FontSize, iconFont->FontSize,