ash/Anemone3DS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:3dsfug/Anemone3DS

Browse Source
This commit is contained in:
Alex Taber
2017-08-31 22:00:37 -04:00
parent 43b37d2616 70e086b20c
commit aa3f35504f
10 changed files with 118 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/draw.c
View File

@@ -94,7 +94,7 @@ void draw_interface(Theme_s * themes_list, int theme_count, int selected_theme,
{
if (current_theme.has_preview)
{
pp2d_draw_texture_part(current_theme.preview_id, 0, 0, 6, 0, 400, 240);
pp2d_draw_texture_part(TEXTURE_PREVIEW, 0, 0, 6, 0, 400, 240);
}
}
else
@@ -119,7 +119,7 @@ void draw_interface(Theme_s * themes_list, int theme_count, int selected_theme,
if (current_theme.has_preview)
{
//skip the weird 6 pixels to the left
pp2d_texture_select_part(current_theme.preview_id, 220, 35, 6, 0, 400, 480);
pp2d_texture_select_part(TEXTURE_PREVIEW, 220, 35, 6, 0, 400, 480);
pp2d_texture_scale(0.4, 0.4);
pp2d_texture_draw();
}
@@ -131,7 +131,7 @@ void draw_interface(Theme_s * themes_list, int theme_count, int selected_theme,
{
if (current_theme.has_preview)
{
pp2d_draw_texture_part(current_theme.preview_id, 0, 0, 46, 240, 320, 240);
pp2d_draw_texture_part(TEXTURE_PREVIEW, 0, 0, 46, 240, 320, 240);
}
}
else

16
source/main.c
View File

@@ -51,9 +51,16 @@ int main(void)
int theme_count = 0;
Theme_s * themes_list = NULL;
Result res = get_themes(&themes_list, &theme_count);
if (R_FAILED(res))
{
//don't need to worry about possible textures (icons, previews), that's freed by pp2d itself
free(themes_list);
themes_list = NULL;
}
int selected_theme = 0;
int shuffle_theme_count = 0;
int previously_selected = ~selected_theme; //make sure it loads the preview the first time
bool preview_mode = false;
while(aptMainLoop())
@@ -145,6 +152,15 @@ int main(void)
PTMSYSM_RebootAsync(0);
ptmSysmExit();
}
//if the selected theme changed, load the preview
if (selected_theme != previously_selected)
{
current_theme->has_preview = false; //will be freed anyway
current_theme = &themes_list[selected_theme]; //update current_theme
load_theme_preview(current_theme);
previously_selected = selected_theme;
}
}
free(themes_list);

11
source/minizip/ioapi.c
View File

@@ -11,6 +11,14 @@
See the accompanying LICENSE file for the full text of the license.
*/
//taken and adapted from https://stackoverflow.com/a/13492589
// save diagnostic state
#pragma GCC diagnostic push
// turn off the specific warning. Can also use "-Wall"
#pragma GCC diagnostic ignored "-Wunused-parameter"
#include <stdlib.h>
#include <string.h>
@@ -367,3 +375,6 @@ void fill_fopen64_filefunc (zlib_filefunc64_def* pzlib_filefunc_def)
pzlib_filefunc_def->zerror_file = ferror_file_func;
pzlib_filefunc_def->opaque = NULL;
}
// turn the warnings back on
#pragma GCC diagnostic pop

10
source/minizip/ioapi_mem.c
View File

@@ -18,6 +18,13 @@
with.
*/
//taken and adapted from https://stackoverflow.com/a/13492589
// save diagnostic state
#pragma GCC diagnostic push
// turn off the specific warning. Can also use "-Wall"
#pragma GCC diagnostic ignored "-Wunused-parameter"
#include <stdio.h>
#include <stdlib.h>
@@ -190,3 +197,6 @@ void fill_memory_filefunc (pzlib_filefunc_def, ourmem)
pzlib_filefunc_def->zerror_file = ferror_mem_func;
pzlib_filefunc_def->opaque = ourmem;
}
// turn the warnings back on
#pragma GCC diagnostic pop

11
source/minizip/unzip.c
View File

@@ -21,6 +21,14 @@
access functions to crctables and pkeys
*/
//taken and adapted from https://stackoverflow.com/a/13492589
// save diagnostic state
#pragma GCC diagnostic push
// turn off the specific warning. Can also use "-Wall"
#pragma GCC diagnostic ignored "-Wtype-limits"
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -1949,3 +1957,6 @@ extern int ZEXPORT unzeof(unzFile file)
return 1;
return 0;
}
// turn the warnings back on
#pragma GCC diagnostic pop

122
source/themes.c
View File

