3DS/Wii/PSP/GameCube: Some improvements

3DS: Now also supports using circle pad for moving camera
Wii/PSP/GameCube: Falls back to using default.png from texture pack for fonts in launcher, instead of never displaying any text at all
This commit is contained in:
UnknownShadow200 2023-07-26 23:56:59 +10:00
parent 2aa9e65262
commit 8bf0e1aa87
4 changed files with 9 additions and 12 deletions

View File

@ -23,12 +23,6 @@ jobs:
NOTIFY_MESSAGE: 'Failed to compile 3DS build' NOTIFY_MESSAGE: 'Failed to compile 3DS build'
WEBHOOK_URL: '${{ secrets.WEBHOOK_URL }}' WEBHOOK_URL: '${{ secrets.WEBHOOK_URL }}'
- uses: ./.github/actions/upload_build
if: ${{ always() && steps.compile.outcome == 'success' }}
with:
SOURCE_FILE: 'ClassiCube-3ds.elf'
DEST_NAME: 'ClassiCube-3ds.elf'
- uses: ./.github/actions/upload_build - uses: ./.github/actions/upload_build
if: ${{ always() && steps.compile.outcome == 'success' }} if: ${{ always() && steps.compile.outcome == 'success' }}
with: with:

View File

@ -23,12 +23,6 @@ jobs:
NOTIFY_MESSAGE: 'Failed to compile Wii/Gamecube build' NOTIFY_MESSAGE: 'Failed to compile Wii/Gamecube build'
WEBHOOK_URL: '${{ secrets.WEBHOOK_URL }}' WEBHOOK_URL: '${{ secrets.WEBHOOK_URL }}'
- uses: ./.github/actions/upload_build
if: ${{ always() && steps.compile.outcome == 'success' }}
with:
SOURCE_FILE: 'ClassiCube-wii.elf'
DEST_NAME: 'ClassiCube-wii.elf'
- uses: ./.github/actions/upload_build - uses: ./.github/actions/upload_build
if: ${{ always() && steps.compile.outcome == 'success' }} if: ${{ always() && steps.compile.outcome == 'success' }}
with: with:

View File

@ -734,6 +734,9 @@ cc_result SysFont_Make(struct FontDesc* desc, const cc_string* fontName, int siz
desc->height = Drawer2D_AdjHeight(size); desc->height = Drawer2D_AdjHeight(size);
desc->handle = (void*)1; desc->handle = (void*)1;
// TODO: Actually implement native font APIs
Font_MakeBitmapped(desc, size, flags);
return 0; return 0;
} }

View File

@ -105,6 +105,12 @@ void Window_ProcessEvents(double delta) {
Cursor_GetRawPos(&x, &y); Cursor_GetRawPos(&x, &y);
Pointer_SetPosition(0, x, y); Pointer_SetPosition(0, x, y);
} }
if (Input_RawMode) {
circlePosition pos = { 0, 0 };
hidCircleRead(&pos);
Event_RaiseRawMove(&PointerEvents.RawMoved, -pos.dx / 32.0f, pos.dy / 32.0f);
}
} }
static void Cursor_GetRawPos(int* x, int* y) { static void Cursor_GetRawPos(int* x, int* y) {