Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-05-14 04:58:36 -07:00
Code Issues Packages Projects Releases Wiki Activity

Add anim support to custom asset packs

Browse Source
This commit is contained in:
Willy-JL
2023-01-20 00:29:16 +00:00
parent de225d1808
commit 3d1d1b2d67
1 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
applications/services/desktop/animations/animation_storage.c
View File

@@ -12,6 +12,7 @@
#include <assets_dolphin_internal.h> #include <assets_dolphin_internal.h>
#include <assets_dolphin_blocking.h> #include <assets_dolphin_blocking.h>
#include "../../../settings/xtreme_settings/xtreme_settings.h" #include "../../../settings/xtreme_settings/xtreme_settings.h"
#include "../../../settings/xtreme_settings/xtreme_assets.h"
#define ANIMATION_META_FILE "meta.txt" #define ANIMATION_META_FILE "meta.txt"
#define ANIMATION_DIR EXT_PATH("dolphin") #define ANIMATION_DIR EXT_PATH("dolphin")
#define TAG "AnimationStorage" #define TAG "AnimationStorage"
@@ -20,30 +21,40 @@
#define ANIMATION_MANIFEST_FILE ANIMATION_DIR "/manifest.txt" #define ANIMATION_MANIFEST_FILE ANIMATION_DIR "/manifest.txt"
*/ */
char ANIMATION_MANIFEST_FILE[30]; // 66 Max length = strlen("/ext/dolphin_custom//Anims/manifest.txt") + MAX_PACK_NAME_LEN + 1 (Null terminator)
char ANIMATION_MANIFEST_FILE[72];
static void animation_storage_free_bubbles(BubbleAnimation* animation); static void animation_storage_free_bubbles(BubbleAnimation* animation);
static void animation_storage_free_frames(BubbleAnimation* animation); static void animation_storage_free_frames(BubbleAnimation* animation);
static void animation_storage_free_animation(BubbleAnimation** storage_animation); static void animation_storage_free_animation(BubbleAnimation** storage_animation);
static BubbleAnimation* animation_storage_load_animation(const char* name); static BubbleAnimation* animation_storage_load_animation(const char* name);
void animation_handler_beta() { void animation_handler_select_manifest() {
if(XTREME_SETTINGS()->sfw_mode) { XtremeSettings* xtreme_settings = XTREME_SETTINGS();
snprintf(ANIMATION_MANIFEST_FILE, sizeof(ANIMATION_DIR), "%s", ANIMATION_DIR); if (xtreme_settings->asset_pack[0] != '\0') {
FURI_LOG_I(TAG, "SFW Manifest selected"); snprintf(ANIMATION_MANIFEST_FILE, sizeof(PACKS_DIR), "%s", PACKS_DIR);
strcat(ANIMATION_MANIFEST_FILE, "/sfw/manifest.txt"); FURI_LOG_I(TAG, "Custom Manifest selected");
strcat(ANIMATION_MANIFEST_FILE, "/");
strcat(ANIMATION_MANIFEST_FILE, xtreme_settings->asset_pack);
strcat(ANIMATION_MANIFEST_FILE, "/Anims");
} else { } else {
snprintf(ANIMATION_MANIFEST_FILE, sizeof(ANIMATION_DIR), "%s", ANIMATION_DIR); snprintf(ANIMATION_MANIFEST_FILE, sizeof(ANIMATION_DIR), "%s", ANIMATION_DIR);
if(xtreme_settings->sfw_mode) {
FURI_LOG_I(TAG, "SFW Manifest selected");
strcat(ANIMATION_MANIFEST_FILE, "/sfw");
} else {
FURI_LOG_I(TAG, "NSFW Manifest selected"); FURI_LOG_I(TAG, "NSFW Manifest selected");
strcat(ANIMATION_MANIFEST_FILE, "/nsfw/manifest.txt"); strcat(ANIMATION_MANIFEST_FILE, "/nsfw");
} }
}
strcat(ANIMATION_MANIFEST_FILE, "/manifest.txt");
} }
static bool animation_storage_load_single_manifest_info( static bool animation_storage_load_single_manifest_info(
StorageAnimationManifestInfo* manifest_info, StorageAnimationManifestInfo* manifest_info,
const char* name) { const char* name) {
furi_assert(manifest_info); furi_assert(manifest_info);
animation_handler_beta(); animation_handler_select_manifest();
bool result = false; bool result = false;
Storage* storage = furi_record_open(RECORD_STORAGE); Storage* storage = furi_record_open(RECORD_STORAGE);
FlipperFormat* file = flipper_format_file_alloc(storage); FlipperFormat* file = flipper_format_file_alloc(storage);
@@ -99,7 +110,7 @@ static bool animation_storage_load_single_manifest_info(
void animation_storage_fill_animation_list(StorageAnimationList_t* animation_list) { void animation_storage_fill_animation_list(StorageAnimationList_t* animation_list) {
furi_assert(sizeof(StorageAnimationList_t) == sizeof(void*)); furi_assert(sizeof(StorageAnimationList_t) == sizeof(void*));
furi_assert(!StorageAnimationList_size(*animation_list)); furi_assert(!StorageAnimationList_size(*animation_list));
animation_handler_beta(); animation_handler_select_manifest();
Storage* storage = furi_record_open(RECORD_STORAGE); Storage* storage = furi_record_open(RECORD_STORAGE);
FlipperFormat* file = flipper_format_file_alloc(storage); FlipperFormat* file = flipper_format_file_alloc(storage);