@@ -31,19 +31,74 @@
#include "pp2d/pp2d/pp2d.h"
#include "pp2d/pp2d/lodepng.h"
static void parse_smdh(Theme_s *theme, u16 *path, ssize_t textureID)
void load_theme_preview(Theme_s *theme)
{
//free the previously loaded preview. wont do anything if there wasnt one
pp2d_free_texture(TEXTURE_PREVIEW);
char *preview_buffer = NULL;
u64 size = 0;
if (!(theme->is_zip))
{
u16 path_to_preview[0x106] = {0};
strucat(path_to_preview, theme->path);
struacat(path_to_preview, "/preview.png");
size = file_to_buf(fsMakePath(PATH_UTF16, path_to_preview), ArchiveSD, &preview_buffer);
} else {
size = zip_file_to_buf("preview.png", theme->path, &preview_buffer);
}
if (!size)
{
free(preview_buffer);
return;
}
u8 * image = NULL;
unsigned int width = 0, height = 0;
int result = lodepng_decode32(&image, &width, &height, (u8*)preview_buffer, size);
if (result == 0) // no error
{
for (u32 i = 0; i < width; i++)
{
for (u32 j = 0; j < height; j++)
{
u32 p = (i + j*width) * 4;
u8 r = *(u8*)(image + p);
u8 g = *(u8*)(image + p + 1);
u8 b = *(u8*)(image + p + 2);
u8 a = *(u8*)(image + p + 3);
*(image + p) = a;
*(image + p + 1) = b;
*(image + p + 2) = g;
*(image + p + 3) = r;
}
}
theme->has_preview = true;
pp2d_load_texture_memory(TEXTURE_PREVIEW, image, (u32)width, (u32)height);
}
free(image);
free(preview_buffer);
}
static void parse_smdh(Theme_s *theme, ssize_t textureID)
{
char *info_buffer = NULL;
u64 size = 0;
if (!(theme->is_zip))
{
u16 path_to_smdh[0x106] = {0};
strucat(path_to_smdh, path);
strucat(path_to_smdh, theme->path);
struacat(path_to_smdh, "/info.smdh");
size = file_to_buf(fsMakePath(PATH_UTF16, path_to_smdh), ArchiveSD, &info_buffer);
} else {
size = zip_file_to_buf("info.smdh", path, &info_buffer);
size = zip_file_to_buf("info.smdh", theme->path, &info_buffer);
}
if (!size)
@@ -87,59 +142,6 @@ static void parse_smdh(Theme_s *theme, u16 *path, ssize_t textureID)
free(info_buffer);
}
static void load_preview(Theme_s *theme, u16 *path, ssize_t textureID)
{
char *preview_buffer = NULL;
u64 size = 0;
if (!(theme->is_zip))
{
u16 path_to_preview[0x106] = {0};
strucat(path_to_preview, path);
struacat(path_to_preview, "/preview.png");
size = file_to_buf(fsMakePath(PATH_UTF16, path_to_preview), ArchiveSD, &preview_buffer);
} else {
size = zip_file_to_buf("preview.png", path, &preview_buffer);
}
if (!size)
{
free(preview_buffer);
return;
}
u8 * image = NULL;
unsigned int width = 0, height = 0;
int result = lodepng_decode32(&image, &width, &height, (u8*)preview_buffer, size);
if (result == 0) // no error
{
for (u32 i = 0; i < width; i++)
{
for (u32 j = 0; j < height; j++)
{
u32 p = (i + j*width) * 4;
u8 r = *(u8*)(image + p);
u8 g = *(u8*)(image + p + 1);
u8 b = *(u8*)(image + p + 2);
u8 a = *(u8*)(image + p + 3);
*(image + p) = a;
*(image + p + 1) = b;
*(image + p + 2) = g;
*(image + p + 3) = r;
}
}
theme->has_preview = true;
pp2d_load_texture_memory(textureID, image, (u32)width, (u32)height);
theme->preview_id = textureID;
}
free(image);
free(preview_buffer);
}
Result get_themes(Theme_s **themes_list, int *theme_count)
{
Result res = 0;
@@ -177,10 +179,8 @@ Result get_themes(Theme_s **themes_list, int *theme_count)
memcpy(current_theme->path, theme_path, 0x106 * sizeof(u16));
current_theme->is_zip = !strcmp(entry.shortExt, "ZIP");
ssize_t textureID = MAX_TEXTURE + (*theme_count * 2);
parse_smdh(current_theme, theme_path, textureID);
current_theme->has_preview = false;
// load_preview(current_theme, theme_path, textureID+1);
ssize_t iconID = TEXTURE_PREVIEW + *theme_count;
parse_smdh(current_theme, iconID);
}
FSDIR_Close(dir_handle);
@@ -438,4 +438,4 @@ Result shuffle_install(Theme_s *themes_list, int theme_count)
free(thememanage_buf);
return MAKERESULT(RL_SUCCESS, RS_SUCCESS, RM_COMMON, RD_SUCCESS);
}
}

4
source/unicode.c
View File

@@ -26,7 +26,7 @@
#include "unicode.h"
ssize_t strulen(u16 *input, ssize_t max_len)
ssize_t strulen(const u16 *input, ssize_t max_len)
{
for (int i = 0; i < max_len; i++) if (input[i] == 0) return i;
return max_len;
@@ -47,7 +47,7 @@ void printu(u16 *input)
ssize_t in_len = strulen(input, 0x106);
ssize_t buf_len = in_len + 1; // Plus 1 for proper null termination
wchar_t *buf = calloc(buf_len, sizeof(wchar_t));
utf16_to_utf32(buf, input, buf_len);
utf16_to_utf32((u32*)buf, input, buf_len);
printf("%ls\n", buf);
free(buf);
}