Pango (initial pull request) (#295)

AEFeinstein · Sep 22, 2024 · 0e137f6 · 0e137f6
1 parent 1da5644
commit 0e137f6
Show file tree

Hide file tree

Showing 176 changed files with 6,005 additions and 8 deletions.
diff --git a/assets/fonts/pango-fw.font.png b/assets/fonts/pango-fw.font.png
diff --git a/assets/pango/levels/mockup.bin b/assets/pango/levels/mockup.bin
diff --git a/assets/pango/levels/preset.bin b/assets/pango/levels/preset.bin
diff --git a/assets/pango/sounds/bgmCastle.mid b/assets/pango/sounds/bgmCastle.mid
diff --git a/assets/pango/sounds/bgmDeMAGio.mid b/assets/pango/sounds/bgmDeMAGio.mid
diff --git a/assets/pango/sounds/bgmGameOver.mid b/assets/pango/sounds/bgmGameOver.mid
diff --git a/assets/pango/sounds/bgmGameStart.mid b/assets/pango/sounds/bgmGameStart.mid
diff --git a/assets/pango/sounds/bgmIntro.mid b/assets/pango/sounds/bgmIntro.mid
diff --git a/assets/pango/sounds/bgmNameEntry.mid b/assets/pango/sounds/bgmNameEntry.mid
diff --git a/assets/pango/sounds/bgmSmooth.mid b/assets/pango/sounds/bgmSmooth.mid
diff --git a/assets/pango/sounds/bgmUnderground.mid b/assets/pango/sounds/bgmUnderground.mid
diff --git a/assets/pango/sounds/snd1up.mid b/assets/pango/sounds/snd1up.mid
diff --git a/assets/pango/sounds/sndBlockStop.mid b/assets/pango/sounds/sndBlockStop.mid
diff --git a/assets/pango/sounds/sndCheckpoint.mid b/assets/pango/sounds/sndCheckpoint.mid
diff --git a/assets/pango/sounds/sndCoin.mid b/assets/pango/sounds/sndCoin.mid
diff --git a/assets/pango/sounds/sndDie.mid b/assets/pango/sounds/sndDie.mid
diff --git a/assets/pango/sounds/sndHit.mid b/assets/pango/sounds/sndHit.mid
diff --git a/assets/pango/sounds/sndHurt.mid b/assets/pango/sounds/sndHurt.mid
diff --git a/assets/pango/sounds/sndJump1.mid b/assets/pango/sounds/sndJump1.mid
diff --git a/assets/pango/sounds/sndJump2.mid b/assets/pango/sounds/sndJump2.mid
diff --git a/assets/pango/sounds/sndJump3.mid b/assets/pango/sounds/sndJump3.mid
diff --git a/assets/pango/sounds/sndLevelClearA.mid b/assets/pango/sounds/sndLevelClearA.mid
diff --git a/assets/pango/sounds/sndLevelClearB.mid b/assets/pango/sounds/sndLevelClearB.mid
diff --git a/assets/pango/sounds/sndLevelClearC.mid b/assets/pango/sounds/sndLevelClearC.mid
diff --git a/assets/pango/sounds/sndLevelClearD.mid b/assets/pango/sounds/sndLevelClearD.mid
diff --git a/assets/pango/sounds/sndLevelClearS.mid b/assets/pango/sounds/sndLevelClearS.mid
diff --git a/assets/pango/sounds/sndMenuConfirm.mid b/assets/pango/sounds/sndMenuConfirm.mid
diff --git a/assets/pango/sounds/sndMenuDeny.mid b/assets/pango/sounds/sndMenuDeny.mid
diff --git a/assets/pango/sounds/sndMenuSelect.mid b/assets/pango/sounds/sndMenuSelect.mid
diff --git a/assets/pango/sounds/sndOutOfTime.mid b/assets/pango/sounds/sndOutOfTime.mid
diff --git a/assets/pango/sounds/sndPause.mid b/assets/pango/sounds/sndPause.mid
diff --git a/assets/pango/sounds/sndPowerUp.mid b/assets/pango/sounds/sndPowerUp.mid
diff --git a/assets/pango/sounds/sndSlide.mid b/assets/pango/sounds/sndSlide.mid
diff --git a/assets/pango/sounds/sndSpawn.mid b/assets/pango/sounds/sndSpawn.mid
diff --git a/assets/pango/sounds/sndSquish.mid b/assets/pango/sounds/sndSquish.mid
diff --git a/assets/pango/sounds/sndWarp.mid b/assets/pango/sounds/sndWarp.mid
diff --git a/assets/pango/sounds/sndWaveBall.mid b/assets/pango/sounds/sndWaveBall.mid
diff --git a/assets/pango/sprites/blockfragment.png b/assets/pango/sprites/blockfragment.png
diff --git a/assets/pango/sprites/break-000.png b/assets/pango/sprites/break-000.png
diff --git a/assets/pango/sprites/break-001.png b/assets/pango/sprites/break-001.png
diff --git a/assets/pango/sprites/break-002.png b/assets/pango/sprites/break-002.png
diff --git a/assets/pango/sprites/break-003.png b/assets/pango/sprites/break-003.png
diff --git a/assets/pango/sprites/kr-000.png b/assets/pango/sprites/kr-000.png
diff --git a/assets/pango/sprites/kr-001.png b/assets/pango/sprites/kr-001.png
diff --git a/assets/pango/sprites/kr-002.png b/assets/pango/sprites/kr-002.png
diff --git a/assets/pango/sprites/kr-003.png b/assets/pango/sprites/kr-003.png
diff --git a/assets/pango/sprites/kr-004.png b/assets/pango/sprites/kr-004.png
diff --git a/assets/pango/sprites/kr-005.png b/assets/pango/sprites/kr-005.png
diff --git a/assets/pango/sprites/kr-006.png b/assets/pango/sprites/kr-006.png
diff --git a/assets/pango/sprites/kr-007.png b/assets/pango/sprites/kr-007.png
diff --git a/assets/pango/sprites/kr-008.png b/assets/pango/sprites/kr-008.png
diff --git a/assets/pango/sprites/kr-009.png b/assets/pango/sprites/kr-009.png
diff --git a/assets/pango/sprites/kr-010.png b/assets/pango/sprites/kr-010.png
diff --git a/assets/pango/sprites/kr-011.png b/assets/pango/sprites/kr-011.png
diff --git a/assets/pango/sprites/kr-012.png b/assets/pango/sprites/kr-012.png
diff --git a/assets/pango/sprites/kr-013.png b/assets/pango/sprites/kr-013.png
diff --git a/assets/pango/sprites/kr-014.png b/assets/pango/sprites/kr-014.png
diff --git a/assets/pango/sprites/kr-015.png b/assets/pango/sprites/kr-015.png
diff --git a/assets/pango/sprites/pa-000.png b/assets/pango/sprites/pa-000.png
diff --git a/assets/pango/sprites/pa-001.png b/assets/pango/sprites/pa-001.png
diff --git a/assets/pango/sprites/pa-002.png b/assets/pango/sprites/pa-002.png
diff --git a/assets/pango/sprites/pa-003.png b/assets/pango/sprites/pa-003.png
diff --git a/assets/pango/sprites/pa-004.png b/assets/pango/sprites/pa-004.png
diff --git a/assets/pango/sprites/pa-005.png b/assets/pango/sprites/pa-005.png
diff --git a/assets/pango/sprites/pa-006.png b/assets/pango/sprites/pa-006.png
diff --git a/assets/pango/sprites/pa-007.png b/assets/pango/sprites/pa-007.png
diff --git a/assets/pango/sprites/pa-008.png b/assets/pango/sprites/pa-008.png
diff --git a/assets/pango/sprites/pa-009.png b/assets/pango/sprites/pa-009.png
diff --git a/assets/pango/sprites/pa-010.png b/assets/pango/sprites/pa-010.png
diff --git a/assets/pango/sprites/pa-011.png b/assets/pango/sprites/pa-011.png
diff --git a/assets/pango/sprites/pa-012.png b/assets/pango/sprites/pa-012.png
diff --git a/assets/pango/sprites/pa-013.png b/assets/pango/sprites/pa-013.png
diff --git a/assets/pango/sprites/pa-014.png b/assets/pango/sprites/pa-014.png
diff --git a/assets/pango/sprites/pa-015.png b/assets/pango/sprites/pa-015.png
diff --git a/assets/pango/sprites/pa-100.png b/assets/pango/sprites/pa-100.png
diff --git a/assets/pango/sprites/pa-101.png b/assets/pango/sprites/pa-101.png
diff --git a/assets/pango/sprites/pa-102.png b/assets/pango/sprites/pa-102.png
diff --git a/assets/pango/sprites/pa-103.png b/assets/pango/sprites/pa-103.png
diff --git a/assets/pango/sprites/pa-104.png b/assets/pango/sprites/pa-104.png
diff --git a/assets/pango/sprites/pa-105.png b/assets/pango/sprites/pa-105.png
diff --git a/assets/pango/sprites/pa-106.png b/assets/pango/sprites/pa-106.png
diff --git a/assets/pango/sprites/pa-107.png b/assets/pango/sprites/pa-107.png
diff --git a/assets/pango/sprites/pa-108.png b/assets/pango/sprites/pa-108.png
diff --git a/assets/pango/sprites/pa-109.png b/assets/pango/sprites/pa-109.png
diff --git a/assets/pango/sprites/pa-110.png b/assets/pango/sprites/pa-110.png
diff --git a/assets/pango/sprites/pa-111.png b/assets/pango/sprites/pa-111.png
diff --git a/assets/pango/sprites/pa-112.png b/assets/pango/sprites/pa-112.png
diff --git a/assets/pango/sprites/pa-113.png b/assets/pango/sprites/pa-113.png
diff --git a/assets/pango/sprites/pa-114.png b/assets/pango/sprites/pa-114.png
diff --git a/assets/pango/sprites/pa-en-000.png b/assets/pango/sprites/pa-en-000.png
diff --git a/assets/pango/sprites/pa-en-001.png b/assets/pango/sprites/pa-en-001.png
diff --git a/assets/pango/sprites/pa-en-002.png b/assets/pango/sprites/pa-en-002.png
diff --git a/assets/pango/sprites/pa-en-003.png b/assets/pango/sprites/pa-en-003.png
diff --git a/assets/pango/sprites/pa-en-004.png b/assets/pango/sprites/pa-en-004.png
diff --git a/assets/pango/sprites/pa-en-005.png b/assets/pango/sprites/pa-en-005.png
diff --git a/assets/pango/sprites/pa-en-006.png b/assets/pango/sprites/pa-en-006.png
diff --git a/assets/pango/sprites/pa-en-007.png b/assets/pango/sprites/pa-en-007.png
diff --git a/assets/pango/sprites/pa-en-008.png b/assets/pango/sprites/pa-en-008.png
diff --git a/assets/pango/sprites/po-000.png b/assets/pango/sprites/po-000.png
diff --git a/assets/pango/sprites/po-001.png b/assets/pango/sprites/po-001.png
diff --git a/assets/pango/sprites/po-002.png b/assets/pango/sprites/po-002.png
diff --git a/assets/pango/sprites/po-003.png b/assets/pango/sprites/po-003.png
diff --git a/assets/pango/sprites/po-004.png b/assets/pango/sprites/po-004.png
diff --git a/assets/pango/sprites/po-005.png b/assets/pango/sprites/po-005.png
diff --git a/assets/pango/sprites/po-006.png b/assets/pango/sprites/po-006.png
diff --git a/assets/pango/sprites/po-007.png b/assets/pango/sprites/po-007.png
diff --git a/assets/pango/sprites/po-008.png b/assets/pango/sprites/po-008.png
diff --git a/assets/pango/sprites/po-009.png b/assets/pango/sprites/po-009.png
diff --git a/assets/pango/sprites/po-010.png b/assets/pango/sprites/po-010.png
diff --git a/assets/pango/sprites/po-011.png b/assets/pango/sprites/po-011.png
diff --git a/assets/pango/sprites/po-012.png b/assets/pango/sprites/po-012.png
diff --git a/assets/pango/sprites/po-013.png b/assets/pango/sprites/po-013.png
diff --git a/assets/pango/sprites/po-014.png b/assets/pango/sprites/po-014.png
diff --git a/assets/pango/sprites/px-000.png b/assets/pango/sprites/px-000.png
diff --git a/assets/pango/sprites/px-001.png b/assets/pango/sprites/px-001.png
diff --git a/assets/pango/sprites/px-002.png b/assets/pango/sprites/px-002.png
diff --git a/assets/pango/sprites/px-003.png b/assets/pango/sprites/px-003.png
diff --git a/assets/pango/sprites/px-004.png b/assets/pango/sprites/px-004.png
diff --git a/assets/pango/sprites/px-005.png b/assets/pango/sprites/px-005.png
diff --git a/assets/pango/sprites/px-006.png b/assets/pango/sprites/px-006.png
diff --git a/assets/pango/sprites/px-007.png b/assets/pango/sprites/px-007.png
diff --git a/assets/pango/sprites/px-008.png b/assets/pango/sprites/px-008.png
diff --git a/assets/pango/sprites/px-009.png b/assets/pango/sprites/px-009.png
diff --git a/assets/pango/sprites/px-010.png b/assets/pango/sprites/px-010.png
diff --git a/assets/pango/sprites/px-011.png b/assets/pango/sprites/px-011.png
diff --git a/assets/pango/sprites/px-012.png b/assets/pango/sprites/px-012.png
diff --git a/assets/pango/sprites/px-013.png b/assets/pango/sprites/px-013.png
diff --git a/assets/pango/sprites/px-014.png b/assets/pango/sprites/px-014.png
diff --git a/assets/pango/tiles/.DS_Store b/assets/pango/tiles/.DS_Store
diff --git a/assets/pango/tiles/pa-tile-000.png b/assets/pango/tiles/pa-tile-000.png
diff --git a/assets/pango/tiles/pa-tile-001.png b/assets/pango/tiles/pa-tile-001.png
diff --git a/assets/pango/tiles/pa-tile-002.png b/assets/pango/tiles/pa-tile-002.png
diff --git a/assets/pango/tiles/pa-tile-003.png b/assets/pango/tiles/pa-tile-003.png
diff --git a/assets/pango/tiles/pa-tile-004.png b/assets/pango/tiles/pa-tile-004.png
diff --git a/assets/pango/tiles/pa-tile-005.png b/assets/pango/tiles/pa-tile-005.png
diff --git a/assets/pango/tiles/pa-tile-006.png b/assets/pango/tiles/pa-tile-006.png
diff --git a/assets/pango/tiles/pa-tile-007.png b/assets/pango/tiles/pa-tile-007.png
diff --git a/assets/pango/tiles/pa-tile-008.png b/assets/pango/tiles/pa-tile-008.png
diff --git a/assets/pango/tiles/pa-tile-009.png b/assets/pango/tiles/pa-tile-009.png
diff --git a/assets/pango/tiles/pa-tile-010.png b/assets/pango/tiles/pa-tile-010.png
diff --git a/assets/pango/tiles/pa-tile-011.png b/assets/pango/tiles/pa-tile-011.png
diff --git a/assets/pango/tiles/pa-tile-012.png b/assets/pango/tiles/pa-tile-012.png
diff --git a/assets/pango/tiles/pa-tile-013.png b/assets/pango/tiles/pa-tile-013.png
diff --git a/assets/pango/tiles/pa-tile-014.png b/assets/pango/tiles/pa-tile-014.png
diff --git a/assets/pango/tiles/pa-tile-015.png b/assets/pango/tiles/pa-tile-015.png
diff --git a/emulator/src/extensions/modes/ext_modes.c b/emulator/src/extensions/modes/ext_modes.c
@@ -25,11 +25,12 @@
 #include "jukebox.h"
 #include "keebTest.h"
 #include "mainMenu.h"
-#include "modeTimer.h"
 #include "mode_2048.h"
 #include "mode_bigbug.h"
 #include "mode_credits.h"
 #include "mode_synth.h"
+#include "modeTimer.h"
+#include "pango.h"
 #include "touchTest.h"
 #include "tunernome.h"
 #include "ultimateTTT.h"
@@ -70,6 +71,7 @@ static swadgeMode_t* allSwadgeModes[] = {
     &keebTestMode,
     &mainMenuMode,
     &modeCredits,
+    &pangoMode,
     &synthMode,
     &t48Mode,
     &timerMode,

diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt
@@ -23,23 +23,30 @@ idf_component_register(SRCS "asset_loaders/common/heatshrink_encoder.c"
                             "midi/midiUsb.c"
                             "midi/midiUtil.c"
                             "midi/waveTables.c"
+                            "modes/games/2048/2048_game.c"
+                            "modes/games/2048/2048_menus.c"
+                            "modes/games/2048/mode_2048.c"
                             "modes/games/bigbug/aabb_utils_bigbug.c"
                             "modes/games/bigbug/entity_bigbug.c"
                             "modes/games/bigbug/entityManager_bigbug.c"
                             "modes/games/bigbug/gameData_bigbug.c"
                             "modes/games/bigbug/mode_bigbug.c"
+                            "modes/games/bigbug/pathfinding_bigbug.c"
                             "modes/games/bigbug/soundManager_bigbug.c"
                             "modes/games/bigbug/tilemap_bigbug.c"
-                            "modes/games/bigbug/pathfinding_bigbug.c"
+                            "modes/games/pango/paEntity.c"
+                            "modes/games/pango/paEntityManager.c"
+                            "modes/games/pango/paGameData.c"
+                            "modes/games/pango/pango.c"
+                            "modes/games/pango/paSoundManager.c"
+                            "modes/games/pango/paTilemap.c"
+                            "modes/games/pango/paWsgManager.c"
                             "modes/games/ultimateTTT/ultimateTTT.c"
                             "modes/games/ultimateTTT/ultimateTTTgame.c"
                             "modes/games/ultimateTTT/ultimateTTThowTo.c"
                             "modes/games/ultimateTTT/ultimateTTTmarkerSelect.c"
                             "modes/games/ultimateTTT/ultimateTTTp2p.c"
                             "modes/games/ultimateTTT/ultimateTTTresult.c"
-                            "modes/games/2048/2048_game.c"
-                            "modes/games/2048/2048_menus.c"
-                            "modes/games/2048/mode_2048.c"
                             "modes/music/colorchord/colorchord.c"
                             "modes/music/jukebox/jukebox.c"
                             "modes/music/tunernome/tunernome.c"
@@ -102,9 +109,10 @@ idf_component_register(SRCS "asset_loaders/common/heatshrink_encoder.c"
                                 "./midi"
                                 "./modes"
                                 "./modes/games"
+                                "./modes/games/2048"
                                 "./modes/games/bigbug"
+                                "./modes/games/pango"
                                 "./modes/games/ultimateTTT"
-                                "./modes/games/2048/"
                                 "./modes/music"
                                 "./modes/music/colorchord"
                                 "./modes/music/jukebox"

diff --git a/main/menu/menuManiaRenderer.c b/main/menu/menuManiaRenderer.c
@@ -113,8 +113,8 @@ menuManiaRenderer_t* initMenuManiaRenderer(font_t* titleFont, font_t* titleFontO
     }
     else
     {
-        renderer->titleFont          = titleFont;
-        renderer->titleFontAllocated = false;
+        renderer->titleFontOutline          = titleFont;
+        renderer->titleFontOutlineAllocated = false;
     }
 
     // Save or allocate menu font