music viz anim

bmchtech · Jul 16, 2021 · f974aba · f974aba
1 parent 1335001
commit f974aba
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 5 deletions.
diff --git a/demo/DuskDemo/asset/build/Makefile b/demo/DuskDemo/asset/build/Makefile
@@ -47,6 +47,9 @@ atl_logo_0.img.bin: atl_logo_0.png
 atl_thred_0.img.bin: atl_thred_0.png
 	grit "$<" $(GRIT_FLAGS) -Mh 8 -Mw 8 -o "$@"
 
+atl_mus_0.img.bin: atl_mus_0.png
+	grit "$<" $(GRIT_FLAGS) -Mh 8 -Mw 8 -o "$@"
+
 $(ATLS_PNG): $(ATLS_OUT)
 	@true
 

diff --git a/demo/DuskDemo/asset/img/mus/musviz.png b/demo/DuskDemo/asset/img/mus/musviz.png
diff --git a/demo/DuskDemo/src/scenes/audio.c b/demo/DuskDemo/src/scenes/audio.c
@@ -5,6 +5,8 @@
 #include "soundbank.h"
 
 mm_sound_effect boom;
+Sprite* vizspr;
+Anim vz_anim1;
 
 void audio_start() {
     dusk_init_graphics_mode0();
@@ -31,6 +33,19 @@ void audio_start() {
     boom.volume = 255;
     boom.panning = 255;
 
+    // load sprite atlas
+    dusk_sprites_init();
+    SpriteAtlas atlas = dusk_load_atlas("atl_mus");
+    dusk_sprites_upload_atlas(&atlas);
+
+    vizspr = dusk_sprites_make(0, 64, 64,
+                               (Sprite){
+                                   .x = SCREEN_WIDTH / 2 - 32,
+                                   .y = SCREEN_HEIGHT / 2 - 32,
+                                   .tid = 0,
+                               });
+    vz_anim1 = MAKE_ANIM(0, 16);
+
     // init text engine
     REG_DISPCNT |= DCNT_BG1;
     tte_init_chr4c(1, BG_CBB(0) | BG_SBB(31), 0, 0x0201, CLR_GRAY, NULL, NULL);
@@ -41,15 +56,20 @@ void audio_start() {
 }
 
 void audio_update() {
-    dusk_frame(); // video frame    
-    mmFrame(); // audio frame
+    dusk_frame(); // video frame
+    mmFrame();    // audio frame
+
+    dusk_sprites_anim_play(vizspr, &vz_anim1);
 
     int a_press = key_is_down(KEY_A);
 
     if (a_press) {
         // play sfx
         mmEffectEx(&boom);
     }
+
+    // update sprites
+    dusk_sprites_update();
 }
 
 void audio_end() {

diff --git a/demo/DuskDemo/src/scenes/thred.c b/demo/DuskDemo/src/scenes/thred.c
@@ -3,7 +3,7 @@
 #include "tonc.h"
 
 Sprite* thred;
-Anim anim1;
+Anim th_anim1;
 
 void thred_start() {
     dusk_init_graphics_mode0();
@@ -21,7 +21,7 @@ void thred_start() {
                                   .page = 0,
                               });
 
-    anim1 = MAKE_ANIM(0, 16);
+    th_anim1 = MAKE_ANIM(0, 16);
 
     // ----------
 
@@ -36,7 +36,7 @@ void thred_start() {
 void thred_update() {
     dusk_frame();
 
-    dusk_sprites_anim_play(thred, &anim1);
+    dusk_sprites_anim_play(thred, &th_anim1);
 
     // update sprites
     dusk_sprites_update();