-
Notifications
You must be signed in to change notification settings - Fork 9
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #13 from rodri042/v1.1
v1.1: overclock mod, runtime config, key mappings, 3d-printed case
- Loading branch information
Showing
35 changed files
with
1,046 additions
and
294 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,3 @@ | ||
| *.exe filter=lfs diff=lfs merge=lfs -text | ||
| *.tool filter=lfs diff=lfs merge=lfs -text | ||
| *.zip filter=lfs diff=lfs merge=lfs -text | ||
| *.gif filter=lfs diff=lfs merge=lfs -text |
Binary file not shown.
Binary file not shown.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,6 +3,4 @@ | |
|
|
||
| // #define WITH_AUDIO | ||
|
|
||
| // #define BENCHMARK | ||
|
|
||
| #endif // BUILD_CONFIG_H | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,232 @@ | ||
| #ifndef RUNTIME_CONFIG_H | ||
| #define RUNTIME_CONFIG_H | ||
|
|
||
| #include <tonc.h> | ||
| #include "Protocol.h" | ||
| #include "Utils.h" | ||
| #include "_state.h" | ||
|
|
||
| #define CONFIG_ITEMS 11 | ||
| #define CONFIG_PERCENTAGE_ITEMS 3 | ||
| #define CONFIG_BOOLEAN_ITEMS 2 | ||
| #define CONFIG_NUMERIC_ITEMS 9 | ||
| #define CONFIG_COMPRESSION_ITEMS 6 | ||
| #define CONFIG_MENU_KEY_ITEMS 2 | ||
|
|
||
| const char* const CONFIG_PERCENTAGE_OPTIONS[CONFIG_PERCENTAGE_ITEMS] = { | ||
| " <25%>", " <50%>", "<100%>"}; | ||
| const char* const CONFIG_BOOLEAN_OPTIONS[CONFIG_BOOLEAN_ITEMS] = {"<OFF>", | ||
| " <ON>"}; | ||
| const char* const CONFIG_COMPRESSION_OPTIONS[CONFIG_COMPRESSION_ITEMS] = { | ||
| "<-->", "<LO>", "<MD>", "<HI>", "<EX>", "<!!>"}; | ||
| const char* const CONFIG_MENU_KEY_OPTIONS[CONFIG_MENU_KEY_ITEMS] = { | ||
| "<A+B+L+R>", " <START>"}; | ||
| const char* const CONFIG_NUMERIC_OPTIONS[CONFIG_NUMERIC_ITEMS] = { | ||
| "<01>", "<02>", "<03>", "<04>", "<05>", "<06>", "<07>", "<08>", "<09>"}; | ||
|
|
||
| typedef struct Config { | ||
| u32 renderMode; | ||
|
|
||
| u8 frameWidthIndex; | ||
| u8 frameHeightIndex; | ||
| bool scanlines; | ||
| u8 compression; | ||
| bool cpuOverclock; | ||
| bool ewramOverclock; | ||
| bool exitWithStart; | ||
| u8 controls; | ||
|
|
||
| bool isBenchmark() { return RENDER_MODE_IS_BENCHMARK(renderMode); } | ||
| void update() { | ||
| renderMode = frameWidthIndex * CONFIG_PERCENTAGE_ITEMS + frameHeightIndex; | ||
| } | ||
| } Config; | ||
|
|
||
| extern Config config; | ||
|
|
||
| namespace RuntimeConfig { | ||
|
|
||
| enum Option { | ||
| FRAME_WIDTH, | ||
| FRAME_HEIGHT, | ||
| SCANLINES, | ||
| COMPRESSION, | ||
| CPU_OVERCLOCK, | ||
| EWRAM_OVERCLOCK, | ||
| EXIT_WITH_START_KEY, | ||
| CONTROLS, | ||
| BENCHMARK, | ||
| DEFAULTS, | ||
| START | ||
| }; | ||
|
|
||
| inline void drawMenu(u32 option) { | ||
| #define SELECTION(ID) (option == ID ? ">" : " ") | ||
|
|
||
| tte_erase_screen(); | ||
| tte_write("#{P:0,0}"); | ||
| tte_write(" gba-remote-play (^_^)\n\n"); | ||
| tte_write(SELECTION(Option::FRAME_WIDTH)); | ||
| tte_write("Frame width "); | ||
| tte_write(CONFIG_PERCENTAGE_OPTIONS[config.frameWidthIndex]); | ||
| tte_write("\n"); | ||
| tte_write(SELECTION(Option::FRAME_HEIGHT)); | ||
| tte_write("Frame height "); | ||
| tte_write(CONFIG_PERCENTAGE_OPTIONS[config.frameHeightIndex]); | ||
| tte_write("\n"); | ||
| tte_write(SELECTION(Option::SCANLINES)); | ||
| tte_write("Scanlines "); | ||
| tte_write(CONFIG_BOOLEAN_OPTIONS[config.scanlines]); | ||
| tte_write("\n"); | ||
| tte_write(SELECTION(Option::COMPRESSION)); | ||
| tte_write("Compression "); | ||
| tte_write(CONFIG_COMPRESSION_OPTIONS[config.compression]); | ||
| tte_write("\n"); | ||
| tte_write(SELECTION(Option::CPU_OVERCLOCK)); | ||
| tte_write("CPU Overclock "); | ||
| tte_write(CONFIG_BOOLEAN_OPTIONS[config.cpuOverclock]); | ||
| tte_write("\n"); | ||
| tte_write(SELECTION(Option::EWRAM_OVERCLOCK)); | ||
| tte_write("EWRAM Overclock "); | ||
| tte_write(CONFIG_BOOLEAN_OPTIONS[config.ewramOverclock]); | ||
| tte_write("\n"); | ||
| tte_write(SELECTION(Option::EXIT_WITH_START_KEY)); | ||
| tte_write("Menu key "); | ||
| tte_write(CONFIG_MENU_KEY_OPTIONS[config.exitWithStart]); | ||
| tte_write("\n"); | ||
| tte_write(SELECTION(Option::CONTROLS)); | ||
| tte_write("Controls "); | ||
| tte_write(CONFIG_NUMERIC_OPTIONS[config.controls]); | ||
| tte_write("\n\n"); | ||
| tte_write(SELECTION(Option::BENCHMARK)); | ||
| tte_write("[BENCHMARK]\n"); | ||
| tte_write(SELECTION(Option::DEFAULTS)); | ||
| tte_write("[RESET OPTIONS]\n"); | ||
| tte_write(SELECTION(Option::START)); | ||
| tte_write(RENDER_MODE_IS_INVALID(config.renderMode) | ||
| ? "<This mode is not supported>" | ||
| : "[START STREAMING]"); | ||
| } | ||
|
|
||
| ALWAYS_INLINE void initialize() { | ||
| config.frameWidthIndex = 1; | ||
| config.frameHeightIndex = 1; | ||
| config.scanlines = true; | ||
| config.compression = 2; | ||
| config.cpuOverclock = false; | ||
| config.exitWithStart = false; | ||
| config.controls = 0; | ||
| config.update(); | ||
| } | ||
|
|
||
| ALWAYS_INLINE void show() { | ||
| u32 option = 0; | ||
| u32 keys = 0, previousKeys = pressedKeys(); | ||
|
|
||
| #define IS_PRESSED(KEY) (keys & KEY && !(previousKeys & KEY)) | ||
| #define CYCLE_OPTIONS(N, LIMIT) ((N) < 0 ? ((LIMIT)-1) : ((N) % LIMIT)) | ||
|
|
||
| REG_DISPCNT = DCNT_MODE0 | DCNT_BG0; | ||
| tte_init_se(0, BG_CBB(0) | BG_SBB(31), 0xF000, CLR_WHITE, 0, &fwf_default, | ||
| NULL); | ||
|
|
||
| drawMenu(option); | ||
|
|
||
| while (true) { | ||
| keys = pressedKeys(); | ||
|
|
||
| if (IS_PRESSED(KEY_DOWN)) { | ||
| option = (option + 1) % CONFIG_ITEMS; | ||
| drawMenu(option); | ||
| } else if (IS_PRESSED(KEY_UP)) { | ||
| option = option == 0 ? CONFIG_ITEMS - 1 : option - 1; | ||
| drawMenu(option); | ||
| } else if (IS_PRESSED(KEY_A) || IS_PRESSED(KEY_RIGHT) || | ||
| IS_PRESSED(KEY_LEFT)) { | ||
| s8 direction = (IS_PRESSED(KEY_LEFT) ? -1 : 1); | ||
|
|
||
| switch (option) { | ||
| case Option::FRAME_WIDTH: { | ||
| config.frameWidthIndex = CYCLE_OPTIONS( | ||
| config.frameWidthIndex + direction, CONFIG_PERCENTAGE_ITEMS); | ||
| config.update(); | ||
| break; | ||
| } | ||
| case Option::FRAME_HEIGHT: { | ||
| config.frameHeightIndex = CYCLE_OPTIONS( | ||
| config.frameHeightIndex + direction, CONFIG_PERCENTAGE_ITEMS); | ||
| config.update(); | ||
| break; | ||
| } | ||
| case Option::SCANLINES: { | ||
| config.scanlines = !config.scanlines; | ||
| break; | ||
| } | ||
| case Option::COMPRESSION: { | ||
| config.compression = CYCLE_OPTIONS(config.compression + direction, | ||
| CONFIG_COMPRESSION_ITEMS); | ||
| break; | ||
| } | ||
| case Option::CPU_OVERCLOCK: { | ||
| config.cpuOverclock = !config.cpuOverclock; | ||
| break; | ||
| } | ||
| case Option::EWRAM_OVERCLOCK: { | ||
| overclockEWRAM(); | ||
| config.ewramOverclock = true; | ||
| break; | ||
| } | ||
| case Option::EXIT_WITH_START_KEY: { | ||
| config.exitWithStart = !config.exitWithStart; | ||
| break; | ||
| } | ||
| case Option::CONTROLS: { | ||
| config.controls = | ||
| CYCLE_OPTIONS(config.controls + direction, CONFIG_NUMERIC_ITEMS); | ||
| break; | ||
| } | ||
| case Option::BENCHMARK: { | ||
| if (IS_PRESSED(KEY_A)) { | ||
| tte_erase_screen(); | ||
| tte_write("#{P:0,0}"); | ||
| tte_write( | ||
| "\n L - Benchmark: safe/slow\n R - Benchmark: one-way/fast"); | ||
|
|
||
| while (true) { | ||
| if (pressedKeys() & KEY_L) { | ||
| config.renderMode = RENDER_MODE_BENCHMARK_1; | ||
| return; | ||
| } | ||
| if (pressedKeys() & KEY_R) { | ||
| config.renderMode = RENDER_MODE_BENCHMARK_2; | ||
| return; | ||
| } | ||
| } | ||
| } | ||
| break; | ||
| } | ||
| case Option::DEFAULTS: { | ||
| if (IS_PRESSED(KEY_A)) | ||
| initialize(); | ||
| break; | ||
| } | ||
| case Option::START: { | ||
| if (IS_PRESSED(KEY_A) && !RENDER_MODE_IS_INVALID(config.renderMode)) | ||
| return; | ||
| break; | ||
| } | ||
| } | ||
| drawMenu(option); | ||
| } else if (IS_PRESSED(KEY_START) && | ||
| !RENDER_MODE_IS_INVALID(config.renderMode)) { | ||
| return; | ||
| } | ||
|
|
||
| previousKeys = keys; | ||
| vid_vsync(); | ||
| } | ||
| } | ||
|
|
||
| } // namespace RuntimeConfig | ||
|
|
||
| #endif // RUNTIME_CONFIG_H |
Oops, something went wrong.