Skip to content

Major refactor: Don't keep JSON around after loading, switch to RapidJSON #203

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Epicpkmn11 wants to merge 16 commits into
base: master
Choose a base branch
from
Draft

Major refactor: Don't keep JSON around after loading, switch to RapidJSON #203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
3cea00a
Add RapidJSON
Epicpkmn11 Jul 6, 2026
8083042
Major refactor: Don't keep JSON around after loading, switch to Rapid…
Epicpkmn11 Jul 6, 2026
5554fad
After CIA self-update, cleanly exit and reload
Epicpkmn11 Jul 10, 2026
0d29566
Fix download list not showing top screen info
Epicpkmn11 Jul 10, 2026
4df32ed
If A pressed on empty queue, return to entry info
Epicpkmn11 Jul 10, 2026
998a48e
keyboard: Restore tolower
Epicpkmn11 Jul 10, 2026
354419e
Fix messing up the global entries vector on downloading/updating UniS…
Epicpkmn11 Jul 10, 2026
1024881
Remove CITRA flag
Epicpkmn11 Jul 14, 2026
cc9e38f
download: Switch to RapidJSON
Epicpkmn11 Jul 14, 2026
2de5e46
theme: Convert to RapidJSON, refactor to not store JSON
Epicpkmn11 Jul 15, 2026
d3c1744
language: Switch to RapidJSON, load to std::map instead of keeping JSON
Epicpkmn11 Jul 15, 2026
31f7b4c
Fix crash on invalid theme JSON
Epicpkmn11 Jul 15, 2026
3412abb
config: Use RapidJSON & don't store JSON
Epicpkmn11 Jul 15, 2026
86cb537
Old JSON cleanup
Epicpkmn11 Jul 15, 2026
02f58cd
meta: Switch to RapidJSON and refactor to not store as JSON
Epicpkmn11 Jul 15, 2026
53e629e
Remove nlohmann::json
Epicpkmn11 Jul 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ CFLAGS := -g -Wall -Wno-psabi -O2 -mword-relocations \

CFLAGS += $(INCLUDE) -D__3DS__ -D_GNU_SOURCE=1

CXXFLAGS := $(CFLAGS) -fno-rtti -fno-exceptions -std=gnu++17 $(CITRA)
CXXFLAGS := $(CFLAGS) -fno-rtti -fno-exceptions -std=gnu++17

ASFLAGS := -g $(ARCH)
LDFLAGS = -specs=3dsx.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map)
Expand Down Expand Up @@ -221,16 +221,12 @@ ifneq ($(ROMFS),)
export _3DSXFLAGS += --romfs=$(CURDIR)/$(ROMFS)
endif

.PHONY: all citra clean cppcheck
.PHONY: all clean cppcheck

#---------------------------------------------------------------------------------
all: $(BUILD) $(GFXBUILD) $(DEPSDIR) $(ROMFS_T3XFILES) $(T3XHFILES)
@$(MAKE) --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile

#---------------------------------------------------------------------------------
citra: $(BUILD) $(GFXBUILD) $(DEPSDIR) $(ROMFS_T3XFILES) $(T3XHFILES)
@$(MAKE) --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile CITRA=-DCITRA

#------------------------------------------------------------------------------
clean:
@echo clean ...
Expand Down
2 changes: 0 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,6 @@ git submodule update --init --recursive

Once you've cloned the repository (with submodules), simply run `make` in the root of the repository.

If you're testing in Citra, run `make citra` instead of just `make` to disable the Wi-Fi check. (Note: `source/utils/download.cpp` must be rebuilt for this to take affect, save the file if it's already been built)

## Screenshots

<details><summary>Screenshots</summary>
Expand Down
4 changes: 3 additions & 1 deletion include/common.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,10 @@

#define _STORE_PATH "sdmc:/3ds/Universal-Updater/stores/"
#define _META_PATH "sdmc:/3ds/Universal-Updater/MetaData.json"
#define _THEME_AMOUNT 2
#define _THEME_PATH "sdmc:/3ds/Universal-Updater/Themes.json"
#define _CONFIG_PATH "sdmc:/3ds/Universal-Updater/Config.json"
#define _UNISTORE_VERSION 4
#define UU_TITLE_ID 0x0004000004391700

inline std::unique_ptr<Config> config;
inline uint32_t hRepeat, hUp, hDown, hHeld;
Expand Down
6 changes: 3 additions & 3 deletions include/gui/gfx.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
#include <citro2d.h>
#include <string>

extern std::unique_ptr<Theme> UIThemes;
extern Theme UITheme;

/* Standard Colors. */
#define WHITE C2D_Color32(255, 255, 255, 255)
Expand All @@ -52,8 +52,8 @@ namespace GFX {
void DrawBattery();
void HandleBattery();
void DrawWifi();
void DrawIcon(const int Idx, int X, int Y, uint32_t Color = UIThemes->SideBarIconColor(), float BlendPower = 1.0f, float ScaleX = 1.0f, float ScaleY = 1.0f);
void DrawIconRotated(const int Idx, int X, int Y, float Angle = 0.0f, uint32_t Color = UIThemes->SideBarIconColor(), float BlendPower = 1.0f, float ScaleX = 1.0f, float ScaleY = 1.0f);
void DrawIcon(const int Idx, int X, int Y, uint32_t Color = UITheme.SideBarIconColor(), float BlendPower = 1.0f, float ScaleX = 1.0f, float ScaleY = 1.0f);
void DrawIconRotated(const int Idx, int X, int Y, float Angle = 0.0f, uint32_t Color = UITheme.SideBarIconColor(), float BlendPower = 1.0f, float ScaleX = 1.0f, float ScaleY = 1.0f);
};

#endif
Loading
Loading