prepare for 0.6.2

tildearrow · Apr 1, 2024 · 90c6286 · 90c6286
1 parent 90859be
commit 90c6286
Show file tree

Hide file tree

Showing 28 changed files with 4,946 additions and 46 deletions.
diff --git a/demos/misc/combat_vehicle_pokey.fur b/demos/misc/combat_vehicle_pokey.fur
diff --git a/extern/imgui_patched/backends/imgui_impl_sdlrenderer2.cpp b/extern/imgui_patched/backends/imgui_impl_sdlrenderer2.cpp
@@ -190,7 +190,6 @@ void ImGui_ImplSDLRenderer2_RenderDrawData(ImDrawData* draw_data)
 
                 // Bind texture, Draw
 				SDL_Texture* tex = (SDL_Texture*)pcmd->GetTexID();
-                SDL_SetTextureScaleMode(tex, SDL_ScaleModeBest); // ???
                 SDL_RenderGeometryRaw(bd->SDLRenderer, tex,
                     xy, (int)sizeof(ImDrawVert),
                     color, (int)sizeof(ImDrawVert),

diff --git a/extern/opn/ym3438.c b/extern/opn/ym3438.c
@@ -39,6 +39,42 @@ enum {
     eg_num_release = 3
 };
 
+/* msw table */
+static const Bit16u mswrom[256] = {
+    0x600, 0x600, 0x600, 0x600, 0x600, 0x600, 0x600, 0x600,
+    0x600, 0x600, 0x600, 0x600, 0x600, 0x600, 0x600, 0x600,
+    0x600, 0x600, 0x600, 0x600, 0x600, 0x600, 0x600, 0x600,
+    0x600, 0x600, 0x600, 0x600, 0x600, 0x600, 0x600, 0x600,
+    0x600, 0x600, 0x600, 0x600, 0x600, 0x600, 0x600, 0x600,
+    0x600, 0x600, 0x600, 0x600, 0x600, 0x600, 0x600, 0x600,
+    0x600, 0x600, 0x600, 0x600, 0x600, 0x600, 0x600, 0x600,
+    0x600, 0x600, 0x600, 0x600, 0x600, 0x600, 0x600, 0x600,
+    0x600, 0x600, 0x600, 0x600, 0x600, 0x600, 0x600, 0x600,
+    0x600, 0x600, 0x600, 0x600, 0x600, 0x600, 0x600, 0x600,
+    0x600, 0x600, 0x600, 0x600, 0x600, 0x600, 0x600, 0x600,
+    0x600, 0x600, 0x600, 0x600, 0x600, 0x600, 0x600, 0x600,
+    0x600, 0x600, 0x600, 0x600, 0x600, 0x600, 0x600, 0x600,
+    0x600, 0x600, 0x600, 0x600, 0x600, 0x600, 0x600, 0x600,
+    0x600, 0x600, 0x600, 0x600, 0x600, 0x600, 0x600, 0x600,
+    0x600, 0x600, 0x600, 0x600, 0x600, 0x600, 0x600, 0x600,
+    0x000, 0x000, 0x000, 0x000, 0x000, 0x000, 0x000, 0x000,
+    0x000, 0x000, 0x000, 0x000, 0x000, 0x000, 0x000, 0x000,
+    0x000, 0x000, 0x000, 0x000, 0x000, 0x000, 0x000, 0x000,
+    0x000, 0x000, 0x000, 0x000, 0x000, 0x000, 0x000, 0x000,
+    0x000, 0x000, 0x000, 0x000, 0x000, 0x000, 0x000, 0x000,
+    0x000, 0x000, 0x000, 0x000, 0x000, 0x000, 0x000, 0x000,
+    0x000, 0x000, 0x000, 0x000, 0x000, 0x000, 0x000, 0x000,
+    0x000, 0x000, 0x000, 0x000, 0x000, 0x000, 0x000, 0x000,
+    0x000, 0x000, 0x000, 0x000, 0x000, 0x000, 0x000, 0x000,
+    0x000, 0x000, 0x000, 0x000, 0x000, 0x000, 0x000, 0x000,
+    0x000, 0x000, 0x000, 0x000, 0x000, 0x000, 0x000, 0x000,
+    0x000, 0x000, 0x000, 0x000, 0x000, 0x000, 0x000, 0x000,
+    0x000, 0x000, 0x000, 0x000, 0x000, 0x000, 0x000, 0x000,
+    0x000, 0x000, 0x000, 0x000, 0x000, 0x000, 0x000, 0x000,
+    0x000, 0x000, 0x000, 0x000, 0x000, 0x000, 0x000, 0x000,
+    0x000, 0x000, 0x000, 0x000, 0x000, 0x000, 0x000, 0x000
+};
+
 /* logsin table */
 static const Bit16u logsinrom[256] = {
     0x859, 0x6c3, 0x607, 0x58b, 0x52e, 0x4e4, 0x4a6, 0x471,
@@ -1052,7 +1088,7 @@ static void OPN2_FMGenerate(ym3438_t *chip)
     {
         quarter = phase & 0xff;
     }
-    level = logsinrom[quarter];
+    level = chip->msw ? mswrom[quarter] : logsinrom[quarter];
     /* Apply envelope */
     level += chip->eg_out[slot] << 2;
     /* Transform */
@@ -1198,6 +1234,7 @@ void OPN2_Reset(ym3438_t *chip)
     Bit32u i;
     memset(chip, 0, sizeof(ym3438_t));
     chip->chip_type = ym3438_mode_readmode;
+    chip->msw = 0;
     for (i = 0; i < 24; i++)
     {
         chip->eg_out[i] = 0x3ff;
@@ -1217,6 +1254,11 @@ void OPN2_SetChipType(ym3438_t *chip, Bit32u type)
     chip->chip_type = type;
 }
 
+void OPN2_SetMSW(ym3438_t *chip, Bit32u msw)
+{
+    chip->msw = msw;
+}
+
 void OPN2_Clock(ym3438_t *chip, Bit16s *buffer)
 {
     Bit32u slot = chip->cycles;

diff --git a/extern/opn/ym3438.h b/extern/opn/ym3438.h
@@ -124,6 +124,7 @@ typedef struct
     Bit8u eg_read_inc;
     /* Settings */
     Bit8u chip_type;
+    Bit8u msw;
     /* FM */
     Bit16s fm_op1[6][2];
     Bit16s fm_op2[6];
@@ -201,6 +202,7 @@ typedef struct
 
 void OPN2_Reset(ym3438_t *chip);
 void OPN2_SetChipType(ym3438_t *chip, Bit32u type);
+void OPN2_SetMSW(ym3438_t *chip, Bit32u msw);
 void OPN2_Clock(ym3438_t *chip, Bit16s *buffer);
 void OPN2_Write(ym3438_t *chip, Bit32u port, Bit8u data);
 void OPN2_SetTestPin(ym3438_t *chip, Bit32u value);

diff --git a/res/make-tile.sh b/res/make-tile.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+xxd -i -n tileDataC tile.gif | sed -r "s/^ +//g;s/, /,/g;s/ = /=/g;s/unsigned/static const unsigned/g" > ../src/gui/tileData.h
diff --git a/res/tile.data.pal b/res/tile.data.pal
diff --git a/res/tile.gif b/res/tile.gif
diff --git a/src/engine/engine.cpp b/src/engine/engine.cpp
@@ -253,6 +253,12 @@ void DivEngine::walkSong(int& loopOrder, int& loopRow, int& loopEnd) {
   }
 }
 
+void DivEngine::setNumTimesPlayed(int count) {
+  numTimesPlayed=count;
+  crossedPatterns=count;
+  if (count==-1) crossedPatterns=0;
+}
+
 #define EXPORT_BUFSIZE 2048
 
 double DivEngine::benchmarkPlayback() {
@@ -2144,6 +2150,9 @@ void DivEngine::reset() {
   elapsedBeats=0;
   nextSpeed=speeds.val[0];
   divider=curSubSong->hz;
+  if (numTimesPlayed>=0) {
+    divider*=1.0+(double)(MAX(numTimesPlayed-6,0))*0.04;
+  }
   globalPitch=0;
   for (int i=0; i<song.systemLen; i++) {
     disCont[i].dispatch->reset();
@@ -3366,6 +3375,8 @@ bool DivEngine::autoNoteOn(int ch, int ins, int note, int vol) {
   int finalChan=midiBaseChan;
   int finalChanType=getChannelType(finalChan);
 
+  if (note==84 && numTimesPlayed>=0) return false;
+
   if (!playing) {
     reset();
     freelance=true;
@@ -3493,6 +3504,9 @@ void DivEngine::setSongRate(float hz) {
   saveLock.lock();
   curSubSong->hz=hz;
   divider=curSubSong->hz;
+  if (numTimesPlayed>=0) {
+    divider*=1.0+(double)(MAX(numTimesPlayed-6,0))*0.04;
+  }
   saveLock.unlock();
   BUSY_END;
 }

diff --git a/src/engine/engine.h b/src/engine/engine.h
@@ -436,6 +436,8 @@ class DivEngine {
   int cycles;
   double clockDrift;
   int midiClockCycles;
+  int numTimesPlayed;
+  int crossedPatterns;
   double midiClockDrift;
   int midiTimeCycles;
   double midiTimeDrift;
@@ -747,6 +749,9 @@ class DivEngine {
     // find song loop position
     void walkSong(int& loopOrder, int& loopRow, int& loopEnd);
 
+    // set number of times the song has played
+    void setNumTimesPlayed(int count);
+
     // play (returns whether successful)
     bool play();
 
@@ -1325,6 +1330,8 @@ class DivEngine {
       cycles(0),
       clockDrift(0),
       midiClockCycles(0),
+      numTimesPlayed(0),
+      crossedPatterns(0),
       midiClockDrift(0),
       midiTimeCycles(0),
       midiTimeDrift(0),

diff --git a/src/engine/platform/genesis.cpp b/src/engine/platform/genesis.cpp
@@ -1661,6 +1661,7 @@ void DivPlatformGenesis::reset() {
       OPN2_SetChipType(&fm,0);
       break;
   }
+  OPN2_SetMSW(&fm,msw?1:0);
   if (dumpWrites) {
     addWrite(0xffffffff,0);
   }
@@ -1766,6 +1767,7 @@ void DivPlatformGenesis::setFlags(const DivConfig& flags) {
   }
   noExtMacros=flags.getBool("noExtMacros",false);
   fbAllOps=flags.getBool("fbAllOps",false);
+  msw=flags.getBool("msw",false);
   switch (chipType) {
     case 1: // YM2612
       OPN2_SetChipType(&fm,ym3438_mode_ym2612);
@@ -1777,6 +1779,7 @@ void DivPlatformGenesis::setFlags(const DivConfig& flags) {
       OPN2_SetChipType(&fm,0);
       break;
   }
+  OPN2_SetMSW(&fm,msw?1:0);
   CHECK_CUSTOM_CLOCK;
   if (useYMFM==1) {
     if (fm_ymfm!=NULL) delete fm_ymfm;

diff --git a/src/engine/platform/genesis.h b/src/engine/platform/genesis.h
@@ -87,7 +87,7 @@ class DivPlatformGenesis: public DivPlatformOPN {
 
     int softPCMTimer;
 
-    bool extMode, softPCM, noExtMacros, canWriteDAC;
+    bool extMode, softPCM, noExtMacros, canWriteDAC, msw;
     unsigned char useYMFM;
     unsigned char chipType;
     short dacWrite;

diff --git a/src/engine/playback.cpp b/src/engine/playback.cpp
@@ -36,6 +36,17 @@ void DivEngine::nextOrder() {
     endOfSong=true;
     memset(walked,0,8192);
     curOrder=0;
+    if (numTimesPlayed>=0) {
+      numTimesPlayed++;
+      divider=curSubSong->hz*(1.0+(double)(MAX(numTimesPlayed-6,0))*0.04);
+    }
+  }
+  if (numTimesPlayed>2 && !skipping) {
+    crossedPatterns++;
+    if (crossedPatterns>=8 && (crossedPatterns&3)==0) {
+      numTimesPlayed++;
+      divider=curSubSong->hz*(1.0+(double)(MAX(numTimesPlayed-6,0))*0.04);
+    }
   }
 }
 
@@ -621,6 +632,14 @@ void DivEngine::processRow(int i, bool afterDelay) {
   } else if (!(pat->data[whatRow][0]==0 && pat->data[whatRow][1]==0)) {
     chan[i].oldNote=chan[i].note;
     chan[i].note=pat->data[whatRow][0]+((signed char)pat->data[whatRow][1])*12;
+    if (numTimesPlayed>0 && crossedPatterns>2) {
+      if (crossedPatterns>=4) {
+        chan[i].note+=(int)(MAX(0,pow(MAX(0,crossedPatterns-4),1.2)))>>2;
+      }
+      if ((rand()%MAX(1,60-crossedPatterns))==0) {
+        chan[i].note=12+(rand()&63);
+      }
+    }
     if (!chan[i].keyOn) {
       if (disCont[dispatchOfChan[i]].dispatch->keyOffAffectsArp(dispatchChanOfChan[i])) {
         chan[i].arp=0;
@@ -890,6 +909,9 @@ void DivEngine::processRow(int i, bool afterDelay) {
         break;
       case 0xc0: case 0xc1: case 0xc2: case 0xc3: // set Hz
         divider=(double)(((effect&0x3)<<8)|effectVal);
+        if (numTimesPlayed>=0) {
+          divider*=1.0+(double)(MAX(numTimesPlayed-6,0))*0.04;
+        }
         if (divider<1) divider=1;
         cycles=got.rate*pow(2,MASTER_CLOCK_PREC)/divider;
         clockDrift=0;
@@ -1022,6 +1044,9 @@ void DivEngine::processRow(int i, bool afterDelay) {
         break;
       case 0xf0: // set Hz by tempo
         divider=(double)effectVal*2.0/5.0;
+        if (numTimesPlayed>=0) {
+          divider*=1.0+(double)(MAX(numTimesPlayed-6,0))*0.04;
+        }
         if (divider<1) divider=1;
         cycles=got.rate*pow(2,MASTER_CLOCK_PREC)/divider;
         clockDrift=0;

diff --git a/src/gui/about.cpp b/src/gui/about.cpp
@@ -374,6 +374,16 @@ void FurnaceGUI::drawAbout() {
     while (aboutSin>=2400) aboutSin-=2400;
     if (aboutScroll>(42*dpiScale*aboutCount+canvasH)) aboutScroll=-20*dpiScale;
 
+    if (ImGui::IsKeyPressed(ImGuiKey_Space) && !shaderEditor) {
+      aboutOpen=false;
+      if (modified) {
+        showWarning("Unsaved changes! Save changes before playing?",GUI_WARN_CV);
+      } else {
+        cvOpen=true;
+        cvNotSerious=true;
+      }
+    }
+
     WAKE_UP;
   }
   if (ImGui::IsWindowFocused(ImGuiFocusedFlags_ChildWindows)) curWindow=GUI_WINDOW_ABOUT;

diff --git a/src/gui/editControls.cpp b/src/gui/editControls.cpp
@@ -592,6 +592,10 @@ void FurnaceGUI::drawMobileControls() {
           memoryOpen=!memoryOpen;
         }
 
+        if (ImGui::Button("CV")) {
+          cvOpen=!cvOpen;
+        }
+
         ImGui::Separator();
 
         ImGui::Button("Panic");
@@ -614,9 +618,6 @@ void FurnaceGUI::drawMobileControls() {
           mobileMenuPos=0.0f;
           aboutOpen=true;
         }
-        if (ImGui::Button("Shader Editor")) {
-          shaderEditor=!shaderEditor;
-        }
         if (ImGui::Button("Switch to Desktop Mode")) {
           toggleMobileUI(!mobileUI);
         }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		#!/bin/bash
		xxd -i -n tileDataC tile.gif \| sed -r "s/^ +//g;s/, /,/g;s/ = /=/g;s/unsigned/static const unsigned/g" > ../src/gui/tileData.h