Compare commits
119
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9b0214ee55 | ||
|
|
7ad735552a | ||
|
|
ea35472ef8 | ||
|
|
50c5621d8a | ||
|
|
da275cfd52 | ||
|
|
0f4ee5d965 | ||
|
|
af8c0f5ccd | ||
|
|
8ea370a1d1 | ||
|
|
fcf0de72af | ||
|
|
320c5e6ce5 | ||
|
|
7a858cc424 | ||
|
|
c0292842a5 | ||
|
|
717902462b | ||
|
|
1d73b9d224 | ||
|
|
51f262efa0 | ||
|
|
a6e4e3f71f | ||
|
|
4387d223b9 | ||
|
|
00bfaf6360 | ||
|
|
709bd7be52 | ||
|
|
80f4348e21 | ||
|
|
e630827b34 | ||
|
|
106d9b0fc0 | ||
|
|
4a26f79945 | ||
|
|
1a199f6ce3 | ||
|
|
ec59e77867 | ||
|
|
cb28d2b611 | ||
|
|
27b6ddf5cb | ||
|
|
475c865e33 | ||
|
|
0b4ba062bb | ||
|
|
28f5e66662 | ||
|
|
e225a076f0 | ||
|
|
774c8ad0f8 | ||
|
|
52d1e7414d | ||
|
|
af4cb53e5f | ||
|
|
c019271e12 | ||
|
|
82ae2bce9d | ||
|
|
092e259a06 | ||
|
|
08b4bbfe91 | ||
|
|
560c51cf27 | ||
|
|
674f86b18a | ||
|
|
e3f10e0926 | ||
|
|
d7223d7387 | ||
|
|
45331c2a60 | ||
|
|
33f50a2c69 | ||
|
|
6c8e4d5cbd | ||
|
|
3b7215876a | ||
|
|
c74f5890bd | ||
|
|
fbd3c71ba7 | ||
|
|
128f9ab9d4 | ||
|
|
36fb359aa2 | ||
|
|
1bd73d69fe | ||
|
|
fb48285143 | ||
|
|
3de50b8370 | ||
|
|
e61cbe25b7 | ||
|
|
8395830be6 | ||
|
|
6e4ec2b9d8 | ||
|
|
f501bb8e28 | ||
|
|
d07cd3397d | ||
|
|
e008fb108a | ||
|
|
9aaffff7a8 | ||
|
|
7357b4a5df | ||
|
|
1ddc298a74 | ||
|
|
e2a9442aa6 | ||
|
|
aa0180571e | ||
|
|
7f7be39230 | ||
|
|
4d95415232 | ||
|
|
2cbd80a004 | ||
|
|
9abf8101da | ||
|
|
24badd06a5 | ||
|
|
7a03ef8eaf | ||
|
|
f3ea507313 | ||
|
|
4b0388a0e1 | ||
|
|
a84137b5ff | ||
|
|
ca02ee0352 | ||
|
|
fbaa54145e | ||
|
|
28754ffbf2 | ||
|
|
470c0eba7a | ||
|
|
7098dcec43 | ||
|
|
07137f57af | ||
|
|
8b7491a3d3 | ||
|
|
8cfa8ddfeb | ||
|
|
ef284a15a1 | ||
|
|
3723921573 | ||
|
|
195399635e | ||
|
|
46e2a924d3 | ||
|
|
b693ea4102 | ||
|
|
a73f55beb0 | ||
|
|
0bd2491ab7 | ||
|
|
860c797c9c | ||
|
|
38c5080f9f | ||
|
|
fae191d8fe | ||
|
|
d83a953e2d | ||
|
|
2dcf0d0f0d | ||
|
|
6dee37d8c1 | ||
|
|
3bad03afb3 | ||
|
|
6a6d8448f7 | ||
|
|
189babd2cf | ||
|
|
988a0f2294 | ||
|
|
85bf455731 | ||
|
|
589e4224f3 | ||
|
|
bd7fa154b4 | ||
|
|
a292f1992b | ||
|
|
88ddf429b7 | ||
|
|
7a1f6662df | ||
|
|
afc68bccc6 | ||
|
|
b4cdc4a64f | ||
|
|
3ad5afb81c | ||
|
|
bed3f20118 | ||
|
|
de67315178 | ||
|
|
8d5c0c7cad | ||
|
|
a8271e01bd | ||
|
|
900b3f8558 | ||
|
|
fdc4e056f9 | ||
|
|
7b98e40ccf | ||
|
|
01d89cf22c | ||
|
|
503a3c799a | ||
|
|
0b21388844 | ||
|
|
117bdf0c00 | ||
|
|
172dc5d37b |
No files matched your search
@@ -4,36 +4,6 @@ on:
|
|||||||
tags:
|
tags:
|
||||||
- '*'
|
- '*'
|
||||||
jobs:
|
jobs:
|
||||||
run-tests:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- name: Checkout repository
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
- name: Install dependencies
|
|
||||||
run: |
|
|
||||||
sudo apt-get update
|
|
||||||
sudo apt-get install -y \
|
|
||||||
build-essential \
|
|
||||||
cmake \
|
|
||||||
python3 \
|
|
||||||
python3-pip \
|
|
||||||
python3-polib \
|
|
||||||
python3-pil \
|
|
||||||
libsdl2-dev \
|
|
||||||
libgl1-mesa-dev \
|
|
||||||
libzip-dev \
|
|
||||||
python3-dotenv \
|
|
||||||
python3-pyqt5 \
|
|
||||||
python3-opengl \
|
|
||||||
xz-utils \
|
|
||||||
liblzma-dev \
|
|
||||||
libbz2-dev \
|
|
||||||
zlib1g-dev \
|
|
||||||
git \
|
|
||||||
libssl-dev
|
|
||||||
- name: Run tests
|
|
||||||
run: ./scripts/test-linux.sh
|
|
||||||
|
|
||||||
build-linux:
|
build-linux:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
|
|||||||
@@ -0,0 +1,35 @@
|
|||||||
|
name: Test Dusk
|
||||||
|
on:
|
||||||
|
pull_request:
|
||||||
|
branches:
|
||||||
|
- main
|
||||||
|
jobs:
|
||||||
|
run-tests:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- name: Checkout repository
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
- name: Install dependencies
|
||||||
|
run: |
|
||||||
|
sudo apt-get update
|
||||||
|
sudo apt-get install -y \
|
||||||
|
build-essential \
|
||||||
|
cmake \
|
||||||
|
python3 \
|
||||||
|
python3-pip \
|
||||||
|
python3-polib \
|
||||||
|
python3-pil \
|
||||||
|
libsdl2-dev \
|
||||||
|
libgl1-mesa-dev \
|
||||||
|
libzip-dev \
|
||||||
|
python3-dotenv \
|
||||||
|
python3-pyqt5 \
|
||||||
|
python3-opengl \
|
||||||
|
xz-utils \
|
||||||
|
liblzma-dev \
|
||||||
|
libbz2-dev \
|
||||||
|
zlib1g-dev \
|
||||||
|
git \
|
||||||
|
libssl-dev
|
||||||
|
- name: Run tests
|
||||||
|
run: ./scripts/test-linux.sh
|
||||||
@@ -1,455 +0,0 @@
|
|||||||
# Dusk — Claude Code rules
|
|
||||||
|
|
||||||
## File headers
|
|
||||||
Every C, H, and JS file starts with:
|
|
||||||
|
|
||||||
```c
|
|
||||||
/**
|
|
||||||
* Copyright (c) 2026 Dominic Masters
|
|
||||||
*
|
|
||||||
* This software is released under the MIT License.
|
|
||||||
* https://opensource.org/licenses/MIT
|
|
||||||
*/
|
|
||||||
```
|
|
||||||
|
|
||||||
JS files use `//` comment style instead.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## C conventions
|
|
||||||
|
|
||||||
### Types
|
|
||||||
Always use the project-defined aliases instead of bare C primitives:
|
|
||||||
|
|
||||||
| Use | Not |
|
|
||||||
|-----------|--------------|
|
|
||||||
| `bool_t` | `bool` |
|
|
||||||
| `int_t` | `int` |
|
|
||||||
| `float_t` | `float` |
|
|
||||||
| `char_t` | `char` |
|
|
||||||
|
|
||||||
Use `uint8_t`, `uint16_t`, `int32_t`, etc. for fixed-width integers.
|
|
||||||
All struct and enum types end in `_t` (`animation_t`, `errorret_t`, …).
|
|
||||||
|
|
||||||
### Naming
|
|
||||||
- **Functions** — snake_case, prefixed with their module:
|
|
||||||
`assetLock()`, `entityPositionInit()`, `moduleAssetBatchCtor()`
|
|
||||||
- **Struct fields** — camelCase: `keyframeCount`, `localPosition`
|
|
||||||
- **Macros / constants** — UPPER_SNAKE_CASE:
|
|
||||||
`ENTITY_ID_INVALID`, `ERROR_OK`, `COMPONENT_TYPE_COUNT`
|
|
||||||
- **Files** — snake_case matching the primary type: `entityposition.c`,
|
|
||||||
`moduleassetbatch.c`
|
|
||||||
|
|
||||||
### Header files (`.h`)
|
|
||||||
- Use `#pragma once` — no include guards.
|
|
||||||
- Declare every public function, `#define`, and `extern` global.
|
|
||||||
- Write a JSDoc block (`/** … */`) above every declaration explaining
|
|
||||||
purpose, `@param`s, and `@returns`.
|
|
||||||
- Only include headers that the `.h` file itself strictly requires for
|
|
||||||
the types it exposes. Move everything else to the `.c` file.
|
|
||||||
Do not use forward declarations as a workaround — use the real
|
|
||||||
include in the `.c` file instead.
|
|
||||||
|
|
||||||
### Implementation files (`.c`)
|
|
||||||
- Contain function bodies only; no declarations.
|
|
||||||
- Pull in whatever additional includes the implementation needs.
|
|
||||||
- Do not use `static` or `inline` on **functions**. Every function,
|
|
||||||
including internal helpers, must be declared in the matching `.h` and
|
|
||||||
defined in the `.c` file. Internal helpers belong near the bottom of
|
|
||||||
the `.c` file, not at the top with a `static` qualifier.
|
|
||||||
`static` and `inline` on functions are only appropriate when the
|
|
||||||
function body is written directly inside a `.h` file.
|
|
||||||
`static` on **variables** (file-scope state) is fine and expected.
|
|
||||||
|
|
||||||
### Formatting
|
|
||||||
- Hard-wrap all lines at **80 characters**.
|
|
||||||
|
|
||||||
### Error handling
|
|
||||||
Return `errorret_t` from fallible functions. Use these macros:
|
|
||||||
|
|
||||||
```c
|
|
||||||
errorOk(); // return success
|
|
||||||
errorThrow("msg %d", val); // return failure with message
|
|
||||||
errorChain(someCall()); // propagate failure, continue on success
|
|
||||||
errorIsOk(ret) / errorIsNotOk(ret) // test a result
|
|
||||||
errorCatch(ret); // handle + free an error
|
|
||||||
```
|
|
||||||
|
|
||||||
Never return raw error codes or use `errno` for in-engine errors.
|
|
||||||
|
|
||||||
### Memory
|
|
||||||
Use the project allocator — never raw `malloc`/`free`:
|
|
||||||
|
|
||||||
```c
|
|
||||||
memoryAllocate(size) // allocate
|
|
||||||
memoryFree(ptr) // free
|
|
||||||
memoryZero(dest, size) // zero a block
|
|
||||||
memoryCopy(dest, src, size) // copy
|
|
||||||
```
|
|
||||||
|
|
||||||
### Asserts
|
|
||||||
Prefer specific assert macros over bare `assert()`:
|
|
||||||
|
|
||||||
```c
|
|
||||||
assertNotNull(ptr, "msg");
|
|
||||||
assertTrue(cond, "msg");
|
|
||||||
assertFalse(cond, "msg");
|
|
||||||
assertUnreachable("msg");
|
|
||||||
assertIsMainThread("msg");
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Build system
|
|
||||||
Each subdirectory has its own `CMakeLists.txt` that adds sources with:
|
|
||||||
|
|
||||||
```cmake
|
|
||||||
target_sources(${DUSK_LIBRARY_TARGET_NAME}
|
|
||||||
PUBLIC
|
|
||||||
myfile.c
|
|
||||||
)
|
|
||||||
```
|
|
||||||
|
|
||||||
Never add source files to the root `CMakeLists.txt` directly.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Platform support
|
|
||||||
|
|
||||||
### Targets
|
|
||||||
Set `DUSK_TARGET_SYSTEM` at CMake configure time to select a platform:
|
|
||||||
|
|
||||||
| `DUSK_TARGET_SYSTEM` | Macro defined | Platform |
|
|
||||||
|----------------------|-------------------|------------------|
|
|
||||||
| `linux` | `DUSK_LINUX` | Linux desktop |
|
|
||||||
| `knulli` | `DUSK_KNULLI` | Knulli (handheld)|
|
|
||||||
| `psp` | `DUSK_PSP` | Sony PSP |
|
|
||||||
| `vita` | `DUSK_VITA` | PlayStation Vita |
|
|
||||||
| `gamecube` | `DUSK_GAMECUBE` | Nintendo GameCube|
|
|
||||||
| `wii` | `DUSK_WII` | Nintendo Wii |
|
|
||||||
|
|
||||||
### Layer structure
|
|
||||||
```
|
|
||||||
src/dusk/ core, platform-agnostic game logic
|
|
||||||
src/duskgl/ OpenGL abstraction (Linux, Knulli, PSP, Vita)
|
|
||||||
src/dusksdl2/ SDL2 window + input (Linux, Knulli, PSP, Vita)
|
|
||||||
src/dusklinux/ Linux + Knulli platform impl
|
|
||||||
src/duskpsp/ PSP platform impl
|
|
||||||
src/duskvita/ Vita platform impl
|
|
||||||
src/duskdolphin/ GameCube / Wii platform impl (no SDL2/OpenGL)
|
|
||||||
```
|
|
||||||
|
|
||||||
Dolphin is the only target that bypasses SDL2 and OpenGL entirely —
|
|
||||||
it uses native GameCube/Wii rendering and input APIs.
|
|
||||||
|
|
||||||
### Platform guards
|
|
||||||
Use the compile-time macros for platform-specific code:
|
|
||||||
|
|
||||||
```c
|
|
||||||
#ifdef DUSK_PSP
|
|
||||||
// PSP-only path
|
|
||||||
#elif defined(DUSK_GAMECUBE) || defined(DUSK_WII)
|
|
||||||
// GameCube / Wii path
|
|
||||||
#else
|
|
||||||
// Generic / Linux fallback
|
|
||||||
#endif
|
|
||||||
```
|
|
||||||
|
|
||||||
Additional capability macros set per-target:
|
|
||||||
`DUSK_SDL2`, `DUSK_OPENGL`, `DUSK_OPENGL_ES`, `DUSK_OPENGL_LEGACY`,
|
|
||||||
`DUSK_INPUT_GAMEPAD`, `DUSK_INPUT_KEYBOARD`, `DUSK_INPUT_POINTER`,
|
|
||||||
`DUSK_PLATFORM_ENDIAN_BIG` / `DUSK_PLATFORM_ENDIAN_LITTLE`.
|
|
||||||
|
|
||||||
### Abstraction pattern
|
|
||||||
Platform-specific implementations are wired in via `#define` macros in
|
|
||||||
each platform's `displayplatform.h` / `inputplatform.h` etc., which
|
|
||||||
the core calls through. Functions that a platform does not support are
|
|
||||||
simply left undefined — the core guards calls with `#ifdef`.
|
|
||||||
|
|
||||||
### Adding platform-specific code
|
|
||||||
- Put it under `src/dusk<platform>/` in the matching subsystem folder.
|
|
||||||
- Gate any core call-site with the appropriate `#ifdef DUSK_<PLATFORM>`
|
|
||||||
or capability macro.
|
|
||||||
- Keep the `src/dusk/` core free of platform ifdefs — delegate through
|
|
||||||
the platform header macros instead.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Adding a new asset loader type
|
|
||||||
1. Add an enum value to `assetloadertype_t` (before `_COUNT`) in
|
|
||||||
`src/dusk/asset/loader/assetloader.h`.
|
|
||||||
2. Add fields to the input/loading/output unions in `assetloader.h`.
|
|
||||||
3. Implement `assetXxxLoaderSync`, `assetXxxLoaderAsync`, and
|
|
||||||
`assetXxxDispose` in a new `src/dusk/asset/loader/xxx/` directory.
|
|
||||||
4. Register the three callbacks in `ASSET_LOADER_CALLBACKS[]` in
|
|
||||||
`src/dusk/asset/loader/assetloader.c`.
|
|
||||||
5. If user-facing, create a JS module (see below) and a `.d.ts` file.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Adding a new entity component
|
|
||||||
1. Create `src/dusk/entity/component/<category>/entityMyComp.h/.c` with
|
|
||||||
struct `entityMyComp_t`, `entityMyCompInit()`, and optionally
|
|
||||||
`entityMyCompDispose()`.
|
|
||||||
2. Add the include to `src/dusk/entity/componentlist.h` header block.
|
|
||||||
3. Add a row to `src/dusk/entity/componentlist.h`:
|
|
||||||
```c
|
|
||||||
X(MYCOMP, entityMyComp_t, myComp, entityMyCompInit, NULL, NULL)
|
|
||||||
```
|
|
||||||
This auto-generates the enum, union field, and definition entry.
|
|
||||||
4. If JS-facing, create the script module and `.d.ts` (see below).
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Adding a new script (JS) module
|
|
||||||
1. Create `src/dusk/script/module/<category>/moduleMyMod.h/.c`.
|
|
||||||
- Declare `extern scriptproto_t MODULE_MYMOD_PROTO;` in the header.
|
|
||||||
- Use `moduleBaseFunction(name)` to define JS-callable functions.
|
|
||||||
- Register props/funcs in `moduleMyModInit()` with
|
|
||||||
`scriptProtoDefineProp` / `scriptProtoDefineFunc` /
|
|
||||||
`scriptProtoDefineStaticFunc`.
|
|
||||||
2. `#include` the header in
|
|
||||||
`src/dusk/script/module/modulelist.c` and call
|
|
||||||
`moduleMyModInit()` in `moduleListInit()` (and `Dispose` in
|
|
||||||
`moduleListDispose()`).
|
|
||||||
3. For component modules also register in
|
|
||||||
`src/dusk/script/module/entity/component/modulecomponentlist.c`
|
|
||||||
so `entity.add()` returns the typed wrapper.
|
|
||||||
4. Create `types/<category>/mymod.d.ts` and add a
|
|
||||||
`/// <reference path="..." />` line to `types/index.d.ts`.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Script module type declarations
|
|
||||||
Whenever a `src/dusk/script/module/**/*.c` file is created or modified,
|
|
||||||
check whether the corresponding `types/**/*.d.ts` needs updating and
|
|
||||||
apply any changes before finishing the task.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## JavaScript (asset scripts)
|
|
||||||
- Use `var` for module-level state; `const` for values that never
|
|
||||||
change.
|
|
||||||
- Always use semicolons.
|
|
||||||
- Scene objects are plain objects (`var scene = {}`) with assigned
|
|
||||||
methods.
|
|
||||||
- Export via `module.exports = scene`.
|
|
||||||
- Async scene init should use `async function` and `await`.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Coding style
|
|
||||||
|
|
||||||
### ASCII only
|
|
||||||
Source files (`.c`, `.h`, `.js`) must contain only ASCII characters (U+0000–U+007F).
|
|
||||||
Non-ASCII characters are banned even in comments and string literals.
|
|
||||||
Use ASCII-only substitutes instead:
|
|
||||||
- `--` or `-` instead of `—` (em dash)
|
|
||||||
- `->` instead of `→` (arrow)
|
|
||||||
- `x` or `*` instead of `×` (multiplication)
|
|
||||||
|
|
||||||
Only non-script asset files (e.g. `.po` locale files) may contain non-ASCII text.
|
|
||||||
|
|
||||||
### Indentation
|
|
||||||
2 spaces. No tabs.
|
|
||||||
|
|
||||||
### Keyword and operator spacing
|
|
||||||
No space between a keyword or function name and its opening parenthesis:
|
|
||||||
|
|
||||||
```c
|
|
||||||
if(!ptr) return;
|
|
||||||
for(uint8_t i = 0; i < count; i++) {
|
|
||||||
while(entry->state != DONE) {
|
|
||||||
switch(type) {
|
|
||||||
sizeof(assetbatch_t)
|
|
||||||
memoryZero(ptr, size)
|
|
||||||
```
|
|
||||||
|
|
||||||
Spaces around all binary operators and after every comma:
|
|
||||||
|
|
||||||
```c
|
|
||||||
pos->flags |= ENTITY_POSITION_FLAG_WORLD_DIRTY;
|
|
||||||
(size_t)end - (size_t)start
|
|
||||||
foo(a, b, c)
|
|
||||||
```
|
|
||||||
|
|
||||||
### Braces
|
|
||||||
Opening brace on the **same line** as the statement (K&R style) for all
|
|
||||||
constructs — functions, `if`, `else`, `for`, `while`, `switch`:
|
|
||||||
|
|
||||||
```c
|
|
||||||
void assetEntryLock(assetentry_t *entry) {
|
|
||||||
...
|
|
||||||
}
|
|
||||||
|
|
||||||
if(dirty) {
|
|
||||||
...
|
|
||||||
} else {
|
|
||||||
...
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
### Guard returns
|
|
||||||
Short guards go on one line with no braces:
|
|
||||||
|
|
||||||
```c
|
|
||||||
if(!ptr) return;
|
|
||||||
if(!b || !b->batch) return jerry_undefined();
|
|
||||||
if(!(flags & DIRTY)) return;
|
|
||||||
```
|
|
||||||
|
|
||||||
### Blank lines
|
|
||||||
- One blank line between functions; no blank line at the start or end of
|
|
||||||
a function body.
|
|
||||||
- One blank line between logical blocks inside a function body.
|
|
||||||
- No trailing blank lines at the end of a file.
|
|
||||||
|
|
||||||
### Pointer placement
|
|
||||||
`*` is attached to the variable name, not the type:
|
|
||||||
|
|
||||||
```c
|
|
||||||
assetentry_t *entry
|
|
||||||
const char_t *name
|
|
||||||
void *ptr
|
|
||||||
uint8_t *d = (uint8_t *)dest;
|
|
||||||
```
|
|
||||||
|
|
||||||
### Casts
|
|
||||||
Space between cast and operand:
|
|
||||||
|
|
||||||
```c
|
|
||||||
(assetbatch_t *)user
|
|
||||||
(uint8_t *)dest
|
|
||||||
(textureformat_t)v
|
|
||||||
```
|
|
||||||
|
|
||||||
### Return
|
|
||||||
No parentheses around the return value:
|
|
||||||
|
|
||||||
```c
|
|
||||||
return ptr;
|
|
||||||
return MEMORY_POINTERS_IN_USE;
|
|
||||||
```
|
|
||||||
|
|
||||||
### switch / case
|
|
||||||
`case` indented 2 spaces from `switch`; body indented 2 more from `case`:
|
|
||||||
|
|
||||||
```c
|
|
||||||
switch(type) {
|
|
||||||
case ASSET_LOADER_TYPE_TEXTURE:
|
|
||||||
descs[i].input.texture = (textureformat_t)v;
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
### Multi-line function signatures
|
|
||||||
When parameters don't fit on one line, put each on its own line indented
|
|
||||||
2 spaces; the closing `) {` (definition) or `);` (declaration) goes on
|
|
||||||
its own line at column 0:
|
|
||||||
|
|
||||||
```c
|
|
||||||
void assetEntryInit(
|
|
||||||
assetentry_t *entry,
|
|
||||||
const char_t *name,
|
|
||||||
const assetloadertype_t type,
|
|
||||||
assetloaderinput_t *input
|
|
||||||
) {
|
|
||||||
|
|
||||||
errorret_t memoryCompare(
|
|
||||||
const void *a,
|
|
||||||
const void *b,
|
|
||||||
const size_t size
|
|
||||||
);
|
|
||||||
```
|
|
||||||
|
|
||||||
### Structs and enums
|
|
||||||
Anonymous inner struct or enum with a `typedef`, `_t` suffix, closing
|
|
||||||
brace and name on the same line:
|
|
||||||
|
|
||||||
```c
|
|
||||||
typedef struct {
|
|
||||||
errorcode_t code;
|
|
||||||
char_t *message;
|
|
||||||
} errorstate_t;
|
|
||||||
|
|
||||||
typedef enum {
|
|
||||||
ASSET_LOADER_TYPE_NULL,
|
|
||||||
ASSET_LOADER_TYPE_COUNT
|
|
||||||
} assetloadertype_t;
|
|
||||||
```
|
|
||||||
|
|
||||||
### Designated initialisers
|
|
||||||
Spaces inside braces; `.field = value`:
|
|
||||||
|
|
||||||
```c
|
|
||||||
jsassetentry_t e = { .entry = entry };
|
|
||||||
assetbatchloadedpend_t init = { .batch = batch };
|
|
||||||
```
|
|
||||||
|
|
||||||
### Ternary operator
|
|
||||||
Spaces around `?` and `:`:
|
|
||||||
|
|
||||||
```c
|
|
||||||
const float val = psx > 0.0f ? pt[0][0] / psx : 0.0f;
|
|
||||||
```
|
|
||||||
|
|
||||||
### const placement
|
|
||||||
`const` before the type, `*` attached to the variable:
|
|
||||||
|
|
||||||
```c
|
|
||||||
const char_t *name
|
|
||||||
const void *src
|
|
||||||
const size_t size
|
|
||||||
```
|
|
||||||
|
|
||||||
### Comments in `.c` files
|
|
||||||
- Do not use section dividers (`/* ---- ... ---- */`). Just let the
|
|
||||||
functions follow one another with a single blank line between them.
|
|
||||||
- Multi-line explanatory comments inside function bodies use `//` lines:
|
|
||||||
```c
|
|
||||||
// Script modules are freed; orphaned JS wrapper objects now get GC'd
|
|
||||||
// so their finalizers fire before assetDispose() checks ref counts.
|
|
||||||
jerry_heap_gc(JERRY_GC_PRESSURE_HIGH);
|
|
||||||
```
|
|
||||||
- Do not use `/* */` for inline or inline-block comments inside `.c`
|
|
||||||
function bodies.
|
|
||||||
|
|
||||||
### Comments in `.h` files
|
|
||||||
Every public declaration gets a Javadoc block (`/** … */`) with
|
|
||||||
`@param` and `@returns` where relevant. Keep it on the lines immediately
|
|
||||||
above the declaration with no blank line in between.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Color system
|
|
||||||
|
|
||||||
Colors are defined in `src/dusk/display/color.csv` and code-generated
|
|
||||||
into a `color.h` header by `tools/color/csv/__main__.py`.
|
|
||||||
|
|
||||||
Each row in the CSV has `name,r,g,b,a` with channel values in `[0.0, 1.0]`.
|
|
||||||
The script emits four `#define` variants per color plus a bare alias:
|
|
||||||
|
|
||||||
```
|
|
||||||
COLOR_<NAME>_4B color4b(r8, g8, b8, a8) // default alias target
|
|
||||||
COLOR_<NAME>_3B color3b(r8, g8, b8)
|
|
||||||
COLOR_<NAME>_3F color3f(rf, gf, bf)
|
|
||||||
COLOR_<NAME>_4F color4f(rf, gf, bf, af)
|
|
||||||
COLOR_<NAME> COLOR_<NAME>_4B
|
|
||||||
```
|
|
||||||
|
|
||||||
`color_t` is `color4b_t` (four `uint8_t` channels).
|
|
||||||
|
|
||||||
To add a new color, append a row to `color.csv` and rebuild — do not
|
|
||||||
hand-edit the generated header.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Tests
|
|
||||||
- Tests live in `test/` mirroring `src/dusk/` structure.
|
|
||||||
- Use cmocka; include `dusktest.h`.
|
|
||||||
- Test functions: `static void test_something(void **state)`.
|
|
||||||
- After each test, assert `memoryGetAllocatedCount() == 0` to catch
|
|
||||||
leaks.
|
|
||||||
- Build with `-DDUSK_BUILD_TESTS=ON`.
|
|
||||||
@@ -13,6 +13,7 @@ cmake_policy(SET CMP0079 NEW)
|
|||||||
# set(FETCHCONTENT_UPDATES_DISCONNECTED ON)
|
# set(FETCHCONTENT_UPDATES_DISCONNECTED ON)
|
||||||
|
|
||||||
option(DUSK_BUILD_TESTS "Enable tests" OFF)
|
option(DUSK_BUILD_TESTS "Enable tests" OFF)
|
||||||
|
option(DUSK_NETWORK "Enable network support" ON)
|
||||||
|
|
||||||
set(DUSK_GAME_NAME "Dusk" CACHE STRING "Game display name")
|
set(DUSK_GAME_NAME "Dusk" CACHE STRING "Game display name")
|
||||||
set(DUSK_GAME_AUTHOR "YourWishes" CACHE STRING "Game author / coder")
|
set(DUSK_GAME_AUTHOR "YourWishes" CACHE STRING "Game author / coder")
|
||||||
@@ -90,6 +91,12 @@ target_compile_definitions(${DUSK_LIBRARY_TARGET_NAME}
|
|||||||
DUSK_VERSION="${DUSK_VERSION}"
|
DUSK_VERSION="${DUSK_VERSION}"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
if(DUSK_NETWORK)
|
||||||
|
target_compile_definitions(${DUSK_LIBRARY_TARGET_NAME} PUBLIC
|
||||||
|
DUSK_NETWORK
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
|
||||||
# Toolchains
|
# Toolchains
|
||||||
include(cmake/targets/${DUSK_TARGET_SYSTEM}.cmake)
|
include(cmake/targets/${DUSK_TARGET_SYSTEM}.cmake)
|
||||||
|
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -1,21 +0,0 @@
|
|||||||
// Copyright (c) 2026 Dominic Masters
|
|
||||||
//
|
|
||||||
// This software is released under the MIT License.
|
|
||||||
// https://opensource.org/licenses/MIT
|
|
||||||
|
|
||||||
const platformNames = {
|
|
||||||
[System.PLATFORM_LINUX]: 'Linux',
|
|
||||||
[System.PLATFORM_KNULLI]: 'Knulli',
|
|
||||||
[System.PLATFORM_PSP]: 'PSP',
|
|
||||||
[System.PLATFORM_GAMECUBE]: 'GameCube',
|
|
||||||
[System.PLATFORM_WII]: 'Wii',
|
|
||||||
};
|
|
||||||
|
|
||||||
Console.print('Platform: ' + (platformNames[System.platform] || 'Unknown'));
|
|
||||||
|
|
||||||
UIFullboxOver.setColor(Color.BLACK);
|
|
||||||
|
|
||||||
requireAsync('testscene.js').then(Scene.set).catch(err => {
|
|
||||||
Console.print('Error loading scene: ' + err);
|
|
||||||
Engine.exit();
|
|
||||||
});
|
|
||||||
+253
-43
@@ -5,56 +5,266 @@ msgstr ""
|
|||||||
"Content-Type: text/plain; charset=UTF-8\n"
|
"Content-Type: text/plain; charset=UTF-8\n"
|
||||||
"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : n==2 ? 1 : (n<7 ? 2 : 3));\n"
|
"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : n==2 ? 1 : (n<7 ? 2 : 3));\n"
|
||||||
|
|
||||||
|
# Initial Scene
|
||||||
|
msgid "initial.checking_save.title"
|
||||||
|
msgstr "Checking for save data"
|
||||||
|
|
||||||
|
msgid "initial.checking_save.message"
|
||||||
|
msgstr "Please wait..."
|
||||||
|
|
||||||
|
msgid "initial.no_device.title"
|
||||||
|
msgstr "No Save Device Found"
|
||||||
|
|
||||||
|
msgid "initial.no_device.message"
|
||||||
|
msgstr "Could not find a save device, ensure it is connected and try again. You can continue, but progress will not be saved."
|
||||||
|
|
||||||
|
msgid "initial.no_device.retry"
|
||||||
|
msgstr "Try again"
|
||||||
|
|
||||||
|
msgid "initial.no_device.continue"
|
||||||
|
msgstr "Continue without saving"
|
||||||
|
|
||||||
|
|
||||||
|
# Main Menu Scene
|
||||||
|
msgid "main_menu.start_game"
|
||||||
|
msgstr "Start Game"
|
||||||
|
|
||||||
|
msgid "main_menu.options"
|
||||||
|
msgstr "Options"
|
||||||
|
|
||||||
|
msgid "main_menu.quit"
|
||||||
|
msgstr "Quit Game"
|
||||||
|
|
||||||
|
msgid "main_menu.quit_confirm"
|
||||||
|
msgstr "Are you sure you want to quit?"
|
||||||
|
|
||||||
|
msgid "main_menu.checking_save.title"
|
||||||
|
msgstr "Checking for save data"
|
||||||
|
|
||||||
|
msgid "main_menu.checking_save.message"
|
||||||
|
msgstr "Please wait..."
|
||||||
|
|
||||||
|
msgid "main_menu.no_device.title"
|
||||||
|
msgstr "No Save Device Found"
|
||||||
|
|
||||||
|
msgid "main_menu.no_device.message"
|
||||||
|
msgstr "Could not find a save device, ensure it is connected and try again. You can continue, but progress will not be saved."
|
||||||
|
|
||||||
|
msgid "main_menu.no_device.retry"
|
||||||
|
msgstr "Try again"
|
||||||
|
|
||||||
|
msgid "main_menu.no_device.continue"
|
||||||
|
msgstr "Continue without saving"
|
||||||
|
|
||||||
|
msgid "main_menu.save_load_error.title"
|
||||||
|
msgstr "Error"
|
||||||
|
|
||||||
|
msgid "main_menu.save_load_error.message"
|
||||||
|
msgstr "Failed to load save data. Please try again."
|
||||||
|
|
||||||
|
msgid "main_menu.save_load_error.retry"
|
||||||
|
msgstr "Try Again"
|
||||||
|
|
||||||
|
|
||||||
|
# Select Save Screen
|
||||||
|
msgid "ui.select_save.title"
|
||||||
|
msgstr "Select Save"
|
||||||
|
|
||||||
|
msgid "ui.select_save.empty"
|
||||||
|
msgstr "Empty Slot"
|
||||||
|
|
||||||
|
msgid "ui.select_save.slot_format"
|
||||||
|
msgstr "%s Lv.%d %s"
|
||||||
|
|
||||||
|
msgid "ui.select_save.delete_mode"
|
||||||
|
msgstr "Delete a Save"
|
||||||
|
|
||||||
|
msgid "ui.select_save.delete_confirm"
|
||||||
|
msgstr "Are you sure you want to delete this save?"
|
||||||
|
|
||||||
|
msgid "ui.select_save.name_title"
|
||||||
|
msgstr "Enter game save file name"
|
||||||
|
|
||||||
|
msgid "ui.save_slot.number_format"
|
||||||
|
msgstr "Slot %d"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#: ui/menu.c:10
|
#: ui/menu.c:10
|
||||||
msgid "ui.title"
|
msgid "ui.title"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Welcome"
|
"Welcome"
|
||||||
|
|
||||||
#: ui/user.c:22
|
msgid "save.linux.mkdirp_failed"
|
||||||
msgid "ui.greeting"
|
msgstr "Failed to create save directory, check the disk is not full or write-protected."
|
||||||
msgstr "Hello, %s!"
|
|
||||||
|
|
||||||
#: ui/files.c:40
|
#: src/dusk/ui/frame/settings/uisettings.c
|
||||||
msgid "ui.file_status"
|
msgid "ui.settings.tabs.general"
|
||||||
msgstr "%s has %d files."
|
msgstr "General"
|
||||||
|
|
||||||
#: ui/cart.c:55
|
#: src/dusk/ui/frame/settings/uisettings.c
|
||||||
msgid "cart.item_count"
|
msgid "ui.settings.tabs.input"
|
||||||
msgid_plural "cart.item_count"
|
msgstr "Input"
|
||||||
msgstr[0] "%d item"
|
|
||||||
msgstr[1] "%d items (dual)"
|
|
||||||
msgstr[2] "%d items (few)"
|
|
||||||
msgstr[3] "%d items (many)"
|
|
||||||
|
|
||||||
#: ui/notifications.c:71
|
#: src/dusk/ui/frame/settings/uisettings.c
|
||||||
msgid ""
|
msgid "ui.settings.tabs.display"
|
||||||
"ui.multiline_help"
|
msgstr "Display"
|
||||||
msgstr ""
|
|
||||||
"Line one of the help text.\n"
|
|
||||||
"Line two continues here.\n"
|
|
||||||
"Line three ends here."
|
|
||||||
|
|
||||||
#: ui/errors.c:90
|
#: src/dusk/ui/frame/settings/uisettings.c
|
||||||
msgid ""
|
msgid "ui.settings.tabs.audio"
|
||||||
"error.upload_failed.long"
|
msgstr "Audio"
|
||||||
msgstr ""
|
|
||||||
"Upload failed for file \"%s\".\n"
|
|
||||||
"Please try again later or contact support."
|
|
||||||
|
|
||||||
#: ui/messages.c:110
|
msgid "ui.settings.input.deadzone"
|
||||||
msgid ""
|
msgstr "Deadzone"
|
||||||
"user.invite_status"
|
|
||||||
msgid_plural ""
|
#: src/dusk/ui/frame/settings/uisettingsgeneral.c
|
||||||
"user.invite_status"
|
msgid "ui.settings.general.language"
|
||||||
msgstr[0] ""
|
msgstr "Language"
|
||||||
"%s invited %d user.\n"
|
|
||||||
"Please review the request."
|
msgid "ui.settings.general.language_detail"
|
||||||
msgstr[1] ""
|
msgstr "Takes effect after restarting the application."
|
||||||
"%s invited %d users (dual).\n"
|
|
||||||
"Please review the requests."
|
#: src/dusk/ui/frame/settings/uisettings.c
|
||||||
msgstr[2] ""
|
msgid "ui.settings.apply"
|
||||||
"%s invited %d users (few).\n"
|
msgstr "Apply"
|
||||||
"Please review the requests."
|
|
||||||
msgstr[3] ""
|
#: src/dusk/ui/frame/uiconfirm.c
|
||||||
"%s invited %d users (many).\n"
|
msgid "ui.confirm.discard_changes"
|
||||||
"Please review the requests."
|
msgstr "Discard unsaved changes?"
|
||||||
|
|
||||||
|
#: src/dusk/ui/frame/game/uigamemenu.c
|
||||||
|
msgid "ui.game_menu.characters"
|
||||||
|
msgstr "Characters"
|
||||||
|
|
||||||
|
#: src/dusk/ui/frame/game/uigamemenu.c
|
||||||
|
msgid "ui.game_menu.items"
|
||||||
|
msgstr "Items"
|
||||||
|
|
||||||
|
#: src/dusk/ui/frame/game/uigamemenu.c
|
||||||
|
msgid "ui.game_menu.settings"
|
||||||
|
msgstr "Settings"
|
||||||
|
|
||||||
|
#: src/dusk/ui/frame/game/uigamemenu.c
|
||||||
|
msgid "ui.game_menu.save"
|
||||||
|
msgstr "Save"
|
||||||
|
|
||||||
|
#: src/dusk/ui/frame/game/uigamemenu.c
|
||||||
|
msgid "ui.game_menu.save_success"
|
||||||
|
msgstr "Game saved."
|
||||||
|
|
||||||
|
#: src/dusk/ui/frame/game/uigamemenu.c
|
||||||
|
msgid "ui.game_menu.save_cancelled"
|
||||||
|
msgstr "Save cancelled."
|
||||||
|
|
||||||
|
#: src/dusk/ui/frame/game/uigamemenu.c
|
||||||
|
msgid "ui.game_menu.save_unavailable"
|
||||||
|
msgstr "Can't save - no save device found."
|
||||||
|
|
||||||
|
#: src/dusk/ui/frame/game/uigamemenu.c
|
||||||
|
msgid "ui.game_menu.save_temporary"
|
||||||
|
msgstr "This session is temporary - no save device was found, so saving is disabled."
|
||||||
|
|
||||||
|
#: src/dusk/ui/frame/game/uigamemenu.c
|
||||||
|
msgid "ui.game_menu.save_create_confirm"
|
||||||
|
msgstr "No save data found. Create a new save?"
|
||||||
|
|
||||||
|
#: src/dusk/ui/frame/game/uigamemenu.c
|
||||||
|
msgid "ui.game_menu.save_failed_format"
|
||||||
|
msgstr "Save failed: %s"
|
||||||
|
|
||||||
|
#: src/dusk/ui/frame/game/uigamemenu.c
|
||||||
|
msgid "ui.game_menu.save_check_failed_format"
|
||||||
|
msgstr "Can't save: %s"
|
||||||
|
|
||||||
|
#: src/dusk/ui/frame/initial/uiinitialnocard.c
|
||||||
|
msgid "ui.initial.no_card.message"
|
||||||
|
msgstr "No save device found. You can continue, but\nprogress will not be saved."
|
||||||
|
|
||||||
|
#: src/dusk/ui/frame/initial/uiinitialnocard.c
|
||||||
|
msgid "ui.initial.no_card.retry"
|
||||||
|
msgstr "Retry"
|
||||||
|
|
||||||
|
#: src/dusk/ui/frame/initial/uiinitialnocard.c
|
||||||
|
msgid "ui.initial.no_card.continue"
|
||||||
|
msgstr "Continue Anyway"
|
||||||
|
|
||||||
|
#: src/dusk/ui/frame/initial/uiinitialcreatesave.c
|
||||||
|
msgid "ui.initial.create_save.message"
|
||||||
|
msgstr "No save data found. Create a new save?"
|
||||||
|
|
||||||
|
#: src/dusk/ui/frame/initial/uiinitialcreatesave.c
|
||||||
|
msgid "ui.initial.create_save.yes"
|
||||||
|
msgstr "Yes"
|
||||||
|
|
||||||
|
#: src/dusk/ui/frame/initial/uiinitialcreatesave.c
|
||||||
|
msgid "ui.initial.create_save.no"
|
||||||
|
msgstr "No"
|
||||||
|
|
||||||
|
#: src/dusk/ui/frame/uiconfirm.c
|
||||||
|
msgid "ui.confirm.confirm"
|
||||||
|
msgstr "Confirm"
|
||||||
|
|
||||||
|
#: src/dusk/ui/frame/uiconfirm.c
|
||||||
|
msgid "ui.confirm.cancel"
|
||||||
|
msgstr "Cancel"
|
||||||
|
|
||||||
|
#: src/dusk/ui/frame/battle/uibattlemenu.c
|
||||||
|
msgid "ui.battle.menu.attack"
|
||||||
|
msgstr "Attack"
|
||||||
|
|
||||||
|
#: src/dusk/ui/frame/battle/uibattlemenu.c
|
||||||
|
msgid "ui.battle.menu.flee"
|
||||||
|
msgstr "Flee"
|
||||||
|
|
||||||
|
#: src/dusk/ui/frame/battle/uibattlemenu.c
|
||||||
|
msgid "ui.battle.menu.target_format"
|
||||||
|
msgstr "Enemy %u (%u/%u HP)"
|
||||||
|
|
||||||
|
#: src/dusk/ui/frame/battle/uibattlehud.c
|
||||||
|
msgid "ui.battle.hud.hp_format"
|
||||||
|
msgstr "HP %u/%u"
|
||||||
|
|
||||||
|
#: src/dusk/ui/frame/battle/uibattlehud.c
|
||||||
|
msgid "ui.battle.hud.mp_format"
|
||||||
|
msgstr "MP %u/%u"
|
||||||
|
|
||||||
|
#: src/dusk/ui/frame/settings/uisettingsaudio.c
|
||||||
|
msgid "ui.settings.audio.placeholder"
|
||||||
|
msgstr "No audio settings yet"
|
||||||
|
|
||||||
|
#: src/dusk/ui/frame/settings/uisettingsdisplay.c
|
||||||
|
msgid "ui.settings.display.placeholder"
|
||||||
|
msgstr "No display settings yet"
|
||||||
|
|
||||||
|
#: src/dusk/ui/frame/settings/uisettingsinput.c
|
||||||
|
msgid "ui.settings.input.placeholder"
|
||||||
|
msgstr "No input settings yet"
|
||||||
|
|
||||||
|
#: src/dusk/ui/frame/backpack/uibackpack.c
|
||||||
|
msgid "ui.backpack.category_format"
|
||||||
|
msgstr "Category %u"
|
||||||
|
|
||||||
|
#: src/dusk/ui/overlay/uiloading.c
|
||||||
|
msgid "ui.loading.text"
|
||||||
|
msgstr "loading"
|
||||||
|
|
||||||
|
#: src/dusk/ui/overlay/uiautosave.c
|
||||||
|
msgid "ui.autosave.saving"
|
||||||
|
msgstr "SAVING"
|
||||||
|
|
||||||
|
msgid "item.potion.name"
|
||||||
|
msgstr "Potion"
|
||||||
|
|
||||||
|
msgid "item.potato.name"
|
||||||
|
msgstr "Potato"
|
||||||
|
|
||||||
|
msgid "item.apple.name"
|
||||||
|
msgstr "Apple"
|
||||||
Binary file not shown.
Binary file not shown.
@@ -1,63 +0,0 @@
|
|||||||
// Copyright (c) 2026 Dominic Masters
|
|
||||||
//
|
|
||||||
// This software is released under the MIT License.
|
|
||||||
// https://opensource.org/licenses/MIT
|
|
||||||
|
|
||||||
const PLAYER_SPEED = 5.0;
|
|
||||||
// 1 world unit = 16 pixels.
|
|
||||||
const PIXEL_SCALE = 1.0 / 16.0;
|
|
||||||
// Player sprite is 32x32 px (test.png dimensions).
|
|
||||||
const PLAYER_W = 32 * PIXEL_SCALE;
|
|
||||||
const PLAYER_H = 32 * PIXEL_SCALE;
|
|
||||||
|
|
||||||
var player = {};
|
|
||||||
|
|
||||||
player.getAssets = () => {
|
|
||||||
return [
|
|
||||||
{ path: 'test.png', type: Asset.TYPE_TEXTURE, format: Texture.FORMAT_RGBA }
|
|
||||||
];
|
|
||||||
}
|
|
||||||
|
|
||||||
player.init = function(scene) {
|
|
||||||
var texture = scene.assets.getAssetByPath('test.png');
|
|
||||||
Console.print('Player init: got texture ' + texture);
|
|
||||||
|
|
||||||
_entity = Entity.create();
|
|
||||||
_position = _entity.add(Component.POSITION);
|
|
||||||
_physics = _entity.add(Component.PHYSICS);
|
|
||||||
|
|
||||||
_physics.bodyType = Physics.DYNAMIC;
|
|
||||||
_physics.shape = Physics.SHAPE_CUBE;
|
|
||||||
_physics.gravityScale = 1.0;
|
|
||||||
|
|
||||||
var r = _entity.add(Component.RENDERABLE);
|
|
||||||
r.texture = texture.texture;
|
|
||||||
r.type = Renderable.SPRITEBATCH;
|
|
||||||
r.color = new Color(220, 80, 80);
|
|
||||||
// Upright quad centered on X, bottom-aligned on Y.
|
|
||||||
r.sprites = [[-PLAYER_W/2, 0, 0, PLAYER_W/2, PLAYER_H, 0, 0, 1, 1, 0]];
|
|
||||||
|
|
||||||
_position.localPosition = new Vec3(0, PLAYER_H, 0);
|
|
||||||
};
|
|
||||||
|
|
||||||
player.getPosition = function() {
|
|
||||||
return _position;
|
|
||||||
};
|
|
||||||
|
|
||||||
player.update = function() {
|
|
||||||
if(!_physics) return;
|
|
||||||
var vx = Input.axis(INPUT_ACTION_LEFT, INPUT_ACTION_RIGHT) * PLAYER_SPEED;
|
|
||||||
var vz = Input.axis(INPUT_ACTION_DOWN, INPUT_ACTION_UP) * PLAYER_SPEED;
|
|
||||||
// Preserve vertical velocity so gravity and landing work correctly.
|
|
||||||
var vy = _physics.velocity.y;
|
|
||||||
_physics.velocity = new Vec3(vx, vy, vz);
|
|
||||||
};
|
|
||||||
|
|
||||||
player.dispose = function() {
|
|
||||||
Entity.dispose(_entity);
|
|
||||||
_entity = null;
|
|
||||||
_position = null;
|
|
||||||
_physics = null;
|
|
||||||
};
|
|
||||||
|
|
||||||
module.exports = player;
|
|
||||||
@@ -1,42 +0,0 @@
|
|||||||
// Copyright (c) 2026 Dominic Masters
|
|
||||||
//
|
|
||||||
// This software is released under the MIT License.
|
|
||||||
// https://opensource.org/licenses/MIT
|
|
||||||
|
|
||||||
var scene = {};
|
|
||||||
|
|
||||||
// Pokemon DS-style camera: ~34 degrees elevation (atan(6/9)).
|
|
||||||
// CAM_HEIGHT / CAM_DIST ratio controls the tilt - keep it under 0.7 for
|
|
||||||
// the characteristically shallow DS angle.
|
|
||||||
const CAM_HEIGHT = 6;
|
|
||||||
const CAM_DIST = 9;
|
|
||||||
|
|
||||||
scene.init = async function() {
|
|
||||||
// Camera
|
|
||||||
scene.cam = Entity.create();
|
|
||||||
var camPos = scene.cam.add(Component.POSITION);
|
|
||||||
var cam = scene.cam.add(Component.CAMERA);
|
|
||||||
camPos.localPosition = new Vec3(3, 3, 3);
|
|
||||||
camPos.lookAt(new Vec3(0, 0, 0));
|
|
||||||
|
|
||||||
// Floor - large flat slab, no texture needed.
|
|
||||||
scene.floor = Entity.create();
|
|
||||||
var floorPos = scene.floor.add(Component.POSITION);
|
|
||||||
var floorR = scene.floor.add(Component.RENDERABLE);
|
|
||||||
floorR.type = Renderable.SHADER_MATERIAL;
|
|
||||||
floorR.color = Color.BLUE;
|
|
||||||
// floorPos.localScale = new Vec3(16, 0.2, 16);
|
|
||||||
// floorPos.localPosition = new Vec3(0, -0.1, 0);
|
|
||||||
|
|
||||||
await UIFullboxOver.transition(Color.BLACK, Color.TRANSPARENT, 1.0);
|
|
||||||
};
|
|
||||||
|
|
||||||
scene.update = function() {
|
|
||||||
};
|
|
||||||
|
|
||||||
scene.dispose = function() {
|
|
||||||
Entity.dispose(scene.floor);
|
|
||||||
Entity.dispose(scene.cam);
|
|
||||||
};
|
|
||||||
|
|
||||||
module.exports = scene;
|
|
||||||
Binary file not shown.
Binary file not shown.
|
Before Width: | Height: | Size: 1.2 KiB |
@@ -1,6 +0,0 @@
|
|||||||
module = {
|
|
||||||
render() {
|
|
||||||
Text.draw(0, 0, "Hello World");
|
|
||||||
SpriteBatch.flush();
|
|
||||||
}
|
|
||||||
};
|
|
||||||
@@ -2179,5 +2179,27 @@
|
|||||||
0
|
0
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
],
|
||||||
|
"entities": [
|
||||||
|
{
|
||||||
|
"type": "global",
|
||||||
|
"globalId": 3,
|
||||||
|
"pos": [8, 8, 1]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "item",
|
||||||
|
"itemId": 1,
|
||||||
|
"quantity": 1,
|
||||||
|
"pos": [12, 2, 0]
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"areas": [
|
||||||
|
{
|
||||||
|
"min": [11, 3, 0],
|
||||||
|
"max": [16, 9, 10],
|
||||||
|
"callbackId": 1,
|
||||||
|
"notify": 3,
|
||||||
|
"trigger": 6
|
||||||
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
@@ -1464,7 +1464,7 @@
|
|||||||
10,
|
10,
|
||||||
0
|
0
|
||||||
],
|
],
|
||||||
"type": 1,
|
"type": 4,
|
||||||
"tile": 0
|
"tile": 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -1473,7 +1473,7 @@
|
|||||||
10,
|
10,
|
||||||
0
|
0
|
||||||
],
|
],
|
||||||
"type": 1,
|
"type": 4,
|
||||||
"tile": 0
|
"tile": 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -1482,7 +1482,7 @@
|
|||||||
10,
|
10,
|
||||||
0
|
0
|
||||||
],
|
],
|
||||||
"type": 1,
|
"type": 4,
|
||||||
"tile": 0
|
"tile": 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -1491,7 +1491,7 @@
|
|||||||
10,
|
10,
|
||||||
0
|
0
|
||||||
],
|
],
|
||||||
"type": 1,
|
"type": 4,
|
||||||
"tile": 0
|
"tile": 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -1500,7 +1500,7 @@
|
|||||||
10,
|
10,
|
||||||
0
|
0
|
||||||
],
|
],
|
||||||
"type": 1,
|
"type": 4,
|
||||||
"tile": 0
|
"tile": 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -1509,7 +1509,7 @@
|
|||||||
10,
|
10,
|
||||||
0
|
0
|
||||||
],
|
],
|
||||||
"type": 1,
|
"type": 4,
|
||||||
"tile": 0
|
"tile": 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -2267,6 +2267,276 @@
|
|||||||
],
|
],
|
||||||
"type": 1,
|
"type": 1,
|
||||||
"tile": 0
|
"tile": 0
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"pos": [
|
||||||
|
6,
|
||||||
|
9,
|
||||||
|
1
|
||||||
|
],
|
||||||
|
"type": 4,
|
||||||
|
"tile": 0
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"pos": [
|
||||||
|
7,
|
||||||
|
9,
|
||||||
|
1
|
||||||
|
],
|
||||||
|
"type": 4,
|
||||||
|
"tile": 0
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"pos": [
|
||||||
|
8,
|
||||||
|
9,
|
||||||
|
1
|
||||||
|
],
|
||||||
|
"type": 4,
|
||||||
|
"tile": 0
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"pos": [
|
||||||
|
9,
|
||||||
|
9,
|
||||||
|
1
|
||||||
|
],
|
||||||
|
"type": 4,
|
||||||
|
"tile": 0
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"pos": [
|
||||||
|
10,
|
||||||
|
9,
|
||||||
|
1
|
||||||
|
],
|
||||||
|
"type": 4,
|
||||||
|
"tile": 0
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"pos": [
|
||||||
|
11,
|
||||||
|
9,
|
||||||
|
1
|
||||||
|
],
|
||||||
|
"type": 4,
|
||||||
|
"tile": 0
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"pos": [
|
||||||
|
6,
|
||||||
|
8,
|
||||||
|
2
|
||||||
|
],
|
||||||
|
"type": 4,
|
||||||
|
"tile": 0
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"pos": [
|
||||||
|
7,
|
||||||
|
8,
|
||||||
|
2
|
||||||
|
],
|
||||||
|
"type": 4,
|
||||||
|
"tile": 0
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"pos": [
|
||||||
|
8,
|
||||||
|
8,
|
||||||
|
2
|
||||||
|
],
|
||||||
|
"type": 4,
|
||||||
|
"tile": 0
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"pos": [
|
||||||
|
9,
|
||||||
|
8,
|
||||||
|
2
|
||||||
|
],
|
||||||
|
"type": 4,
|
||||||
|
"tile": 0
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"pos": [
|
||||||
|
10,
|
||||||
|
8,
|
||||||
|
2
|
||||||
|
],
|
||||||
|
"type": 4,
|
||||||
|
"tile": 0
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"pos": [
|
||||||
|
11,
|
||||||
|
8,
|
||||||
|
2
|
||||||
|
],
|
||||||
|
"type": 4,
|
||||||
|
"tile": 0
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"pos": [
|
||||||
|
6,
|
||||||
|
5,
|
||||||
|
3
|
||||||
|
],
|
||||||
|
"type": 1,
|
||||||
|
"tile": 0
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"pos": [
|
||||||
|
7,
|
||||||
|
5,
|
||||||
|
3
|
||||||
|
],
|
||||||
|
"type": 1,
|
||||||
|
"tile": 0
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"pos": [
|
||||||
|
8,
|
||||||
|
5,
|
||||||
|
3
|
||||||
|
],
|
||||||
|
"type": 1,
|
||||||
|
"tile": 0
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"pos": [
|
||||||
|
9,
|
||||||
|
5,
|
||||||
|
3
|
||||||
|
],
|
||||||
|
"type": 1,
|
||||||
|
"tile": 0
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"pos": [
|
||||||
|
10,
|
||||||
|
5,
|
||||||
|
3
|
||||||
|
],
|
||||||
|
"type": 1,
|
||||||
|
"tile": 0
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"pos": [
|
||||||
|
11,
|
||||||
|
5,
|
||||||
|
3
|
||||||
|
],
|
||||||
|
"type": 1,
|
||||||
|
"tile": 0
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"pos": [
|
||||||
|
6,
|
||||||
|
6,
|
||||||
|
3
|
||||||
|
],
|
||||||
|
"type": 1,
|
||||||
|
"tile": 0
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"pos": [
|
||||||
|
7,
|
||||||
|
6,
|
||||||
|
3
|
||||||
|
],
|
||||||
|
"type": 1,
|
||||||
|
"tile": 0
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"pos": [
|
||||||
|
8,
|
||||||
|
6,
|
||||||
|
3
|
||||||
|
],
|
||||||
|
"type": 1,
|
||||||
|
"tile": 0
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"pos": [
|
||||||
|
9,
|
||||||
|
6,
|
||||||
|
3
|
||||||
|
],
|
||||||
|
"type": 1,
|
||||||
|
"tile": 0
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"pos": [
|
||||||
|
10,
|
||||||
|
6,
|
||||||
|
3
|
||||||
|
],
|
||||||
|
"type": 1,
|
||||||
|
"tile": 0
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"pos": [
|
||||||
|
11,
|
||||||
|
6,
|
||||||
|
3
|
||||||
|
],
|
||||||
|
"type": 1,
|
||||||
|
"tile": 0
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"pos": [
|
||||||
|
6,
|
||||||
|
7,
|
||||||
|
3
|
||||||
|
],
|
||||||
|
"type": 1,
|
||||||
|
"tile": 0
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"pos": [
|
||||||
|
7,
|
||||||
|
7,
|
||||||
|
3
|
||||||
|
],
|
||||||
|
"type": 1,
|
||||||
|
"tile": 0
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"pos": [
|
||||||
|
8,
|
||||||
|
7,
|
||||||
|
3
|
||||||
|
],
|
||||||
|
"type": 1,
|
||||||
|
"tile": 0
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"pos": [
|
||||||
|
9,
|
||||||
|
7,
|
||||||
|
3
|
||||||
|
],
|
||||||
|
"type": 1,
|
||||||
|
"tile": 0
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"pos": [
|
||||||
|
10,
|
||||||
|
7,
|
||||||
|
3
|
||||||
|
],
|
||||||
|
"type": 1,
|
||||||
|
"tile": 0
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"pos": [
|
||||||
|
11,
|
||||||
|
7,
|
||||||
|
3
|
||||||
|
],
|
||||||
|
"type": 1,
|
||||||
|
"tile": 0
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"meshes": []
|
"meshes": []
|
||||||
|
|||||||
@@ -0,0 +1,69 @@
|
|||||||
|
{
|
||||||
|
"items": [
|
||||||
|
// Boot check: make sure a save device is available before handing off
|
||||||
|
// to the main menu.
|
||||||
|
{
|
||||||
|
"type": "MODAL",
|
||||||
|
"title": "initial.checking_save.title",
|
||||||
|
"message": "initial.checking_save.message"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "WAIT",
|
||||||
|
"seconds": 0.2
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "SAVE_DEVICE_CHECK",
|
||||||
|
"successMarker": "CONTINUE",
|
||||||
|
"failureMarker": "NO_DEVICE"
|
||||||
|
},
|
||||||
|
|
||||||
|
// No save device found - offer to retry or continue without saving.
|
||||||
|
{
|
||||||
|
"type": "MARKER",
|
||||||
|
"name": "NO_DEVICE"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "MODAL_CLOSE"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "MODAL_OPTIONS_MARKERS",
|
||||||
|
"title": "initial.no_device.title",
|
||||||
|
"message": "initial.no_device.message",
|
||||||
|
"options": [
|
||||||
|
{
|
||||||
|
"text": "initial.no_device.retry",
|
||||||
|
"marker": "RETRY"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"text": "initial.no_device.continue",
|
||||||
|
"marker": "CONTINUE"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
|
||||||
|
{
|
||||||
|
"type": "MARKER",
|
||||||
|
"name": "RETRY"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "MODAL_CLOSE"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "RESTART"
|
||||||
|
},
|
||||||
|
|
||||||
|
// Save device found (or continuing without one) - hand off to the
|
||||||
|
// main menu scene.
|
||||||
|
{
|
||||||
|
"type": "MARKER",
|
||||||
|
"name": "CONTINUE"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "MODAL_CLOSE"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "SCENE",
|
||||||
|
"sceneType": "MAIN_MENU"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
@@ -0,0 +1,92 @@
|
|||||||
|
{
|
||||||
|
"items": [
|
||||||
|
{
|
||||||
|
"type": "MODAL",
|
||||||
|
"title": "main_menu.checking_save.title",
|
||||||
|
"message": "main_menu.checking_save.message"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "WAIT",
|
||||||
|
"seconds": 0.2
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "SAVE_DEVICE_CHECK",
|
||||||
|
"successMarker": "CONTINUE",
|
||||||
|
"failureMarker": "NO_DEVICE"
|
||||||
|
},
|
||||||
|
|
||||||
|
// No save device found - offer to retry or continue without saving.
|
||||||
|
{
|
||||||
|
"type": "MARKER",
|
||||||
|
"name": "NO_DEVICE"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "MODAL_CLOSE"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "MODAL_OPTIONS_MARKERS",
|
||||||
|
"title": "main_menu.no_device.title",
|
||||||
|
"message": "main_menu.no_device.message",
|
||||||
|
"options": [
|
||||||
|
{
|
||||||
|
"text": "main_menu.no_device.retry",
|
||||||
|
"marker": "RETRY"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"text": "main_menu.no_device.continue",
|
||||||
|
"marker": "CONTINUE"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
|
||||||
|
// Retry
|
||||||
|
{
|
||||||
|
"type": "MARKER",
|
||||||
|
"name": "RETRY"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "MODAL_CLOSE"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "RESTART"
|
||||||
|
},
|
||||||
|
|
||||||
|
// Save device found - attempt to load all save slots.
|
||||||
|
{
|
||||||
|
"type": "MARKER",
|
||||||
|
"name": "CONTINUE"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "MODAL_CLOSE"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "SAVE_LOAD_ALL_SLOTS",
|
||||||
|
"successMarker": "LOADED",
|
||||||
|
"failureMarker": "LOAD_ERROR"
|
||||||
|
},
|
||||||
|
|
||||||
|
// Save data failed to load (e.g. corrupt/unreadable) - only option is
|
||||||
|
// to retry, no "continue without saving" here since we already know a
|
||||||
|
// device is present.
|
||||||
|
{
|
||||||
|
"type": "MARKER",
|
||||||
|
"name": "LOAD_ERROR"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "MODAL_OPTIONS_MARKERS",
|
||||||
|
"title": "main_menu.save_load_error.title",
|
||||||
|
"message": "main_menu.save_load_error.message",
|
||||||
|
"options": [
|
||||||
|
{
|
||||||
|
"text": "main_menu.save_load_error.retry",
|
||||||
|
"marker": "RETRY"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
|
||||||
|
{
|
||||||
|
"type": "MARKER",
|
||||||
|
"name": "LOADED"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
@@ -16,6 +16,9 @@ target_compile_definitions(${DUSK_LIBRARY_TARGET_NAME} PUBLIC
|
|||||||
DOL=1
|
DOL=1
|
||||||
ISO=2
|
ISO=2
|
||||||
DUSK_DOLPHIN_BUILD_TYPE=${DUSK_DOLPHIN_BUILD_TYPE}
|
DUSK_DOLPHIN_BUILD_TYPE=${DUSK_DOLPHIN_BUILD_TYPE}
|
||||||
|
# GameCube/Wii PowerPC is always big-endian; declare it at compile time
|
||||||
|
# like every other target instead of relying on endian.h's runtime probe.
|
||||||
|
DUSK_PLATFORM_ENDIAN_BIG
|
||||||
)
|
)
|
||||||
|
|
||||||
# Custom compiler flags
|
# Custom compiler flags
|
||||||
@@ -58,6 +61,7 @@ target_link_libraries(${DUSK_LIBRARY_TARGET_NAME} PRIVATE
|
|||||||
zstd
|
zstd
|
||||||
z
|
z
|
||||||
lzma
|
lzma
|
||||||
|
ansnd
|
||||||
)
|
)
|
||||||
|
|
||||||
if(DUSK_DOLPHIN_BUILD_TYPE STREQUAL "ISO")
|
if(DUSK_DOLPHIN_BUILD_TYPE STREQUAL "ISO")
|
||||||
|
|||||||
@@ -36,7 +36,7 @@ target_compile_definitions(${DUSK_LIBRARY_TARGET_NAME} PUBLIC
|
|||||||
# DUSK_OPENGL_LEGACY
|
# DUSK_OPENGL_LEGACY
|
||||||
DUSK_LINUX
|
DUSK_LINUX
|
||||||
DUSK_DISPLAY_SIZE_DYNAMIC
|
DUSK_DISPLAY_SIZE_DYNAMIC
|
||||||
DUSK_DISPLAY_WIDTH_DEFAULT=640
|
DUSK_DISPLAY_WIDTH_DEFAULT=854
|
||||||
DUSK_DISPLAY_HEIGHT_DEFAULT=480
|
DUSK_DISPLAY_HEIGHT_DEFAULT=480
|
||||||
DUSK_DISPLAY_SCREEN_HEIGHT=240
|
DUSK_DISPLAY_SCREEN_HEIGHT=240
|
||||||
DUSK_INPUT_KEYBOARD
|
DUSK_INPUT_KEYBOARD
|
||||||
|
|||||||
@@ -56,6 +56,7 @@ target_compile_definitions(${DUSK_BINARY_TARGET_NAME} PUBLIC
|
|||||||
DUSK_DISPLAY_HEIGHT=272
|
DUSK_DISPLAY_HEIGHT=272
|
||||||
DUSK_THREAD_PTHREAD
|
DUSK_THREAD_PTHREAD
|
||||||
DUSK_TIME_DYNAMIC
|
DUSK_TIME_DYNAMIC
|
||||||
|
DUSK_DISPLAY_OVERSCAN=6
|
||||||
)
|
)
|
||||||
|
|
||||||
if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
|
if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
|
||||||
@@ -64,6 +65,23 @@ if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
|
|||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
# Generate PARAM.SFO as a normal tracked build output (instead of letting
|
||||||
|
# create_pbp_file() auto-generate + delete it) so it can be reused below by
|
||||||
|
# a properly dependency-tracked EBOOT.PBP repack step.
|
||||||
|
set(DUSK_PSP_PARAM_SFO "${DUSK_BUILD_DIR}/PARAM.SFO")
|
||||||
|
add_custom_command(
|
||||||
|
OUTPUT "${DUSK_PSP_PARAM_SFO}"
|
||||||
|
COMMAND "$ENV{PSPDEV}/bin/mksfoex" "-d" "MEMSIZE=1" "-s" "APP_VER=01.00"
|
||||||
|
"${DUSK_BINARY_TARGET_NAME}" "${DUSK_PSP_PARAM_SFO}"
|
||||||
|
COMMENT "Generating PARAM.SFO for ${DUSK_BINARY_TARGET_NAME}"
|
||||||
|
VERBATIM
|
||||||
|
)
|
||||||
|
add_custom_target(DuskPspParamSfo DEPENDS "${DUSK_PSP_PARAM_SFO}")
|
||||||
|
|
||||||
|
# create_pbp_file()'s own POST_BUILD chain (below) also consumes
|
||||||
|
# DUSK_PSP_PARAM_SFO, so make sure it exists before that chain runs.
|
||||||
|
add_dependencies(${DUSK_BINARY_TARGET_NAME} DuskPspParamSfo)
|
||||||
|
|
||||||
# Postbuild, create .pbp file for PSP.
|
# Postbuild, create .pbp file for PSP.
|
||||||
create_pbp_file(
|
create_pbp_file(
|
||||||
TARGET "${DUSK_BINARY_TARGET_NAME}"
|
TARGET "${DUSK_BINARY_TARGET_NAME}"
|
||||||
@@ -73,4 +91,33 @@ create_pbp_file(
|
|||||||
TITLE "${DUSK_BINARY_TARGET_NAME}"
|
TITLE "${DUSK_BINARY_TARGET_NAME}"
|
||||||
PSAR_PATH ${DUSK_ASSETS_ZIP}
|
PSAR_PATH ${DUSK_ASSETS_ZIP}
|
||||||
VERSION 01.00
|
VERSION 01.00
|
||||||
|
SFO_PATH "${DUSK_PSP_PARAM_SFO}"
|
||||||
|
OUTPUT_DIR "${DUSK_BUILD_DIR}"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
# CreatePBP.cmake's pack-pbp step is a POST_BUILD command tied to the
|
||||||
|
# executable target, so it only reruns when the ELF itself relinks. That
|
||||||
|
# means regenerating dusk.dsk (assets) alone, without touching any C
|
||||||
|
# source, silently leaves EBOOT.PBP embedding a stale asset pak. Repack it
|
||||||
|
# here as a normal file-tracked custom command depending on both the
|
||||||
|
# executable and the asset zip, so EBOOT.PBP always reflects the current
|
||||||
|
# assets even when nothing else about the build changed.
|
||||||
|
set(DUSK_PSP_EBOOT "${DUSK_BUILD_DIR}/EBOOT.PBP")
|
||||||
|
if(BUILD_PRX)
|
||||||
|
set(DUSK_PSP_EXECUTABLE "$<TARGET_FILE:${DUSK_BINARY_TARGET_NAME}>.prx")
|
||||||
|
else()
|
||||||
|
set(DUSK_PSP_EXECUTABLE "$<TARGET_FILE:${DUSK_BINARY_TARGET_NAME}>")
|
||||||
|
endif()
|
||||||
|
add_custom_command(
|
||||||
|
OUTPUT "${DUSK_PSP_EBOOT}"
|
||||||
|
COMMAND "$ENV{PSPDEV}/bin/pack-pbp" "${DUSK_PSP_EBOOT}" "${DUSK_PSP_PARAM_SFO}"
|
||||||
|
"NULL" "NULL" "NULL" "NULL" "NULL"
|
||||||
|
"${DUSK_PSP_EXECUTABLE}" "${DUSK_ASSETS_ZIP}"
|
||||||
|
DEPENDS
|
||||||
|
"$<TARGET_FILE:${DUSK_BINARY_TARGET_NAME}>"
|
||||||
|
"${DUSK_PSP_PARAM_SFO}"
|
||||||
|
"${DUSK_ASSETS_ZIP}"
|
||||||
|
COMMENT "Repacking EBOOT.PBP (tracks executable + asset pak freshness)"
|
||||||
|
VERBATIM
|
||||||
|
)
|
||||||
|
add_custom_target(DuskPspEbootRepack ALL DEPENDS "${DUSK_PSP_EBOOT}")
|
||||||
@@ -4,6 +4,17 @@ target_compile_definitions(${DUSK_LIBRARY_TARGET_NAME} PUBLIC
|
|||||||
DUSK_WII
|
DUSK_WII
|
||||||
)
|
)
|
||||||
|
|
||||||
|
# Wii save storage method - see src/duskdolphin/save/savedeviceplatform.h.
|
||||||
|
set(DUSK_SAVE_WII_METHOD "NAND" CACHE STRING
|
||||||
|
"Wii save storage: NAND (internal storage via ISFS), CARD (GameCube-\
|
||||||
|
compatible memory card emulation), or SD (SD card via libfat)"
|
||||||
|
)
|
||||||
|
set_property(CACHE DUSK_SAVE_WII_METHOD PROPERTY STRINGS "NAND" "CARD" "SD")
|
||||||
|
|
||||||
|
target_compile_definitions(${DUSK_LIBRARY_TARGET_NAME} PUBLIC
|
||||||
|
DUSK_SAVE_WII_METHOD_${DUSK_SAVE_WII_METHOD}
|
||||||
|
)
|
||||||
|
|
||||||
# Generate Homebrew Channel meta.xml from project identity variables
|
# Generate Homebrew Channel meta.xml from project identity variables
|
||||||
string(TIMESTAMP DUSK_BUILD_DATE "%Y%m%d000000" UTC)
|
string(TIMESTAMP DUSK_BUILD_DATE "%Y%m%d000000" UTC)
|
||||||
configure_file(
|
configure_file(
|
||||||
|
|||||||
@@ -17,6 +17,10 @@ const ChunkTerrain = (() => {
|
|||||||
const CHUNK_DEPTH = 4;
|
const CHUNK_DEPTH = 4;
|
||||||
const TILE_COUNT = CHUNK_WIDTH * CHUNK_HEIGHT * CHUNK_DEPTH;
|
const TILE_COUNT = CHUNK_WIDTH * CHUNK_HEIGHT * CHUNK_DEPTH;
|
||||||
|
|
||||||
|
// World-space Z distance of one Z-layer/story, in world-float space.
|
||||||
|
// Must match WORLD_LAYER_HEIGHT in src/dusk/rpg/overworld/worldpos.h.
|
||||||
|
const WORLD_LAYER_HEIGHT = Math.SQRT1_2;
|
||||||
|
|
||||||
const TILE_SHAPE_NULL = 0;
|
const TILE_SHAPE_NULL = 0;
|
||||||
const TILE_SHAPE_GROUND = 1;
|
const TILE_SHAPE_GROUND = 1;
|
||||||
const TILE_SHAPE_RAMP_NORTH = 2;
|
const TILE_SHAPE_RAMP_NORTH = 2;
|
||||||
@@ -88,7 +92,53 @@ const ChunkTerrain = (() => {
|
|||||||
const v1 = (y + 1) / CHUNK_HEIGHT;
|
const v1 = (y + 1) / CHUNK_HEIGHT;
|
||||||
const [sw, se, ne, nw] = corners;
|
const [sw, se, ne, nw] = corners;
|
||||||
|
|
||||||
pushTileQuad(out, u0, u1, v0, v1, x, y, z + sw, z + se, z + ne, z + nw);
|
pushTileQuad(
|
||||||
|
out, u0, u1, v0, v1, x, y,
|
||||||
|
(z + sw) * WORLD_LAYER_HEIGHT,
|
||||||
|
(z + se) * WORLD_LAYER_HEIGHT,
|
||||||
|
(z + ne) * WORLD_LAYER_HEIGHT,
|
||||||
|
(z + nw) * WORLD_LAYER_HEIGHT
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return new Float32Array(out);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Four edges (SW-SE, SE-NE, NE-NW, NW-SW) of a tile's quad as line
|
||||||
|
// segments, lifted slightly above the terrain surface to avoid
|
||||||
|
// z-fighting - same corner-height convention as pushTileQuad().
|
||||||
|
function pushTileGridLines(out, fx, fy, swZ, seZ, neZ, nwZ) {
|
||||||
|
const eps = 0.01;
|
||||||
|
const sw = [fx, fy, swZ + eps];
|
||||||
|
const se = [fx + 1, fy, seZ + eps];
|
||||||
|
const ne = [fx + 1, fy + 1, neZ + eps];
|
||||||
|
const nw = [fx, fy + 1, nwZ + eps];
|
||||||
|
const edges = [sw, se, se, ne, ne, nw, nw, sw];
|
||||||
|
for(const [x, y, z] of edges) out.push(0, 0, x, y, z);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Generate grid-outline line segments for every non-null tile, following
|
||||||
|
// the same per-corner heights as buildTerrainVerts() so lines hug ramps
|
||||||
|
// instead of cutting through them. Returns a Float32Array of interleaved
|
||||||
|
// [u, v, x, y, z] vertices meant to be drawn with gl.LINES (pairs).
|
||||||
|
function buildGridLines(tiles) {
|
||||||
|
const out = [];
|
||||||
|
for(let z = 0; z < CHUNK_DEPTH; z++) {
|
||||||
|
for(let y = 0; y < CHUNK_HEIGHT; y++) {
|
||||||
|
for(let x = 0; x < CHUNK_WIDTH; x++) {
|
||||||
|
const type = tiles[tileIndex(x, y, z)] || TILE_SHAPE_NULL;
|
||||||
|
const corners = RAMP_CORNERS[type];
|
||||||
|
if(!corners) continue;
|
||||||
|
|
||||||
|
const [sw, se, ne, nw] = corners;
|
||||||
|
pushTileGridLines(
|
||||||
|
out, x, y,
|
||||||
|
(z + sw) * WORLD_LAYER_HEIGHT,
|
||||||
|
(z + se) * WORLD_LAYER_HEIGHT,
|
||||||
|
(z + ne) * WORLD_LAYER_HEIGHT,
|
||||||
|
(z + nw) * WORLD_LAYER_HEIGHT
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -96,7 +146,7 @@ const ChunkTerrain = (() => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
return Object.freeze({
|
return Object.freeze({
|
||||||
CHUNK_WIDTH, CHUNK_HEIGHT, CHUNK_DEPTH, TILE_COUNT,
|
CHUNK_WIDTH, CHUNK_HEIGHT, CHUNK_DEPTH, TILE_COUNT, WORLD_LAYER_HEIGHT,
|
||||||
TILE_SHAPE_NULL, TILE_SHAPE_GROUND,
|
TILE_SHAPE_NULL, TILE_SHAPE_GROUND,
|
||||||
TILE_SHAPE_RAMP_NORTH, TILE_SHAPE_RAMP_EAST,
|
TILE_SHAPE_RAMP_NORTH, TILE_SHAPE_RAMP_EAST,
|
||||||
TILE_SHAPE_RAMP_SOUTH, TILE_SHAPE_RAMP_WEST,
|
TILE_SHAPE_RAMP_SOUTH, TILE_SHAPE_RAMP_WEST,
|
||||||
@@ -104,6 +154,6 @@ const ChunkTerrain = (() => {
|
|||||||
TILE_SHAPE_RAMP_SOUTHEAST, TILE_SHAPE_RAMP_SOUTHWEST,
|
TILE_SHAPE_RAMP_SOUTHEAST, TILE_SHAPE_RAMP_SOUTHWEST,
|
||||||
TILE_SHAPE_RAMP_NORTHEAST_INNER, TILE_SHAPE_RAMP_NORTHWEST_INNER,
|
TILE_SHAPE_RAMP_NORTHEAST_INNER, TILE_SHAPE_RAMP_NORTHWEST_INNER,
|
||||||
TILE_SHAPE_RAMP_SOUTHEAST_INNER, TILE_SHAPE_RAMP_SOUTHWEST_INNER,
|
TILE_SHAPE_RAMP_SOUTHEAST_INNER, TILE_SHAPE_RAMP_SOUTHWEST_INNER,
|
||||||
RAMP_CORNERS, tileIndex, buildTerrainVerts,
|
RAMP_CORNERS, tileIndex, buildTerrainVerts, buildGridLines,
|
||||||
});
|
});
|
||||||
})();
|
})();
|
||||||
@@ -9,7 +9,7 @@
|
|||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
flex-wrap: wrap;
|
flex-wrap: wrap;
|
||||||
gap: 6px;
|
gap: 6px;
|
||||||
max-height: 512px;
|
max-height: 600px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.tile-swatch {
|
.tile-swatch {
|
||||||
|
|||||||
@@ -41,16 +41,15 @@
|
|||||||
[ChunkTerrain.TILE_SHAPE_RAMP_SOUTHWEST_INNER]: { dx: -1, dy: 1 },
|
[ChunkTerrain.TILE_SHAPE_RAMP_SOUTHWEST_INNER]: { dx: -1, dy: 1 },
|
||||||
};
|
};
|
||||||
|
|
||||||
// Draws an arrow centered at (cx, cy) pointing toward the ramp's high
|
const INNER_CORNER_SHAPES = new Set([
|
||||||
// side, so ramp direction is visible at a glance on both the palette
|
ChunkTerrain.TILE_SHAPE_RAMP_NORTHEAST_INNER,
|
||||||
// swatches and the tile grid.
|
ChunkTerrain.TILE_SHAPE_RAMP_NORTHWEST_INNER,
|
||||||
function drawArrow(ctx, cx, cy, size, dx, dy) {
|
ChunkTerrain.TILE_SHAPE_RAMP_SOUTHEAST_INNER,
|
||||||
const mag = Math.hypot(dx, dy) || 1;
|
ChunkTerrain.TILE_SHAPE_RAMP_SOUTHWEST_INNER,
|
||||||
const ux = dx / mag, uy = dy / mag;
|
]);
|
||||||
const len = size * 0.32;
|
|
||||||
const tipX = cx + ux * len, tipY = cy + uy * len;
|
|
||||||
const tailX = cx - ux * len, tailY = cy - uy * len;
|
|
||||||
|
|
||||||
|
// Draws a single-headed arrow from (tailX, tailY) to (tipX, tipY).
|
||||||
|
function drawArrowSegment(ctx, tailX, tailY, tipX, tipY, size) {
|
||||||
ctx.strokeStyle = "#ffffff";
|
ctx.strokeStyle = "#ffffff";
|
||||||
ctx.fillStyle = "#ffffff";
|
ctx.fillStyle = "#ffffff";
|
||||||
ctx.lineWidth = Math.max(1, size * 0.08);
|
ctx.lineWidth = Math.max(1, size * 0.08);
|
||||||
@@ -62,7 +61,7 @@
|
|||||||
ctx.stroke();
|
ctx.stroke();
|
||||||
|
|
||||||
const headLen = size * 0.18;
|
const headLen = size * 0.18;
|
||||||
const angle = Math.atan2(uy, ux);
|
const angle = Math.atan2(tipY - tailY, tipX - tailX);
|
||||||
const leftAngle = angle + Math.PI * 0.8;
|
const leftAngle = angle + Math.PI * 0.8;
|
||||||
const rightAngle = angle - Math.PI * 0.8;
|
const rightAngle = angle - Math.PI * 0.8;
|
||||||
ctx.beginPath();
|
ctx.beginPath();
|
||||||
@@ -73,6 +72,54 @@
|
|||||||
ctx.fill();
|
ctx.fill();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Draws an arrow centered at (cx, cy) pointing toward the ramp's high
|
||||||
|
// side, so ramp direction is visible at a glance on both the palette
|
||||||
|
// swatches and the tile grid. Used for cardinal ramps and outer-corner
|
||||||
|
// ramps (a single raised corner).
|
||||||
|
function drawArrow(ctx, cx, cy, size, dx, dy) {
|
||||||
|
const mag = Math.hypot(dx, dy) || 1;
|
||||||
|
const ux = dx / mag, uy = dy / mag;
|
||||||
|
const len = size * 0.32;
|
||||||
|
drawArrowSegment(ctx, cx - ux * len, cy - uy * len, cx + ux * len, cy + uy * len, size);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Draws a plain right-angle bracket - two line segments meeting at 90
|
||||||
|
// degrees at the tile's corner, one running along each of the two edges
|
||||||
|
// adjacent to it - so inner-corner ramps (three corners raised, one
|
||||||
|
// dropped) read as "the adjacent sides meeting in a 90-degree corner",
|
||||||
|
// distinct from the single diagonal arrow used for outer-corner ramps.
|
||||||
|
function drawCornerBracket(ctx, cx, cy, size, dx, dy) {
|
||||||
|
const cornerDist = size * 0.42;
|
||||||
|
const armLen = size * 0.34;
|
||||||
|
const cornerX = cx + dx * cornerDist;
|
||||||
|
const cornerY = cy + dy * cornerDist;
|
||||||
|
|
||||||
|
ctx.strokeStyle = "#ffffff";
|
||||||
|
ctx.lineWidth = Math.max(1, size * 0.08);
|
||||||
|
ctx.lineCap = "round";
|
||||||
|
ctx.lineJoin = "round";
|
||||||
|
|
||||||
|
ctx.beginPath();
|
||||||
|
ctx.moveTo(cornerX - dx * armLen, cornerY);
|
||||||
|
ctx.lineTo(cornerX, cornerY);
|
||||||
|
ctx.lineTo(cornerX, cornerY - dy * armLen);
|
||||||
|
ctx.stroke();
|
||||||
|
}
|
||||||
|
|
||||||
|
// Draws the direction icon for a ramp tile `type` in a `size`x`size` area
|
||||||
|
// centered at (cx, cy): a diagonal arrow for cardinal/outer-corner ramps,
|
||||||
|
// or a right-angle bracket for inner-corner ramps. No-op for shapes with
|
||||||
|
// no direction (ground, erase).
|
||||||
|
function drawShapeIcon(ctx, cx, cy, size, type) {
|
||||||
|
const dir = SHAPE_DIRECTIONS[type];
|
||||||
|
if(!dir) return;
|
||||||
|
if(INNER_CORNER_SHAPES.has(type)) {
|
||||||
|
drawCornerBracket(ctx, cx, cy, size, dir.dx, dir.dy);
|
||||||
|
} else {
|
||||||
|
drawArrow(ctx, cx, cy, size, dir.dx, dir.dy);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Draws a small pencil icon centered in a `size`x`size` canvas.
|
// Draws a small pencil icon centered in a `size`x`size` canvas.
|
||||||
function drawPencilIcon(ctx, size) {
|
function drawPencilIcon(ctx, size) {
|
||||||
ctx.save();
|
ctx.save();
|
||||||
@@ -146,6 +193,7 @@
|
|||||||
|
|
||||||
let mapRenderer = null;
|
let mapRenderer = null;
|
||||||
let terrainMesh = null;
|
let terrainMesh = null;
|
||||||
|
let gridLinesMesh = null;
|
||||||
let terrainTexturePromise = null;
|
let terrainTexturePromise = null;
|
||||||
let modelIndex = null;
|
let modelIndex = null;
|
||||||
let neighborChunks = [];
|
let neighborChunks = [];
|
||||||
@@ -262,6 +310,13 @@
|
|||||||
return modelIndex;
|
return modelIndex;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Scales a mesh's stored [x, y, z] offset for preview, matching the
|
||||||
|
// Z scaling mapChunkLoaded() applies at runtime (chunk.meshOffsets[m][2]
|
||||||
|
// * WORLD_LAYER_HEIGHT) - x/y stay 1:1 since only Z is height-scaled.
|
||||||
|
function scaledMeshOffset(pos) {
|
||||||
|
return [pos[0], pos[1], pos[2] * ChunkTerrain.WORLD_LAYER_HEIGHT];
|
||||||
|
}
|
||||||
|
|
||||||
// Resolves a chunk mesh entry's bare filename (e.g. "house_5_3.dmf") to
|
// Resolves a chunk mesh entry's bare filename (e.g. "house_5_3.dmf") to
|
||||||
// its model JSON by basename, mirroring find_model() in
|
// its model JSON by basename, mirroring find_model() in
|
||||||
// tools/asset/chunk/__main__.py - the chunk JSON only ever stores a bare
|
// tools/asset/chunk/__main__.py - the chunk JSON only ever stores a bare
|
||||||
@@ -330,7 +385,7 @@
|
|||||||
for(const m of neighborMeshes) {
|
for(const m of neighborMeshes) {
|
||||||
try {
|
try {
|
||||||
const resolved = await resolveModelForMeshFile(m.file);
|
const resolved = await resolveModelForMeshFile(m.file);
|
||||||
if(resolved) models.push({ ...resolved, offset: m.pos });
|
if(resolved) models.push({ ...resolved, offset: scaledMeshOffset(m.pos) });
|
||||||
} catch(e) {
|
} catch(e) {
|
||||||
console.warn("Failed to load neighbor mesh preview", m.file, e);
|
console.warn("Failed to load neighbor mesh preview", m.file, e);
|
||||||
}
|
}
|
||||||
@@ -426,13 +481,12 @@
|
|||||||
buildPalette();
|
buildPalette();
|
||||||
});
|
});
|
||||||
|
|
||||||
const dir = SHAPE_DIRECTIONS[s.type];
|
if(SHAPE_DIRECTIONS[s.type]) {
|
||||||
if(dir) {
|
|
||||||
const icon = document.createElement("canvas");
|
const icon = document.createElement("canvas");
|
||||||
icon.width = 32;
|
icon.width = 32;
|
||||||
icon.height = 32;
|
icon.height = 32;
|
||||||
icon.className = "tile-swatch-icon";
|
icon.className = "tile-swatch-icon";
|
||||||
drawArrow(icon.getContext("2d"), 16, 16, 32, dir.dx, dir.dy);
|
drawShapeIcon(icon.getContext("2d"), 16, 16, 32, s.type);
|
||||||
btn.appendChild(icon);
|
btn.appendChild(icon);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -489,11 +543,10 @@
|
|||||||
const sy = (ChunkTerrain.CHUNK_HEIGHT - 1 - y) * cell;
|
const sy = (ChunkTerrain.CHUNK_HEIGHT - 1 - y) * cell;
|
||||||
ctx.fillStyle = SHAPE_COLORS[type] || "#15171b";
|
ctx.fillStyle = SHAPE_COLORS[type] || "#15171b";
|
||||||
ctx.fillRect(x * cell, sy, cell, cell);
|
ctx.fillRect(x * cell, sy, cell, cell);
|
||||||
ctx.strokeStyle = "rgba(255, 255, 255, 0.08)";
|
ctx.strokeStyle = "rgba(255, 255, 255, 0.25)";
|
||||||
ctx.strokeRect(x * cell, sy, cell, cell);
|
ctx.strokeRect(x * cell, sy, cell, cell);
|
||||||
|
|
||||||
const dir = SHAPE_DIRECTIONS[type];
|
drawShapeIcon(ctx, x * cell + cell / 2, sy + cell / 2, cell, type);
|
||||||
if(dir) drawArrow(ctx, x * cell + cell / 2, sy + cell / 2, cell, dir.dx, dir.dy);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -592,6 +645,9 @@
|
|||||||
function rebuildTerrainMesh() {
|
function rebuildTerrainMesh() {
|
||||||
const floats = ChunkTerrain.buildTerrainVerts(tiles);
|
const floats = ChunkTerrain.buildTerrainVerts(tiles);
|
||||||
terrainMesh = floats.length ? mapRenderer.createMesh(floats) : null;
|
terrainMesh = floats.length ? mapRenderer.createMesh(floats) : null;
|
||||||
|
|
||||||
|
const lineFloats = ChunkTerrain.buildGridLines(tiles);
|
||||||
|
gridLinesMesh = lineFloats.length ? mapRenderer.createMesh(lineFloats) : null;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Keeps the preview canvas's backing-store resolution matched to its
|
// Keeps the preview canvas's backing-store resolution matched to its
|
||||||
@@ -619,7 +675,7 @@
|
|||||||
for(const m of meshes) {
|
for(const m of meshes) {
|
||||||
try {
|
try {
|
||||||
const resolved = await resolveModelForMeshFile(m.file);
|
const resolved = await resolveModelForMeshFile(m.file);
|
||||||
if(resolved) models.push({ ...resolved, offset: m.pos });
|
if(resolved) models.push({ ...resolved, offset: scaledMeshOffset(m.pos) });
|
||||||
} catch(e) {
|
} catch(e) {
|
||||||
console.warn("Failed to load mesh preview", m.file, e);
|
console.warn("Failed to load mesh preview", m.file, e);
|
||||||
}
|
}
|
||||||
@@ -637,13 +693,15 @@
|
|||||||
models: n.models,
|
models: n.models,
|
||||||
}));
|
}));
|
||||||
|
|
||||||
|
const zLevelHeight = currentZLevel * ChunkTerrain.WORLD_LAYER_HEIGHT;
|
||||||
mapRenderer.render({
|
mapRenderer.render({
|
||||||
target: [ChunkTerrain.CHUNK_WIDTH / 2, ChunkTerrain.CHUNK_HEIGHT / 2, currentZLevel],
|
target: [ChunkTerrain.CHUNK_WIDTH / 2, ChunkTerrain.CHUNK_HEIGHT / 2, zLevelHeight],
|
||||||
worldH: zoomWorldH,
|
worldH: zoomWorldH,
|
||||||
terrain: terrainMesh ? { mesh: terrainMesh, texture: terrainTexture } : null,
|
terrain: terrainMesh ? { mesh: terrainMesh, texture: terrainTexture } : null,
|
||||||
|
gridLines: gridLinesMesh ? { mesh: gridLinesMesh } : null,
|
||||||
models,
|
models,
|
||||||
neighbors,
|
neighbors,
|
||||||
highlight: hoverTile ? { x: hoverTile.x, y: hoverTile.y, z: currentZLevel } : null,
|
highlight: hoverTile ? { x: hoverTile.x, y: hoverTile.y, z: zLevelHeight } : null,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -221,6 +221,7 @@ const MapRenderer = (() => {
|
|||||||
// scene = {
|
// scene = {
|
||||||
// target: [x, y, z], worldH: number,
|
// target: [x, y, z], worldH: number,
|
||||||
// terrain: { mesh, texture } | null,
|
// terrain: { mesh, texture } | null,
|
||||||
|
// gridLines: { mesh } | null,
|
||||||
// models: [{ mesh, texture, color: [r,g,b,a in 0..1], offset: [x,y,z] }],
|
// models: [{ mesh, texture, color: [r,g,b,a in 0..1], offset: [x,y,z] }],
|
||||||
// neighbors: [{
|
// neighbors: [{
|
||||||
// offset: [x,y,z],
|
// offset: [x,y,z],
|
||||||
@@ -248,6 +249,10 @@ const MapRenderer = (() => {
|
|||||||
drawMesh(scene.terrain.mesh, identity, scene.terrain.texture, [1, 1, 1, 1], true);
|
drawMesh(scene.terrain.mesh, identity, scene.terrain.texture, [1, 1, 1, 1], true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if(scene.gridLines) {
|
||||||
|
drawMesh(scene.gridLines.mesh, identity, null, [0, 0, 0, 0.35], false, gl.LINES);
|
||||||
|
}
|
||||||
|
|
||||||
for(const model of scene.models) {
|
for(const model of scene.models) {
|
||||||
const modelMatrix = mat4Translation(new Float32Array(16), model.offset);
|
const modelMatrix = mat4Translation(new Float32Array(16), model.offset);
|
||||||
drawMesh(model.mesh, modelMatrix, model.texture, model.color, true);
|
drawMesh(model.mesh, modelMatrix, model.texture, model.color, true);
|
||||||
|
|||||||
@@ -5,6 +5,10 @@
|
|||||||
|
|
||||||
add_subdirectory(dusk)
|
add_subdirectory(dusk)
|
||||||
|
|
||||||
|
if(DUSK_NETWORK)
|
||||||
|
add_subdirectory(dusknetwork)
|
||||||
|
endif()
|
||||||
|
|
||||||
if(DUSK_TARGET_SYSTEM STREQUAL "linux" OR DUSK_TARGET_SYSTEM STREQUAL "knulli")
|
if(DUSK_TARGET_SYSTEM STREQUAL "linux" OR DUSK_TARGET_SYSTEM STREQUAL "knulli")
|
||||||
add_subdirectory(dusklinux)
|
add_subdirectory(dusklinux)
|
||||||
add_subdirectory(dusksdl2)
|
add_subdirectory(dusksdl2)
|
||||||
|
|||||||
@@ -53,9 +53,9 @@ target_sources(${DUSK_BINARY_TARGET_NAME}
|
|||||||
|
|
||||||
# Subdirs
|
# Subdirs
|
||||||
add_subdirectory(animation)
|
add_subdirectory(animation)
|
||||||
add_subdirectory(event)
|
|
||||||
add_subdirectory(assert)
|
add_subdirectory(assert)
|
||||||
add_subdirectory(asset)
|
add_subdirectory(asset)
|
||||||
|
add_subdirectory(audio)
|
||||||
add_subdirectory(console)
|
add_subdirectory(console)
|
||||||
add_subdirectory(display)
|
add_subdirectory(display)
|
||||||
add_subdirectory(log)
|
add_subdirectory(log)
|
||||||
@@ -68,7 +68,6 @@ add_subdirectory(scene)
|
|||||||
add_subdirectory(system)
|
add_subdirectory(system)
|
||||||
add_subdirectory(time)
|
add_subdirectory(time)
|
||||||
add_subdirectory(ui)
|
add_subdirectory(ui)
|
||||||
add_subdirectory(network)
|
|
||||||
add_subdirectory(save)
|
add_subdirectory(save)
|
||||||
add_subdirectory(util)
|
add_subdirectory(util)
|
||||||
add_subdirectory(thread)
|
add_subdirectory(thread)
|
||||||
@@ -7,4 +7,5 @@ target_sources(${DUSK_LIBRARY_TARGET_NAME}
|
|||||||
PUBLIC
|
PUBLIC
|
||||||
easing.c
|
easing.c
|
||||||
animation.c
|
animation.c
|
||||||
|
keyframe.c
|
||||||
)
|
)
|
||||||
+103
-23
@@ -11,42 +11,122 @@
|
|||||||
void animationInit(
|
void animationInit(
|
||||||
animation_t *anim,
|
animation_t *anim,
|
||||||
keyframe_t *keyframes,
|
keyframe_t *keyframes,
|
||||||
uint16_t keyframeCount
|
uint16_t *keyframeCounts,
|
||||||
|
const uint16_t layerCount
|
||||||
) {
|
) {
|
||||||
assertNotNull(anim, "Animation pointer cannot be null.");
|
assertNotNull(anim, "Animation pointer cannot be null.");
|
||||||
assertNotNull(keyframes, "Keyframes pointer cannot be null.");
|
assertNotNull(keyframes, "Keyframes pointer cannot be null.");
|
||||||
assertTrue(keyframeCount > 0, "Keyframe count must be more than 0.");
|
assertNotNull(keyframeCounts, "Keyframe counts pointer cannot be null.");
|
||||||
|
assertTrue(layerCount > 0, "Layer count must be greater than zero.");
|
||||||
|
|
||||||
|
memoryZero(anim, sizeof(animation_t));
|
||||||
anim->keyframes = keyframes;
|
anim->keyframes = keyframes;
|
||||||
anim->keyframeCount = keyframeCount;
|
anim->keyframeCounts = keyframeCounts;
|
||||||
|
anim->layerCount = layerCount;
|
||||||
|
|
||||||
|
// Determine duration
|
||||||
|
float_t duration = 0.0f;
|
||||||
|
for(uint16_t layer = 0; layer < layerCount; layer++) {
|
||||||
|
uint16_t keyframeCount = keyframeCounts[layer];
|
||||||
|
assertTrue(keyframeCount > 0, "Keyframe count invalid.");
|
||||||
|
keyframe_t *layerKeyframes = keyframes + layer * keyframeCount;
|
||||||
|
|
||||||
|
#ifdef DUSK_ASSERTIONS
|
||||||
|
// Check that the keyframes are sorted by time.
|
||||||
|
for(uint16_t i = 1; i < keyframeCount; i++) {
|
||||||
|
assertTrue(
|
||||||
|
layerKeyframes[i].time >= layerKeyframes[i - 1].time,
|
||||||
|
"Keyframes must be sorted by time."
|
||||||
|
);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
keyframe_t *lastKeyframe = layerKeyframes + keyframeCount - 1;
|
||||||
|
duration = mathMax(duration, lastKeyframe->time);
|
||||||
|
}
|
||||||
|
assertTrue(duration > 0, "Animation duration must be greater than 0.");
|
||||||
|
anim->duration = duration;
|
||||||
}
|
}
|
||||||
|
|
||||||
float_t animationGetValue(animation_t *anim, const float_t time) {
|
float_t animationGetLayerValue(const animation_t *anim, const uint16_t layer) {
|
||||||
assertNotNull(anim, "Animation pointer cannot be null.");
|
assertNotNull(anim, "Animation pointer cannot be null.");
|
||||||
assertNotNull(anim->keyframes, "Keyframes pointer cannot be null.");
|
assertTrue(layer < anim->layerCount, "Layer index out of bounds.");
|
||||||
assertTrue(anim->keyframeCount > 0, "Keyframe count invalid.");
|
|
||||||
assertTrue(time >= 0, "Time must be non-negative.");
|
|
||||||
|
|
||||||
keyframe_t *start;
|
uint16_t keyframeCount = anim->keyframeCounts[layer];
|
||||||
keyframe_t *end;
|
keyframe_t *layerKeyframes = anim->keyframes + layer * keyframeCount;
|
||||||
keyframe_t *last = anim->keyframes + anim->keyframeCount - 1;
|
return keyframeGetValue(layerKeyframes, keyframeCount, anim->time);
|
||||||
keyframe_t *current = anim->keyframes;
|
}
|
||||||
start = current;
|
|
||||||
|
void animationUpdate(
|
||||||
do {
|
animation_t *anim,
|
||||||
if(current->time > time) {
|
const float_t deltaTime
|
||||||
end = current;
|
) {
|
||||||
|
assertNotNull(anim, "Animation pointer cannot be null.");
|
||||||
|
assertTrue(deltaTime >= 0, "Delta time must be non-negative.");
|
||||||
|
|
||||||
|
bool_t justCompleted = false;
|
||||||
|
|
||||||
|
if(!(anim->flags & ANIMATION_FLAG_INTERNAL_COMPLETED)) {
|
||||||
|
bool_t loop = (anim->flags & ANIMATION_FLAG_LOOP) != 0;
|
||||||
|
bool_t pingpong = (anim->flags & ANIMATION_FLAG_PINGPONG) != 0;
|
||||||
|
assertFalse(
|
||||||
|
loop && pingpong,
|
||||||
|
"Cannot set both ANIMATION_FLAG_LOOP and ANIMATION_FLAG_PINGPONG."
|
||||||
|
);
|
||||||
|
|
||||||
|
bool_t backward;
|
||||||
|
if(pingpong) {
|
||||||
|
backward = (anim->flags & ANIMATION_FLAG_INTERNAL_PINGPONG_BACKWARD) != 0;
|
||||||
|
} else {
|
||||||
|
backward = (anim->flags & ANIMATION_FLAG_REVERSE) != 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Resolve boundary crossings one at a time, so a single large deltaTime
|
||||||
|
// can correctly loop/pingpong across multiple boundaries in one call.
|
||||||
|
float_t remaining = deltaTime;
|
||||||
|
while(remaining > 0.0f) {
|
||||||
|
float_t toBoundary = (
|
||||||
|
backward ? anim->time : (anim->duration - anim->time)
|
||||||
|
);
|
||||||
|
if(remaining < toBoundary) {
|
||||||
|
anim->time += backward ? -remaining : remaining;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
start = current;
|
|
||||||
current++;
|
|
||||||
|
|
||||||
if(current > last) {
|
remaining -= toBoundary;
|
||||||
end = start;
|
anim->time = backward ? 0.0f : anim->duration;
|
||||||
|
|
||||||
|
bool_t stopHere;
|
||||||
|
if(backward) {
|
||||||
|
stopHere = (anim->flags & ANIMATION_FLAG_STOP_BEGINNING) != 0;
|
||||||
|
} else {
|
||||||
|
stopHere = (anim->flags & ANIMATION_FLAG_STOP_END) != 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
if(stopHere) {
|
||||||
|
justCompleted = true;
|
||||||
|
break;
|
||||||
|
} else if(pingpong) {
|
||||||
|
backward = !backward;
|
||||||
|
if(backward) anim->flags |= ANIMATION_FLAG_INTERNAL_PINGPONG_BACKWARD;
|
||||||
|
else anim->flags &= ~ANIMATION_FLAG_INTERNAL_PINGPONG_BACKWARD;
|
||||||
|
} else if(loop) {
|
||||||
|
anim->time = backward ? anim->duration : 0.0f;
|
||||||
|
if(anim->onLoop) anim->onLoop(anim->user);
|
||||||
|
} else {
|
||||||
|
justCompleted = true;
|
||||||
break;
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if(justCompleted) anim->flags |= ANIMATION_FLAG_INTERNAL_COMPLETED;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Call onUpdate for each layer.
|
||||||
|
for(uint16_t layer = 0; layer < anim->layerCount; layer++) {
|
||||||
|
float_t value = animationGetLayerValue(anim, layer);
|
||||||
|
if(anim->onUpdate) anim->onUpdate(layer, value, anim->user);
|
||||||
}
|
}
|
||||||
} while(true);
|
|
||||||
|
|
||||||
float_t t = (time - start->time) / (end->time - start->time);
|
if(justCompleted && anim->onComplete) anim->onComplete(anim->user);
|
||||||
return mathLerp(start->value, end->value, easingApply(start->easing, t));
|
|
||||||
}
|
}
|
||||||
@@ -6,29 +6,89 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
#include "keyframe.h"
|
#include "keyframe.h"
|
||||||
|
|
||||||
|
#define ANIMATION_FLAG_LOOP (1 << 0)
|
||||||
|
#define ANIMATION_FLAG_REVERSE (1 << 1)
|
||||||
|
#define ANIMATION_FLAG_PINGPONG (1 << 2)
|
||||||
|
#define ANIMATION_FLAG_STOP_BEGINNING (1 << 3)
|
||||||
|
#define ANIMATION_FLAG_STOP_END (1 << 4)
|
||||||
|
|
||||||
|
// Internal - tracks which direction a pingponging animation is currently
|
||||||
|
// travelling. Do not set this manually, it is managed by animationUpdate().
|
||||||
|
#define ANIMATION_FLAG_INTERNAL_PINGPONG_BACKWARD (1 << 7)
|
||||||
|
|
||||||
|
// Internal - set once the animation has stopped advancing (see
|
||||||
|
// animationUpdate()). Do not set this manually. There is currently no way to
|
||||||
|
// restart a completed animation short of clearing this bit and resetting
|
||||||
|
// anim->time by hand.
|
||||||
|
#define ANIMATION_FLAG_INTERNAL_COMPLETED (1 << 6)
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
keyframe_t *keyframes;
|
keyframe_t *keyframes;
|
||||||
uint16_t keyframeCount;
|
uint16_t *keyframeCounts;
|
||||||
|
uint16_t layerCount;
|
||||||
|
float_t time;
|
||||||
|
float_t duration;
|
||||||
|
uint8_t flags;
|
||||||
|
|
||||||
|
void *user;
|
||||||
|
void (*onUpdate)(const uint16_t layer, const float_t value, void *user);
|
||||||
|
void (*onComplete)(void *user);
|
||||||
|
void (*onLoop)(void *user);
|
||||||
} animation_t;
|
} animation_t;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Initializes an animation.
|
* Initializes an animation with the given keyframes and layer count.
|
||||||
*
|
*
|
||||||
* @param anim The animation to initialize.
|
* @param anim Pointer to the animation to initialize.
|
||||||
* @param keyframes The keyframes to use for the animation.
|
* @param keyframes Pointer to the array of keyframes for each layer.
|
||||||
* @param keyframeCount The number of keyframes in the animation.
|
* @param keyframeCount Number of keyframes in each layer.
|
||||||
|
* @param layerCount Number of layers in the animation.
|
||||||
*/
|
*/
|
||||||
void animationInit(
|
void animationInit(
|
||||||
animation_t *anim,
|
animation_t *anim,
|
||||||
keyframe_t *keyframes,
|
keyframe_t *keyframes,
|
||||||
uint16_t keyframeCount
|
uint16_t *keyframeCounts,
|
||||||
|
const uint16_t layerCount
|
||||||
);
|
);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Gets the value of the animation at a given time.
|
* Sets the current time of the animation, clamping it to the valid range.
|
||||||
|
* This will call the onUpdate callback but none of the other callbacks.
|
||||||
*
|
*
|
||||||
* @param anim The animation to get the value from.
|
* @param anim Pointer to the animation to set the time for.
|
||||||
* @param time The time at which to get the value, in seconds.
|
* @param time The new time to set for the animation.
|
||||||
* @return The value of the animation at the given time.
|
|
||||||
*/
|
*/
|
||||||
float_t animationGetValue(animation_t *anim, const float_t time);
|
void animationSetTime(animation_t *anim, const float_t time);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets the current value of a specific layer in the animation based on the
|
||||||
|
* current animation time.
|
||||||
|
*/
|
||||||
|
float_t animationGetLayerValue(const animation_t *anim, const uint16_t layer);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Updates the animation state based on the elapsed time. Advances anim->time
|
||||||
|
* by deltaTime (or against it, if ANIMATION_FLAG_REVERSE is set), then
|
||||||
|
* resolves whatever happens when it reaches the 0 or duration boundary:
|
||||||
|
*
|
||||||
|
* - ANIMATION_FLAG_PINGPONG: reflects off the boundary and continues playing
|
||||||
|
* in the opposite direction, forever, unless stopped (see below).
|
||||||
|
* - ANIMATION_FLAG_LOOP: wraps back around to the other boundary and keeps
|
||||||
|
* playing in the same direction, forever, unless stopped (see below).
|
||||||
|
* - ANIMATION_FLAG_STOP_BEGINNING / ANIMATION_FLAG_STOP_END: when the
|
||||||
|
* animation reaches that specific boundary, it clamps there and stops
|
||||||
|
* (firing onComplete) instead of looping/pingponging past it.
|
||||||
|
* - If none of the above apply at a boundary, the animation clamps there and
|
||||||
|
* stops, firing onComplete.
|
||||||
|
*
|
||||||
|
* onUpdate is called for every layer on every call. onLoop is called each
|
||||||
|
* time a loop wraps around. onComplete is called at most once, the moment
|
||||||
|
* the animation stops advancing.
|
||||||
|
*
|
||||||
|
* @param anim Pointer to the animation to update.
|
||||||
|
* @param deltaTime Time elapsed since the last update (in seconds).
|
||||||
|
*/
|
||||||
|
void animationUpdate(
|
||||||
|
animation_t *anim,
|
||||||
|
const float_t deltaTime
|
||||||
|
);
|
||||||
@@ -0,0 +1,45 @@
|
|||||||
|
/**
|
||||||
|
* Copyright (c) 2026 Dominic Masters
|
||||||
|
*
|
||||||
|
* This software is released under the MIT License.
|
||||||
|
* https://opensource.org/licenses/MIT
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "keyframe.h"
|
||||||
|
#include "assert/assert.h"
|
||||||
|
#include "util/math.h"
|
||||||
|
|
||||||
|
float_t keyframeGetValue(
|
||||||
|
const keyframe_t *keyframes,
|
||||||
|
const uint32_t keyframeCount,
|
||||||
|
const float_t time
|
||||||
|
) {
|
||||||
|
assertNotNull(keyframes, "Keyframes pointer cannot be null.");
|
||||||
|
assertTrue(keyframeCount > 0, "Keyframe count must be more than 0.");
|
||||||
|
assertTrue(time >= 0, "Time must be non-negative.");
|
||||||
|
#ifdef DUSK_ASSERTIONS
|
||||||
|
// Checks that the keyframes are sorted by time.
|
||||||
|
for(uint32_t i = 1; i < keyframeCount; i++) {
|
||||||
|
assertTrue(
|
||||||
|
keyframes[i].time >= keyframes[i - 1].time,
|
||||||
|
"Keyframes must be sorted by time."
|
||||||
|
);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
keyframe_t *last = (keyframe_t *)(keyframes + keyframeCount - 1);
|
||||||
|
if(time >= last->time) return last->value;
|
||||||
|
|
||||||
|
// Since time < last->time (checked above), current is guaranteed to stop
|
||||||
|
// at or before reaching last, so no separate end-of-array check is needed.
|
||||||
|
keyframe_t *current = (keyframe_t *)keyframes;
|
||||||
|
keyframe_t *start = current;
|
||||||
|
while(current->time <= time) {
|
||||||
|
start = current;
|
||||||
|
current++;
|
||||||
|
}
|
||||||
|
keyframe_t *end = current;
|
||||||
|
|
||||||
|
float_t t = (time - start->time) / (end->time - start->time);
|
||||||
|
return mathLerp(start->value, end->value, easingApply(start->easing, t));
|
||||||
|
}
|
||||||
@@ -11,3 +11,17 @@ typedef struct {
|
|||||||
float_t value;
|
float_t value;
|
||||||
easingtype_t easing;
|
easingtype_t easing;
|
||||||
} keyframe_t;
|
} keyframe_t;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets the value of a keyframe at a given time.
|
||||||
|
*
|
||||||
|
* @param keyframes The keyframes to get the value from.
|
||||||
|
* @param keyframeCount The number of keyframes in the array.
|
||||||
|
* @param time The time at which to get the value, in seconds.
|
||||||
|
* @return The value of the keyframe at the given time.
|
||||||
|
*/
|
||||||
|
float_t keyframeGetValue(
|
||||||
|
const keyframe_t *keyframes,
|
||||||
|
const uint32_t keyframeCount,
|
||||||
|
const float_t time
|
||||||
|
);
|
||||||
@@ -22,6 +22,8 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef DUSK_ASSERTIONS_FAKED
|
#ifndef DUSK_ASSERTIONS_FAKED
|
||||||
|
#define DUSK_ASSERTIONS 1
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Initializes the assert system. Must be the very first call in engine
|
* Initializes the assert system. Must be the very first call in engine
|
||||||
* startup.
|
* startup.
|
||||||
|
|||||||
@@ -7,7 +7,6 @@
|
|||||||
target_sources(${DUSK_LIBRARY_TARGET_NAME}
|
target_sources(${DUSK_LIBRARY_TARGET_NAME}
|
||||||
PUBLIC
|
PUBLIC
|
||||||
asset.c
|
asset.c
|
||||||
assetbatch.c
|
|
||||||
assetfile.c
|
assetfile.c
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
+41
-48
@@ -59,7 +59,10 @@ assetentry_t * assetGetEntry(
|
|||||||
entry++;
|
entry++;
|
||||||
} while(entry < ASSET.entries + ASSET_ENTRY_COUNT_MAX);
|
} while(entry < ASSET.entries + ASSET_ENTRY_COUNT_MAX);
|
||||||
|
|
||||||
// We did not find one existing, Find first available slot.
|
// We did not find one existing. Find first available slot, reaping
|
||||||
|
// zero-ref entries to make room if none are immediately available.
|
||||||
|
bool_t reaped = false;
|
||||||
|
for(;;) {
|
||||||
entry = ASSET.entries;
|
entry = ASSET.entries;
|
||||||
do {
|
do {
|
||||||
if(entry->type != ASSET_LOADER_TYPE_NULL) {
|
if(entry->type != ASSET_LOADER_TYPE_NULL) {
|
||||||
@@ -74,6 +77,11 @@ assetentry_t * assetGetEntry(
|
|||||||
entry++;
|
entry++;
|
||||||
} while(entry < ASSET.entries + ASSET_ENTRY_COUNT_MAX);
|
} while(entry < ASSET.entries + ASSET_ENTRY_COUNT_MAX);
|
||||||
|
|
||||||
|
if(reaped) break;
|
||||||
|
reaped = true;
|
||||||
|
errorCatch(assetReapUnused());
|
||||||
|
}
|
||||||
|
|
||||||
assertUnreachable("No available asset entry slots.");
|
assertUnreachable("No available asset entry slots.");
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
@@ -191,6 +199,32 @@ void assetUnlockEntry(assetentry_t *entry) {
|
|||||||
assetEntryUnlock(entry);
|
assetEntryUnlock(entry);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
errorret_t assetReapUnused(void) {
|
||||||
|
assertIsMainThread("assetReapUnused must be called from the main thread.");
|
||||||
|
|
||||||
|
// Repeatedly find and dispose zero-ref LOADED entries until none remain.
|
||||||
|
// This handles dependency chains where an entry (e.g. a model) holds refs
|
||||||
|
// on child entries (mesh, texture): dispose parents first so child ref
|
||||||
|
// counts drop to zero, then pick up the children on the next pass. Without
|
||||||
|
// this, a forward-only scan fails when a shared child entry appears before
|
||||||
|
// a parent that still holds a ref to it.
|
||||||
|
bool_t any;
|
||||||
|
do {
|
||||||
|
any = false;
|
||||||
|
assetentry_t *entry = ASSET.entries;
|
||||||
|
do {
|
||||||
|
if(entry->type == ASSET_LOADER_TYPE_NULL) { entry++; continue; }
|
||||||
|
if(entry->state != ASSET_ENTRY_STATE_LOADED) { entry++; continue; }
|
||||||
|
if(entry->refs.count > 0) { entry++; continue; }
|
||||||
|
errorChain(assetEntryDispose(entry));
|
||||||
|
any = true;
|
||||||
|
entry++;
|
||||||
|
} while(entry < ASSET.entries + ASSET_ENTRY_COUNT_MAX);
|
||||||
|
} while(any);
|
||||||
|
|
||||||
|
errorOk();
|
||||||
|
}
|
||||||
|
|
||||||
errorret_t assetUpdate(void) {
|
errorret_t assetUpdate(void) {
|
||||||
assertIsMainThread("assetUpdate must be called from the main thread.");
|
assertIsMainThread("assetUpdate must be called from the main thread.");
|
||||||
|
|
||||||
@@ -288,7 +322,9 @@ errorret_t assetUpdate(void) {
|
|||||||
} else if(loading->entry->state == ASSET_ENTRY_STATE_LOADED) {
|
} else if(loading->entry->state == ASSET_ENTRY_STATE_LOADED) {
|
||||||
assetentry_t *loadedEntry = loading->entry;
|
assetentry_t *loadedEntry = loading->entry;
|
||||||
loading->entry = NULL;
|
loading->entry = NULL;
|
||||||
eventInvoke(&loadedEntry->onLoaded, loadedEntry);
|
if(loadedEntry->onLoaded) {
|
||||||
|
loadedEntry->onLoaded(loadedEntry, loadedEntry->onLoadedUser);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
loading++;
|
loading++;
|
||||||
@@ -312,8 +348,8 @@ errorret_t assetUpdate(void) {
|
|||||||
assetentry_t *errEntry = loading->entry;
|
assetentry_t *errEntry = loading->entry;
|
||||||
loading->entry = NULL;
|
loading->entry = NULL;
|
||||||
threadMutexUnlock(&loading->mutex);
|
threadMutexUnlock(&loading->mutex);
|
||||||
eventInvoke(&errEntry->onError, errEntry);
|
if(errEntry->onError) errEntry->onError(errEntry, errEntry->onErrorUser);
|
||||||
errorThrow("Failed to load asset asynchronously.");
|
loading++;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -324,30 +360,6 @@ errorret_t assetUpdate(void) {
|
|||||||
}
|
}
|
||||||
} while(loading < ASSET.loading + ASSET_LOADING_COUNT_MAX);
|
} while(loading < ASSET.loading + ASSET_LOADING_COUNT_MAX);
|
||||||
|
|
||||||
|
|
||||||
// Reap unused entries.
|
|
||||||
entry = ASSET.entries;
|
|
||||||
do {
|
|
||||||
if(entry->state != ASSET_ENTRY_STATE_LOADED) {
|
|
||||||
entry++;
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
if(entry->type == ASSET_LOADER_TYPE_NULL) {
|
|
||||||
entry++;
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
if(entry->refs.count > 0) {
|
|
||||||
entry++;
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
// consolePrint("Reaping asset %s", entry->name);
|
|
||||||
errorChain(assetEntryDispose(entry));
|
|
||||||
entry++;
|
|
||||||
} while(entry < ASSET.entries + ASSET_ENTRY_COUNT_MAX);
|
|
||||||
|
|
||||||
errorOk();
|
errorOk();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -413,26 +425,7 @@ errorret_t assetDispose(void) {
|
|||||||
assertIsMainThread("Must be called from the main thread.");
|
assertIsMainThread("Must be called from the main thread.");
|
||||||
threadStop(&ASSET.loadThread);
|
threadStop(&ASSET.loadThread);
|
||||||
|
|
||||||
// Drain-dispose: repeatedly find and dispose zero-ref LOADED entries
|
errorChain(assetReapUnused());
|
||||||
// until none remain. This handles dependency chains where an entry
|
|
||||||
// (e.g. a model) holds refs on child entries (mesh, texture): dispose
|
|
||||||
// parents first so child ref counts drop to zero, then pick up the
|
|
||||||
// children on the next pass. Without this, a forward-only scan fails
|
|
||||||
// when a shared child entry appears before a parent that still holds a
|
|
||||||
// ref to it.
|
|
||||||
bool_t any;
|
|
||||||
do {
|
|
||||||
any = false;
|
|
||||||
assetentry_t *e = ASSET.entries;
|
|
||||||
do {
|
|
||||||
if(e->type == ASSET_LOADER_TYPE_NULL) { e++; continue; }
|
|
||||||
if(e->state != ASSET_ENTRY_STATE_LOADED) { e++; continue; }
|
|
||||||
if(e->refs.count > 0) { e++; continue; }
|
|
||||||
errorChain(assetEntryDispose(e));
|
|
||||||
any = true;
|
|
||||||
e++;
|
|
||||||
} while(e < ASSET.entries + ASSET_ENTRY_COUNT_MAX);
|
|
||||||
} while(any);
|
|
||||||
|
|
||||||
// Cleanup zip file.
|
// Cleanup zip file.
|
||||||
if(ASSET.zip != NULL) {
|
if(ASSET.zip != NULL) {
|
||||||
|
|||||||
+12
-2
@@ -23,8 +23,8 @@
|
|||||||
#define ASSET_FILE_NAME "dusk.dsk"
|
#define ASSET_FILE_NAME "dusk.dsk"
|
||||||
#define ASSET_HEADER_SIZE 3
|
#define ASSET_HEADER_SIZE 3
|
||||||
|
|
||||||
#define ASSET_LOADING_COUNT_MAX 20
|
#define ASSET_LOADING_COUNT_MAX 10
|
||||||
#define ASSET_ENTRY_COUNT_MAX 128
|
#define ASSET_ENTRY_COUNT_MAX 64
|
||||||
|
|
||||||
typedef struct asset_s {
|
typedef struct asset_s {
|
||||||
zip_t *zip;
|
zip_t *zip;
|
||||||
@@ -112,6 +112,16 @@ void assetUnlock(const char_t *name);
|
|||||||
*/
|
*/
|
||||||
void assetUnlockEntry(assetentry_t *entry);
|
void assetUnlockEntry(assetentry_t *entry);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Frees every currently unreferenced (zero-ref) loaded asset entry. Repeats
|
||||||
|
* until a full pass frees nothing further, since disposing a parent entry
|
||||||
|
* (e.g. a model) may drop a child entry's (e.g. a mesh) ref count to zero,
|
||||||
|
* making it eligible for reaping too.
|
||||||
|
*
|
||||||
|
* @return An error code if any entry could not be disposed properly.
|
||||||
|
*/
|
||||||
|
errorret_t assetReapUnused(void);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Requires an asset entry to be loaded. This will block until the asset entry
|
* Requires an asset entry to be loaded. This will block until the asset entry
|
||||||
* is fully loaded.
|
* is fully loaded.
|
||||||
|
|||||||
@@ -1,165 +0,0 @@
|
|||||||
/**
|
|
||||||
* Copyright (c) 2026 Dominic Masters
|
|
||||||
*
|
|
||||||
* This software is released under the MIT License.
|
|
||||||
* https://opensource.org/licenses/MIT
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "assetbatch.h"
|
|
||||||
#include "asset.h"
|
|
||||||
#include "assert/assert.h"
|
|
||||||
#include "util/memory.h"
|
|
||||||
#include <unistd.h>
|
|
||||||
|
|
||||||
void assetBatchInit(
|
|
||||||
assetbatch_t *batch,
|
|
||||||
const uint16_t count,
|
|
||||||
const assetbatchdesc_t *descs
|
|
||||||
) {
|
|
||||||
assertNotNull(batch, "Batch cannot be NULL.");
|
|
||||||
assertNotNull(descs, "Descs cannot be NULL.");
|
|
||||||
assertTrue(count > 0, "Count must be greater than 0.");
|
|
||||||
assertTrue(
|
|
||||||
count <= ASSET_BATCH_COUNT_MAX, "Count exceeds ASSET_BATCH_COUNT_MAX."
|
|
||||||
);
|
|
||||||
|
|
||||||
memoryZero(batch, sizeof(assetbatch_t));
|
|
||||||
batch->count = count;
|
|
||||||
|
|
||||||
eventInit(
|
|
||||||
&batch->onLoaded,
|
|
||||||
batch->onLoadedCallbacks, batch->onLoadedUsers, ASSET_BATCH_EVENT_MAX
|
|
||||||
);
|
|
||||||
eventInit(
|
|
||||||
&batch->onEntryLoaded,
|
|
||||||
batch->onEntryLoadedCallbacks,
|
|
||||||
batch->onEntryLoadedUsers,
|
|
||||||
ASSET_BATCH_EVENT_MAX
|
|
||||||
);
|
|
||||||
eventInit(
|
|
||||||
&batch->onError,
|
|
||||||
batch->onErrorCallbacks, batch->onErrorUsers, ASSET_BATCH_EVENT_MAX
|
|
||||||
);
|
|
||||||
eventInit(
|
|
||||||
&batch->onEntryError,
|
|
||||||
batch->onEntryErrorCallbacks,
|
|
||||||
batch->onEntryErrorUsers,
|
|
||||||
ASSET_BATCH_EVENT_MAX
|
|
||||||
);
|
|
||||||
|
|
||||||
for(uint16_t i = 0; i < count; i++) {
|
|
||||||
batch->inputs[i] = descs[i].input;
|
|
||||||
batch->entries[i] = assetLock(
|
|
||||||
descs[i].path, descs[i].type, &batch->inputs[i]
|
|
||||||
);
|
|
||||||
|
|
||||||
if(batch->entries[i]->state == ASSET_ENTRY_STATE_LOADED) {
|
|
||||||
// Already loaded (cached) - count it now, no subscription needed.
|
|
||||||
batch->loadedCount++;
|
|
||||||
} else if(batch->entries[i]->state == ASSET_ENTRY_STATE_ERROR) {
|
|
||||||
batch->errorCount++;
|
|
||||||
} else {
|
|
||||||
eventSubscribe(
|
|
||||||
&batch->entries[i]->onLoaded, assetBatchEntryOnLoadedCb, batch
|
|
||||||
);
|
|
||||||
eventSubscribe(
|
|
||||||
&batch->entries[i]->onError, assetBatchEntryOnErrorCb, batch
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void assetBatchLock(assetbatch_t *batch) {
|
|
||||||
assertNotNull(batch, "Batch cannot be NULL.");
|
|
||||||
for(uint16_t i = 0; i < batch->count; i++) {
|
|
||||||
assetEntryLock(batch->entries[i]);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void assetBatchUnlock(assetbatch_t *batch) {
|
|
||||||
assertNotNull(batch, "Batch cannot be NULL.");
|
|
||||||
for(uint16_t i = 0; i < batch->count; i++) {
|
|
||||||
assetEntryUnlock(batch->entries[i]);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
bool_t assetBatchIsLoaded(const assetbatch_t *batch) {
|
|
||||||
assertNotNull(batch, "Batch cannot be NULL.");
|
|
||||||
for(uint16_t i = 0; i < batch->count; i++) {
|
|
||||||
if(batch->entries[i]->state != ASSET_ENTRY_STATE_LOADED) return false;
|
|
||||||
}
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool_t assetBatchHasError(const assetbatch_t *batch) {
|
|
||||||
assertNotNull(batch, "Batch cannot be NULL.");
|
|
||||||
for(uint16_t i = 0; i < batch->count; i++) {
|
|
||||||
if(batch->entries[i]->state == ASSET_ENTRY_STATE_ERROR) return true;
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
errorret_t assetBatchRequireLoaded(assetbatch_t *batch) {
|
|
||||||
assertNotNull(batch, "Batch cannot be NULL.");
|
|
||||||
|
|
||||||
bool_t allDone;
|
|
||||||
do {
|
|
||||||
allDone = true;
|
|
||||||
for(uint16_t i = 0; i < batch->count; i++) {
|
|
||||||
const assetentrystate_t state = batch->entries[i]->state;
|
|
||||||
if(state == ASSET_ENTRY_STATE_ERROR) {
|
|
||||||
errorThrow("Asset '%s' failed to load.", batch->entries[i]->name);
|
|
||||||
}
|
|
||||||
if(state != ASSET_ENTRY_STATE_LOADED) {
|
|
||||||
allDone = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if(!allDone) {
|
|
||||||
usleep(1000);
|
|
||||||
errorChain(assetUpdate());
|
|
||||||
}
|
|
||||||
} while(!allDone);
|
|
||||||
|
|
||||||
errorOk();
|
|
||||||
}
|
|
||||||
|
|
||||||
void assetBatchDispose(assetbatch_t *batch) {
|
|
||||||
assertNotNull(batch, "Batch cannot be NULL.");
|
|
||||||
for(uint16_t i = 0; i < batch->count; i++) {
|
|
||||||
if(batch->entries[i]) {
|
|
||||||
// Unsubscribe while we still hold a lock so the entry is live.
|
|
||||||
eventUnsubscribe(&batch->entries[i]->onLoaded, assetBatchEntryOnLoadedCb);
|
|
||||||
eventUnsubscribe(&batch->entries[i]->onError, assetBatchEntryOnErrorCb);
|
|
||||||
assetUnlockEntry(batch->entries[i]);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
memoryZero(batch, sizeof(assetbatch_t));
|
|
||||||
}
|
|
||||||
|
|
||||||
void assetBatchEntryOnLoadedCb(void *params, void *user) {
|
|
||||||
assetentry_t *entry = (assetentry_t *)params;
|
|
||||||
assetbatch_t *batch = (assetbatch_t *)user;
|
|
||||||
|
|
||||||
batch->loadedCount++;
|
|
||||||
eventInvoke(&batch->onEntryLoaded, entry);
|
|
||||||
|
|
||||||
if((uint16_t)(batch->loadedCount + batch->errorCount) >= batch->count) {
|
|
||||||
if(batch->errorCount == 0) {
|
|
||||||
eventInvoke(&batch->onLoaded, batch);
|
|
||||||
} else {
|
|
||||||
eventInvoke(&batch->onError, batch);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void assetBatchEntryOnErrorCb(void *params, void *user) {
|
|
||||||
assetentry_t *entry = (assetentry_t *)params;
|
|
||||||
assetbatch_t *batch = (assetbatch_t *)user;
|
|
||||||
|
|
||||||
batch->errorCount++;
|
|
||||||
eventInvoke(&batch->onEntryError, entry);
|
|
||||||
|
|
||||||
if((uint16_t)(batch->loadedCount + batch->errorCount) >= batch->count) {
|
|
||||||
eventInvoke(&batch->onError, batch);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,124 +0,0 @@
|
|||||||
/**
|
|
||||||
* Copyright (c) 2026 Dominic Masters
|
|
||||||
*
|
|
||||||
* This software is released under the MIT License.
|
|
||||||
* https://opensource.org/licenses/MIT
|
|
||||||
*/
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
#include "asset/loader/assetentry.h"
|
|
||||||
#include "asset/loader/assetloader.h"
|
|
||||||
#include "event/event.h"
|
|
||||||
|
|
||||||
#define ASSET_BATCH_COUNT_MAX 64
|
|
||||||
#define ASSET_BATCH_EVENT_MAX 4
|
|
||||||
|
|
||||||
typedef struct {
|
|
||||||
const char_t *path;
|
|
||||||
assetloadertype_t type;
|
|
||||||
assetloaderinput_t input;
|
|
||||||
} assetbatchdesc_t;
|
|
||||||
|
|
||||||
typedef struct {
|
|
||||||
assetentry_t *entries[ASSET_BATCH_COUNT_MAX];
|
|
||||||
assetloaderinput_t inputs[ASSET_BATCH_COUNT_MAX];
|
|
||||||
uint16_t count;
|
|
||||||
uint16_t loadedCount;
|
|
||||||
uint16_t errorCount;
|
|
||||||
|
|
||||||
/** Fires once when every entry loaded. params = assetbatch_t * */
|
|
||||||
event_t onLoaded;
|
|
||||||
eventcallback_t onLoadedCallbacks[ASSET_BATCH_EVENT_MAX];
|
|
||||||
void *onLoadedUsers[ASSET_BATCH_EVENT_MAX];
|
|
||||||
|
|
||||||
/** Fires each time a single entry loads. params = assetentry_t * */
|
|
||||||
event_t onEntryLoaded;
|
|
||||||
eventcallback_t onEntryLoadedCallbacks[ASSET_BATCH_EVENT_MAX];
|
|
||||||
void *onEntryLoadedUsers[ASSET_BATCH_EVENT_MAX];
|
|
||||||
|
|
||||||
/** Fires when all entries finish (any with errors). params: assetbatch_t * */
|
|
||||||
event_t onError;
|
|
||||||
eventcallback_t onErrorCallbacks[ASSET_BATCH_EVENT_MAX];
|
|
||||||
void *onErrorUsers[ASSET_BATCH_EVENT_MAX];
|
|
||||||
|
|
||||||
/** Fires each time a single entry errors. params = assetentry_t * */
|
|
||||||
event_t onEntryError;
|
|
||||||
eventcallback_t onEntryErrorCallbacks[ASSET_BATCH_EVENT_MAX];
|
|
||||||
void *onEntryErrorUsers[ASSET_BATCH_EVENT_MAX];
|
|
||||||
} assetbatch_t;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Initialises the batch from an array of descriptors. Each entry is locked
|
|
||||||
* and queued for loading immediately.
|
|
||||||
*
|
|
||||||
* @param batch Batch to initialise.
|
|
||||||
* @param descs Array of entry descriptors (need not outlive this call).
|
|
||||||
* @param count Number of descriptors (must be <= ASSET_BATCH_COUNT_MAX).
|
|
||||||
*/
|
|
||||||
void assetBatchInit(
|
|
||||||
assetbatch_t *batch,
|
|
||||||
uint16_t count,
|
|
||||||
const assetbatchdesc_t *descs
|
|
||||||
);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Acquires one additional lock on every entry in the batch.
|
|
||||||
*
|
|
||||||
* @param batch Batch to lock.
|
|
||||||
*/
|
|
||||||
void assetBatchLock(assetbatch_t *batch);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Releases one lock from every entry in the batch. When an entry's lock
|
|
||||||
* count reaches zero it will be reaped on the next assetUpdate.
|
|
||||||
*
|
|
||||||
* @param batch Batch to unlock.
|
|
||||||
*/
|
|
||||||
void assetBatchUnlock(assetbatch_t *batch);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns true if every entry in the batch has finished loading.
|
|
||||||
*
|
|
||||||
* @param batch Batch to query.
|
|
||||||
*/
|
|
||||||
bool_t assetBatchIsLoaded(const assetbatch_t *batch);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns true if any entry in the batch is in an error state.
|
|
||||||
*
|
|
||||||
* @param batch Batch to query.
|
|
||||||
*/
|
|
||||||
bool_t assetBatchHasError(const assetbatch_t *batch);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Blocks until every entry is loaded. Returns an error if any entry fails.
|
|
||||||
*
|
|
||||||
* @param batch Batch to wait on.
|
|
||||||
*/
|
|
||||||
errorret_t assetBatchRequireLoaded(assetbatch_t *batch);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Releases the batch's lock on every entry and clears the batch. After this
|
|
||||||
* call the batch struct may be reused with assetBatchInit.
|
|
||||||
*
|
|
||||||
* @param batch Batch to dispose.
|
|
||||||
*/
|
|
||||||
void assetBatchDispose(assetbatch_t *batch);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Event trampoline invoked when a batch entry finishes loading.
|
|
||||||
* Increments the loaded counter and fires batch-level events.
|
|
||||||
*
|
|
||||||
* @param params The loaded assetentry_t pointer.
|
|
||||||
* @param user The owning assetbatch_t pointer.
|
|
||||||
*/
|
|
||||||
void assetBatchEntryOnLoadedCb(void *params, void *user);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Event trampoline invoked when a batch entry fails to load.
|
|
||||||
* Increments the error counter and fires batch-level events.
|
|
||||||
*
|
|
||||||
* @param params The errored assetentry_t pointer.
|
|
||||||
* @param user The owning assetbatch_t pointer.
|
|
||||||
*/
|
|
||||||
void assetBatchEntryOnErrorCb(void *params, void *user);
|
|
||||||
@@ -87,13 +87,30 @@ errorret_t assetFileRead(
|
|||||||
errorOk();
|
errorOk();
|
||||||
}
|
}
|
||||||
|
|
||||||
// I assume zip_fread takes buffer NULL for skipping?
|
// Some zip_fread() implementations (seen on PSP) reject a single call
|
||||||
zip_int64_t bytesRead = zip_fread(file->zipFile, buffer, bufferSize);
|
// asking for the entire (potentially large) file at once with EINVAL;
|
||||||
|
// the line reader above only ever asks for up to 1024 bytes per call and
|
||||||
|
// works fine, so read in bounded chunks here too.
|
||||||
|
size_t totalRead = 0;
|
||||||
|
uint8_t *dest = (uint8_t *)buffer;
|
||||||
|
while(totalRead < bufferSize) {
|
||||||
|
size_t chunkSize = mathMin(
|
||||||
|
bufferSize - totalRead, ASSET_FILE_READ_CHUNK_MAX
|
||||||
|
);
|
||||||
|
zip_int64_t bytesRead = zip_fread(
|
||||||
|
file->zipFile, dest + totalRead, chunkSize
|
||||||
|
);
|
||||||
if(bytesRead < 0) {
|
if(bytesRead < 0) {
|
||||||
errorThrow("Failed to read from asset file: %s", file->filename);
|
errorThrow(
|
||||||
|
"Failed to read from asset file: %s (%s)",
|
||||||
|
file->filename, zip_file_strerror(file->zipFile)
|
||||||
|
);
|
||||||
}
|
}
|
||||||
file->position += bytesRead;
|
if(bytesRead == 0) break;
|
||||||
file->lastRead = bytesRead;
|
totalRead += (size_t)bytesRead;
|
||||||
|
}
|
||||||
|
file->position += totalRead;
|
||||||
|
file->lastRead = totalRead;
|
||||||
errorOk();
|
errorOk();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -201,7 +218,7 @@ const uint8_t *assetFileLineReaderUnreadPtr(
|
|||||||
return reader->readBuffer + reader->bufferStart;
|
return reader->readBuffer + reader->bufferStart;
|
||||||
}
|
}
|
||||||
|
|
||||||
static errorret_t assetFileLineReaderAppend(
|
errorret_t assetFileLineReaderAppend(
|
||||||
assetfilelinereader_t *reader,
|
assetfilelinereader_t *reader,
|
||||||
const uint8_t *src,
|
const uint8_t *src,
|
||||||
size_t srcLength
|
size_t srcLength
|
||||||
@@ -223,7 +240,7 @@ static errorret_t assetFileLineReaderAppend(
|
|||||||
errorOk();
|
errorOk();
|
||||||
}
|
}
|
||||||
|
|
||||||
static void assetFileLineReaderTerminate(assetfilelinereader_t *reader) {
|
void assetFileLineReaderTerminate(assetfilelinereader_t *reader) {
|
||||||
assertNotNull(reader, "Reader cannot be NULL.");
|
assertNotNull(reader, "Reader cannot be NULL.");
|
||||||
assertNotNull(reader->outBuffer, "Out buffer cannot be NULL.");
|
assertNotNull(reader->outBuffer, "Out buffer cannot be NULL.");
|
||||||
assertTrue(
|
assertTrue(
|
||||||
@@ -233,7 +250,7 @@ static void assetFileLineReaderTerminate(assetfilelinereader_t *reader) {
|
|||||||
reader->outBuffer[reader->lineLength] = '\0';
|
reader->outBuffer[reader->lineLength] = '\0';
|
||||||
}
|
}
|
||||||
|
|
||||||
static ssize_t assetFileLineReaderFindNewline(
|
ssize_t assetFileLineReaderFindNewline(
|
||||||
const assetfilelinereader_t *reader
|
const assetfilelinereader_t *reader
|
||||||
) {
|
) {
|
||||||
size_t i;
|
size_t i;
|
||||||
|
|||||||
@@ -11,6 +11,12 @@
|
|||||||
|
|
||||||
#define ASSET_FILE_NAME_MAX 48
|
#define ASSET_FILE_NAME_MAX 48
|
||||||
|
|
||||||
|
// Max bytes requested per zip_fread() call in assetFileRead(). Some
|
||||||
|
// zip_fread() implementations (seen on PSP) reject a single call asking
|
||||||
|
// for very large amounts of data at once; the locale line reader has
|
||||||
|
// always used 1024-byte reads successfully, so that's the proven-safe cap.
|
||||||
|
#define ASSET_FILE_READ_CHUNK_MAX 1024
|
||||||
|
|
||||||
typedef struct assetfile_s assetfile_t;
|
typedef struct assetfile_s assetfile_t;
|
||||||
|
|
||||||
typedef errorret_t (*assetfileloader_t)(assetfile_t *file);
|
typedef errorret_t (*assetfileloader_t)(assetfile_t *file);
|
||||||
@@ -144,6 +150,63 @@ void assetFileLineReaderInit(
|
|||||||
const size_t outBufferSize
|
const size_t outBufferSize
|
||||||
);
|
);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns the number of bytes still unread in the line reader's read buffer.
|
||||||
|
*
|
||||||
|
* @param reader The line reader to check.
|
||||||
|
* @return Number of unread bytes remaining in the read buffer.
|
||||||
|
*/
|
||||||
|
size_t assetFileLineReaderUnreadBytes(const assetfilelinereader_t *reader);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns a pointer to the first unread byte in the line reader's read
|
||||||
|
* buffer.
|
||||||
|
*
|
||||||
|
* @param reader The line reader to check.
|
||||||
|
* @return Pointer to the first unread byte.
|
||||||
|
*/
|
||||||
|
const uint8_t *assetFileLineReaderUnreadPtr(
|
||||||
|
const assetfilelinereader_t *reader
|
||||||
|
);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Appends src to the line reader's current line buffer, growing lineLength.
|
||||||
|
*
|
||||||
|
* @param reader The line reader whose out buffer to append to.
|
||||||
|
* @param src Bytes to append.
|
||||||
|
* @param srcLength Number of bytes in src.
|
||||||
|
* @return Error state if any (the line would exceed the output buffer).
|
||||||
|
*/
|
||||||
|
errorret_t assetFileLineReaderAppend(
|
||||||
|
assetfilelinereader_t *reader,
|
||||||
|
const uint8_t *src,
|
||||||
|
size_t srcLength
|
||||||
|
);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Null-terminates the line reader's current line buffer at lineLength.
|
||||||
|
*
|
||||||
|
* @param reader The line reader whose out buffer to terminate.
|
||||||
|
*/
|
||||||
|
void assetFileLineReaderTerminate(assetfilelinereader_t *reader);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Searches the line reader's unread buffered bytes for a newline character.
|
||||||
|
*
|
||||||
|
* @param reader The line reader to search.
|
||||||
|
* @return The index of the newline within readBuffer, or -1 if not found.
|
||||||
|
*/
|
||||||
|
ssize_t assetFileLineReaderFindNewline(const assetfilelinereader_t *reader);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Refills the line reader's read buffer from the underlying file once its
|
||||||
|
* buffered bytes are fully consumed. A no-op once the file is at EOF.
|
||||||
|
*
|
||||||
|
* @param reader The line reader to refill.
|
||||||
|
* @return Error state if any.
|
||||||
|
*/
|
||||||
|
errorret_t assetFileLineReaderFill(assetfilelinereader_t *reader);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Reads the next line from the asset file into the line buffer. The line
|
* Reads the next line from the asset file into the line buffer. The line
|
||||||
* buffer is null-terminated and does not include the newline character.
|
* buffer is null-terminated and does not include the newline character.
|
||||||
|
|||||||
@@ -17,3 +17,4 @@ add_subdirectory(locale)
|
|||||||
add_subdirectory(json)
|
add_subdirectory(json)
|
||||||
add_subdirectory(chunk)
|
add_subdirectory(chunk)
|
||||||
add_subdirectory(dmf)
|
add_subdirectory(dmf)
|
||||||
|
add_subdirectory(cutscene)
|
||||||
@@ -35,22 +35,6 @@ void assetEntryInit(
|
|||||||
entry->input = NULL;
|
entry->input = NULL;
|
||||||
}
|
}
|
||||||
refInit(&entry->refs, entry, NULL, NULL, NULL);
|
refInit(&entry->refs, entry, NULL, NULL, NULL);
|
||||||
|
|
||||||
eventInit(
|
|
||||||
&entry->onLoaded,
|
|
||||||
entry->onLoadedCallbacks, entry->onLoadedUsers,
|
|
||||||
ASSET_ENTRY_EVENT_MAX
|
|
||||||
);
|
|
||||||
eventInit(
|
|
||||||
&entry->onUnloaded,
|
|
||||||
entry->onUnloadedCallbacks, entry->onUnloadedUsers,
|
|
||||||
ASSET_ENTRY_EVENT_MAX
|
|
||||||
);
|
|
||||||
eventInit(
|
|
||||||
&entry->onError,
|
|
||||||
entry->onErrorCallbacks, entry->onErrorUsers,
|
|
||||||
ASSET_ENTRY_EVENT_MAX
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void assetEntryLock(assetentry_t *entry) {
|
void assetEntryLock(assetentry_t *entry) {
|
||||||
@@ -97,7 +81,7 @@ errorret_t assetEntryDispose(assetentry_t *entry) {
|
|||||||
"Asset entry still refed at dispose time."
|
"Asset entry still refed at dispose time."
|
||||||
);
|
);
|
||||||
|
|
||||||
eventInvoke(&entry->onUnloaded, entry);
|
if(entry->onUnloaded) entry->onUnloaded(entry, entry->onUnloadedUser);
|
||||||
errorChain(ASSET_LOADER_CALLBACKS[entry->type].dispose(entry));
|
errorChain(ASSET_LOADER_CALLBACKS[entry->type].dispose(entry));
|
||||||
memoryZero(entry, sizeof(assetentry_t));
|
memoryZero(entry, sizeof(assetentry_t));
|
||||||
errorOk();
|
errorOk();
|
||||||
|
|||||||
@@ -7,7 +7,6 @@
|
|||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
#include "asset/loader/assetloading.h"
|
#include "asset/loader/assetloading.h"
|
||||||
#include "event/event.h"
|
|
||||||
#include "util/ref.h"
|
#include "util/ref.h"
|
||||||
|
|
||||||
typedef enum {
|
typedef enum {
|
||||||
@@ -20,11 +19,17 @@ typedef enum {
|
|||||||
ASSET_ENTRY_STATE_ERROR
|
ASSET_ENTRY_STATE_ERROR
|
||||||
} assetentrystate_t;
|
} assetentrystate_t;
|
||||||
|
|
||||||
/** Maximum number of subscribers for each per-entry event. */
|
|
||||||
#define ASSET_ENTRY_EVENT_MAX 2
|
|
||||||
|
|
||||||
typedef struct assetentry_s assetentry_t;
|
typedef struct assetentry_s assetentry_t;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A single asset entry callback. Each entry supports at most one subscriber
|
||||||
|
* per event - a second assignment without clearing the first is a bug.
|
||||||
|
*
|
||||||
|
* @param entry The assetentry_t the event fired on.
|
||||||
|
* @param user The user pointer passed alongside the callback.
|
||||||
|
*/
|
||||||
|
typedef void (*assetentrycallback_t)(assetentry_t *entry, void *user);
|
||||||
|
|
||||||
struct assetentry_s {
|
struct assetentry_s {
|
||||||
char_t name[ASSET_FILE_NAME_MAX];
|
char_t name[ASSET_FILE_NAME_MAX];
|
||||||
assetloadertype_t type;
|
assetloadertype_t type;
|
||||||
@@ -33,30 +38,27 @@ struct assetentry_s {
|
|||||||
ref_t refs;
|
ref_t refs;
|
||||||
assetloaderinput_t *input;
|
assetloaderinput_t *input;
|
||||||
assetloaderinput_t inputData;
|
assetloaderinput_t inputData;
|
||||||
/**
|
|
||||||
* Fired once when loading completes successfully (params = assetentry_t *).
|
|
||||||
* Always invoked on the main thread.
|
|
||||||
*/
|
|
||||||
event_t onLoaded;
|
|
||||||
eventcallback_t onLoadedCallbacks[ASSET_ENTRY_EVENT_MAX];
|
|
||||||
void *onLoadedUsers[ASSET_ENTRY_EVENT_MAX];
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Fired once when the entry is disposed/reaped (params = assetentry_t *).
|
* Fired once when loading completes successfully.
|
||||||
* The asset data is still accessible when the callback runs.
|
|
||||||
* Always invoked on the main thread.
|
* Always invoked on the main thread.
|
||||||
*/
|
*/
|
||||||
event_t onUnloaded;
|
assetentrycallback_t onLoaded;
|
||||||
eventcallback_t onUnloadedCallbacks[ASSET_ENTRY_EVENT_MAX];
|
void *onLoadedUser;
|
||||||
void *onUnloadedUsers[ASSET_ENTRY_EVENT_MAX];
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Fired once when loading fails (params = assetentry_t *).
|
* Fired once when the entry is disposed/reaped. The asset data is still
|
||||||
|
* accessible when the callback runs. Always invoked on the main thread.
|
||||||
|
*/
|
||||||
|
assetentrycallback_t onUnloaded;
|
||||||
|
void *onUnloadedUser;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Fired once when loading fails.
|
||||||
* Always invoked on the main thread.
|
* Always invoked on the main thread.
|
||||||
*/
|
*/
|
||||||
event_t onError;
|
assetentrycallback_t onError;
|
||||||
eventcallback_t onErrorCallbacks[ASSET_ENTRY_EVENT_MAX];
|
void *onErrorUser;
|
||||||
void *onErrorUsers[ASSET_ENTRY_EVENT_MAX];
|
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -51,4 +51,10 @@ assetloadercallbacks_t ASSET_LOADER_CALLBACKS[ASSET_LOADER_TYPE_COUNT] = {
|
|||||||
.loadAsync = assetChunkLoaderAsync,
|
.loadAsync = assetChunkLoaderAsync,
|
||||||
.dispose = assetChunkDispose
|
.dispose = assetChunkDispose
|
||||||
},
|
},
|
||||||
|
|
||||||
|
[ASSET_LOADER_TYPE_CUTSCENE] = {
|
||||||
|
.loadSync = assetCutsceneLoaderSync,
|
||||||
|
.loadAsync = assetCutsceneLoaderAsync,
|
||||||
|
.dispose = assetCutsceneDispose
|
||||||
|
},
|
||||||
};
|
};
|
||||||
@@ -13,6 +13,7 @@
|
|||||||
#include "asset/loader/locale/assetlocaleloader.h"
|
#include "asset/loader/locale/assetlocaleloader.h"
|
||||||
#include "asset/loader/json/assetjsonloader.h"
|
#include "asset/loader/json/assetjsonloader.h"
|
||||||
#include "asset/loader/chunk/assetchunkloader.h"
|
#include "asset/loader/chunk/assetchunkloader.h"
|
||||||
|
#include "asset/loader/cutscene/assetcutsceneloader.h"
|
||||||
|
|
||||||
typedef enum {
|
typedef enum {
|
||||||
ASSET_LOADER_TYPE_NULL,
|
ASSET_LOADER_TYPE_NULL,
|
||||||
@@ -24,6 +25,7 @@ typedef enum {
|
|||||||
ASSET_LOADER_TYPE_LOCALE,
|
ASSET_LOADER_TYPE_LOCALE,
|
||||||
ASSET_LOADER_TYPE_JSON,
|
ASSET_LOADER_TYPE_JSON,
|
||||||
ASSET_LOADER_TYPE_CHUNK,
|
ASSET_LOADER_TYPE_CHUNK,
|
||||||
|
ASSET_LOADER_TYPE_CUTSCENE,
|
||||||
|
|
||||||
ASSET_LOADER_TYPE_COUNT
|
ASSET_LOADER_TYPE_COUNT
|
||||||
} assetloadertype_t;
|
} assetloadertype_t;
|
||||||
@@ -36,6 +38,7 @@ typedef union {
|
|||||||
assetlocaleloaderloading_t locale;
|
assetlocaleloaderloading_t locale;
|
||||||
assetjsonloaderloading_t json;
|
assetjsonloaderloading_t json;
|
||||||
assetchunkloaderloading_t chunk;
|
assetchunkloaderloading_t chunk;
|
||||||
|
assetcutsceneloaderloading_t cutscene;
|
||||||
} assetloaderloading_t;
|
} assetloaderloading_t;
|
||||||
|
|
||||||
typedef union {
|
typedef union {
|
||||||
@@ -46,6 +49,7 @@ typedef union {
|
|||||||
assetlocaleoutput_t locale;
|
assetlocaleoutput_t locale;
|
||||||
assetjsonoutput_t json;
|
assetjsonoutput_t json;
|
||||||
assetchunkoutput_t chunk;
|
assetchunkoutput_t chunk;
|
||||||
|
assetcutsceneoutput_t cutscene;
|
||||||
} assetloaderoutput_t;
|
} assetloaderoutput_t;
|
||||||
|
|
||||||
typedef union {
|
typedef union {
|
||||||
@@ -54,6 +58,7 @@ typedef union {
|
|||||||
assetlocaleloaderinput_t locale;
|
assetlocaleloaderinput_t locale;
|
||||||
assetjsonloaderinput_t json;
|
assetjsonloaderinput_t json;
|
||||||
assetchunkloaderinput_t chunk;
|
assetchunkloaderinput_t chunk;
|
||||||
|
assetcutsceneloaderinput_t cutscene;
|
||||||
} assetloaderinput_t;
|
} assetloaderinput_t;
|
||||||
|
|
||||||
typedef struct assetloading_s assetloading_t;
|
typedef struct assetloading_s assetloading_t;
|
||||||
|
|||||||
@@ -13,6 +13,7 @@
|
|||||||
#include "asset/loader/assetentry.h"
|
#include "asset/loader/assetentry.h"
|
||||||
#include "asset/loader/assetloader.h"
|
#include "asset/loader/assetloader.h"
|
||||||
#include "asset/asset.h"
|
#include "asset/asset.h"
|
||||||
|
#include "rpg/overworld/worldpos.h"
|
||||||
|
|
||||||
errorret_t assetChunkLoaderAsync(assetloading_t *loading) {
|
errorret_t assetChunkLoaderAsync(assetloading_t *loading) {
|
||||||
assertNotNull(loading, "Loading cannot be NULL");
|
assertNotNull(loading, "Loading cannot be NULL");
|
||||||
@@ -111,9 +112,15 @@ errorret_t assetChunkLoaderSync(assetloading_t *loading) {
|
|||||||
size_t offset = 8;
|
size_t offset = 8;
|
||||||
|
|
||||||
size_t tileSize = CHUNK_TILE_COUNT * sizeof(tile_t);
|
size_t tileSize = CHUNK_TILE_COUNT * sizeof(tile_t);
|
||||||
|
out->tiles = memoryAllocate(tileSize);
|
||||||
memoryCopy(out->tiles, data + offset, tileSize);
|
memoryCopy(out->tiles, data + offset, tileSize);
|
||||||
offset += tileSize;
|
offset += tileSize;
|
||||||
|
|
||||||
|
for(size_t t = 0; t < CHUNK_TILE_COUNT; t++) {
|
||||||
|
uint32_t *shape = (uint32_t *)&out->tiles[t].shape;
|
||||||
|
*shape = endianLittleToHost32(*shape);
|
||||||
|
}
|
||||||
|
|
||||||
out->meshCount = data[offset];
|
out->meshCount = data[offset];
|
||||||
offset += sizeof(uint8_t);
|
offset += sizeof(uint8_t);
|
||||||
assertTrue(
|
assertTrue(
|
||||||
@@ -135,6 +142,65 @@ errorret_t assetChunkLoaderSync(assetloading_t *loading) {
|
|||||||
|
|
||||||
memoryCopy(out->meshOffsets[m], data + offset, sizeof(vec3));
|
memoryCopy(out->meshOffsets[m], data + offset, sizeof(vec3));
|
||||||
offset += sizeof(vec3);
|
offset += sizeof(vec3);
|
||||||
|
out->meshOffsets[m][0] = endianLittleToHostFloat(out->meshOffsets[m][0]);
|
||||||
|
out->meshOffsets[m][1] = endianLittleToHostFloat(out->meshOffsets[m][1]);
|
||||||
|
out->meshOffsets[m][2] = endianLittleToHostFloat(out->meshOffsets[m][2]);
|
||||||
|
}
|
||||||
|
|
||||||
|
out->entitySpawnCount = data[offset];
|
||||||
|
offset += sizeof(uint8_t);
|
||||||
|
assertTrue(
|
||||||
|
out->entitySpawnCount <= CHUNK_ENTITY_SPAWN_COUNT_MAX,
|
||||||
|
"Chunk entity spawn count exceeds maximum."
|
||||||
|
);
|
||||||
|
|
||||||
|
for(uint8_t s = 0; s < out->entitySpawnCount; s++) {
|
||||||
|
chunkentityspawn_t *spawn = &out->entitySpawns[s];
|
||||||
|
spawn->kind = (chunkentityspawnkind_t)data[offset];
|
||||||
|
offset += sizeof(uint8_t);
|
||||||
|
|
||||||
|
uint16_t a;
|
||||||
|
memoryCopy(&a, data + offset, sizeof(uint16_t));
|
||||||
|
a = endianLittleToHost16(a);
|
||||||
|
offset += sizeof(uint16_t);
|
||||||
|
|
||||||
|
uint8_t b = data[offset];
|
||||||
|
offset += sizeof(uint8_t);
|
||||||
|
|
||||||
|
if(spawn->kind == CHUNK_ENTITY_SPAWN_KIND_ITEM) {
|
||||||
|
spawn->globalId = 0;
|
||||||
|
spawn->itemId = a;
|
||||||
|
spawn->itemQuantity = b;
|
||||||
|
} else {
|
||||||
|
spawn->globalId = a;
|
||||||
|
spawn->itemId = 0;
|
||||||
|
spawn->itemQuantity = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
spawn->position = worldPosReadLE(data, &offset);
|
||||||
|
}
|
||||||
|
|
||||||
|
out->areaSpawnCount = data[offset];
|
||||||
|
offset += sizeof(uint8_t);
|
||||||
|
assertTrue(
|
||||||
|
out->areaSpawnCount <= CHUNK_AREA_COUNT_MAX,
|
||||||
|
"Chunk area spawn count exceeds maximum."
|
||||||
|
);
|
||||||
|
|
||||||
|
for(uint8_t s = 0; s < out->areaSpawnCount; s++) {
|
||||||
|
chunkareaspawn_t *area = &out->areaSpawns[s];
|
||||||
|
area->min = worldPosReadLE(data, &offset);
|
||||||
|
area->max = worldPosReadLE(data, &offset);
|
||||||
|
|
||||||
|
uint16_t callbackId;
|
||||||
|
memoryCopy(&callbackId, data + offset, sizeof(uint16_t));
|
||||||
|
area->callbackId = endianLittleToHost16(callbackId);
|
||||||
|
offset += sizeof(uint16_t);
|
||||||
|
|
||||||
|
area->notify = data[offset];
|
||||||
|
offset += sizeof(uint8_t);
|
||||||
|
area->trigger = data[offset];
|
||||||
|
offset += sizeof(uint8_t);
|
||||||
}
|
}
|
||||||
|
|
||||||
memoryFree(data);
|
memoryFree(data);
|
||||||
@@ -157,6 +223,12 @@ errorret_t assetChunkDispose(assetentry_t *entry) {
|
|||||||
assertIsMainThread("Must be called from the main thread.");
|
assertIsMainThread("Must be called from the main thread.");
|
||||||
|
|
||||||
assetchunkoutput_t *out = &entry->data.chunk;
|
assetchunkoutput_t *out = &entry->data.chunk;
|
||||||
|
|
||||||
|
if(out->tiles != NULL) {
|
||||||
|
memoryFree(out->tiles);
|
||||||
|
out->tiles = NULL;
|
||||||
|
}
|
||||||
|
|
||||||
for(uint8_t m = 0; m < out->meshCount; m++) {
|
for(uint8_t m = 0; m < out->meshCount; m++) {
|
||||||
if(out->modelEntries[m] == NULL) continue;
|
if(out->modelEntries[m] == NULL) continue;
|
||||||
assetUnlockEntry(out->modelEntries[m]);
|
assetUnlockEntry(out->modelEntries[m]);
|
||||||
|
|||||||
@@ -9,7 +9,7 @@
|
|||||||
#include "asset/assetfile.h"
|
#include "asset/assetfile.h"
|
||||||
#include "rpg/overworld/chunk.h"
|
#include "rpg/overworld/chunk.h"
|
||||||
|
|
||||||
#define ASSET_CHUNK_FILE_VERSION 3
|
#define ASSET_CHUNK_FILE_VERSION 5
|
||||||
|
|
||||||
typedef struct assetloading_s assetloading_t;
|
typedef struct assetloading_s assetloading_t;
|
||||||
typedef struct assetentry_s assetentry_t;
|
typedef struct assetentry_s assetentry_t;
|
||||||
@@ -33,12 +33,39 @@ typedef struct {
|
|||||||
uint8_t modelIndex;
|
uint8_t modelIndex;
|
||||||
} assetchunkloaderloading_t;
|
} assetchunkloaderloading_t;
|
||||||
|
|
||||||
|
typedef enum {
|
||||||
|
CHUNK_ENTITY_SPAWN_KIND_GLOBAL,
|
||||||
|
CHUNK_ENTITY_SPAWN_KIND_ITEM
|
||||||
|
} chunkentityspawnkind_t;
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
tile_t tiles[CHUNK_TILE_COUNT];
|
chunkentityspawnkind_t kind;
|
||||||
|
uint16_t globalId; // Valid when kind == CHUNK_ENTITY_SPAWN_KIND_GLOBAL.
|
||||||
|
uint16_t itemId; // Valid when kind == CHUNK_ENTITY_SPAWN_KIND_ITEM.
|
||||||
|
uint8_t itemQuantity; // Valid when kind == CHUNK_ENTITY_SPAWN_KIND_ITEM.
|
||||||
|
worldpos_t position;
|
||||||
|
} chunkentityspawn_t;
|
||||||
|
|
||||||
|
typedef struct {
|
||||||
|
worldpos_t min;
|
||||||
|
worldpos_t max;
|
||||||
|
uint16_t callbackId; // Index into MAP_AREA_CALLBACK_LIST.
|
||||||
|
uint8_t notify;
|
||||||
|
uint8_t trigger;
|
||||||
|
} chunkareaspawn_t;
|
||||||
|
|
||||||
|
typedef struct {
|
||||||
|
tile_t *tiles;
|
||||||
uint8_t meshCount;
|
uint8_t meshCount;
|
||||||
char_t modelNames[CHUNK_MESH_COUNT_MAX][CHUNK_MESH_NAME_MAX];
|
char_t modelNames[CHUNK_MESH_COUNT_MAX][CHUNK_MESH_NAME_MAX];
|
||||||
vec3 meshOffsets[CHUNK_MESH_COUNT_MAX];
|
vec3 meshOffsets[CHUNK_MESH_COUNT_MAX];
|
||||||
assetentry_t *modelEntries[CHUNK_MESH_COUNT_MAX];
|
assetentry_t *modelEntries[CHUNK_MESH_COUNT_MAX];
|
||||||
|
|
||||||
|
uint8_t entitySpawnCount;
|
||||||
|
chunkentityspawn_t entitySpawns[CHUNK_ENTITY_SPAWN_COUNT_MAX];
|
||||||
|
|
||||||
|
uint8_t areaSpawnCount;
|
||||||
|
chunkareaspawn_t areaSpawns[CHUNK_AREA_COUNT_MAX];
|
||||||
} assetchunkoutput_t;
|
} assetchunkoutput_t;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -5,6 +5,5 @@
|
|||||||
|
|
||||||
target_sources(${DUSK_LIBRARY_TARGET_NAME}
|
target_sources(${DUSK_LIBRARY_TARGET_NAME}
|
||||||
PUBLIC
|
PUBLIC
|
||||||
uiframe.c
|
assetcutsceneloader.c
|
||||||
uisettings.c
|
|
||||||
)
|
)
|
||||||
@@ -0,0 +1,449 @@
|
|||||||
|
/**
|
||||||
|
* Copyright (c) 2026 Dominic Masters
|
||||||
|
*
|
||||||
|
* This software is released under the MIT License.
|
||||||
|
* https://opensource.org/licenses/MIT
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "assetcutsceneloader.h"
|
||||||
|
#include "assert/assert.h"
|
||||||
|
#include "util/memory.h"
|
||||||
|
#include "util/endian.h"
|
||||||
|
#include "asset/loader/assetloading.h"
|
||||||
|
#include "asset/loader/assetentry.h"
|
||||||
|
#include "asset/loader/assetloader.h"
|
||||||
|
#include "asset/asset.h"
|
||||||
|
#include "rpg/overworld/worldpos.h"
|
||||||
|
|
||||||
|
// DCTS header: magic "DCTS" (4), version u32 LE (4), pauseType u8 (1),
|
||||||
|
// itemCount u8 (1), poolSize u16 LE (2) = 12 bytes.
|
||||||
|
#define ASSET_CUTSCENE_HEADER_SIZE 12
|
||||||
|
|
||||||
|
uint8_t assetCutsceneReadU8(const uint8_t *data, size_t *offset) {
|
||||||
|
uint8_t value = data[*offset];
|
||||||
|
*offset += sizeof(uint8_t);
|
||||||
|
return value;
|
||||||
|
}
|
||||||
|
|
||||||
|
uint16_t assetCutsceneReadU16(const uint8_t *data, size_t *offset) {
|
||||||
|
uint16_t value;
|
||||||
|
memoryCopy(&value, data + *offset, sizeof(uint16_t));
|
||||||
|
*offset += sizeof(uint16_t);
|
||||||
|
return endianLittleToHost16(value);
|
||||||
|
}
|
||||||
|
|
||||||
|
uint32_t assetCutsceneReadU32(const uint8_t *data, size_t *offset) {
|
||||||
|
uint32_t value;
|
||||||
|
memoryCopy(&value, data + *offset, sizeof(uint32_t));
|
||||||
|
*offset += sizeof(uint32_t);
|
||||||
|
return endianLittleToHost32(value);
|
||||||
|
}
|
||||||
|
|
||||||
|
float_t assetCutsceneReadFloat(const uint8_t *data, size_t *offset) {
|
||||||
|
float_t value;
|
||||||
|
memoryCopy(&value, data + *offset, sizeof(float_t));
|
||||||
|
*offset += sizeof(float_t);
|
||||||
|
return endianLittleToHostFloat(value);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Copies a length-prefixed string directly into an item's own embedded
|
||||||
|
// char_t[destCapacity] field (CUTSCENE_TEXT_MAX_CHARS and friends) - these
|
||||||
|
// are never pool references, see the item-field inventory in the runtime
|
||||||
|
// cutscene file design.
|
||||||
|
void assetCutsceneReadEmbeddedString(
|
||||||
|
const uint8_t *data,
|
||||||
|
size_t *offset,
|
||||||
|
char_t *dest,
|
||||||
|
const size_t destCapacity
|
||||||
|
) {
|
||||||
|
uint8_t len = assetCutsceneReadU8(data, offset);
|
||||||
|
assertTrue(len < destCapacity, "Cutscene string exceeds field capacity");
|
||||||
|
memoryCopy(dest, data + *offset, len);
|
||||||
|
dest[len] = '\0';
|
||||||
|
*offset += len;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Resolves a u16 pool offset (read from the item stream) to a real pointer
|
||||||
|
// into the entry's own persistent pool allocation.
|
||||||
|
const char_t * assetCutsceneReadPoolString(
|
||||||
|
const uint8_t *data,
|
||||||
|
size_t *offset,
|
||||||
|
const char_t *pool
|
||||||
|
) {
|
||||||
|
uint16_t poolOffset = assetCutsceneReadU16(data, offset);
|
||||||
|
return pool + poolOffset;
|
||||||
|
}
|
||||||
|
|
||||||
|
errorret_t assetCutsceneLoaderAsync(assetloading_t *loading) {
|
||||||
|
assertNotNull(loading, "Loading cannot be NULL");
|
||||||
|
assertNotMainThread("Should be called from an async thread.");
|
||||||
|
|
||||||
|
if(loading->loading.cutscene.state != ASSET_CUTSCENE_LOADING_STATE_READ_FILE) {
|
||||||
|
errorOk();
|
||||||
|
}
|
||||||
|
|
||||||
|
assertNull(loading->loading.cutscene.data, "Data already defined?");
|
||||||
|
|
||||||
|
assetfile_t *file = &loading->loading.cutscene.file;
|
||||||
|
assetLoaderErrorChain(loading,
|
||||||
|
assetFileInit(file, loading->entry->name, NULL, NULL)
|
||||||
|
);
|
||||||
|
|
||||||
|
uint8_t *data = memoryAllocate(file->size);
|
||||||
|
assetLoaderErrorChain(loading, assetFileOpen(file));
|
||||||
|
assetLoaderErrorChain(loading, assetFileRead(file, data, file->size));
|
||||||
|
assertTrue(
|
||||||
|
file->lastRead == file->size,
|
||||||
|
"Failed to read entire cutscene file."
|
||||||
|
);
|
||||||
|
// Saved before assetFileDispose zeroes the whole assetfile_t struct
|
||||||
|
// (including .size) - the sync phase needs the file's total length to
|
||||||
|
// locate the pool region, which starts poolSize bytes before the end.
|
||||||
|
loading->loading.cutscene.dataSize = (size_t)file->size;
|
||||||
|
|
||||||
|
assetLoaderErrorChain(loading, assetFileClose(file));
|
||||||
|
assetLoaderErrorChain(loading, assetFileDispose(file));
|
||||||
|
|
||||||
|
loading->loading.cutscene.data = data;
|
||||||
|
loading->loading.cutscene.state = ASSET_CUTSCENE_LOADING_STATE_PARSE;
|
||||||
|
loading->entry->state = ASSET_ENTRY_STATE_PENDING_SYNC;
|
||||||
|
errorOk();
|
||||||
|
}
|
||||||
|
|
||||||
|
errorret_t assetCutsceneLoaderSync(assetloading_t *loading) {
|
||||||
|
assertNotNull(loading, "Loading cannot be NULL");
|
||||||
|
assertTrue(loading->type == ASSET_LOADER_TYPE_CUTSCENE, "Invalid type.");
|
||||||
|
assertIsMainThread("Must be called from the main thread.");
|
||||||
|
|
||||||
|
if(loading->loading.cutscene.state == ASSET_CUTSCENE_LOADING_STATE_INITIAL) {
|
||||||
|
loading->loading.cutscene.state = ASSET_CUTSCENE_LOADING_STATE_READ_FILE;
|
||||||
|
loading->entry->state = ASSET_ENTRY_STATE_PENDING_ASYNC;
|
||||||
|
errorOk();
|
||||||
|
}
|
||||||
|
|
||||||
|
assetcutsceneoutput_t *out = &loading->entry->data.cutscene;
|
||||||
|
uint8_t *data = loading->loading.cutscene.data;
|
||||||
|
assertNotNull(data, "Cutscene data should have been loaded by now.");
|
||||||
|
|
||||||
|
size_t fileSize = loading->loading.cutscene.dataSize;
|
||||||
|
|
||||||
|
if(data[0] != 'D' || data[1] != 'C' || data[2] != 'T' || data[3] != 'S') {
|
||||||
|
memoryFree(data);
|
||||||
|
assetLoaderErrorThrow(loading, "Invalid cutscene file header");
|
||||||
|
}
|
||||||
|
|
||||||
|
size_t offset = 4;
|
||||||
|
uint32_t version = assetCutsceneReadU32(data, &offset);
|
||||||
|
if(version != ASSET_CUTSCENE_FILE_VERSION) {
|
||||||
|
memoryFree(data);
|
||||||
|
assetLoaderErrorThrow(
|
||||||
|
loading, "Unsupported cutscene file version %u", version
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
cutscenepause_t pauseType = (cutscenepause_t)assetCutsceneReadU8(data, &offset);
|
||||||
|
uint8_t itemCount = assetCutsceneReadU8(data, &offset);
|
||||||
|
uint16_t poolSize = assetCutsceneReadU16(data, &offset);
|
||||||
|
assertTrue(offset == ASSET_CUTSCENE_HEADER_SIZE, "Cutscene header size mismatch");
|
||||||
|
|
||||||
|
out->pool = poolSize > 0 ? memoryAllocate(poolSize) : NULL;
|
||||||
|
if(poolSize > 0) {
|
||||||
|
size_t poolStart = fileSize - (size_t)poolSize;
|
||||||
|
memoryCopy(out->pool, data + poolStart, poolSize);
|
||||||
|
}
|
||||||
|
const char_t *pool = out->pool;
|
||||||
|
|
||||||
|
out->items = memoryAllocate(itemCount * sizeof(cutsceneitem_t));
|
||||||
|
memoryZero(out->items, itemCount * sizeof(cutsceneitem_t));
|
||||||
|
|
||||||
|
for(uint8_t i = 0; i < itemCount; i++) {
|
||||||
|
cutsceneitem_t *item = &out->items[i];
|
||||||
|
item->type = (cutsceneitemtype_t)assetCutsceneReadU8(data, &offset);
|
||||||
|
|
||||||
|
switch(item->type) {
|
||||||
|
case CUTSCENE_ITEM_TYPE_TEXT:
|
||||||
|
assetCutsceneReadEmbeddedString(
|
||||||
|
data, &offset, item->text.text, CUTSCENE_TEXT_MAX_CHARS
|
||||||
|
);
|
||||||
|
break;
|
||||||
|
|
||||||
|
case CUTSCENE_ITEM_TYPE_TEXT_MINI:
|
||||||
|
assetCutsceneReadEmbeddedString(
|
||||||
|
data, &offset, item->textMini.text, CUTSCENE_TEXT_MINI_MAX_CHARS
|
||||||
|
);
|
||||||
|
item->textMini.position[0] = assetCutsceneReadFloat(data, &offset);
|
||||||
|
item->textMini.position[1] = assetCutsceneReadFloat(data, &offset);
|
||||||
|
item->textMini.position[2] = assetCutsceneReadFloat(data, &offset);
|
||||||
|
item->textMini.duration = assetCutsceneReadFloat(data, &offset);
|
||||||
|
break;
|
||||||
|
|
||||||
|
case CUTSCENE_ITEM_TYPE_TEXT_MINI_HIDE:
|
||||||
|
item->textMiniHide.index = assetCutsceneReadU8(data, &offset);
|
||||||
|
break;
|
||||||
|
|
||||||
|
case CUTSCENE_ITEM_TYPE_WAIT:
|
||||||
|
item->wait = assetCutsceneReadFloat(data, &offset);
|
||||||
|
break;
|
||||||
|
|
||||||
|
case CUTSCENE_ITEM_TYPE_ENTITY_TELEPORT:
|
||||||
|
item->entityTeleport.entityIndex = assetCutsceneReadU8(data, &offset);
|
||||||
|
item->entityTeleport.target = worldPosReadLE(data, &offset);
|
||||||
|
break;
|
||||||
|
|
||||||
|
case CUTSCENE_ITEM_TYPE_ENTITY_WALK_TO: {
|
||||||
|
item->entityWalkTo.entityIndex = assetCutsceneReadU8(data, &offset);
|
||||||
|
item->entityWalkTo.walkAround = assetCutsceneReadU8(data, &offset) != 0;
|
||||||
|
uint8_t count = assetCutsceneReadU8(data, &offset);
|
||||||
|
uint16_t poolOffset = assetCutsceneReadU16(data, &offset);
|
||||||
|
item->entityWalkTo.count = count;
|
||||||
|
item->entityWalkTo.positions = (const worldpos_t *)(pool + poolOffset);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
case CUTSCENE_ITEM_TYPE_FADE:
|
||||||
|
item->fade.from.r = assetCutsceneReadU8(data, &offset);
|
||||||
|
item->fade.from.g = assetCutsceneReadU8(data, &offset);
|
||||||
|
item->fade.from.b = assetCutsceneReadU8(data, &offset);
|
||||||
|
item->fade.from.a = assetCutsceneReadU8(data, &offset);
|
||||||
|
item->fade.to.r = assetCutsceneReadU8(data, &offset);
|
||||||
|
item->fade.to.g = assetCutsceneReadU8(data, &offset);
|
||||||
|
item->fade.to.b = assetCutsceneReadU8(data, &offset);
|
||||||
|
item->fade.to.a = assetCutsceneReadU8(data, &offset);
|
||||||
|
item->fade.duration = assetCutsceneReadFloat(data, &offset);
|
||||||
|
item->fade.easing = (easingtype_t)assetCutsceneReadU8(data, &offset);
|
||||||
|
break;
|
||||||
|
|
||||||
|
case CUTSCENE_ITEM_TYPE_SET_PAUSE:
|
||||||
|
item->setPause = (cutscenepause_t)assetCutsceneReadU8(data, &offset);
|
||||||
|
break;
|
||||||
|
|
||||||
|
case CUTSCENE_ITEM_TYPE_ITEM_GIVE:
|
||||||
|
item->itemGive.item = (itemid_t)assetCutsceneReadU16(data, &offset);
|
||||||
|
item->itemGive.quantity = assetCutsceneReadU8(data, &offset);
|
||||||
|
break;
|
||||||
|
|
||||||
|
case CUTSCENE_ITEM_TYPE_ENTITY_REMOVE:
|
||||||
|
item->entityRemove.entityIndex = assetCutsceneReadU8(data, &offset);
|
||||||
|
break;
|
||||||
|
|
||||||
|
case CUTSCENE_ITEM_TYPE_ENTITY_ADD:
|
||||||
|
item->entityAdd.entityType = assetCutsceneReadU8(data, &offset);
|
||||||
|
item->entityAdd.position = worldPosReadLE(data, &offset);
|
||||||
|
break;
|
||||||
|
|
||||||
|
case CUTSCENE_ITEM_TYPE_ENTITY_TURN:
|
||||||
|
item->entityTurn.entityIndex = assetCutsceneReadU8(data, &offset);
|
||||||
|
item->entityTurn.direction =
|
||||||
|
(entitydir_t)assetCutsceneReadU8(data, &offset);
|
||||||
|
break;
|
||||||
|
|
||||||
|
case CUTSCENE_ITEM_TYPE_ENTITY_WALK_TO_ENTITY:
|
||||||
|
item->entityWalkToEntity.entityIndex =
|
||||||
|
assetCutsceneReadU8(data, &offset);
|
||||||
|
item->entityWalkToEntity.targetEntityIndex =
|
||||||
|
assetCutsceneReadU8(data, &offset);
|
||||||
|
item->entityWalkToEntity.offsetX =
|
||||||
|
worldUnitReadLE(data, &offset);
|
||||||
|
item->entityWalkToEntity.offsetY =
|
||||||
|
worldUnitReadLE(data, &offset);
|
||||||
|
break;
|
||||||
|
|
||||||
|
case CUTSCENE_ITEM_TYPE_MAP_AREA_REMOVE:
|
||||||
|
item->mapAreaRemove.areaId = assetCutsceneReadU8(data, &offset);
|
||||||
|
break;
|
||||||
|
|
||||||
|
case CUTSCENE_ITEM_TYPE_MAP_AREA_WAIT: {
|
||||||
|
uint8_t count = assetCutsceneReadU8(data, &offset);
|
||||||
|
uint16_t poolOffset = assetCutsceneReadU16(data, &offset);
|
||||||
|
assertTrue(
|
||||||
|
count <= CUTSCENE_MAP_AREA_WAIT_MAX,
|
||||||
|
"Cutscene map area wait count exceeds maximum"
|
||||||
|
);
|
||||||
|
item->mapAreaWait.count = count;
|
||||||
|
item->mapAreaWait.areaIds = (const uint8_t *)(pool + poolOffset);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
case CUTSCENE_ITEM_TYPE_START_BATTLE: {
|
||||||
|
item->startBattle.encounterType =
|
||||||
|
(battleencountertype_t)assetCutsceneReadU8(data, &offset);
|
||||||
|
item->startBattle.fleeAvailable =
|
||||||
|
assetCutsceneReadU8(data, &offset) != 0;
|
||||||
|
uint8_t enemyCount = assetCutsceneReadU8(data, &offset);
|
||||||
|
assertTrue(
|
||||||
|
enemyCount <= CUTSCENE_START_BATTLE_ENEMY_COUNT_MAX,
|
||||||
|
"Cutscene battle enemy count exceeds maximum"
|
||||||
|
);
|
||||||
|
item->startBattle.enemyCount = enemyCount;
|
||||||
|
for(uint8_t e = 0; e < enemyCount; e++) {
|
||||||
|
cutscenestartbattleenemy_t *enemy = &item->startBattle.enemies[e];
|
||||||
|
enemy->stats.attack = assetCutsceneReadU16(data, &offset);
|
||||||
|
enemy->stats.defense = assetCutsceneReadU16(data, &offset);
|
||||||
|
enemy->stats.magic = assetCutsceneReadU16(data, &offset);
|
||||||
|
enemy->stats.speed = assetCutsceneReadU16(data, &offset);
|
||||||
|
enemy->stats.luck = assetCutsceneReadU16(data, &offset);
|
||||||
|
enemy->healthMax = assetCutsceneReadU16(data, &offset);
|
||||||
|
enemy->mpMax = assetCutsceneReadU16(data, &offset);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
case CUTSCENE_ITEM_TYPE_EMOJI:
|
||||||
|
item->emoji.entityIndex = assetCutsceneReadU8(data, &offset);
|
||||||
|
item->emoji.duration = assetCutsceneReadFloat(data, &offset);
|
||||||
|
item->emoji.emojiType = (uiemojitype_t)assetCutsceneReadU8(data, &offset);
|
||||||
|
break;
|
||||||
|
|
||||||
|
case CUTSCENE_ITEM_TYPE_SHAKE:
|
||||||
|
item->shake.amount = assetCutsceneReadU8(data, &offset);
|
||||||
|
item->shake.duration = assetCutsceneReadFloat(data, &offset);
|
||||||
|
break;
|
||||||
|
|
||||||
|
case CUTSCENE_ITEM_TYPE_BATTLE_WAIT_STATE:
|
||||||
|
item->battleWaitState.state =
|
||||||
|
(battlestate_t)assetCutsceneReadU8(data, &offset);
|
||||||
|
break;
|
||||||
|
|
||||||
|
case CUTSCENE_ITEM_TYPE_BATTLE_FORCE_ACTION:
|
||||||
|
item->battleForceAction.fighterIndex = assetCutsceneReadU8(data, &offset);
|
||||||
|
item->battleForceAction.targetIndex = assetCutsceneReadU8(data, &offset);
|
||||||
|
break;
|
||||||
|
|
||||||
|
case CUTSCENE_ITEM_TYPE_MODAL: {
|
||||||
|
assetCutsceneReadEmbeddedString(
|
||||||
|
data, &offset, item->modal.title, CUTSCENE_MODAL_TITLE_MAX_CHARS
|
||||||
|
);
|
||||||
|
assetCutsceneReadEmbeddedString(
|
||||||
|
data, &offset, item->modal.message, CUTSCENE_MODAL_MESSAGE_MAX_CHARS
|
||||||
|
);
|
||||||
|
// v1 only supports the message-only form: MODAL and MODAL_OPTIONS
|
||||||
|
// share this same tag with no separate discriminator, and there is
|
||||||
|
// no native-callback registry yet to resolve an options callback.
|
||||||
|
// Read into a local first (not inline in the check below) - on a
|
||||||
|
// release build with DUSK_ASSERTIONS_FAKED, an assert's condition
|
||||||
|
// is never evaluated at all, so a byte-consuming call inside one
|
||||||
|
// would silently desync every item after it. This is untrusted
|
||||||
|
// file content anyway, so it gets a real error, not an assert.
|
||||||
|
uint8_t optionCount = assetCutsceneReadU8(data, &offset);
|
||||||
|
if(optionCount != 0) {
|
||||||
|
memoryFree(data);
|
||||||
|
memoryFree(out->items);
|
||||||
|
out->items = NULL;
|
||||||
|
if(out->pool != NULL) {
|
||||||
|
memoryFree(out->pool);
|
||||||
|
out->pool = NULL;
|
||||||
|
}
|
||||||
|
assetLoaderErrorThrow(
|
||||||
|
loading,
|
||||||
|
"Cutscene MODAL item with options is not supported in "
|
||||||
|
"file-based cutscenes yet - use MODAL_OPTIONS_MARKERS instead"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
case CUTSCENE_ITEM_TYPE_MODAL_OPTIONS_MARKERS: {
|
||||||
|
assetCutsceneReadEmbeddedString(
|
||||||
|
data, &offset, item->modalOptionsMarkers.title,
|
||||||
|
CUTSCENE_MODAL_TITLE_MAX_CHARS
|
||||||
|
);
|
||||||
|
assetCutsceneReadEmbeddedString(
|
||||||
|
data, &offset, item->modalOptionsMarkers.message,
|
||||||
|
CUTSCENE_MODAL_MESSAGE_MAX_CHARS
|
||||||
|
);
|
||||||
|
uint8_t optionCount = assetCutsceneReadU8(data, &offset);
|
||||||
|
assertTrue(
|
||||||
|
optionCount <= CUTSCENE_MODAL_OPTIONS_MARKERS_MAX,
|
||||||
|
"Cutscene modal option count exceeds maximum"
|
||||||
|
);
|
||||||
|
item->modalOptionsMarkers.optionCount = optionCount;
|
||||||
|
for(uint8_t o = 0; o < optionCount; o++) {
|
||||||
|
item->modalOptionsMarkers.options[o] =
|
||||||
|
assetCutsceneReadPoolString(data, &offset, pool);
|
||||||
|
item->modalOptionsMarkers.markers[o] =
|
||||||
|
assetCutsceneReadPoolString(data, &offset, pool);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
case CUTSCENE_ITEM_TYPE_MODAL_CLOSE:
|
||||||
|
case CUTSCENE_ITEM_TYPE_RESTART:
|
||||||
|
break;
|
||||||
|
|
||||||
|
case CUTSCENE_ITEM_TYPE_PRINT:
|
||||||
|
assetCutsceneReadEmbeddedString(
|
||||||
|
data, &offset, item->print.text, CUTSCENE_PRINT_MAX_CHARS
|
||||||
|
);
|
||||||
|
break;
|
||||||
|
|
||||||
|
case CUTSCENE_ITEM_TYPE_MARKER:
|
||||||
|
item->marker.name = assetCutsceneReadPoolString(data, &offset, pool);
|
||||||
|
break;
|
||||||
|
|
||||||
|
case CUTSCENE_ITEM_TYPE_SCENE:
|
||||||
|
item->sceneChange.type = (scenetype_t)assetCutsceneReadU8(data, &offset);
|
||||||
|
break;
|
||||||
|
|
||||||
|
case CUTSCENE_ITEM_TYPE_SAVE_DEVICE_CHECK:
|
||||||
|
item->saveDeviceCheck.successMarker =
|
||||||
|
assetCutsceneReadPoolString(data, &offset, pool);
|
||||||
|
item->saveDeviceCheck.failureMarker =
|
||||||
|
assetCutsceneReadPoolString(data, &offset, pool);
|
||||||
|
break;
|
||||||
|
|
||||||
|
case CUTSCENE_ITEM_TYPE_SAVE_LOAD_ALL_SLOTS:
|
||||||
|
item->saveLoadAllSlots.successMarker =
|
||||||
|
assetCutsceneReadPoolString(data, &offset, pool);
|
||||||
|
item->saveLoadAllSlots.failureMarker =
|
||||||
|
assetCutsceneReadPoolString(data, &offset, pool);
|
||||||
|
break;
|
||||||
|
|
||||||
|
default:
|
||||||
|
memoryFree(data);
|
||||||
|
memoryFree(out->items);
|
||||||
|
out->items = NULL;
|
||||||
|
if(out->pool != NULL) {
|
||||||
|
memoryFree(out->pool);
|
||||||
|
out->pool = NULL;
|
||||||
|
}
|
||||||
|
assetLoaderErrorThrow(
|
||||||
|
loading,
|
||||||
|
"Cutscene item type %u is not supported in file-based cutscenes "
|
||||||
|
"(item %u/%u, offset %u/%u, poolSize %u)",
|
||||||
|
(uint32_t)item->type, (uint32_t)i, (uint32_t)itemCount,
|
||||||
|
(uint32_t)offset, (uint32_t)fileSize, (uint32_t)poolSize
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
memoryFree(data);
|
||||||
|
loading->loading.cutscene.data = NULL;
|
||||||
|
|
||||||
|
out->cutscene.items = out->items;
|
||||||
|
out->cutscene.itemCount = itemCount;
|
||||||
|
out->cutscene.pause = pauseType;
|
||||||
|
out->cutscene.dataSize = 0;
|
||||||
|
|
||||||
|
loading->entry->state = ASSET_ENTRY_STATE_LOADED;
|
||||||
|
errorOk();
|
||||||
|
}
|
||||||
|
|
||||||
|
errorret_t assetCutsceneDispose(assetentry_t *entry) {
|
||||||
|
assertNotNull(entry, "Entry cannot be NULL");
|
||||||
|
assertTrue(entry->type == ASSET_LOADER_TYPE_CUTSCENE, "Invalid type.");
|
||||||
|
assertIsMainThread("Must be called from the main thread.");
|
||||||
|
|
||||||
|
assetcutsceneoutput_t *out = &entry->data.cutscene;
|
||||||
|
|
||||||
|
if(out->items != NULL) {
|
||||||
|
memoryFree(out->items);
|
||||||
|
out->items = NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
if(out->pool != NULL) {
|
||||||
|
memoryFree(out->pool);
|
||||||
|
out->pool = NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
errorOk();
|
||||||
|
}
|
||||||
@@ -0,0 +1,143 @@
|
|||||||
|
/**
|
||||||
|
* Copyright (c) 2026 Dominic Masters
|
||||||
|
*
|
||||||
|
* This software is released under the MIT License.
|
||||||
|
* https://opensource.org/licenses/MIT
|
||||||
|
*/
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
#include "asset/assetfile.h"
|
||||||
|
#include "rpg/cutscene/cutscene.h"
|
||||||
|
#include "rpg/cutscene/item/cutsceneitem.h"
|
||||||
|
|
||||||
|
#define ASSET_CUTSCENE_FILE_VERSION 1
|
||||||
|
|
||||||
|
typedef struct assetloading_s assetloading_t;
|
||||||
|
typedef struct assetentry_s assetentry_t;
|
||||||
|
|
||||||
|
typedef struct {
|
||||||
|
void *nothing;
|
||||||
|
} assetcutsceneloaderinput_t;
|
||||||
|
|
||||||
|
typedef enum {
|
||||||
|
ASSET_CUTSCENE_LOADING_STATE_INITIAL,
|
||||||
|
ASSET_CUTSCENE_LOADING_STATE_READ_FILE,
|
||||||
|
ASSET_CUTSCENE_LOADING_STATE_PARSE
|
||||||
|
} assetcutsceneloadingstate_t;
|
||||||
|
|
||||||
|
typedef struct {
|
||||||
|
assetfile_t file;
|
||||||
|
assetcutsceneloadingstate_t state;
|
||||||
|
uint8_t *data;
|
||||||
|
size_t dataSize;// Saved before assetFileDispose zeroes file.size.
|
||||||
|
} assetcutsceneloaderloading_t;
|
||||||
|
|
||||||
|
// Runtime-loaded cutscene: items/pool are heap-allocated to the file's
|
||||||
|
// actual declared sizes (not fixed-capacity), so an entry that never holds
|
||||||
|
// a cutscene costs nothing extra in the shared assetloaderoutput_t union -
|
||||||
|
// see assetchunkoutput_t.tiles for the same pattern.
|
||||||
|
typedef struct {
|
||||||
|
cutscene_t cutscene; // .items points at the items array below
|
||||||
|
cutsceneitem_t *items;
|
||||||
|
char_t *pool;
|
||||||
|
} assetcutsceneoutput_t;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Reads a uint8_t from the current offset, advancing *offset past it.
|
||||||
|
*
|
||||||
|
* @param data The buffer to read from.
|
||||||
|
* @param offset In/out cursor into data, advanced past the value read.
|
||||||
|
* @return The decoded uint8_t.
|
||||||
|
*/
|
||||||
|
uint8_t assetCutsceneReadU8(const uint8_t *data, size_t *offset);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Reads a little-endian uint16_t from a potentially-unaligned offset,
|
||||||
|
* advancing *offset past it.
|
||||||
|
*
|
||||||
|
* @param data The buffer to read from.
|
||||||
|
* @param offset In/out cursor into data, advanced past the value read.
|
||||||
|
* @return The decoded uint16_t.
|
||||||
|
*/
|
||||||
|
uint16_t assetCutsceneReadU16(const uint8_t *data, size_t *offset);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Reads a little-endian uint32_t from a potentially-unaligned offset,
|
||||||
|
* advancing *offset past it.
|
||||||
|
*
|
||||||
|
* @param data The buffer to read from.
|
||||||
|
* @param offset In/out cursor into data, advanced past the value read.
|
||||||
|
* @return The decoded uint32_t.
|
||||||
|
*/
|
||||||
|
uint32_t assetCutsceneReadU32(const uint8_t *data, size_t *offset);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Reads a little-endian float_t from a potentially-unaligned offset,
|
||||||
|
* advancing *offset past it.
|
||||||
|
*
|
||||||
|
* @param data The buffer to read from.
|
||||||
|
* @param offset In/out cursor into data, advanced past the value read.
|
||||||
|
* @return The decoded float_t.
|
||||||
|
*/
|
||||||
|
float_t assetCutsceneReadFloat(const uint8_t *data, size_t *offset);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Copies a length-prefixed string directly into an item's own embedded
|
||||||
|
* char_t[destCapacity] field (CUTSCENE_TEXT_MAX_CHARS and friends) - these
|
||||||
|
* are never pool references, see the item-field inventory in the runtime
|
||||||
|
* cutscene file design.
|
||||||
|
*
|
||||||
|
* @param data The buffer to read from.
|
||||||
|
* @param offset In/out cursor into data, advanced past the string read.
|
||||||
|
* @param dest Destination buffer to copy the string into.
|
||||||
|
* @param destCapacity Capacity of dest, including the null terminator.
|
||||||
|
*/
|
||||||
|
void assetCutsceneReadEmbeddedString(
|
||||||
|
const uint8_t *data,
|
||||||
|
size_t *offset,
|
||||||
|
char_t *dest,
|
||||||
|
const size_t destCapacity
|
||||||
|
);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Resolves a u16 pool offset (read from the item stream) to a real pointer
|
||||||
|
* into the entry's own persistent pool allocation.
|
||||||
|
*
|
||||||
|
* @param data The buffer to read the pool offset from.
|
||||||
|
* @param offset In/out cursor into data, advanced past the pool offset.
|
||||||
|
* @param pool The base pointer of the entry's persistent pool allocation.
|
||||||
|
* @return Pointer to the string within pool.
|
||||||
|
*/
|
||||||
|
const char_t * assetCutsceneReadPoolString(
|
||||||
|
const uint8_t *data,
|
||||||
|
size_t *offset,
|
||||||
|
const char_t *pool
|
||||||
|
);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Asynchronous loader for cutscene assets. Reads the raw DCTS file bytes
|
||||||
|
* into the loading buffer so the sync phase can parse without blocking the
|
||||||
|
* main thread on I/O.
|
||||||
|
*
|
||||||
|
* @param loading Loading information for the asset being loaded.
|
||||||
|
* @return Error code indicating success or failure of the load operation.
|
||||||
|
*/
|
||||||
|
errorret_t assetCutsceneLoaderAsync(assetloading_t *loading);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Synchronous loader for cutscene assets. Validates the DCTS binary
|
||||||
|
* previously read by the async phase and decodes it into a heap-allocated
|
||||||
|
* cutsceneitem_t array + string/data pool.
|
||||||
|
*
|
||||||
|
* @param loading Loading information for the asset being loaded.
|
||||||
|
* @return Error code indicating success or failure of the load operation.
|
||||||
|
*/
|
||||||
|
errorret_t assetCutsceneLoaderSync(assetloading_t *loading);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Disposer for cutscene assets.
|
||||||
|
*
|
||||||
|
* @param entry Asset entry containing the cutscene data to dispose.
|
||||||
|
* @return Error code indicating success or failure of the dispose operation.
|
||||||
|
*/
|
||||||
|
errorret_t assetCutsceneDispose(assetentry_t *entry);
|
||||||
@@ -48,8 +48,20 @@ errorret_t assetMeshLoaderAsync(assetloading_t *loading) {
|
|||||||
uint32_t vertCount = endianLittleToHost32(*(uint32_t *)(raw + 8));
|
uint32_t vertCount = endianLittleToHost32(*(uint32_t *)(raw + 8));
|
||||||
meshvertex_t *vertices = NULL;
|
meshvertex_t *vertices = NULL;
|
||||||
if(vertCount > 0) {
|
if(vertCount > 0) {
|
||||||
vertices = memoryAllocate(vertCount * sizeof(meshvertex_t));
|
// 32-byte (cache-line) aligned: GX_SetArray + DCFlushRange on Dolphin
|
||||||
|
// require this for the DMA'd vertex data to actually reach the GPU
|
||||||
|
// coherently. Static compiled-in vertex arrays happen to get this from
|
||||||
|
// the linker; a plain memoryAllocate here would not.
|
||||||
|
vertices = memoryAlign(32, vertCount * sizeof(meshvertex_t));
|
||||||
memoryCopy(vertices, raw + 12, vertCount * sizeof(meshvertex_t));
|
memoryCopy(vertices, raw + 12, vertCount * sizeof(meshvertex_t));
|
||||||
|
|
||||||
|
for(uint32_t v = 0; v < vertCount; v++) {
|
||||||
|
vertices[v].uv[0] = endianLittleToHostFloat(vertices[v].uv[0]);
|
||||||
|
vertices[v].uv[1] = endianLittleToHostFloat(vertices[v].uv[1]);
|
||||||
|
vertices[v].pos[0] = endianLittleToHostFloat(vertices[v].pos[0]);
|
||||||
|
vertices[v].pos[1] = endianLittleToHostFloat(vertices[v].pos[1]);
|
||||||
|
vertices[v].pos[2] = endianLittleToHostFloat(vertices[v].pos[2]);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
memoryFree(raw);
|
memoryFree(raw);
|
||||||
|
|
||||||
@@ -103,18 +115,22 @@ errorret_t assetMeshLoaderSync(assetloading_t *loading) {
|
|||||||
out->vertices = NULL;
|
out->vertices = NULL;
|
||||||
errorChain(ret);
|
errorChain(ret);
|
||||||
}
|
}
|
||||||
|
out->meshInitialized = true;
|
||||||
|
|
||||||
ret = meshFlush(&out->mesh, 0, (int32_t)vertCount);
|
ret = meshFlush(&out->mesh, 0, (int32_t)vertCount);
|
||||||
if(errorIsNotOk(ret)) {
|
if(errorIsNotOk(ret)) {
|
||||||
loading->entry->state = ASSET_ENTRY_STATE_ERROR;
|
loading->entry->state = ASSET_ENTRY_STATE_ERROR;
|
||||||
meshDispose(&out->mesh);
|
meshDispose(&out->mesh);
|
||||||
|
out->meshInitialized = false;
|
||||||
memoryFree(out->vertices);
|
memoryFree(out->vertices);
|
||||||
out->vertices = NULL;
|
out->vertices = NULL;
|
||||||
errorChain(ret);
|
errorChain(ret);
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifndef DUSK_OPENGL_LEGACY
|
#if defined(DUSK_OPENGL) && !defined(DUSK_OPENGL_LEGACY)
|
||||||
// VBO owns the data now; CPU copy is no longer needed.
|
// VBO owns the data now; CPU copy is no longer needed. The platform
|
||||||
|
// mesh object itself still needs meshDispose later - tracked via
|
||||||
|
// out->meshInitialized, independent of the CPU buffer's lifetime.
|
||||||
memoryFree(out->vertices);
|
memoryFree(out->vertices);
|
||||||
out->vertices = NULL;
|
out->vertices = NULL;
|
||||||
#endif
|
#endif
|
||||||
@@ -129,8 +145,11 @@ errorret_t assetMeshDispose(assetentry_t *entry) {
|
|||||||
assertIsMainThread("Must be called from the main thread.");
|
assertIsMainThread("Must be called from the main thread.");
|
||||||
|
|
||||||
assetmeshoutput_t *out = &entry->data.mesh;
|
assetmeshoutput_t *out = &entry->data.mesh;
|
||||||
if(out->vertices != NULL) {
|
if(out->meshInitialized) {
|
||||||
errorChain(meshDispose(&out->mesh));
|
errorChain(meshDispose(&out->mesh));
|
||||||
|
out->meshInitialized = false;
|
||||||
|
}
|
||||||
|
if(out->vertices != NULL) {
|
||||||
memoryFree(out->vertices);
|
memoryFree(out->vertices);
|
||||||
out->vertices = NULL;
|
out->vertices = NULL;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -30,6 +30,7 @@ typedef struct {
|
|||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
mesh_t mesh;
|
mesh_t mesh;
|
||||||
|
bool_t meshInitialized;
|
||||||
meshvertex_t *vertices;
|
meshvertex_t *vertices;
|
||||||
} assetmeshoutput_t;
|
} assetmeshoutput_t;
|
||||||
|
|
||||||
|
|||||||
@@ -71,6 +71,12 @@ errorret_t assetLocaleDispose(assetentry_t *entry) {
|
|||||||
assertIsMainThread("Must be called from the main thread.");
|
assertIsMainThread("Must be called from the main thread.");
|
||||||
|
|
||||||
assetlocalefile_t *localeFile = &entry->data.locale;
|
assetlocalefile_t *localeFile = &entry->data.locale;
|
||||||
|
|
||||||
|
if(localeFile->cache != NULL) {
|
||||||
|
memoryFree(localeFile->cache);
|
||||||
|
localeFile->cache = NULL;
|
||||||
|
}
|
||||||
|
|
||||||
errorChain(assetFileClose(&localeFile->file));
|
errorChain(assetFileClose(&localeFile->file));
|
||||||
return assetFileDispose(&localeFile->file);
|
return assetFileDispose(&localeFile->file);
|
||||||
}
|
}
|
||||||
@@ -470,6 +476,83 @@ errorret_t assetLocaleLineUnbuffer(
|
|||||||
errorOk();
|
errorOk();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
errorret_t assetLocaleCacheFind(
|
||||||
|
assetlocalefile_t *file,
|
||||||
|
const char_t *messageId,
|
||||||
|
const int32_t pluralCount,
|
||||||
|
char_t *stringBuffer,
|
||||||
|
const size_t stringBufferSize,
|
||||||
|
bool_t *outHit
|
||||||
|
) {
|
||||||
|
assertNotNull(file, "Asset file cannot be NULL.");
|
||||||
|
assertNotNull(messageId, "Message ID cannot be NULL.");
|
||||||
|
assertNotNull(outHit, "outHit cannot be NULL.");
|
||||||
|
|
||||||
|
*outHit = false;
|
||||||
|
if(file->cache == NULL) errorOk();
|
||||||
|
|
||||||
|
assetlocalecache_t *cache = file->cache;
|
||||||
|
for(uint8_t i = 0; i < ASSET_LOCALE_CACHE_COUNT; i++) {
|
||||||
|
assetlocalecacheentry_t *entry = &cache->entries[i];
|
||||||
|
if(entry->messageId[0] == '\0') break;// unused tail - nothing further
|
||||||
|
if(entry->pluralCount != pluralCount) continue;
|
||||||
|
if(!stringEquals(entry->messageId, messageId)) continue;
|
||||||
|
|
||||||
|
// Move to the front of the LRU order (a no-op when already there).
|
||||||
|
if(i > 0) {
|
||||||
|
assetlocalecacheentry_t hit = *entry;
|
||||||
|
memoryMove(
|
||||||
|
&cache->entries[1], &cache->entries[0], i * sizeof(assetlocalecacheentry_t)
|
||||||
|
);
|
||||||
|
cache->entries[0] = hit;
|
||||||
|
}
|
||||||
|
|
||||||
|
size_t len = strlen(cache->entries[0].value);
|
||||||
|
if(len >= stringBufferSize) errorThrow("String buffer overflow");
|
||||||
|
memoryCopy(stringBuffer, cache->entries[0].value, len + 1);
|
||||||
|
*outHit = true;
|
||||||
|
errorOk();
|
||||||
|
}
|
||||||
|
|
||||||
|
errorOk();
|
||||||
|
}
|
||||||
|
|
||||||
|
void assetLocaleCacheInsert(
|
||||||
|
assetlocalefile_t *file,
|
||||||
|
const char_t *messageId,
|
||||||
|
const int32_t pluralCount,
|
||||||
|
const char_t *value
|
||||||
|
) {
|
||||||
|
assertNotNull(file, "Asset file cannot be NULL.");
|
||||||
|
assertNotNull(messageId, "Message ID cannot be NULL.");
|
||||||
|
assertNotNull(value, "Value cannot be NULL.");
|
||||||
|
|
||||||
|
// Caching is a pure optimization - a message ID or value too long for a
|
||||||
|
// fixed cache slot is just never cached, not an error.
|
||||||
|
if(strlen(messageId) >= ASSET_LOCALE_CACHE_KEY_MAX) return;
|
||||||
|
if(strlen(value) >= ASSET_LOCALE_CACHE_VALUE_MAX) return;
|
||||||
|
|
||||||
|
if(file->cache == NULL) {
|
||||||
|
file->cache = (assetlocalecache_t *)memoryAllocate(sizeof(assetlocalecache_t));
|
||||||
|
memoryZero(file->cache, sizeof(assetlocalecache_t));
|
||||||
|
}
|
||||||
|
|
||||||
|
// Shift every entry down one slot, dropping the least-recently-used one
|
||||||
|
// off the end, to make room for the new entry at the front. This assumes
|
||||||
|
// messageId is never already present elsewhere in the cache, which holds
|
||||||
|
// as long as callers only insert after a confirmed assetLocaleCacheFind
|
||||||
|
// miss (a hit would have returned before reaching this point).
|
||||||
|
memoryMove(
|
||||||
|
&file->cache->entries[1], &file->cache->entries[0],
|
||||||
|
(ASSET_LOCALE_CACHE_COUNT - 1) * sizeof(assetlocalecacheentry_t)
|
||||||
|
);
|
||||||
|
|
||||||
|
assetlocalecacheentry_t *entry = &file->cache->entries[0];
|
||||||
|
stringCopy(entry->messageId, messageId, ASSET_LOCALE_CACHE_KEY_MAX);
|
||||||
|
entry->pluralCount = pluralCount;
|
||||||
|
stringCopy(entry->value, value, ASSET_LOCALE_CACHE_VALUE_MAX);
|
||||||
|
}
|
||||||
|
|
||||||
errorret_t assetLocaleGetString(
|
errorret_t assetLocaleGetString(
|
||||||
assetlocalefile_t *file,
|
assetlocalefile_t *file,
|
||||||
const char_t *messageId,
|
const char_t *messageId,
|
||||||
@@ -482,6 +565,13 @@ errorret_t assetLocaleGetString(
|
|||||||
assertTrue(pluralCount >= 0, "Plural index cannot be negative.");
|
assertTrue(pluralCount >= 0, "Plural index cannot be negative.");
|
||||||
assertNotNull(stringBuffer, "String buffer cannot be NULL.");
|
assertNotNull(stringBuffer, "String buffer cannot be NULL.");
|
||||||
assertTrue(stringBufferSize > 0, "String buffer size must be > 0");
|
assertTrue(stringBufferSize > 0, "String buffer size must be > 0");
|
||||||
|
|
||||||
|
bool_t cacheHit = false;
|
||||||
|
errorChain(assetLocaleCacheFind(
|
||||||
|
file, messageId, pluralCount, stringBuffer, stringBufferSize, &cacheHit
|
||||||
|
));
|
||||||
|
if(cacheHit) errorOk();
|
||||||
|
|
||||||
assetfilelinereader_t reader;
|
assetfilelinereader_t reader;
|
||||||
|
|
||||||
bool_t msgidFound = false, msgidPluralFound = false, msgstrFound = false;
|
bool_t msgidFound = false, msgidPluralFound = false, msgstrFound = false;
|
||||||
@@ -506,12 +596,17 @@ errorret_t assetLocaleGetString(
|
|||||||
sizeof(lineBuffer)
|
sizeof(lineBuffer)
|
||||||
);
|
);
|
||||||
|
|
||||||
|
// Prime the reader with the first line before scanning; outBuffer holds
|
||||||
|
// uninitialized memory until the first Next() call fills it.
|
||||||
|
errorChain(assetFileLineReaderNext(&reader));
|
||||||
|
|
||||||
// Skip blanks, comments, etc and start looking for msgid's
|
// Skip blanks, comments, etc and start looking for msgid's
|
||||||
errorChain(assetLocaleLineSkipBlanks(&reader, lineBuffer));
|
errorChain(assetLocaleLineSkipBlanks(&reader, lineBuffer));
|
||||||
|
|
||||||
while(!reader.eof) {
|
while(true) {
|
||||||
// Is this msgid?
|
// Is this msgid?
|
||||||
if(memoryCompare(lineBuffer, "msgid", 5) != 0) {
|
if(memoryCompare(lineBuffer, "msgid", 5) != 0) {
|
||||||
|
if(reader.eof) break;
|
||||||
errorChain(assetFileLineReaderNext(&reader));
|
errorChain(assetFileLineReaderNext(&reader));
|
||||||
msgidBuffer[0] = '\0';
|
msgidBuffer[0] = '\0';
|
||||||
continue;
|
continue;
|
||||||
@@ -535,7 +630,7 @@ errorret_t assetLocaleGetString(
|
|||||||
}
|
}
|
||||||
|
|
||||||
// We are either going to see a msgstr or a msgid_plural
|
// We are either going to see a msgstr or a msgid_plural
|
||||||
while(!reader.eof) {
|
while(true) {
|
||||||
errorChain(assetLocaleLineSkipBlanks(&reader, lineBuffer));
|
errorChain(assetLocaleLineSkipBlanks(&reader, lineBuffer));
|
||||||
|
|
||||||
// Is msgid_plural?
|
// Is msgid_plural?
|
||||||
@@ -620,6 +715,8 @@ errorret_t assetLocaleGetString(
|
|||||||
errorThrow("Failed to find msgstr for message ID: %s", messageId);
|
errorThrow("Failed to find msgstr for message ID: %s", messageId);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
assetLocaleCacheInsert(file, messageId, pluralCount, stringBuffer);
|
||||||
|
|
||||||
errorOk();
|
errorOk();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -70,6 +70,41 @@ typedef struct {
|
|||||||
};
|
};
|
||||||
} assetlocalearg_t;
|
} assetlocalearg_t;
|
||||||
|
|
||||||
|
/** Number of recently resolved strings @ref assetlocalecache_t remembers. */
|
||||||
|
#define ASSET_LOCALE_CACHE_COUNT 128
|
||||||
|
|
||||||
|
/** Max length (excluding null terminator) of a cacheable message ID. */
|
||||||
|
#define ASSET_LOCALE_CACHE_KEY_MAX 64
|
||||||
|
|
||||||
|
/** Max length (excluding null terminator) of a cacheable resolved string. */
|
||||||
|
#define ASSET_LOCALE_CACHE_VALUE_MAX 256
|
||||||
|
|
||||||
|
/** One (messageId, pluralCount) -> resolved string cache slot. */
|
||||||
|
typedef struct {
|
||||||
|
char_t messageId[ASSET_LOCALE_CACHE_KEY_MAX];
|
||||||
|
int32_t pluralCount;
|
||||||
|
char_t value[ASSET_LOCALE_CACHE_VALUE_MAX];
|
||||||
|
} assetlocalecacheentry_t;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Fixed-size move-to-front LRU cache of recently resolved locale strings.
|
||||||
|
* assetLocaleGetString() re-scans and re-decompresses the whole PO file on
|
||||||
|
* every miss, which is expensive to repeat for strings a screen fetches
|
||||||
|
* every time it opens (menu labels, etc) - this cache lets identical
|
||||||
|
* (messageId, pluralCount) lookups skip that entirely.
|
||||||
|
*
|
||||||
|
* Lazily allocated on the first cache insert (see assetlocalefile_t.cache)
|
||||||
|
* so locale entries that are never queried, or a file that's disposed
|
||||||
|
* before anything is cached, never pay for it.
|
||||||
|
*/
|
||||||
|
typedef struct {
|
||||||
|
/**
|
||||||
|
* Entries ordered most-recently-used first. An entry with
|
||||||
|
* messageId[0] == '\0' (and every entry after it) is unused.
|
||||||
|
*/
|
||||||
|
assetlocalecacheentry_t entries[ASSET_LOCALE_CACHE_COUNT];
|
||||||
|
} assetlocalecache_t;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Runtime state for an open locale file.
|
* Runtime state for an open locale file.
|
||||||
*
|
*
|
||||||
@@ -98,6 +133,16 @@ typedef struct {
|
|||||||
|
|
||||||
/** Form index used when no conditional clause matches. */
|
/** Form index used when no conditional clause matches. */
|
||||||
uint8_t pluralDefaultIndex;
|
uint8_t pluralDefaultIndex;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Recently resolved string cache, or NULL if nothing has been cached yet.
|
||||||
|
* Heap-allocated rather than embedded because assetlocalefile_t lives
|
||||||
|
* inside the shared assetloaderoutput_t union alongside every other
|
||||||
|
* asset type - embedding a 128-entry cache there would size that union
|
||||||
|
* (and therefore every one of the ASSET_ENTRY_COUNT_MAX asset slots,
|
||||||
|
* regardless of what type of asset occupies it) up by the same amount.
|
||||||
|
*/
|
||||||
|
assetlocalecache_t *cache;
|
||||||
} assetlocalefile_t;
|
} assetlocalefile_t;
|
||||||
|
|
||||||
/** Convenience alias - the loaded output type of a locale asset entry. */
|
/** Convenience alias - the loaded output type of a locale asset entry. */
|
||||||
@@ -203,12 +248,64 @@ errorret_t assetLocaleLineUnbuffer(
|
|||||||
const size_t stringBufferSize
|
const size_t stringBufferSize
|
||||||
);
|
);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Searches a locale file's cache for a previously resolved
|
||||||
|
* (messageId, pluralCount) pair.
|
||||||
|
*
|
||||||
|
* On a hit, copies the cached value into `stringBuffer` (erroring if it
|
||||||
|
* doesn't fit, same contract as @ref assetLocaleGetString) and moves the
|
||||||
|
* entry to the front of the cache's move-to-front LRU order. On a miss,
|
||||||
|
* `stringBuffer` is left untouched.
|
||||||
|
*
|
||||||
|
* @param file Locale file whose cache to search. Its cache may be NULL
|
||||||
|
* (nothing cached yet), which is treated as a miss.
|
||||||
|
* @param messageId Message ID to look up.
|
||||||
|
* @param pluralCount Plural count the original lookup used.
|
||||||
|
* @param stringBuffer Destination buffer, filled only on a hit.
|
||||||
|
* @param stringBufferSize Capacity of `stringBuffer` in bytes.
|
||||||
|
* @param outHit Set to true on a cache hit, false on a miss.
|
||||||
|
* @return OK on success (hit or miss), error if a hit's cached value does
|
||||||
|
* not fit `stringBuffer`.
|
||||||
|
*/
|
||||||
|
errorret_t assetLocaleCacheFind(
|
||||||
|
assetlocalefile_t *file,
|
||||||
|
const char_t *messageId,
|
||||||
|
const int32_t pluralCount,
|
||||||
|
char_t *stringBuffer,
|
||||||
|
const size_t stringBufferSize,
|
||||||
|
bool_t *outHit
|
||||||
|
);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Records a resolved (messageId, pluralCount) -> value string at the front
|
||||||
|
* of the cache's move-to-front LRU order, evicting the least-recently-used
|
||||||
|
* entry if the cache is already full. Lazily allocates the cache (see
|
||||||
|
* assetlocalefile_t.cache) on the first call.
|
||||||
|
*
|
||||||
|
* Caching is a pure optimization: if `messageId` or `value` is too long to
|
||||||
|
* fit the cache's fixed-size slots, this silently does nothing rather than
|
||||||
|
* erroring or growing the cache.
|
||||||
|
*
|
||||||
|
* @param file Locale file whose cache to insert into.
|
||||||
|
* @param messageId Message ID that was looked up.
|
||||||
|
* @param pluralCount Plural count the lookup was made with.
|
||||||
|
* @param value Resolved string to cache.
|
||||||
|
*/
|
||||||
|
void assetLocaleCacheInsert(
|
||||||
|
assetlocalefile_t *file,
|
||||||
|
const char_t *messageId,
|
||||||
|
const int32_t pluralCount,
|
||||||
|
const char_t *value
|
||||||
|
);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Looks up a translated string by message ID from the open locale file.
|
* Looks up a translated string by message ID from the open locale file.
|
||||||
*
|
*
|
||||||
* Rewinds the file and scans from the beginning on every call. For plural
|
* Checks the file's cache first (see @ref assetLocaleCacheFind); on a miss,
|
||||||
* entries (`msgid_plural`) the `pluralCount` is evaluated against the loaded
|
* rewinds the file and scans from the beginning, then caches the result
|
||||||
* plural rules to select the correct `msgstr[N]` form.
|
* (see @ref assetLocaleCacheInsert) before returning. For plural entries
|
||||||
|
* (`msgid_plural`) the `pluralCount` is evaluated against the loaded plural
|
||||||
|
* rules to select the correct `msgstr[N]` form.
|
||||||
*
|
*
|
||||||
* @param file Locale file to search. Must be open.
|
* @param file Locale file to search. Must be open.
|
||||||
* @param messageId PO message ID to find (`""` retrieves the header entry).
|
* @param messageId PO message ID to find (`""` retrieves the header entry).
|
||||||
|
|||||||
@@ -0,0 +1,13 @@
|
|||||||
|
# Copyright (c) 2026 Dominic Masters
|
||||||
|
#
|
||||||
|
# This software is released under the MIT License.
|
||||||
|
# https://opensource.org/licenses/MIT
|
||||||
|
|
||||||
|
# Sources
|
||||||
|
target_sources(${DUSK_LIBRARY_TARGET_NAME}
|
||||||
|
PUBLIC
|
||||||
|
audio.c
|
||||||
|
audiostream.c
|
||||||
|
audiostreampcm.c
|
||||||
|
audiostreammp3.c
|
||||||
|
)
|
||||||
@@ -0,0 +1,52 @@
|
|||||||
|
/**
|
||||||
|
* Copyright (c) 2026 Dominic Masters
|
||||||
|
*
|
||||||
|
* This software is released under the MIT License.
|
||||||
|
* https://opensource.org/licenses/MIT
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "audio.h"
|
||||||
|
#include "util/memory.h"
|
||||||
|
|
||||||
|
audio_t AUDIO;
|
||||||
|
|
||||||
|
errorret_t audioInit() {
|
||||||
|
memoryZero(&AUDIO, sizeof(audio_t));
|
||||||
|
|
||||||
|
errorChain(audioPlatformInit());
|
||||||
|
|
||||||
|
errorOk();
|
||||||
|
}
|
||||||
|
|
||||||
|
audiostream_t * audioAquireStream() {
|
||||||
|
for(uint8_t i = 0; i < AUDIO_STREAMS_MAX; i++) {
|
||||||
|
audiostream_t *stream = &AUDIO.streams[i];
|
||||||
|
if(stream->type == AUDIO_STREAM_TYPE_NULL) {
|
||||||
|
return stream;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
errorret_t audioUpdate() {
|
||||||
|
errorChain(audioPlatformUpdate());
|
||||||
|
|
||||||
|
for(uint8_t i = 0; i < AUDIO_STREAMS_MAX; i++) {
|
||||||
|
audiostream_t *stream = &AUDIO.streams[i];
|
||||||
|
errorChain(audioStreamUpdate(stream));
|
||||||
|
}
|
||||||
|
|
||||||
|
errorOk();
|
||||||
|
}
|
||||||
|
|
||||||
|
errorret_t audioDispose() {
|
||||||
|
for(uint8_t i = 0; i < AUDIO_STREAMS_MAX; i++) {
|
||||||
|
audiostream_t *stream = &AUDIO.streams[i];
|
||||||
|
errorChain(audioStreamDispose(stream));
|
||||||
|
}
|
||||||
|
|
||||||
|
errorChain(audioPlatformDispose());
|
||||||
|
|
||||||
|
errorOk();
|
||||||
|
}
|
||||||
@@ -0,0 +1,59 @@
|
|||||||
|
/**
|
||||||
|
* Copyright (c) 2026 Dominic Masters
|
||||||
|
*
|
||||||
|
* This software is released under the MIT License.
|
||||||
|
* https://opensource.org/licenses/MIT
|
||||||
|
*/
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
#include "dusk.h"
|
||||||
|
#include "audio/audiostream.h"
|
||||||
|
#include "audio/audioplatform.h"
|
||||||
|
|
||||||
|
#ifndef audioPlatformInit
|
||||||
|
#error "audioPlatformInit is not defined"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifndef audioPlatformUpdate
|
||||||
|
#error "audioPlatformUpdate is not defined"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifndef audioPlatformDispose
|
||||||
|
#error "audioPlatformDispose is not defined"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
typedef struct {
|
||||||
|
audiostream_t streams[AUDIO_STREAMS_MAX];
|
||||||
|
} audio_t;
|
||||||
|
|
||||||
|
extern audio_t AUDIO;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Initializes the audio subsystem.
|
||||||
|
*
|
||||||
|
* @return Error indicating success or failure of the operation.
|
||||||
|
*/
|
||||||
|
errorret_t audioInit();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Aquires an available audio stream, can return NULL if there is no available
|
||||||
|
* stream.
|
||||||
|
*
|
||||||
|
* @return Pointer to an available audio stream.
|
||||||
|
*/
|
||||||
|
audiostream_t * audioAquireStream();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Updates the audio subsystem, updating every active stream. Should be
|
||||||
|
* called once per frame.
|
||||||
|
*
|
||||||
|
* @return Error indicating success or failure of the operation.
|
||||||
|
*/
|
||||||
|
errorret_t audioUpdate();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Disposes the audio subsystem, stopping and disposing every active stream.
|
||||||
|
*
|
||||||
|
* @return Error indicating success or failure of the operation.
|
||||||
|
*/
|
||||||
|
errorret_t audioDispose();
|
||||||
@@ -0,0 +1,133 @@
|
|||||||
|
/**
|
||||||
|
* Copyright (c) 2026 Dominic Masters
|
||||||
|
*
|
||||||
|
* This software is released under the MIT License.
|
||||||
|
* https://opensource.org/licenses/MIT
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "audiostream.h"
|
||||||
|
#include "assert/assert.h"
|
||||||
|
|
||||||
|
errorret_t audioStreamInit(audiostream_t *stream) {
|
||||||
|
assertNotNull(stream, "Stream cannot be NULL.");
|
||||||
|
|
||||||
|
stream->state = 0;
|
||||||
|
stream->data = NULL;
|
||||||
|
stream->dataSize = 0;
|
||||||
|
stream->volume = 0xFF;
|
||||||
|
stream->directionality = AUDIO_STREAM_CENTER;
|
||||||
|
stream->loopStart = -1;
|
||||||
|
stream->loopTo = 0;
|
||||||
|
stream->duration = 0;
|
||||||
|
stream->user = NULL;
|
||||||
|
stream->onLoop = NULL;
|
||||||
|
stream->onEnd = NULL;
|
||||||
|
|
||||||
|
// Type-specific setup (audioStreamPcmInit() / audioStreamMp3Init()) sets
|
||||||
|
// stream->type and asks the platform implementation to set up its state.
|
||||||
|
|
||||||
|
errorOk();
|
||||||
|
}
|
||||||
|
|
||||||
|
void audioStreamPlay(audiostream_t *stream) {
|
||||||
|
assertNotNull(stream, "Stream cannot be NULL.");
|
||||||
|
stream->state |= AUDIO_STREAM_STATE_PLAYING;
|
||||||
|
}
|
||||||
|
|
||||||
|
void audioStreamPause(audiostream_t *stream) {
|
||||||
|
assertNotNull(stream, "Stream cannot be NULL.");
|
||||||
|
stream->state &= ~AUDIO_STREAM_STATE_PLAYING;
|
||||||
|
}
|
||||||
|
|
||||||
|
void audioStreamSetPosition(audiostream_t *stream, const float_t position) {
|
||||||
|
assertNotNull(stream, "Stream cannot be NULL.");
|
||||||
|
|
||||||
|
// Clamp time.
|
||||||
|
float_t t = position;
|
||||||
|
while(t < 0) t += stream->duration;
|
||||||
|
while(t >= stream->duration) t -= stream->duration;
|
||||||
|
|
||||||
|
// Here I will set the stream time, this will require new data to be fetched
|
||||||
|
// next update() call.
|
||||||
|
// To confirm: If this is called late in the frame, will the PCM data be sent
|
||||||
|
// to the output despite time being adjusted? is this going to cause static?
|
||||||
|
}
|
||||||
|
|
||||||
|
void audioStreamSetVolume(audiostream_t *stream, const uint8_t volume) {
|
||||||
|
assertNotNull(stream, "Stream cannot be NULL.");
|
||||||
|
stream->volume = volume;
|
||||||
|
// TODO: Do I need to update the device output? PSP may require this
|
||||||
|
}
|
||||||
|
|
||||||
|
void audioStreamSetDirectionality(
|
||||||
|
audiostream_t *stream,
|
||||||
|
const int8_t directionality
|
||||||
|
) {
|
||||||
|
assertNotNull(stream, "Stream cannot be NULL.");
|
||||||
|
stream->directionality = directionality;
|
||||||
|
// TODO: Need to update internal decoder?
|
||||||
|
}
|
||||||
|
|
||||||
|
void audioStreamSetLooping(audiostream_t *stream, const bool_t looping) {
|
||||||
|
assertNotNull(stream, "Stream cannot be NULL.");
|
||||||
|
|
||||||
|
if(looping) {
|
||||||
|
stream->state |= AUDIO_STREAM_STATE_LOOPING;
|
||||||
|
} else {
|
||||||
|
stream->state &= ~AUDIO_STREAM_STATE_LOOPING;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
errorret_t audioStreamUpdate(audiostream_t *stream) {
|
||||||
|
assertNotNull(stream, "Stream cannot be NULL.");
|
||||||
|
|
||||||
|
if(stream->type == AUDIO_STREAM_TYPE_NULL) {
|
||||||
|
errorOk();
|
||||||
|
}
|
||||||
|
|
||||||
|
// TODO: Once streamed (rather than fully in-memory) sources exist, this is
|
||||||
|
// where new data would be decoded/read in and re-buffered as playback
|
||||||
|
// consumes it. Looping currently only supports restarting from the very
|
||||||
|
// start of the buffer (loopTo is not yet honored) since replaying the
|
||||||
|
// exact same stream->data/dataSize needs no platform-specific changes;
|
||||||
|
// an arbitrary loopTo offset would need slicing that buffer instead.
|
||||||
|
if(
|
||||||
|
(stream->state & AUDIO_STREAM_STATE_PLAYING) &&
|
||||||
|
!(stream->state & AUDIO_STREAM_STATE_BUFFERED)
|
||||||
|
) {
|
||||||
|
errorChain(audioStreamPlatformBuffer(stream));
|
||||||
|
stream->state |= AUDIO_STREAM_STATE_BUFFERED;
|
||||||
|
} else if(
|
||||||
|
(stream->state & AUDIO_STREAM_STATE_PLAYING) &&
|
||||||
|
(stream->state & AUDIO_STREAM_STATE_BUFFERED) &&
|
||||||
|
audioStreamPlatformIsFinished(stream)
|
||||||
|
) {
|
||||||
|
if(stream->state & AUDIO_STREAM_STATE_LOOPING) {
|
||||||
|
stream->state &= ~AUDIO_STREAM_STATE_BUFFERED;
|
||||||
|
|
||||||
|
if(stream->onLoop != NULL) {
|
||||||
|
stream->onLoop(stream);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
stream->state &= ~(AUDIO_STREAM_STATE_PLAYING | AUDIO_STREAM_STATE_BUFFERED);
|
||||||
|
|
||||||
|
if(stream->onEnd != NULL) {
|
||||||
|
stream->onEnd(stream);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
errorOk();
|
||||||
|
}
|
||||||
|
|
||||||
|
errorret_t audioStreamDispose(audiostream_t *stream) {
|
||||||
|
assertNotNull(stream, "Stream cannot be NULL.");
|
||||||
|
|
||||||
|
if(stream->type != AUDIO_STREAM_TYPE_NULL) {
|
||||||
|
errorChain(audioStreamPlatformDispose(stream));
|
||||||
|
}
|
||||||
|
|
||||||
|
stream->type = AUDIO_STREAM_TYPE_NULL;
|
||||||
|
|
||||||
|
errorOk();
|
||||||
|
}
|
||||||
@@ -0,0 +1,171 @@
|
|||||||
|
/**
|
||||||
|
* Copyright (c) 2026 Dominic Masters
|
||||||
|
*
|
||||||
|
* This software is released under the MIT License.
|
||||||
|
* https://opensource.org/licenses/MIT
|
||||||
|
*/
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
#include "audio/audiostreampcm.h"
|
||||||
|
#include "audio/audiostreammp3.h"
|
||||||
|
#include "audio/audiostreamplatform.h"
|
||||||
|
|
||||||
|
#ifndef audioStreamPlatformInit
|
||||||
|
#error "audioStreamPlatformInit is not defined"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifndef audioStreamPlatformDispose
|
||||||
|
#error "audioStreamPlatformDispose is not defined"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifndef audioStreamPlatformBuffer
|
||||||
|
#error "audioStreamPlatformBuffer is not defined"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifndef audioStreamPlatformIsFinished
|
||||||
|
#error "audioStreamPlatformIsFinished is not defined"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#define AUDIO_STREAMS_MAX 8
|
||||||
|
#define AUDIO_STREAM_STATE_PLAYING (1 << 0)
|
||||||
|
#define AUDIO_STREAM_STATE_LOOPING (1 << 1)
|
||||||
|
#define AUDIO_STREAM_STATE_BUFFERED (1 << 2)
|
||||||
|
#define AUDIO_STREAM_CENTER 0
|
||||||
|
#define AUDIO_STREAM_LEFT -128
|
||||||
|
#define AUDIO_STREAM_RIGHT 127
|
||||||
|
|
||||||
|
typedef enum {
|
||||||
|
AUDIO_STREAM_TYPE_NULL,
|
||||||
|
AUDIO_STREAM_TYPE_PCM,
|
||||||
|
AUDIO_STREAM_TYPE_MP3,
|
||||||
|
AUDIO_STREAM_TYPE_COUNT
|
||||||
|
} audistreamtype_t;
|
||||||
|
|
||||||
|
typedef struct audiostream_s audiostream_t;
|
||||||
|
|
||||||
|
typedef struct audiostream_s {
|
||||||
|
// Used for aquiring new data.
|
||||||
|
audistreamtype_t type;
|
||||||
|
|
||||||
|
// What state the stream is in.
|
||||||
|
uint8_t state;
|
||||||
|
|
||||||
|
// Raw PCM Data, already decoded. Not owned by the stream.
|
||||||
|
uint8_t *data;
|
||||||
|
|
||||||
|
// Size of the buffer pointed to by data, in bytes.
|
||||||
|
size_t dataSize;
|
||||||
|
|
||||||
|
// Loudness. Can only be 0 to 0xFF
|
||||||
|
uint8_t volume;
|
||||||
|
|
||||||
|
// In stereo space, where do we send the audio.
|
||||||
|
// TODO: Can we use a 3D vector + Pro Logic II?
|
||||||
|
int8_t directionality;
|
||||||
|
|
||||||
|
// At what point does the stream loop back, -1 means "at end of stream"
|
||||||
|
float_t loopStart;
|
||||||
|
|
||||||
|
// When a loop occurs, where do we loop to? Defaults to 0 or start of stream.
|
||||||
|
float_t loopTo;
|
||||||
|
|
||||||
|
// Cached duration of the stream in seconds.
|
||||||
|
float_t duration;
|
||||||
|
|
||||||
|
// Callbacks
|
||||||
|
void *user;
|
||||||
|
void (*onLoop)(audiostream_t *stream);
|
||||||
|
void (*onEnd)(audiostream_t *stream);
|
||||||
|
|
||||||
|
// Stream type specific data.
|
||||||
|
union {
|
||||||
|
audiostreampcm_t pcm;
|
||||||
|
audiostreammp3_t mp3;
|
||||||
|
};
|
||||||
|
|
||||||
|
// Platform-specific playback state (e.g. SDL2 device, PSP channel, ansnd
|
||||||
|
// voice). Defined by each platform's audiostreamplatform.h.
|
||||||
|
audiostreamplatform_t platform;
|
||||||
|
} audiostream_t;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Initializes an audio stream in preparation for playback. Does not begin
|
||||||
|
* playback; call audioStreamPlay() once the stream is configured (see
|
||||||
|
* audioStreamPcmInit() / audioStreamMp3Init() for the type-specific setup
|
||||||
|
* this must be followed by).
|
||||||
|
*
|
||||||
|
* @param stream The audio stream to initialize.
|
||||||
|
* @return Error indicating success or failure.
|
||||||
|
*/
|
||||||
|
errorret_t audioStreamInit(audiostream_t *stream);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Begins or resumes playback of the given audio stream.
|
||||||
|
*
|
||||||
|
* @param stream The audio stream to play.
|
||||||
|
*/
|
||||||
|
void audioStreamPlay(audiostream_t *stream);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Pauses playback of the given audio stream. Playback position is retained,
|
||||||
|
* so audioStreamPlay() resumes from the same point.
|
||||||
|
*
|
||||||
|
* @param stream The audio stream to pause.
|
||||||
|
*/
|
||||||
|
void audioStreamPause(audiostream_t *stream);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sets the playback position of the given audio stream, in seconds.
|
||||||
|
*
|
||||||
|
* @param stream The audio stream to rewind.
|
||||||
|
*/
|
||||||
|
void audioStreamSetPosition(audiostream_t *stream, const float_t position);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sets the playback volume of the given audio stream.
|
||||||
|
*
|
||||||
|
* @param stream The audio stream to update.
|
||||||
|
* @param volume The new volume, from 0 (silent) to 0xFF (loudest).
|
||||||
|
*/
|
||||||
|
void audioStreamSetVolume(audiostream_t *stream, const uint8_t volume);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sets the stereo directionality (panning) of the given audio stream.
|
||||||
|
*
|
||||||
|
* @param stream The audio stream to update.
|
||||||
|
* @param directionality The new panning value, from AUDIO_STREAM_LEFT to
|
||||||
|
* AUDIO_STREAM_RIGHT.
|
||||||
|
*/
|
||||||
|
void audioStreamSetDirectionality(
|
||||||
|
audiostream_t *stream,
|
||||||
|
const int8_t directionality
|
||||||
|
);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sets whether the given audio stream loops back to the start when it
|
||||||
|
* reaches the end, rather than stopping and firing onEnd. Only looping
|
||||||
|
* back to the very start of the buffer is currently supported - loopTo is
|
||||||
|
* not yet honored.
|
||||||
|
*
|
||||||
|
* @param stream The audio stream to update.
|
||||||
|
* @param looping Whether the stream should loop.
|
||||||
|
*/
|
||||||
|
void audioStreamSetLooping(audiostream_t *stream, const bool_t looping);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Updates the given audio stream, decoding new data and advancing playback
|
||||||
|
* as needed. Should be called every frame for every active stream.
|
||||||
|
*
|
||||||
|
* @param stream The audio stream to update.
|
||||||
|
* @return Error indicating success or failure.
|
||||||
|
*/
|
||||||
|
errorret_t audioStreamUpdate(audiostream_t *stream);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Disposes the audio stream, stopping playback and releasing any resources
|
||||||
|
* associated with it.
|
||||||
|
*
|
||||||
|
* @param stream The audio stream to dispose.
|
||||||
|
* @return Error indicating success or failure.
|
||||||
|
*/
|
||||||
|
errorret_t audioStreamDispose(audiostream_t *stream);
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
/**
|
||||||
|
* Copyright (c) 2026 Dominic Masters
|
||||||
|
*
|
||||||
|
* This software is released under the MIT License.
|
||||||
|
* https://opensource.org/licenses/MIT
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "audiostreammp3.h"
|
||||||
@@ -6,7 +6,8 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
#include "error/error.h"
|
||||||
|
|
||||||
#define CONSOLE_LINE_MAX 512
|
typedef struct {
|
||||||
#define CONSOLE_HISTORY_MAX 16
|
void *empty;
|
||||||
#define CONSOLE_EXEC_BUFFER_MAX 32
|
} audiostreammp3_t;
|
||||||
@@ -0,0 +1,36 @@
|
|||||||
|
/**
|
||||||
|
* Copyright (c) 2026 Dominic Masters
|
||||||
|
*
|
||||||
|
* This software is released under the MIT License.
|
||||||
|
* https://opensource.org/licenses/MIT
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "audiostreampcm.h"
|
||||||
|
#include "audiostream.h"
|
||||||
|
#include "assert/assert.h"
|
||||||
|
|
||||||
|
errorret_t audioStreamPcmInit(
|
||||||
|
audiostream_t *stream,
|
||||||
|
uint8_t *data,
|
||||||
|
const size_t dataSize,
|
||||||
|
const uint32_t sampleRate,
|
||||||
|
const uint8_t channels
|
||||||
|
) {
|
||||||
|
assertNotNull(stream, "Stream cannot be NULL.");
|
||||||
|
assertNotNull(data, "Data cannot be NULL.");
|
||||||
|
|
||||||
|
stream->type = AUDIO_STREAM_TYPE_PCM;
|
||||||
|
stream->data = data;
|
||||||
|
stream->dataSize = dataSize;
|
||||||
|
stream->pcm.sampleRate = sampleRate;
|
||||||
|
stream->pcm.channels = channels;
|
||||||
|
stream->duration = (
|
||||||
|
(float_t) dataSize /
|
||||||
|
(float_t) (channels * sizeof(int16_t)) /
|
||||||
|
(float_t) sampleRate
|
||||||
|
);
|
||||||
|
|
||||||
|
errorChain(audioStreamPlatformInit(stream));
|
||||||
|
|
||||||
|
errorOk();
|
||||||
|
}
|
||||||
@@ -0,0 +1,40 @@
|
|||||||
|
/**
|
||||||
|
* Copyright (c) 2026 Dominic Masters
|
||||||
|
*
|
||||||
|
* This software is released under the MIT License.
|
||||||
|
* https://opensource.org/licenses/MIT
|
||||||
|
*/
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
#include "error/error.h"
|
||||||
|
|
||||||
|
typedef struct audiostream_s audiostream_t;
|
||||||
|
|
||||||
|
typedef struct {
|
||||||
|
// Sample rate of the stream's data, in Hz.
|
||||||
|
uint32_t sampleRate;
|
||||||
|
|
||||||
|
// Number of interleaved channels in the stream's data.
|
||||||
|
uint8_t channels;
|
||||||
|
} audiostreampcm_t;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Configures the given audio stream to play raw, already-decoded 16-bit
|
||||||
|
* signed PCM data. Must be called after audioStreamInit() and before
|
||||||
|
* audioStreamPlay().
|
||||||
|
*
|
||||||
|
* @param stream The audio stream to configure.
|
||||||
|
* @param data The raw PCM data to play. Not copied; must remain valid for as
|
||||||
|
* long as the stream is playing it.
|
||||||
|
* @param dataSize The size of data, in bytes.
|
||||||
|
* @param sampleRate The sample rate of data, in Hz.
|
||||||
|
* @param channels The number of interleaved channels in data.
|
||||||
|
* @return Error indicating success or failure.
|
||||||
|
*/
|
||||||
|
errorret_t audioStreamPcmInit(
|
||||||
|
audiostream_t *stream,
|
||||||
|
uint8_t *data,
|
||||||
|
const size_t dataSize,
|
||||||
|
const uint32_t sampleRate,
|
||||||
|
const uint8_t channels
|
||||||
|
);
|
||||||
@@ -17,11 +17,9 @@ console_t CONSOLE;
|
|||||||
|
|
||||||
void consoleInit(void) {
|
void consoleInit(void) {
|
||||||
memoryZero(&CONSOLE, sizeof(console_t));
|
memoryZero(&CONSOLE, sizeof(console_t));
|
||||||
|
// CONSOLE.visible = false;
|
||||||
CONSOLE.visible = true;
|
CONSOLE.visible = true;
|
||||||
|
|
||||||
#ifdef DUSK_CONSOLE_POSIX
|
|
||||||
threadMutexInit(&CONSOLE.printMutex);
|
threadMutexInit(&CONSOLE.printMutex);
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void consolePrint(const char_t *message, ...) {
|
void consolePrint(const char_t *message, ...) {
|
||||||
@@ -32,20 +30,14 @@ void consolePrint(const char_t *message, ...) {
|
|||||||
int32_t len = stringFormatVA(buffer, CONSOLE_LINE_MAX, message, args);
|
int32_t len = stringFormatVA(buffer, CONSOLE_LINE_MAX, message, args);
|
||||||
va_end(args);
|
va_end(args);
|
||||||
|
|
||||||
#ifdef DUSK_CONSOLE_POSIX
|
|
||||||
threadMutexLock(&CONSOLE.printMutex);
|
threadMutexLock(&CONSOLE.printMutex);
|
||||||
#endif
|
|
||||||
|
|
||||||
memoryMove(
|
memoryMove(
|
||||||
CONSOLE.line[0],
|
CONSOLE.line[0],
|
||||||
CONSOLE.line[1],
|
CONSOLE.line[1],
|
||||||
(CONSOLE_HISTORY_MAX - 1) * CONSOLE_LINE_MAX
|
(CONSOLE_HISTORY_MAX - 1) * CONSOLE_LINE_MAX
|
||||||
);
|
);
|
||||||
memoryCopy(CONSOLE.line[CONSOLE_HISTORY_MAX - 1], buffer, len + 1);
|
memoryCopy(CONSOLE.line[CONSOLE_HISTORY_MAX - 1], buffer, len + 1);
|
||||||
|
|
||||||
#ifdef DUSK_CONSOLE_POSIX
|
|
||||||
threadMutexUnlock(&CONSOLE.printMutex);
|
threadMutexUnlock(&CONSOLE.printMutex);
|
||||||
#endif
|
|
||||||
|
|
||||||
logDebug("%s\n", buffer);
|
logDebug("%s\n", buffer);
|
||||||
}
|
}
|
||||||
@@ -61,7 +53,5 @@ void consoleUpdate(void) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void consoleDispose(void) {
|
void consoleDispose(void) {
|
||||||
#ifdef DUSK_CONSOLE_POSIX
|
|
||||||
threadMutexDispose(&CONSOLE.printMutex);
|
threadMutexDispose(&CONSOLE.printMutex);
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
@@ -6,24 +6,18 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
#include "consoledefs.h"
|
|
||||||
#include "error/error.h"
|
#include "error/error.h"
|
||||||
#include "dusk.h"
|
#include "dusk.h"
|
||||||
|
#include "thread/thread.h"
|
||||||
|
|
||||||
#ifdef DUSK_CONSOLE_POSIX
|
#define CONSOLE_LINE_MAX 128
|
||||||
#include "thread/thread.h"
|
#define CONSOLE_HISTORY_MAX 16
|
||||||
#include <poll.h>
|
#define CONSOLE_EXEC_BUFFER_MAX 32
|
||||||
#include <unistd.h>
|
|
||||||
#define CONSOLE_POSIX_POLL_RATE 75
|
|
||||||
#endif
|
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
char_t line[CONSOLE_HISTORY_MAX][CONSOLE_LINE_MAX];
|
char_t line[CONSOLE_HISTORY_MAX][CONSOLE_LINE_MAX];
|
||||||
bool_t visible;
|
bool_t visible;
|
||||||
|
|
||||||
#ifdef DUSK_CONSOLE_POSIX
|
|
||||||
threadmutex_t printMutex;
|
threadmutex_t printMutex;
|
||||||
#endif
|
|
||||||
} console_t;
|
} console_t;
|
||||||
|
|
||||||
extern console_t CONSOLE;
|
extern console_t CONSOLE;
|
||||||
|
|||||||
@@ -33,13 +33,17 @@ errorret_t displayInit(void) {
|
|||||||
#ifdef displayPlatformInit
|
#ifdef displayPlatformInit
|
||||||
errorChain(displayPlatformInit());
|
errorChain(displayPlatformInit());
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
// Set initial state
|
||||||
errorChain(displaySetState((displaystate_t){ .flags = 0 }));
|
errorChain(displaySetState((displaystate_t){ .flags = 0 }));
|
||||||
|
|
||||||
|
// Init the fixed textures
|
||||||
errorChain(textureInit(
|
errorChain(textureInit(
|
||||||
&TEXTURE_WHITE, 4, 4,
|
&TEXTURE_WHITE, TEXTURE_FIXED_WIDTH, TEXTURE_FIXED_HEIGHT,
|
||||||
TEXTURE_FORMAT_RGBA, (texturedata_t){ .rgbaColors = TEXTURE_WHITE_PIXELS }
|
TEXTURE_FORMAT_RGBA, (texturedata_t){ .rgbaColors = TEXTURE_WHITE_PIXELS }
|
||||||
));
|
));
|
||||||
errorChain(textureInit(
|
errorChain(textureInit(
|
||||||
&TEXTURE_TEST, 4, 4,
|
&TEXTURE_TEST, TEXTURE_FIXED_WIDTH, TEXTURE_FIXED_HEIGHT,
|
||||||
TEXTURE_FORMAT_RGBA, (texturedata_t){ .rgbaColors = TEXTURE_TEST_PIXELS }
|
TEXTURE_FORMAT_RGBA, (texturedata_t){ .rgbaColors = TEXTURE_TEST_PIXELS }
|
||||||
));
|
));
|
||||||
|
|
||||||
@@ -51,13 +55,13 @@ errorret_t displayInit(void) {
|
|||||||
errorChain(capsuleInit());
|
errorChain(capsuleInit());
|
||||||
errorChain(triPrismInit());
|
errorChain(triPrismInit());
|
||||||
|
|
||||||
|
// Init the subsystems
|
||||||
errorChain(frameBufferInitBackBuffer());
|
errorChain(frameBufferInitBackBuffer());
|
||||||
errorChain(spriteBatchInit());
|
errorChain(spriteBatchInit());
|
||||||
errorChain(textInit());
|
errorChain(textInit());
|
||||||
errorChain(screenInit());
|
errorChain(screenInit());
|
||||||
|
|
||||||
// Setup initial shader with default values
|
// Setup initial shader with default values
|
||||||
|
|
||||||
errorChain(shaderListInit());
|
errorChain(shaderListInit());
|
||||||
|
|
||||||
errorOk();
|
errorOk();
|
||||||
|
|||||||
@@ -76,7 +76,7 @@ errorret_t spriteBatchBuffer(
|
|||||||
|
|
||||||
// Buffer to the mesh vertices.
|
// Buffer to the mesh vertices.
|
||||||
spriteBatchBufferToMesh(
|
spriteBatchBufferToMesh(
|
||||||
sprites, batchCount, v, batchCount * QUAD_VERTEX_COUNT
|
sprites + (count - remaining), batchCount, v, batchCount * QUAD_VERTEX_COUNT
|
||||||
);
|
);
|
||||||
SPRITEBATCH.spriteCount += batchCount;
|
SPRITEBATCH.spriteCount += batchCount;
|
||||||
remaining -= batchCount;
|
remaining -= batchCount;
|
||||||
|
|||||||
@@ -7,4 +7,5 @@
|
|||||||
target_sources(${DUSK_LIBRARY_TARGET_NAME}
|
target_sources(${DUSK_LIBRARY_TARGET_NAME}
|
||||||
PUBLIC
|
PUBLIC
|
||||||
text.c
|
text.c
|
||||||
|
font.c
|
||||||
)
|
)
|
||||||
@@ -0,0 +1,195 @@
|
|||||||
|
/**
|
||||||
|
* Copyright (c) 2026 Dominic Masters
|
||||||
|
*
|
||||||
|
* This software is released under the MIT License.
|
||||||
|
* https://opensource.org/licenses/MIT
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "font.h"
|
||||||
|
#include "util/memory.h"
|
||||||
|
#include "util/math.h"
|
||||||
|
#include "display/color.h"
|
||||||
|
|
||||||
|
font_t FONT_DEFAULT;
|
||||||
|
static texture_t FONT_DEFAULT_TEXTURE;
|
||||||
|
static tileset_t FONT_DEFAULT_TILESET;
|
||||||
|
|
||||||
|
const uint8_t FONT_DEFAULT_GLYPHS[FONT_DEFAULT_TILE_COUNT][
|
||||||
|
FONT_DEFAULT_TILE_HEIGHT
|
||||||
|
] = {
|
||||||
|
{ 0x00, 0x10, 0x10, 0x10, 0x10, 0x10, 0x00, 0x10, 0x00, 0x00 }, // !
|
||||||
|
{ 0x00, 0x14, 0x14, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, // "
|
||||||
|
{ 0x00, 0x14, 0x14, 0x3E, 0x14, 0x3E, 0x14, 0x14, 0x00, 0x00 }, // #
|
||||||
|
{ 0x00, 0x08, 0x1E, 0x28, 0x1C, 0x0A, 0x3C, 0x08, 0x00, 0x00 }, // $
|
||||||
|
{ 0x00, 0x00, 0x22, 0x24, 0x08, 0x12, 0x22, 0x00, 0x00, 0x00 }, // %
|
||||||
|
{ 0x00, 0x08, 0x14, 0x14, 0x1A, 0x24, 0x24, 0x1A, 0x00, 0x00 }, // &
|
||||||
|
{ 0x00, 0x20, 0x20, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, // '
|
||||||
|
{ 0x00, 0x04, 0x08, 0x08, 0x08, 0x08, 0x08, 0x04, 0x00, 0x00 }, // (
|
||||||
|
{ 0x00, 0x10, 0x08, 0x08, 0x08, 0x08, 0x08, 0x10, 0x00, 0x00 }, // )
|
||||||
|
{ 0x00, 0x00, 0x08, 0x2A, 0x1C, 0x2A, 0x08, 0x00, 0x00, 0x00 }, // *
|
||||||
|
{ 0x00, 0x00, 0x08, 0x08, 0x3E, 0x08, 0x08, 0x00, 0x00, 0x00 }, // +
|
||||||
|
{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x10, 0x20, 0x00 }, // ,
|
||||||
|
{ 0x00, 0x00, 0x00, 0x00, 0x3E, 0x00, 0x00, 0x00, 0x00, 0x00 }, // -
|
||||||
|
{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x10, 0x00, 0x00 }, // .
|
||||||
|
{ 0x00, 0x04, 0x04, 0x08, 0x08, 0x08, 0x10, 0x10, 0x00, 0x00 }, // /
|
||||||
|
{ 0x00, 0x1C, 0x22, 0x26, 0x2A, 0x32, 0x22, 0x1C, 0x00, 0x00 }, // 0
|
||||||
|
{ 0x00, 0x08, 0x18, 0x08, 0x08, 0x08, 0x08, 0x3E, 0x00, 0x00 }, // 1
|
||||||
|
{ 0x00, 0x1C, 0x22, 0x02, 0x04, 0x08, 0x10, 0x3E, 0x00, 0x00 }, // 2
|
||||||
|
{ 0x00, 0x1C, 0x22, 0x02, 0x0C, 0x02, 0x22, 0x1C, 0x00, 0x00 }, // 3
|
||||||
|
{ 0x00, 0x22, 0x22, 0x22, 0x3E, 0x02, 0x02, 0x02, 0x00, 0x00 }, // 4
|
||||||
|
{ 0x00, 0x3E, 0x20, 0x20, 0x3C, 0x02, 0x22, 0x1C, 0x00, 0x00 }, // 5
|
||||||
|
{ 0x00, 0x1C, 0x20, 0x20, 0x3C, 0x22, 0x22, 0x1C, 0x00, 0x00 }, // 6
|
||||||
|
{ 0x00, 0x3E, 0x02, 0x02, 0x04, 0x08, 0x08, 0x08, 0x00, 0x00 }, // 7
|
||||||
|
{ 0x00, 0x1C, 0x22, 0x22, 0x1C, 0x22, 0x22, 0x1C, 0x00, 0x00 }, // 8
|
||||||
|
{ 0x00, 0x1C, 0x22, 0x22, 0x1E, 0x02, 0x22, 0x1C, 0x00, 0x00 }, // 9
|
||||||
|
{ 0x00, 0x00, 0x10, 0x10, 0x00, 0x10, 0x10, 0x00, 0x00, 0x00 }, // :
|
||||||
|
{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, // ;
|
||||||
|
{ 0x00, 0x04, 0x08, 0x10, 0x20, 0x10, 0x08, 0x04, 0x00, 0x00 }, // <
|
||||||
|
{ 0x00, 0x00, 0x00, 0x3E, 0x00, 0x3E, 0x00, 0x00, 0x00, 0x00 }, // =
|
||||||
|
{ 0x00, 0x10, 0x08, 0x04, 0x02, 0x04, 0x08, 0x10, 0x00, 0x00 }, // >
|
||||||
|
{ 0x00, 0x1C, 0x22, 0x02, 0x04, 0x08, 0x00, 0x08, 0x00, 0x00 }, // ?
|
||||||
|
{ 0x00, 0x1C, 0x26, 0x2A, 0x2A, 0x26, 0x20, 0x1C, 0x00, 0x00 }, // @
|
||||||
|
{ 0x00, 0x1C, 0x22, 0x22, 0x22, 0x3E, 0x22, 0x22, 0x00, 0x00 }, // A
|
||||||
|
{ 0x00, 0x3C, 0x22, 0x22, 0x3C, 0x22, 0x22, 0x3C, 0x00, 0x00 }, // B
|
||||||
|
{ 0x00, 0x1C, 0x22, 0x20, 0x20, 0x20, 0x22, 0x1C, 0x00, 0x00 }, // C
|
||||||
|
{ 0x00, 0x3C, 0x22, 0x22, 0x22, 0x22, 0x22, 0x3C, 0x00, 0x00 }, // D
|
||||||
|
{ 0x00, 0x3E, 0x20, 0x20, 0x3C, 0x20, 0x20, 0x3E, 0x00, 0x00 }, // E
|
||||||
|
{ 0x00, 0x3E, 0x20, 0x20, 0x3C, 0x20, 0x20, 0x20, 0x00, 0x00 }, // F
|
||||||
|
{ 0x00, 0x1C, 0x22, 0x20, 0x2E, 0x22, 0x22, 0x1C, 0x00, 0x00 }, // G
|
||||||
|
{ 0x00, 0x22, 0x22, 0x22, 0x3E, 0x22, 0x22, 0x22, 0x00, 0x00 }, // H
|
||||||
|
{ 0x00, 0x3E, 0x08, 0x08, 0x08, 0x08, 0x08, 0x3E, 0x00, 0x00 }, // I
|
||||||
|
{ 0x00, 0x02, 0x02, 0x02, 0x02, 0x22, 0x22, 0x1C, 0x00, 0x00 }, // J
|
||||||
|
{ 0x00, 0x22, 0x24, 0x28, 0x30, 0x28, 0x24, 0x22, 0x00, 0x00 }, // K
|
||||||
|
{ 0x00, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3E, 0x00, 0x00 }, // L
|
||||||
|
{ 0x00, 0x22, 0x36, 0x2A, 0x22, 0x22, 0x22, 0x22, 0x00, 0x00 }, // M
|
||||||
|
{ 0x00, 0x22, 0x22, 0x32, 0x2A, 0x26, 0x22, 0x22, 0x00, 0x00 }, // N
|
||||||
|
{ 0x00, 0x1C, 0x22, 0x22, 0x22, 0x22, 0x22, 0x1C, 0x00, 0x00 }, // O
|
||||||
|
{ 0x00, 0x3C, 0x22, 0x22, 0x3C, 0x20, 0x20, 0x20, 0x00, 0x00 }, // P
|
||||||
|
{ 0x00, 0x1C, 0x22, 0x22, 0x22, 0x22, 0x22, 0x1C, 0x06, 0x00 }, // Q
|
||||||
|
{ 0x00, 0x3C, 0x22, 0x22, 0x3C, 0x22, 0x22, 0x22, 0x00, 0x00 }, // R
|
||||||
|
{ 0x00, 0x1C, 0x22, 0x20, 0x1C, 0x02, 0x22, 0x1C, 0x00, 0x00 }, // S
|
||||||
|
{ 0x00, 0x3E, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x00, 0x00 }, // T
|
||||||
|
{ 0x00, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x1C, 0x00, 0x00 }, // U
|
||||||
|
{ 0x00, 0x22, 0x22, 0x22, 0x22, 0x14, 0x14, 0x08, 0x00, 0x00 }, // V
|
||||||
|
{ 0x00, 0x22, 0x22, 0x22, 0x22, 0x2A, 0x36, 0x22, 0x00, 0x00 }, // W
|
||||||
|
{ 0x00, 0x22, 0x22, 0x14, 0x08, 0x14, 0x22, 0x22, 0x00, 0x00 }, // X
|
||||||
|
{ 0x00, 0x22, 0x22, 0x14, 0x08, 0x08, 0x08, 0x08, 0x00, 0x00 }, // Y
|
||||||
|
{ 0x00, 0x3E, 0x02, 0x04, 0x08, 0x10, 0x20, 0x3E, 0x00, 0x00 }, // Z
|
||||||
|
{ 0x00, 0x0C, 0x08, 0x08, 0x08, 0x08, 0x08, 0x0C, 0x00, 0x00 }, // [
|
||||||
|
// Custom icon glyph, not a real backslash - a backspace symbol: Caps
|
||||||
|
// Lock's up arrow (see FONT_ICON_CAPSLOCK) rotated 270 degrees to
|
||||||
|
// point left instead, adapted to this font's fixed 6x10 tile (each of
|
||||||
|
// Caps Lock's row widths becomes a column height here, centered
|
||||||
|
// vertically). Backslash was never drawn anyway, and isn't a key this
|
||||||
|
// virtual keyboard can type - see FONT_ICON_BACKSPACE.
|
||||||
|
{ 0x00, 0x00, 0x08, 0x1F, 0x3F, 0x3F, 0x1F, 0x08, 0x00, 0x00 }, // FONT_ICON_BACKSPACE
|
||||||
|
{ 0x00, 0x18, 0x08, 0x08, 0x08, 0x08, 0x08, 0x18, 0x00, 0x00 }, // ]
|
||||||
|
{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, // ^ (not drawn in source font)
|
||||||
|
{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3E }, // _
|
||||||
|
// Custom icon glyph, not a real backtick - an up arrow for Shift, same
|
||||||
|
// head as Caps Lock's (see FONT_ICON_CAPSLOCK) but with a shaft 2px
|
||||||
|
// thinner, plus one empty row near the bottom of it, so it reads as a
|
||||||
|
// lighter/broken version of Caps Lock's thicker uninterrupted one.
|
||||||
|
// Backtick was never drawn anyway, and isn't a key this virtual
|
||||||
|
// keyboard can type - see FONT_ICON_SHIFT.
|
||||||
|
{ 0x0C, 0x1E, 0x3F, 0x0C, 0x0C, 0x0C, 0x0C, 0x00, 0x0C, 0x00 }, // FONT_ICON_SHIFT
|
||||||
|
{ 0x00, 0x00, 0x00, 0x1E, 0x22, 0x22, 0x22, 0x1E, 0x00, 0x00 }, // a
|
||||||
|
{ 0x00, 0x20, 0x20, 0x3C, 0x22, 0x22, 0x22, 0x3C, 0x00, 0x00 }, // b
|
||||||
|
{ 0x00, 0x00, 0x00, 0x1C, 0x22, 0x20, 0x22, 0x1C, 0x00, 0x00 }, // c
|
||||||
|
{ 0x00, 0x02, 0x02, 0x1E, 0x22, 0x22, 0x22, 0x1E, 0x00, 0x00 }, // d
|
||||||
|
{ 0x00, 0x00, 0x00, 0x1C, 0x22, 0x3E, 0x20, 0x1C, 0x00, 0x00 }, // e
|
||||||
|
{ 0x00, 0x0C, 0x12, 0x10, 0x3C, 0x10, 0x10, 0x10, 0x00, 0x00 }, // f
|
||||||
|
{ 0x00, 0x00, 0x00, 0x1E, 0x22, 0x22, 0x22, 0x1E, 0x02, 0x1C }, // g
|
||||||
|
{ 0x00, 0x20, 0x20, 0x3C, 0x22, 0x22, 0x22, 0x22, 0x00, 0x00 }, // h
|
||||||
|
{ 0x00, 0x08, 0x00, 0x18, 0x08, 0x08, 0x08, 0x3E, 0x00, 0x00 }, // i
|
||||||
|
{ 0x00, 0x02, 0x00, 0x06, 0x02, 0x02, 0x02, 0x02, 0x22, 0x1C }, // j
|
||||||
|
{ 0x00, 0x20, 0x20, 0x22, 0x24, 0x38, 0x24, 0x22, 0x00, 0x00 }, // k
|
||||||
|
{ 0x00, 0x30, 0x10, 0x10, 0x10, 0x10, 0x10, 0x0E, 0x00, 0x00 }, // l
|
||||||
|
{ 0x00, 0x00, 0x00, 0x3C, 0x2A, 0x2A, 0x2A, 0x2A, 0x00, 0x00 }, // m
|
||||||
|
{ 0x00, 0x00, 0x00, 0x3C, 0x22, 0x22, 0x22, 0x22, 0x00, 0x00 }, // n
|
||||||
|
{ 0x00, 0x00, 0x00, 0x1C, 0x22, 0x22, 0x22, 0x1C, 0x00, 0x00 }, // o
|
||||||
|
{ 0x00, 0x00, 0x00, 0x3C, 0x22, 0x22, 0x22, 0x3C, 0x20, 0x20 }, // p
|
||||||
|
{ 0x00, 0x00, 0x00, 0x1E, 0x22, 0x22, 0x22, 0x1E, 0x02, 0x02 }, // q
|
||||||
|
{ 0x00, 0x00, 0x00, 0x2C, 0x32, 0x20, 0x20, 0x20, 0x00, 0x00 }, // r
|
||||||
|
{ 0x00, 0x00, 0x00, 0x1E, 0x20, 0x1C, 0x02, 0x3C, 0x00, 0x00 }, // s
|
||||||
|
{ 0x00, 0x10, 0x10, 0x3C, 0x10, 0x10, 0x10, 0x0E, 0x00, 0x00 }, // t
|
||||||
|
{ 0x00, 0x00, 0x00, 0x22, 0x22, 0x22, 0x22, 0x1E, 0x00, 0x00 }, // u
|
||||||
|
{ 0x00, 0x00, 0x00, 0x22, 0x22, 0x22, 0x14, 0x08, 0x00, 0x00 }, // v
|
||||||
|
{ 0x00, 0x00, 0x00, 0x22, 0x22, 0x2A, 0x2A, 0x14, 0x00, 0x00 }, // w
|
||||||
|
{ 0x00, 0x00, 0x00, 0x22, 0x14, 0x08, 0x14, 0x22, 0x00, 0x00 }, // x
|
||||||
|
{ 0x00, 0x00, 0x00, 0x22, 0x22, 0x22, 0x22, 0x1E, 0x02, 0x1C }, // y
|
||||||
|
{ 0x00, 0x00, 0x00, 0x3E, 0x04, 0x08, 0x10, 0x3E, 0x00, 0x00 }, // z
|
||||||
|
{ 0x00, 0x04, 0x08, 0x08, 0x10, 0x08, 0x08, 0x04, 0x00, 0x00 }, // {
|
||||||
|
// Custom icon glyph, not a real pipe - a "return" arrow for the
|
||||||
|
// keyboard's newline key: a vertical riser down the right side that
|
||||||
|
// hooks left into a leftward-pointing arrowhead, i.e. "<-|" rotated
|
||||||
|
// into an L. Pipe was never drawn anyway, and isn't a key this
|
||||||
|
// virtual keyboard can type - see FONT_ICON_NEWLINE.
|
||||||
|
{ 0x02, 0x02, 0x02, 0x02, 0x0E, 0x1E, 0x08, 0x00, 0x00, 0x00 }, // FONT_ICON_NEWLINE
|
||||||
|
{ 0x00, 0x10, 0x08, 0x08, 0x04, 0x08, 0x08, 0x10, 0x00, 0x00 }, // }
|
||||||
|
// Custom icon glyph, not a real tilde - a spacebar symbol for the
|
||||||
|
// keyboard's space key: an underscore with a tick at each end, like
|
||||||
|
// "|___|". Tilde was never drawn anyway, and was explicitly dropped
|
||||||
|
// from this virtual keyboard's own key set - see FONT_ICON_SPACE.
|
||||||
|
{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x21, 0x3F }, // FONT_ICON_SPACE
|
||||||
|
// Custom icon glyph, not a real ASCII character - a thick, solid,
|
||||||
|
// uninterrupted up arrow for Caps Lock (contrast FONT_ICON_SHIFT's
|
||||||
|
// same head but a thinner, gapped shaft). Assigned to char code 127
|
||||||
|
// (DEL) since that codepoint is never legitimately typed text and
|
||||||
|
// (unlike 128+) is still a positive value regardless of whether this
|
||||||
|
// platform's plain `char` is signed - see FONT_ICON_CAPSLOCK.
|
||||||
|
{ 0x0C, 0x1E, 0x3F, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x00 }, // FONT_ICON_CAPSLOCK
|
||||||
|
{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, // unused trailing tile
|
||||||
|
};
|
||||||
|
|
||||||
|
errorret_t fontDefaultInit(void) {
|
||||||
|
const int32_t width = (int32_t)mathNextPowTwo(
|
||||||
|
FONT_DEFAULT_COLUMNS * FONT_DEFAULT_TILE_WIDTH
|
||||||
|
);
|
||||||
|
const int32_t height = (int32_t)mathNextPowTwo(
|
||||||
|
FONT_DEFAULT_ROWS * FONT_DEFAULT_TILE_HEIGHT
|
||||||
|
);
|
||||||
|
|
||||||
|
color_t *pixels = memoryAllocate(sizeof(color_t) * width * height);
|
||||||
|
memoryZero(pixels, sizeof(color_t) * width * height);
|
||||||
|
|
||||||
|
for(uint16_t i = 0; i < FONT_DEFAULT_TILE_COUNT; i++) {
|
||||||
|
const uint16_t tileX = (i % FONT_DEFAULT_COLUMNS) * FONT_DEFAULT_TILE_WIDTH;
|
||||||
|
const uint16_t tileY = (i / FONT_DEFAULT_COLUMNS) * FONT_DEFAULT_TILE_HEIGHT;
|
||||||
|
|
||||||
|
for(uint8_t row = 0; row < FONT_DEFAULT_TILE_HEIGHT; row++) {
|
||||||
|
const uint8_t bits = FONT_DEFAULT_GLYPHS[i][row];
|
||||||
|
|
||||||
|
for(uint8_t col = 0; col < FONT_DEFAULT_TILE_WIDTH; col++) {
|
||||||
|
if(!((bits >> (FONT_DEFAULT_TILE_WIDTH - 1 - col)) & 1)) continue;
|
||||||
|
pixels[((tileY + row) * width) + (tileX + col)] = COLOR_WHITE;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
FONT_DEFAULT_TILESET.tileWidth = FONT_DEFAULT_TILE_WIDTH;
|
||||||
|
FONT_DEFAULT_TILESET.tileHeight = FONT_DEFAULT_TILE_HEIGHT;
|
||||||
|
FONT_DEFAULT_TILESET.columns = FONT_DEFAULT_COLUMNS;
|
||||||
|
FONT_DEFAULT_TILESET.rows = FONT_DEFAULT_ROWS;
|
||||||
|
FONT_DEFAULT_TILESET.tileCount = FONT_DEFAULT_TILE_COUNT;
|
||||||
|
FONT_DEFAULT_TILESET.uv[0] = (float_t)FONT_DEFAULT_TILE_WIDTH / (float_t)width;
|
||||||
|
FONT_DEFAULT_TILESET.uv[1] = (float_t)FONT_DEFAULT_TILE_HEIGHT / (float_t)height;
|
||||||
|
|
||||||
|
const texturedata_t data = { .rgbaColors = pixels };
|
||||||
|
errorret_t textureResult = textureInit(
|
||||||
|
&FONT_DEFAULT_TEXTURE, width, height, TEXTURE_FORMAT_RGBA, data
|
||||||
|
);
|
||||||
|
memoryFree(pixels);
|
||||||
|
errorChain(textureResult);
|
||||||
|
|
||||||
|
FONT_DEFAULT.texture = &FONT_DEFAULT_TEXTURE;
|
||||||
|
FONT_DEFAULT.tileset = &FONT_DEFAULT_TILESET;
|
||||||
|
errorOk();
|
||||||
|
}
|
||||||
|
|
||||||
|
errorret_t fontDefaultDispose(void) {
|
||||||
|
errorChain(textureDispose(&FONT_DEFAULT_TEXTURE));
|
||||||
|
FONT_DEFAULT.texture = NULL;
|
||||||
|
FONT_DEFAULT.tileset = NULL;
|
||||||
|
errorOk();
|
||||||
|
}
|
||||||
@@ -6,6 +6,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
#include "error/error.h"
|
||||||
#include "display/texture/texture.h"
|
#include "display/texture/texture.h"
|
||||||
#include "display/texture/tileset.h"
|
#include "display/texture/tileset.h"
|
||||||
|
|
||||||
@@ -13,3 +14,86 @@ typedef struct {
|
|||||||
texture_t *texture;
|
texture_t *texture;
|
||||||
tileset_t *tileset;
|
tileset_t *tileset;
|
||||||
} font_t;
|
} font_t;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Pixel width/height of a single default-font glyph tile.
|
||||||
|
*/
|
||||||
|
#define FONT_DEFAULT_TILE_WIDTH 6
|
||||||
|
#define FONT_DEFAULT_TILE_HEIGHT 10
|
||||||
|
|
||||||
|
/** Grid layout of the generated default-font texture, in tiles. */
|
||||||
|
#define FONT_DEFAULT_COLUMNS 16
|
||||||
|
#define FONT_DEFAULT_ROWS 6
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Number of glyphs defined in FONT_DEFAULT_GLYPHS (FONT_DEFAULT_COLUMNS *
|
||||||
|
* FONT_DEFAULT_ROWS), covering the printable ASCII range starting at
|
||||||
|
* TEXT_CHAR_START ('!'), one custom icon glyph in a trailing unused tile
|
||||||
|
* (see FONT_ICON_CAPSLOCK), plus one more genuinely unused trailing tile.
|
||||||
|
* FONT_ICON_SHIFT/FONT_ICON_NEWLINE reuse existing-but-blank slots within
|
||||||
|
* the printable range instead of more trailing tiles - see their own
|
||||||
|
* comments.
|
||||||
|
*/
|
||||||
|
#define FONT_DEFAULT_TILE_COUNT (FONT_DEFAULT_COLUMNS * FONT_DEFAULT_ROWS)
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Custom (non-ASCII-meaning) icon glyphs baked into FONT_DEFAULT_GLYPHS
|
||||||
|
* at otherwise-unused codepoints within the range this font covers -
|
||||||
|
* safe to use anywhere a char_t string is expected, e.g. a uibutton_t
|
||||||
|
* label. Kept below 128: char_t is a plain `char`, whose signedness
|
||||||
|
* varies by platform, so a codepoint of 128 or above isn't safely
|
||||||
|
* representable everywhere this engine targets.
|
||||||
|
*/
|
||||||
|
// Thick, solid, uninterrupted up arrow - Caps Lock. A trailing tile
|
||||||
|
// (char code 127/DEL) that was never a real character to begin with.
|
||||||
|
#define FONT_ICON_CAPSLOCK "\x7F"
|
||||||
|
// Same up arrow, but with a thinner and gapped shaft - Shift. Reuses
|
||||||
|
// the backtick's glyph slot: backtick was never drawn by this font
|
||||||
|
// anyway, and isn't a key this engine's virtual keyboard can type.
|
||||||
|
#define FONT_ICON_SHIFT "`"
|
||||||
|
// A "return" arrow (down then left, with a leftward arrowhead) - the
|
||||||
|
// keyboard's newline key. Reuses the pipe's glyph slot, for the same
|
||||||
|
// reason as FONT_ICON_SHIFT.
|
||||||
|
#define FONT_ICON_NEWLINE "|"
|
||||||
|
// An underscore with a tick at each end ("|___|") - the keyboard's
|
||||||
|
// space key. Reuses the tilde's glyph slot: tilde was never drawn by
|
||||||
|
// this font, and was explicitly dropped from this engine's virtual
|
||||||
|
// keyboard's own key set.
|
||||||
|
#define FONT_ICON_SPACE "~"
|
||||||
|
// Caps Lock's arrow rotated to point left - the keyboard's backspace
|
||||||
|
// key. Reuses the backslash's glyph slot, for the same reason as
|
||||||
|
// FONT_ICON_SHIFT/FONT_ICON_NEWLINE/FONT_ICON_SPACE. Last free reused
|
||||||
|
// slot below 128 - one more custom icon after this needs
|
||||||
|
// FONT_DEFAULT_COLUMNS/ROWS grown to make room.
|
||||||
|
#define FONT_ICON_BACKSPACE "\\"
|
||||||
|
|
||||||
|
extern font_t FONT_DEFAULT;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Hard coded bitmap data for the built-in default font. Indexed
|
||||||
|
* [glyph][row], where glyph 0 corresponds to TEXT_CHAR_START ('!') and
|
||||||
|
* glyphs run consecutively through the printable ASCII range. Each row
|
||||||
|
* byte holds FONT_DEFAULT_TILE_WIDTH bit flags, one per pixel column:
|
||||||
|
* bit (FONT_DEFAULT_TILE_WIDTH - 1) is the leftmost pixel and bit 0 is
|
||||||
|
* the rightmost; 1 means the pixel is set, 0 means it is not.
|
||||||
|
*/
|
||||||
|
extern const uint8_t FONT_DEFAULT_GLYPHS[FONT_DEFAULT_TILE_COUNT][
|
||||||
|
FONT_DEFAULT_TILE_HEIGHT
|
||||||
|
];
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Builds the default font's texture + tileset directly from
|
||||||
|
* FONT_DEFAULT_GLYPHS, without going through the asset system - so the
|
||||||
|
* engine always has a usable font to render with regardless of whether
|
||||||
|
* asset loading (e.g. the packed .dsk archive) succeeds.
|
||||||
|
*
|
||||||
|
* @return Either an error or success result.
|
||||||
|
*/
|
||||||
|
errorret_t fontDefaultInit(void);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Disposes of the default font created by fontDefaultInit().
|
||||||
|
*
|
||||||
|
* @return Either an error or success result.
|
||||||
|
*/
|
||||||
|
errorret_t fontDefaultDispose(void);
|
||||||
+114
-41
@@ -9,34 +9,15 @@
|
|||||||
#include "assert/assert.h"
|
#include "assert/assert.h"
|
||||||
#include "util/memory.h"
|
#include "util/memory.h"
|
||||||
#include "display/spritebatch/spritebatch.h"
|
#include "display/spritebatch/spritebatch.h"
|
||||||
#include "asset/asset.h"
|
|
||||||
#include "asset/loader/display/assettextureloader.h"
|
|
||||||
#include "asset/loader/display/assettilesetloader.h"
|
|
||||||
#include "display/shader/shaderunlit.h"
|
#include "display/shader/shaderunlit.h"
|
||||||
|
|
||||||
font_t FONT_DEFAULT;
|
|
||||||
|
|
||||||
errorret_t textInit(void) {
|
errorret_t textInit(void) {
|
||||||
assetloaderinput_t input = { .texture = TEXTURE_FORMAT_RGBA };
|
errorChain(fontDefaultInit());
|
||||||
assetentry_t *entryTexture = assetLock(
|
|
||||||
"ui/minogram.png", ASSET_LOADER_TYPE_TEXTURE, &input
|
|
||||||
);
|
|
||||||
assetentry_t *entryTileset = assetLock(
|
|
||||||
"ui/minogram.dtf", ASSET_LOADER_TYPE_TILESET, NULL
|
|
||||||
);
|
|
||||||
errorChain(assetRequireLoaded(entryTexture));
|
|
||||||
errorChain(assetRequireLoaded(entryTileset));
|
|
||||||
|
|
||||||
FONT_DEFAULT.texture = &entryTexture->data.texture;
|
|
||||||
FONT_DEFAULT.tileset = &entryTileset->data.tileset;
|
|
||||||
errorOk();
|
errorOk();
|
||||||
}
|
}
|
||||||
|
|
||||||
errorret_t textDispose(void) {
|
errorret_t textDispose(void) {
|
||||||
FONT_DEFAULT.texture = NULL;
|
errorChain(fontDefaultDispose());
|
||||||
FONT_DEFAULT.tileset = NULL;
|
|
||||||
assetUnlock("ui/minogram.png");
|
|
||||||
assetUnlock("ui/minogram.dtf");
|
|
||||||
errorOk();
|
errorOk();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -73,6 +54,62 @@ spritebatchsprite_t textGetSprite(
|
|||||||
return sprite;
|
return sprite;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int32_t textBuffer(
|
||||||
|
const float_t x,
|
||||||
|
const float_t y,
|
||||||
|
const char_t *text,
|
||||||
|
font_t *font,
|
||||||
|
spritebatchsprite_t *outSprites,
|
||||||
|
const int32_t maxSprites,
|
||||||
|
int32_t *charIndex,
|
||||||
|
float_t *posX,
|
||||||
|
float_t *posY
|
||||||
|
) {
|
||||||
|
assertNotNull(text, "Text cannot be NULL");
|
||||||
|
|
||||||
|
if(outSprites == NULL) {
|
||||||
|
int32_t count = 0;
|
||||||
|
char_t c;
|
||||||
|
int32_t i = 0;
|
||||||
|
while((c = text[i++]) != '\0') {
|
||||||
|
if(c != ' ' && c != '\n') count++;
|
||||||
|
}
|
||||||
|
return count;
|
||||||
|
}
|
||||||
|
|
||||||
|
assertNotNull(font, "Font cannot be NULL");
|
||||||
|
assertTrue(maxSprites > 0, "Max sprites must be greater than zero");
|
||||||
|
assertNotNull(posX, "Output posX cannot be NULL");
|
||||||
|
assertNotNull(posY, "Output posY cannot be NULL");
|
||||||
|
assertNotNull(charIndex, "Output charIndex cannot be NULL");
|
||||||
|
|
||||||
|
int32_t spriteIndex = 0;
|
||||||
|
char_t c;
|
||||||
|
for(;;) {
|
||||||
|
c = text[*charIndex];
|
||||||
|
if(c == '\0') break;
|
||||||
|
(*charIndex)++;
|
||||||
|
|
||||||
|
if(c == '\n') {
|
||||||
|
*posX = x;
|
||||||
|
*posY += font->tileset->tileHeight;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if(c == ' ') {
|
||||||
|
*posX += font->tileset->tileWidth;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
outSprites[spriteIndex++] = textGetSprite((vec2){*posX, *posY}, c, font);
|
||||||
|
*posX += font->tileset->tileWidth;
|
||||||
|
|
||||||
|
if(spriteIndex >= maxSprites) break;
|
||||||
|
}
|
||||||
|
|
||||||
|
return spriteIndex;
|
||||||
|
}
|
||||||
|
|
||||||
errorret_t textDraw(
|
errorret_t textDraw(
|
||||||
const float_t x,
|
const float_t x,
|
||||||
const float_t y,
|
const float_t y,
|
||||||
@@ -81,10 +118,11 @@ errorret_t textDraw(
|
|||||||
font_t *font
|
font_t *font
|
||||||
) {
|
) {
|
||||||
assertNotNull(text, "Text cannot be NULL");
|
assertNotNull(text, "Text cannot be NULL");
|
||||||
|
int32_t length = strlen(text);
|
||||||
|
if(length == 0) errorOk();
|
||||||
|
|
||||||
if(font == NULL) font = &FONT_DEFAULT;
|
if(font == NULL) font = &FONT_DEFAULT;
|
||||||
|
|
||||||
spritebatchsprite_t sprite;
|
|
||||||
shadermaterial_t material = {
|
shadermaterial_t material = {
|
||||||
.unlit = {
|
.unlit = {
|
||||||
.color = color,
|
.color = color,
|
||||||
@@ -92,31 +130,25 @@ errorret_t textDraw(
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
spritebatchsprite_t sprites[32];
|
||||||
float_t posX = x;
|
float_t posX = x;
|
||||||
float_t posY = y;
|
float_t posY = y;
|
||||||
|
int32_t buffered = 0;
|
||||||
|
int32_t charIndex = 0;
|
||||||
|
do {
|
||||||
|
buffered = textBuffer(
|
||||||
|
x, y, text, font,
|
||||||
|
sprites,
|
||||||
|
sizeof(sprites) / sizeof(spritebatchsprite_t),
|
||||||
|
&charIndex, &posX, &posY
|
||||||
|
);
|
||||||
|
errorChain(spriteBatchBuffer(sprites, buffered, &SHADER_UNLIT, material));
|
||||||
|
} while(charIndex < length);
|
||||||
|
|
||||||
char_t c;
|
|
||||||
int32_t i = 0;
|
|
||||||
while((c = text[i++]) != '\0') {
|
|
||||||
if(c == '\n') {
|
|
||||||
posX = x;
|
|
||||||
posY += font->tileset->tileHeight;
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
if(c == ' ') {
|
|
||||||
posX += font->tileset->tileWidth;
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
sprite = textGetSprite((vec2){posX, posY}, c, font);
|
|
||||||
errorChain(spriteBatchBuffer(&sprite, 1, &SHADER_UNLIT, material));
|
|
||||||
posX += font->tileset->tileWidth;
|
|
||||||
}
|
|
||||||
errorOk();
|
errorOk();
|
||||||
}
|
}
|
||||||
|
|
||||||
void textMeasure(
|
int32_t textMeasure(
|
||||||
const char_t *text,
|
const char_t *text,
|
||||||
const font_t *font,
|
const font_t *font,
|
||||||
int32_t *outWidth,
|
int32_t *outWidth,
|
||||||
@@ -129,6 +161,7 @@ void textMeasure(
|
|||||||
int32_t width = 0;
|
int32_t width = 0;
|
||||||
int32_t height = font->tileset->tileHeight;
|
int32_t height = font->tileset->tileHeight;
|
||||||
int32_t lineWidth = 0;
|
int32_t lineWidth = 0;
|
||||||
|
int32_t spriteCount = 0;
|
||||||
|
|
||||||
char_t c;
|
char_t c;
|
||||||
int32_t i = 0;
|
int32_t i = 0;
|
||||||
@@ -141,10 +174,50 @@ void textMeasure(
|
|||||||
}
|
}
|
||||||
|
|
||||||
lineWidth += font->tileset->tileWidth;
|
lineWidth += font->tileset->tileWidth;
|
||||||
|
|
||||||
|
if(c != ' ') {
|
||||||
|
spriteCount++;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if(lineWidth > width) width = lineWidth;
|
if(lineWidth > width) width = lineWidth;
|
||||||
|
|
||||||
*outWidth = width;
|
*outWidth = width;
|
||||||
*outHeight = height;
|
*outHeight = height;
|
||||||
|
|
||||||
|
return spriteCount;
|
||||||
|
}
|
||||||
|
|
||||||
|
void textWrap(char_t *text, const font_t *font, const float_t maxWidth) {
|
||||||
|
assertNotNull(text, "Text cannot be NULL");
|
||||||
|
assertNotNull(font, "Font cannot be NULL");
|
||||||
|
|
||||||
|
float_t fontWidth = (float_t)font->tileset->tileWidth;
|
||||||
|
if(fontWidth <= 0.0f) return;
|
||||||
|
|
||||||
|
int32_t charsPerLine = (int32_t)(maxWidth / fontWidth);
|
||||||
|
if(charsPerLine <= 0) return;
|
||||||
|
|
||||||
|
int32_t lineWidth = 0;
|
||||||
|
int32_t lastSpace = -1;
|
||||||
|
|
||||||
|
for(int32_t i = 0; text[i] != '\0'; i++) {
|
||||||
|
if(text[i] == '\n') {
|
||||||
|
lineWidth = 0;
|
||||||
|
lastSpace = -1;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if(text[i] == ' ') {
|
||||||
|
lastSpace = i;
|
||||||
|
}
|
||||||
|
|
||||||
|
lineWidth++;
|
||||||
|
|
||||||
|
if(lineWidth > charsPerLine && lastSpace != -1) {
|
||||||
|
text[lastSpace] = '\n';
|
||||||
|
lineWidth = i - lastSpace;
|
||||||
|
lastSpace = -1;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -12,8 +12,6 @@
|
|||||||
|
|
||||||
#define TEXT_CHAR_START '!'
|
#define TEXT_CHAR_START '!'
|
||||||
|
|
||||||
extern font_t FONT_DEFAULT;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Initializes the text system.
|
* Initializes the text system.
|
||||||
*
|
*
|
||||||
@@ -42,6 +40,37 @@ spritebatchsprite_t textGetSprite(
|
|||||||
const font_t *font
|
const font_t *font
|
||||||
);
|
);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Buffers a string into sprites for rendering. If outSprites is NULL then
|
||||||
|
* the function will only return the count of sprites necessary for the buffer.
|
||||||
|
*
|
||||||
|
* posX and posY are updated whilst buffering characters, if you need to do
|
||||||
|
* buffering in sets then these will be reusable between buffer commands. Start
|
||||||
|
* by setting these to x and y initially.
|
||||||
|
*
|
||||||
|
* @param x The x-coordinate to start buffering the text at.
|
||||||
|
* @param y The y-coordinate to start buffering the text at.
|
||||||
|
* @param text The null-terminated string of text to buffer.
|
||||||
|
* @param font Font to use for rendering.
|
||||||
|
* @param outSprites Pointer to an array of spritebatchsprite_t.
|
||||||
|
* @param maxSprites The maximum number of sprites in outSprites.
|
||||||
|
* @param charIndex Pointer to an int32_t to store the character indexed.
|
||||||
|
* @param posX Pointer to a float_t to store the final x position.
|
||||||
|
* @param posY Pointer to a float_t to store the final y position.
|
||||||
|
* @return The count of sprites buffered.
|
||||||
|
*/
|
||||||
|
int32_t textBuffer(
|
||||||
|
const float_t x,
|
||||||
|
const float_t y,
|
||||||
|
const char_t *text,
|
||||||
|
font_t *font,
|
||||||
|
spritebatchsprite_t *outSprites,
|
||||||
|
const int32_t maxSprites,
|
||||||
|
int32_t *charIndex,
|
||||||
|
float_t *posX,
|
||||||
|
float_t *posY
|
||||||
|
);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Draws a string of text at the specified position.
|
* Draws a string of text at the specified position.
|
||||||
*
|
*
|
||||||
@@ -67,10 +96,25 @@ errorret_t textDraw(
|
|||||||
* @param font Font to use for measurement.
|
* @param font Font to use for measurement.
|
||||||
* @param outWidth Pointer to store the measured width in pixels.
|
* @param outWidth Pointer to store the measured width in pixels.
|
||||||
* @param outHeight Pointer to store the measured height in pixels.
|
* @param outHeight Pointer to store the measured height in pixels.
|
||||||
|
* @return The count of sprites that will be rendered for the given text.
|
||||||
*/
|
*/
|
||||||
void textMeasure(
|
int32_t textMeasure(
|
||||||
const char_t *text,
|
const char_t *text,
|
||||||
const font_t *font,
|
const font_t *font,
|
||||||
int32_t *outWidth,
|
int32_t *outWidth,
|
||||||
int32_t *outHeight
|
int32_t *outHeight
|
||||||
);
|
);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Word-wraps text in place for display at up to maxWidth pixels wide,
|
||||||
|
* by replacing the space nearest each overflow point with a newline.
|
||||||
|
* Length is unchanged - this only ever swaps existing spaces for
|
||||||
|
* newlines, never inserts characters - so it's always safe to call on a
|
||||||
|
* fixed-size buffer. A single word wider than maxWidth on its own is
|
||||||
|
* left unbroken.
|
||||||
|
*
|
||||||
|
* @param text Null-terminated, caller-owned buffer to wrap in place.
|
||||||
|
* @param font Font to measure character width with.
|
||||||
|
* @param maxWidth Maximum line width, in pixels.
|
||||||
|
*/
|
||||||
|
void textWrap(char_t *text, const font_t *font, const float_t maxWidth);
|
||||||
@@ -12,7 +12,7 @@
|
|||||||
#include "display/display.h"
|
#include "display/display.h"
|
||||||
|
|
||||||
texture_t TEXTURE_WHITE;
|
texture_t TEXTURE_WHITE;
|
||||||
color_t TEXTURE_WHITE_PIXELS[4*4] = {
|
color_t TEXTURE_WHITE_PIXELS[TEXTURE_FIXED_WIDTH * TEXTURE_FIXED_HEIGHT] = {
|
||||||
COLOR_WHITE, COLOR_WHITE, COLOR_WHITE, COLOR_WHITE,
|
COLOR_WHITE, COLOR_WHITE, COLOR_WHITE, COLOR_WHITE,
|
||||||
COLOR_WHITE, COLOR_WHITE, COLOR_WHITE, COLOR_WHITE,
|
COLOR_WHITE, COLOR_WHITE, COLOR_WHITE, COLOR_WHITE,
|
||||||
COLOR_WHITE, COLOR_WHITE, COLOR_WHITE, COLOR_WHITE,
|
COLOR_WHITE, COLOR_WHITE, COLOR_WHITE, COLOR_WHITE,
|
||||||
@@ -20,7 +20,7 @@ color_t TEXTURE_WHITE_PIXELS[4*4] = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
texture_t TEXTURE_TEST;
|
texture_t TEXTURE_TEST;
|
||||||
color_t TEXTURE_TEST_PIXELS[4*4] = {
|
color_t TEXTURE_TEST_PIXELS[TEXTURE_FIXED_WIDTH * TEXTURE_FIXED_HEIGHT] = {
|
||||||
COLOR_BLACK, COLOR_MAGENTA, COLOR_BLACK, COLOR_MAGENTA,
|
COLOR_BLACK, COLOR_MAGENTA, COLOR_BLACK, COLOR_MAGENTA,
|
||||||
COLOR_MAGENTA, COLOR_BLACK, COLOR_MAGENTA, COLOR_BLACK,
|
COLOR_MAGENTA, COLOR_BLACK, COLOR_MAGENTA, COLOR_BLACK,
|
||||||
COLOR_BLACK, COLOR_MAGENTA, COLOR_BLACK, COLOR_MAGENTA,
|
COLOR_BLACK, COLOR_MAGENTA, COLOR_BLACK, COLOR_MAGENTA,
|
||||||
|
|||||||
@@ -17,6 +17,9 @@
|
|||||||
#error "textureDisposePlatform should not be defined."
|
#error "textureDisposePlatform should not be defined."
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#define TEXTURE_FIXED_WIDTH 4
|
||||||
|
#define TEXTURE_FIXED_HEIGHT 4
|
||||||
|
|
||||||
typedef textureformatplatform_t textureformat_t;
|
typedef textureformatplatform_t textureformat_t;
|
||||||
typedef textureplatform_t texture_t;
|
typedef textureplatform_t texture_t;
|
||||||
|
|
||||||
@@ -29,9 +32,9 @@ typedef union texturedata_u {
|
|||||||
} texturedata_t;
|
} texturedata_t;
|
||||||
|
|
||||||
extern texture_t TEXTURE_WHITE;
|
extern texture_t TEXTURE_WHITE;
|
||||||
extern color_t TEXTURE_WHITE_PIXELS[4*4];
|
extern color_t TEXTURE_WHITE_PIXELS[TEXTURE_FIXED_WIDTH * TEXTURE_FIXED_HEIGHT];
|
||||||
extern texture_t TEXTURE_TEST;
|
extern texture_t TEXTURE_TEST;
|
||||||
extern color_t TEXTURE_TEST_PIXELS[4*4];
|
extern color_t TEXTURE_TEST_PIXELS[TEXTURE_FIXED_WIDTH * TEXTURE_FIXED_HEIGHT];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Initializes a texture.
|
* Initializes a texture.
|
||||||
|
|||||||
@@ -16,13 +16,38 @@
|
|||||||
#include "asset/asset.h"
|
#include "asset/asset.h"
|
||||||
#include "ui/ui.h"
|
#include "ui/ui.h"
|
||||||
#include "assert/assert.h"
|
#include "assert/assert.h"
|
||||||
#include "network/network.h"
|
#ifdef DUSK_NETWORK
|
||||||
|
#include "network/network.h"
|
||||||
|
#endif
|
||||||
#include "system/system.h"
|
#include "system/system.h"
|
||||||
#include "console/console.h"
|
#include "console/console.h"
|
||||||
#include "save/save.h"
|
#include "save/save.h"
|
||||||
|
#include "audio/audio.h"
|
||||||
|
#include "util/math.h"
|
||||||
|
#include <math.h>
|
||||||
|
|
||||||
engine_t ENGINE;
|
engine_t ENGINE;
|
||||||
|
|
||||||
|
// 44100Hz: PSP's sceAudioChReserve hardware channels are fixed at this rate.
|
||||||
|
#define AUDIO_TEST_TONE_SAMPLE_RATE 44100
|
||||||
|
// 441Hz (not 440): divides 44100Hz evenly into exactly 100 samples/cycle,
|
||||||
|
// so a whole-second buffer's last sample exactly matches its first -
|
||||||
|
// a seamless loop point with no source-data discontinuity to click on.
|
||||||
|
#define AUDIO_TEST_TONE_FREQUENCY 441
|
||||||
|
#define AUDIO_TEST_TONE_SAMPLES AUDIO_TEST_TONE_SAMPLE_RATE
|
||||||
|
#define AUDIO_TEST_TONE_SIZE (AUDIO_TEST_TONE_SAMPLES * sizeof(int16_t))
|
||||||
|
|
||||||
|
// 1 second, 16-bit signed mono PCM sine wave, used to smoke-test playback.
|
||||||
|
static uint8_t AUDIO_TEST_TONE[AUDIO_TEST_TONE_SIZE];
|
||||||
|
|
||||||
|
void engineTestToneOnEnd(audiostream_t *stream) {
|
||||||
|
consolePrint("Test tone finished playing");
|
||||||
|
}
|
||||||
|
|
||||||
|
void engineTestToneOnLoop(audiostream_t *stream) {
|
||||||
|
consolePrint("Test tone looped");
|
||||||
|
}
|
||||||
|
|
||||||
errorret_t engineInit(const int32_t argc, const char_t **argv) {
|
errorret_t engineInit(const int32_t argc, const char_t **argv) {
|
||||||
assertInit();
|
assertInit();
|
||||||
memoryZero(&ENGINE, sizeof(engine_t));
|
memoryZero(&ENGINE, sizeof(engine_t));
|
||||||
@@ -37,14 +62,36 @@ errorret_t engineInit(const int32_t argc, const char_t **argv) {
|
|||||||
errorChain(systemInit());
|
errorChain(systemInit());
|
||||||
errorChain(inputInit());
|
errorChain(inputInit());
|
||||||
errorChain(assetInit());
|
errorChain(assetInit());
|
||||||
// errorChain(saveInit());
|
errorChain(saveInit());
|
||||||
errorChain(localeManagerInit());
|
errorChain(localeManagerInit());
|
||||||
errorChain(displayInit());
|
errorChain(displayInit());
|
||||||
|
errorChain(audioInit());
|
||||||
errorChain(uiInit());
|
errorChain(uiInit());
|
||||||
errorChain(rpgInit());
|
errorChain(rpgInit());
|
||||||
|
#ifdef DUSK_NETWORK
|
||||||
errorChain(networkInit());
|
errorChain(networkInit());
|
||||||
|
#endif
|
||||||
errorChain(sceneInit());
|
errorChain(sceneInit());
|
||||||
|
|
||||||
|
int16_t *toneSamples = (int16_t *) AUDIO_TEST_TONE;
|
||||||
|
for(uint32_t i = 0; i < AUDIO_TEST_TONE_SAMPLES; i++) {
|
||||||
|
float_t t = (float_t) i / AUDIO_TEST_TONE_SAMPLE_RATE;
|
||||||
|
toneSamples[i] = (int16_t) (
|
||||||
|
sinf(2.0f * MATH_PI * AUDIO_TEST_TONE_FREQUENCY * t) * INT16_MAX
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
audiostream_t *stream = audioAquireStream();
|
||||||
|
errorChain(audioStreamInit(stream));
|
||||||
|
errorChain(audioStreamPcmInit(
|
||||||
|
stream, AUDIO_TEST_TONE, AUDIO_TEST_TONE_SIZE,
|
||||||
|
AUDIO_TEST_TONE_SAMPLE_RATE, 1
|
||||||
|
));
|
||||||
|
stream->onEnd = engineTestToneOnEnd;
|
||||||
|
stream->onLoop = engineTestToneOnLoop;
|
||||||
|
audioStreamSetLooping(stream, true);
|
||||||
|
audioStreamPlay(stream);
|
||||||
|
|
||||||
consolePrint("Engine initialized");
|
consolePrint("Engine initialized");
|
||||||
|
|
||||||
#ifdef DUSK_ASSERTIONS_FAKED
|
#ifdef DUSK_ASSERTIONS_FAKED
|
||||||
@@ -53,18 +100,21 @@ errorret_t engineInit(const int32_t argc, const char_t **argv) {
|
|||||||
consolePrint("Assertions real");
|
consolePrint("Assertions real");
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
sceneSet(SCENE_TYPE_OVERWORLD);
|
sceneSet(SCENE_TYPE_INITIAL);
|
||||||
|
|
||||||
|
|
||||||
errorOk();
|
errorOk();
|
||||||
}
|
}
|
||||||
|
|
||||||
errorret_t engineUpdate(void) {
|
errorret_t engineUpdate(void) {
|
||||||
// Order here is important.
|
// Order here is important.
|
||||||
|
#ifdef DUSK_NETWORK
|
||||||
errorChain(networkUpdate());
|
errorChain(networkUpdate());
|
||||||
|
#endif
|
||||||
|
errorChain(saveUpdate());
|
||||||
timeUpdate();
|
timeUpdate();
|
||||||
inputUpdate();
|
inputUpdate();
|
||||||
consoleUpdate();
|
consoleUpdate();
|
||||||
|
errorChain(audioUpdate());
|
||||||
errorChain(rpgUpdate());
|
errorChain(rpgUpdate());
|
||||||
errorChain(sceneUpdate());
|
errorChain(sceneUpdate());
|
||||||
errorChain(assetUpdate());
|
errorChain(assetUpdate());
|
||||||
@@ -82,13 +132,16 @@ void engineExit(void) {
|
|||||||
|
|
||||||
errorret_t engineDispose(void) {
|
errorret_t engineDispose(void) {
|
||||||
errorChain(sceneDispose());
|
errorChain(sceneDispose());
|
||||||
|
#ifdef DUSK_NETWORK
|
||||||
errorChain(networkDispose());
|
errorChain(networkDispose());
|
||||||
|
#endif
|
||||||
errorChain(rpgDispose());
|
errorChain(rpgDispose());
|
||||||
localeManagerDispose();
|
localeManagerDispose();
|
||||||
errorChain(uiDispose());
|
errorChain(uiDispose());
|
||||||
|
errorChain(audioDispose());
|
||||||
consoleDispose();
|
consoleDispose();
|
||||||
errorChain(displayDispose());
|
errorChain(displayDispose());
|
||||||
// errorChain(saveDispose());
|
errorChain(saveDispose());
|
||||||
errorChain(assetDispose());
|
errorChain(assetDispose());
|
||||||
|
|
||||||
errorOk();
|
errorOk();
|
||||||
|
|||||||
@@ -1,76 +0,0 @@
|
|||||||
/**
|
|
||||||
* Copyright (c) 2026 Dominic Masters
|
|
||||||
*
|
|
||||||
* This software is released under the MIT License.
|
|
||||||
* https://opensource.org/licenses/MIT
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "event.h"
|
|
||||||
#include "assert/assert.h"
|
|
||||||
#include "util/memory.h"
|
|
||||||
|
|
||||||
void eventInit(
|
|
||||||
event_t *event,
|
|
||||||
eventcallback_t *callbacks,
|
|
||||||
void **users,
|
|
||||||
size_t size
|
|
||||||
) {
|
|
||||||
assertNotNull(event, "event must not be NULL");
|
|
||||||
assertNotNull((void *)callbacks, "callbacks must not be NULL");
|
|
||||||
assertTrue(size > 0, "size must be greater than 0");
|
|
||||||
|
|
||||||
event->callbacks = callbacks;
|
|
||||||
event->users = users;
|
|
||||||
event->size = size;
|
|
||||||
event->count = 0;
|
|
||||||
memoryZero(callbacks, sizeof(eventcallback_t) * size);
|
|
||||||
if(users) memoryZero(users, sizeof(void *) * size);
|
|
||||||
}
|
|
||||||
|
|
||||||
void eventSubscribe(event_t *event, eventcallback_t callback, void *user) {
|
|
||||||
assertNotNull(event, "event must not be NULL");
|
|
||||||
assertNotNull(callback, "callback must not be NULL");
|
|
||||||
|
|
||||||
// Ensure callback isn't already susbcribed
|
|
||||||
for(uint32_t i = 0; i < event->count; i++) {
|
|
||||||
if(event->callbacks[i] != callback) continue;
|
|
||||||
assertUnreachable("Callback already registered, cannot subscribe twice.");
|
|
||||||
}
|
|
||||||
|
|
||||||
assertTrue(event->count < event->size, "event subscriber capacity exceeded");
|
|
||||||
|
|
||||||
event->callbacks[event->count] = callback;
|
|
||||||
if(user) {
|
|
||||||
assertNotNull(event->users, "Cannot add user pointer.");
|
|
||||||
event->users[event->count] = user;
|
|
||||||
}
|
|
||||||
event->count++;
|
|
||||||
}
|
|
||||||
|
|
||||||
void eventUnsubscribe(event_t *event, eventcallback_t callback) {
|
|
||||||
assertNotNull(event, "event must not be NULL");
|
|
||||||
assertNotNull(callback, "callback must not be NULL");
|
|
||||||
|
|
||||||
for(uint32_t i = 0; i < event->count; i++) {
|
|
||||||
if(event->callbacks[i] != callback) continue;
|
|
||||||
|
|
||||||
uint32_t last = event->count - 1;
|
|
||||||
if(i != last) {
|
|
||||||
event->callbacks[i] = event->callbacks[last];
|
|
||||||
if(event->users) event->users[i] = event->users[last];
|
|
||||||
}
|
|
||||||
event->callbacks[last] = NULL;
|
|
||||||
if(event->users) event->users[last] = NULL;
|
|
||||||
event->count--;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void eventInvoke(const event_t *event, void *params) {
|
|
||||||
assertNotNull(event, "event must not be NULL");
|
|
||||||
|
|
||||||
for(uint32_t i = 0; i < event->count; i++) {
|
|
||||||
void *u = event->users ? event->users[i] : NULL;
|
|
||||||
event->callbacks[i](params, u);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,64 +0,0 @@
|
|||||||
/**
|
|
||||||
* Copyright (c) 2026 Dominic Masters
|
|
||||||
*
|
|
||||||
* This software is released under the MIT License.
|
|
||||||
* https://opensource.org/licenses/MIT
|
|
||||||
*/
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
#include "dusk.h"
|
|
||||||
|
|
||||||
typedef void (*eventcallback_t)(void *params, void *user);
|
|
||||||
|
|
||||||
typedef struct {
|
|
||||||
eventcallback_t *callbacks;
|
|
||||||
void **users;
|
|
||||||
size_t size;
|
|
||||||
uint32_t count;
|
|
||||||
} event_t;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Initializes an event, binding it to the provided backing arrays and clearing
|
|
||||||
* all subscribers. May also be called to reset an event (re-clears subscribers
|
|
||||||
* without changing the backing arrays or size).
|
|
||||||
*
|
|
||||||
* @param event The event to initialize.
|
|
||||||
* @param callbacks Caller-owned array of at least `size` callback slots.
|
|
||||||
* @param users Array of user pointers, matching each callback, or NULL.
|
|
||||||
* @param size Capacity of both arrays, must match.
|
|
||||||
*/
|
|
||||||
void eventInit(
|
|
||||||
event_t *event,
|
|
||||||
eventcallback_t *callbacks,
|
|
||||||
void **users,
|
|
||||||
size_t size
|
|
||||||
);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Subscribes a callback to an event. The callback is invoked with params and
|
|
||||||
* the provided user pointer each time the event fires. The same (callback,
|
|
||||||
* user) pair may only be subscribed once.
|
|
||||||
*
|
|
||||||
* @param event The event to subscribe to.
|
|
||||||
* @param callback The function to call when the event fires.
|
|
||||||
* @param user Arbitrary pointer forwarded to the callback unchanged.
|
|
||||||
*/
|
|
||||||
void eventSubscribe(event_t *event, eventcallback_t callback, void *user);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Removes a previously subscribed (callback, user) pair. Does nothing if the
|
|
||||||
* pair is not currently subscribed.
|
|
||||||
*
|
|
||||||
* @param event The event to unsubscribe from.
|
|
||||||
* @param callback The callback that was passed to eventSubscribe.
|
|
||||||
*/
|
|
||||||
void eventUnsubscribe(event_t *event, eventcallback_t callback);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Invokes all subscribed callbacks, passing params and each subscriber's user
|
|
||||||
* pointer.
|
|
||||||
*
|
|
||||||
* @param event The event to invoke.
|
|
||||||
* @param params Arbitrary pointer forwarded to every callback unchanged.
|
|
||||||
*/
|
|
||||||
void eventInvoke(const event_t *event, void *params);
|
|
||||||
@@ -11,7 +11,6 @@
|
|||||||
#include "util/string.h"
|
#include "util/string.h"
|
||||||
#include "util/math.h"
|
#include "util/math.h"
|
||||||
#include "time/time.h"
|
#include "time/time.h"
|
||||||
#include "event/event.h"
|
|
||||||
|
|
||||||
input_t INPUT;
|
input_t INPUT;
|
||||||
|
|
||||||
@@ -22,20 +21,6 @@ errorret_t inputInit(void) {
|
|||||||
INPUT.actions[i].action = (inputaction_t)i;
|
INPUT.actions[i].action = (inputaction_t)i;
|
||||||
INPUT.actions[i].lastValue = 0.0f;
|
INPUT.actions[i].lastValue = 0.0f;
|
||||||
INPUT.actions[i].currentValue = 0.0f;
|
INPUT.actions[i].currentValue = 0.0f;
|
||||||
|
|
||||||
eventInit(
|
|
||||||
&INPUT.actions[i].onPressed,
|
|
||||||
INPUT.actions[i].onPressedCallbacks,
|
|
||||||
INPUT.actions[i].onPressedUsers,
|
|
||||||
INPUT_ACTION_CALLBACK_COUNT_MAX
|
|
||||||
);
|
|
||||||
|
|
||||||
eventInit(
|
|
||||||
&INPUT.actions[i].onReleased,
|
|
||||||
INPUT.actions[i].onReleasedCallbacks,
|
|
||||||
INPUT.actions[i].onReleasedUsers,
|
|
||||||
INPUT_ACTION_CALLBACK_COUNT_MAX
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef inputInitPlatform
|
#ifdef inputInitPlatform
|
||||||
@@ -106,8 +91,6 @@ void inputUpdate(void) {
|
|||||||
inputactiondata_t *act = &INPUT.actions[i];
|
inputactiondata_t *act = &INPUT.actions[i];
|
||||||
bool_t isDown = act->currentValue > 0.0f;
|
bool_t isDown = act->currentValue > 0.0f;
|
||||||
bool_t wasDown = act->lastValue > 0.0f;
|
bool_t wasDown = act->lastValue > 0.0f;
|
||||||
if(isDown && !wasDown) eventInvoke(&act->onPressed, act);
|
|
||||||
if(!isDown && wasDown) eventInvoke(&act->onReleased, act);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -10,12 +10,8 @@
|
|||||||
#include "inputbutton.h"
|
#include "inputbutton.h"
|
||||||
#include "inputaction.h"
|
#include "inputaction.h"
|
||||||
|
|
||||||
#define INPUT_LISTENER_PRESSED_MAX 16
|
|
||||||
#define INPUT_LISTENER_RELEASED_MAX INPUT_LISTENER_PRESSED_MAX
|
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
inputactiondata_t actions[INPUT_ACTION_COUNT];
|
inputactiondata_t actions[INPUT_ACTION_COUNT];
|
||||||
|
|
||||||
inputplatform_t platform;
|
inputplatform_t platform;
|
||||||
} input_t;
|
} input_t;
|
||||||
|
|
||||||
|
|||||||
@@ -8,7 +8,6 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
#include "time/time.h"
|
#include "time/time.h"
|
||||||
#include "input/inputactiondefs.h"
|
#include "input/inputactiondefs.h"
|
||||||
#include "event/event.h"
|
|
||||||
|
|
||||||
#define INPUT_ACTION_CALLBACK_COUNT_MAX 4
|
#define INPUT_ACTION_CALLBACK_COUNT_MAX 4
|
||||||
|
|
||||||
@@ -21,13 +20,6 @@ typedef struct {
|
|||||||
float_t lastDynamicValue;
|
float_t lastDynamicValue;
|
||||||
float_t currentDynamicValue;
|
float_t currentDynamicValue;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
eventcallback_t onPressedCallbacks[INPUT_ACTION_CALLBACK_COUNT_MAX];
|
|
||||||
void *onPressedUsers[INPUT_ACTION_CALLBACK_COUNT_MAX];
|
|
||||||
event_t onPressed;
|
|
||||||
eventcallback_t onReleasedCallbacks[INPUT_ACTION_CALLBACK_COUNT_MAX];
|
|
||||||
void *onReleasedUsers[INPUT_ACTION_CALLBACK_COUNT_MAX];
|
|
||||||
event_t onReleased;
|
|
||||||
} inputactiondata_t;
|
} inputactiondata_t;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -13,7 +13,31 @@ typedef struct {
|
|||||||
const char_t *file;
|
const char_t *file;
|
||||||
} localeinfo_t;
|
} localeinfo_t;
|
||||||
|
|
||||||
static const localeinfo_t LOCALE_EN_US = {
|
static const localeinfo_t LOCALE_INFO_EN_US = {
|
||||||
.name = "en-US",
|
.name = "en-US",
|
||||||
.file = "locale/en_US.po",
|
.file = "locale/en_US.po",
|
||||||
};
|
};
|
||||||
|
|
||||||
|
static const localeinfo_t LOCALE_INFO_JP_JP = {
|
||||||
|
.name = "ja-JP",
|
||||||
|
.file = "locale/jp_JP.po",
|
||||||
|
};
|
||||||
|
|
||||||
|
static const localeinfo_t LOCALE_INFO_ES_MX = {
|
||||||
|
.name = "es-MX",
|
||||||
|
.file = "locale/es_MX.po",
|
||||||
|
};
|
||||||
|
|
||||||
|
static const localeinfo_t * const LOCALE_INFO_LIST[] = {
|
||||||
|
&LOCALE_INFO_EN_US,
|
||||||
|
&LOCALE_INFO_JP_JP,
|
||||||
|
&LOCALE_INFO_ES_MX
|
||||||
|
};
|
||||||
|
|
||||||
|
#define LOCALE_INFO_LIST_COUNT ( \
|
||||||
|
sizeof(LOCALE_INFO_LIST) / sizeof(LOCALE_INFO_LIST[0]) \
|
||||||
|
)
|
||||||
|
|
||||||
|
#define LOCALE_DEFAULT LOCALE_INFO_EN_US
|
||||||
|
|
||||||
|
// EOF
|
||||||
@@ -7,13 +7,22 @@
|
|||||||
|
|
||||||
#include "localemanager.h"
|
#include "localemanager.h"
|
||||||
#include "util/memory.h"
|
#include "util/memory.h"
|
||||||
|
#include "util/string.h"
|
||||||
#include "assert/assert.h"
|
#include "assert/assert.h"
|
||||||
|
#include "ui/ui.h"
|
||||||
|
#include "system/system.h"
|
||||||
|
#include "console/console.h"
|
||||||
|
|
||||||
localemanager_t LOCALE;
|
localemanager_t LOCALE;
|
||||||
|
|
||||||
errorret_t localeManagerInit() {
|
errorret_t localeManagerInit() {
|
||||||
memoryZero(&LOCALE, sizeof(localemanager_t));
|
memoryZero(&LOCALE, sizeof(localemanager_t));
|
||||||
errorChain(localeManagerSetLocale(&LOCALE_EN_US));
|
|
||||||
|
// TODO: Set locale based on system locale.
|
||||||
|
const localeinfo_t *locale = systemGetLocale();
|
||||||
|
errorChain(localeManagerSetLocale(locale));
|
||||||
|
consolePrint("Locale set to: %s", locale->name);
|
||||||
|
|
||||||
errorOk();
|
errorOk();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -30,6 +39,9 @@ errorret_t localeManagerSetLocale(const localeinfo_t *locale) {
|
|||||||
assetEntryLock(LOCALE.entry);
|
assetEntryLock(LOCALE.entry);
|
||||||
errorChain(assetRequireLoaded(LOCALE.entry));
|
errorChain(assetRequireLoaded(LOCALE.entry));
|
||||||
|
|
||||||
|
// TODO : Trigger UI update.
|
||||||
|
errorChain(uiUpdateTranslations());
|
||||||
|
|
||||||
errorOk();
|
errorOk();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -7,7 +7,7 @@
|
|||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
#include "error/error.h"
|
#include "error/error.h"
|
||||||
#include "localemanager.h"
|
#include "locale/localemanager.h"
|
||||||
#include "locale/localeinfo.h"
|
#include "locale/localeinfo.h"
|
||||||
#include "asset/asset.h"
|
#include "asset/asset.h"
|
||||||
|
|
||||||
|
|||||||
@@ -8,10 +8,10 @@ target_sources(${DUSK_LIBRARY_TARGET_NAME}
|
|||||||
PUBLIC
|
PUBLIC
|
||||||
rpg.c
|
rpg.c
|
||||||
rpgcamera.c
|
rpgcamera.c
|
||||||
rpgtextbox.c
|
|
||||||
)
|
)
|
||||||
|
|
||||||
# Subdirs
|
# Subdirs
|
||||||
|
add_subdirectory(battle)
|
||||||
add_subdirectory(cutscene)
|
add_subdirectory(cutscene)
|
||||||
add_subdirectory(entity)
|
add_subdirectory(entity)
|
||||||
add_subdirectory(overworld)
|
add_subdirectory(overworld)
|
||||||
|
|||||||
@@ -0,0 +1,15 @@
|
|||||||
|
# Copyright (c) 2026 Dominic Masters
|
||||||
|
#
|
||||||
|
# This software is released under the MIT License.
|
||||||
|
# https://opensource.org/licenses/MIT
|
||||||
|
|
||||||
|
# Sources
|
||||||
|
target_sources(${DUSK_LIBRARY_TARGET_NAME}
|
||||||
|
PUBLIC
|
||||||
|
battle.c
|
||||||
|
battlefighter.c
|
||||||
|
party.c
|
||||||
|
)
|
||||||
|
|
||||||
|
# Subdirs
|
||||||
|
add_subdirectory(testbattle)
|
||||||
@@ -0,0 +1,326 @@
|
|||||||
|
/**
|
||||||
|
* Copyright (c) 2026 Dominic Masters
|
||||||
|
*
|
||||||
|
* This software is released under the MIT License.
|
||||||
|
* https://opensource.org/licenses/MIT
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "battle.h"
|
||||||
|
#include "assert/assert.h"
|
||||||
|
#include "util/memory.h"
|
||||||
|
#include "rpg/cutscene/cutscenesystem.h"
|
||||||
|
|
||||||
|
battle_t BATTLE;
|
||||||
|
|
||||||
|
void battleInit(void) {
|
||||||
|
memoryZero(&BATTLE, sizeof(battle_t));
|
||||||
|
for(uint8_t i = 0; i < BATTLE_FIGHTER_COUNT_MAX; i++) {
|
||||||
|
BATTLE.fighters[i].id = i;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
uint8_t battleGetAvailableFighter(void) {
|
||||||
|
for(uint8_t i = 0; i < BATTLE_FIGHTER_COUNT_MAX; i++) {
|
||||||
|
if(BATTLE.fighters[i].status == BATTLE_FIGHTER_STATUS_NULL) return i;
|
||||||
|
}
|
||||||
|
|
||||||
|
return 0xFF;
|
||||||
|
}
|
||||||
|
|
||||||
|
battlefighter_t *battleAddFighter(
|
||||||
|
const battlefighterteam_t team,
|
||||||
|
const battlefightercontroller_t controller,
|
||||||
|
const battlefighterstats_t stats,
|
||||||
|
const uint16_t healthMax,
|
||||||
|
const uint16_t mpMax
|
||||||
|
) {
|
||||||
|
const uint8_t index = battleGetAvailableFighter();
|
||||||
|
if(index == 0xFF) return NULL;
|
||||||
|
|
||||||
|
battlefighter_t *fighter = &BATTLE.fighters[index];
|
||||||
|
battleFighterInit(fighter, team, controller, stats, healthMax, mpMax);
|
||||||
|
return fighter;
|
||||||
|
}
|
||||||
|
|
||||||
|
void battleStart(
|
||||||
|
const battleencountertype_t encounterType,
|
||||||
|
const bool_t fleeAvailable
|
||||||
|
) {
|
||||||
|
assertTrue(encounterType < BATTLE_ENCOUNTER_COUNT, "Invalid encounter type");
|
||||||
|
|
||||||
|
BATTLE.encounterType = encounterType;
|
||||||
|
BATTLE.fleeAvailable = fleeAvailable;
|
||||||
|
BATTLE.result = BATTLE_RESULT_NONE;
|
||||||
|
BATTLE.round = 1;
|
||||||
|
|
||||||
|
battleSetState(BATTLE_STATE_OPENING);
|
||||||
|
}
|
||||||
|
|
||||||
|
void battleDispose(void) {
|
||||||
|
battleInit();
|
||||||
|
}
|
||||||
|
|
||||||
|
battlefighter_t *battleGetCurrentFighter(void) {
|
||||||
|
if(BATTLE.state != BATTLE_STATE_PLAYER_SELECTION) return NULL;
|
||||||
|
if(BATTLE.selectionIndex >= BATTLE.executionCount) return NULL;
|
||||||
|
return &BATTLE.fighters[BATTLE.executionOrder[BATTLE.selectionIndex]];
|
||||||
|
}
|
||||||
|
|
||||||
|
uint8_t battleGetAliveCount(const battlefighterteam_t team) {
|
||||||
|
uint8_t count = 0;
|
||||||
|
for(uint8_t i = 0; i < BATTLE_FIGHTER_COUNT_MAX; i++) {
|
||||||
|
if(BATTLE.fighters[i].team != team) continue;
|
||||||
|
if(!battleFighterIsAlive(&BATTLE.fighters[i])) continue;
|
||||||
|
count++;
|
||||||
|
}
|
||||||
|
return count;
|
||||||
|
}
|
||||||
|
|
||||||
|
void battleResolveAttack(
|
||||||
|
battlefighter_t *attacker,
|
||||||
|
battlefighter_t *defender
|
||||||
|
) {
|
||||||
|
assertNotNull(attacker, "Attacker cannot be NULL");
|
||||||
|
assertNotNull(defender, "Defender cannot be NULL");
|
||||||
|
|
||||||
|
const int32_t rawDamage =
|
||||||
|
(int32_t)attacker->stats.attack - (int32_t)defender->stats.defense;
|
||||||
|
const uint16_t damage = rawDamage > 0 ? (uint16_t)rawDamage : 1;
|
||||||
|
|
||||||
|
defender->health = damage >= defender->health ? 0 : defender->health - damage;
|
||||||
|
if(defender->health == 0) defender->status = BATTLE_FIGHTER_STATUS_DEAD;
|
||||||
|
}
|
||||||
|
|
||||||
|
battleresult_t battleCheckResult(void) {
|
||||||
|
if(BATTLE.result != BATTLE_RESULT_NONE) return BATTLE.result;
|
||||||
|
|
||||||
|
if(battleGetAliveCount(BATTLE_FIGHTER_TEAM_ALLY) == 0) {
|
||||||
|
battleSetResult(BATTLE_RESULT_LOSS);
|
||||||
|
} else if(battleGetAliveCount(BATTLE_FIGHTER_TEAM_ENEMY) == 0) {
|
||||||
|
battleSetResult(BATTLE_RESULT_WIN);
|
||||||
|
}
|
||||||
|
|
||||||
|
return BATTLE.result;
|
||||||
|
}
|
||||||
|
|
||||||
|
void battleQueueAction(
|
||||||
|
const uint8_t fighterIndex,
|
||||||
|
const battleactiontype_t type,
|
||||||
|
const uint8_t targetIndex
|
||||||
|
) {
|
||||||
|
battleaction_t *action = &BATTLE.actions[fighterIndex];
|
||||||
|
action->type = type;
|
||||||
|
action->targetIndex = targetIndex;
|
||||||
|
|
||||||
|
if(BATTLE.onActionDecided != NULL) {
|
||||||
|
BATTLE.onActionDecided(&BATTLE.fighters[fighterIndex], action);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void battlePlayerAttack(const uint8_t targetIndex) {
|
||||||
|
battlefighter_t *fighter = battleGetCurrentFighter();
|
||||||
|
if(fighter == NULL) return;
|
||||||
|
if(targetIndex >= BATTLE_FIGHTER_COUNT_MAX) return;
|
||||||
|
if(!battleFighterIsAlive(&BATTLE.fighters[targetIndex])) return;
|
||||||
|
|
||||||
|
battleQueueAction(fighter->id, BATTLE_ACTION_ATTACK, targetIndex);
|
||||||
|
BATTLE.selectionIndex++;
|
||||||
|
battleAdvanceSelection();
|
||||||
|
}
|
||||||
|
|
||||||
|
void battlePlayerFlee(void) {
|
||||||
|
battlefighter_t *fighter = battleGetCurrentFighter();
|
||||||
|
if(fighter == NULL) return;
|
||||||
|
if(!BATTLE.fleeAvailable) return;
|
||||||
|
|
||||||
|
battleSetResult(BATTLE_RESULT_FLED);
|
||||||
|
}
|
||||||
|
|
||||||
|
void battleUpdate(void) {
|
||||||
|
if(BATTLE.state == BATTLE_STATE_NONE) return;
|
||||||
|
if(BATTLE.state == BATTLE_STATE_ENDED) return;
|
||||||
|
if(CUTSCENE_SYSTEM.pause & CUTSCENE_PAUSE_BATTLE) return;
|
||||||
|
|
||||||
|
switch(BATTLE.state) {
|
||||||
|
case BATTLE_STATE_OPENING:
|
||||||
|
battleSetState(BATTLE_STATE_PRE_ROUND);
|
||||||
|
break;
|
||||||
|
|
||||||
|
case BATTLE_STATE_PRE_ROUND:
|
||||||
|
battleUpdatePreRound();
|
||||||
|
break;
|
||||||
|
|
||||||
|
case BATTLE_STATE_AI_SELECTION:
|
||||||
|
battleUpdateAiSelection();
|
||||||
|
break;
|
||||||
|
|
||||||
|
case BATTLE_STATE_MOVES_EXECUTING:
|
||||||
|
battleUpdateMovesExecuting();
|
||||||
|
break;
|
||||||
|
|
||||||
|
case BATTLE_STATE_POST_ROUND:
|
||||||
|
battleUpdatePostRound();
|
||||||
|
break;
|
||||||
|
|
||||||
|
default:
|
||||||
|
// BATTLE_STATE_PLAYER_SELECTION: waits on battlePlayerAttack/Flee.
|
||||||
|
// BATTLE_STATE_NONE/ENDED: handled above.
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void battleBuildExecutionOrder(const bool_t applyEncounterBias) {
|
||||||
|
BATTLE.executionCount = 0;
|
||||||
|
for(uint8_t i = 0; i < BATTLE_FIGHTER_COUNT_MAX; i++) {
|
||||||
|
if(!battleFighterIsAlive(&BATTLE.fighters[i])) continue;
|
||||||
|
BATTLE.executionOrder[BATTLE.executionCount++] = i;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Insertion sort by speed descending -- fine for BATTLE_FIGHTER_COUNT_MAX.
|
||||||
|
for(uint8_t i = 1; i < BATTLE.executionCount; i++) {
|
||||||
|
const uint8_t key = BATTLE.executionOrder[i];
|
||||||
|
const uint16_t keySpeed = BATTLE.fighters[key].stats.speed;
|
||||||
|
|
||||||
|
int8_t j = (int8_t)i - 1;
|
||||||
|
while(
|
||||||
|
j >= 0 &&
|
||||||
|
BATTLE.fighters[BATTLE.executionOrder[j]].stats.speed < keySpeed
|
||||||
|
) {
|
||||||
|
BATTLE.executionOrder[j + 1] = BATTLE.executionOrder[j];
|
||||||
|
j--;
|
||||||
|
}
|
||||||
|
BATTLE.executionOrder[j + 1] = key;
|
||||||
|
}
|
||||||
|
|
||||||
|
if(!applyEncounterBias) return;
|
||||||
|
|
||||||
|
if(BATTLE.encounterType == BATTLE_ENCOUNTER_PLAYER_ADVANTAGE) {
|
||||||
|
battleMoveTeamFirst(BATTLE_FIGHTER_TEAM_ALLY);
|
||||||
|
} else if(BATTLE.encounterType == BATTLE_ENCOUNTER_BACK_ATTACK) {
|
||||||
|
battleMoveTeamFirst(BATTLE_FIGHTER_TEAM_ENEMY);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void battleMoveTeamFirst(const battlefighterteam_t team) {
|
||||||
|
uint8_t sorted[BATTLE_FIGHTER_COUNT_MAX];
|
||||||
|
uint8_t count = 0;
|
||||||
|
|
||||||
|
for(uint8_t i = 0; i < BATTLE.executionCount; i++) {
|
||||||
|
if(BATTLE.fighters[BATTLE.executionOrder[i]].team != team) continue;
|
||||||
|
sorted[count++] = BATTLE.executionOrder[i];
|
||||||
|
}
|
||||||
|
for(uint8_t i = 0; i < BATTLE.executionCount; i++) {
|
||||||
|
if(BATTLE.fighters[BATTLE.executionOrder[i]].team == team) continue;
|
||||||
|
sorted[count++] = BATTLE.executionOrder[i];
|
||||||
|
}
|
||||||
|
|
||||||
|
memoryCopy(BATTLE.executionOrder, sorted, sizeof(uint8_t) * BATTLE.executionCount);
|
||||||
|
}
|
||||||
|
|
||||||
|
battlefighter_t *battleAIChooseTarget(const battlefighter_t *fighter) {
|
||||||
|
const battlefighterteam_t enemyTeam =
|
||||||
|
fighter->team == BATTLE_FIGHTER_TEAM_ALLY ?
|
||||||
|
BATTLE_FIGHTER_TEAM_ENEMY : BATTLE_FIGHTER_TEAM_ALLY;
|
||||||
|
|
||||||
|
battlefighter_t *weakest = NULL;
|
||||||
|
for(uint8_t i = 0; i < BATTLE_FIGHTER_COUNT_MAX; i++) {
|
||||||
|
battlefighter_t *candidate = &BATTLE.fighters[i];
|
||||||
|
if(candidate->team != enemyTeam) continue;
|
||||||
|
if(!battleFighterIsAlive(candidate)) continue;
|
||||||
|
if(weakest == NULL || candidate->health < weakest->health) {
|
||||||
|
weakest = candidate;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return weakest;
|
||||||
|
}
|
||||||
|
|
||||||
|
void battleSetState(const battlestate_t next) {
|
||||||
|
const battlestate_t previous = BATTLE.state;
|
||||||
|
BATTLE.state = next;
|
||||||
|
if(BATTLE.onStateChanged != NULL) BATTLE.onStateChanged(previous, next);
|
||||||
|
}
|
||||||
|
|
||||||
|
void battleSetResult(const battleresult_t result) {
|
||||||
|
BATTLE.result = result;
|
||||||
|
battleSetState(BATTLE_STATE_ENDED);
|
||||||
|
}
|
||||||
|
|
||||||
|
bool_t battleFighterNeedsDecision(
|
||||||
|
const uint8_t fighterIndex,
|
||||||
|
const battlefightercontroller_t controller
|
||||||
|
) {
|
||||||
|
return battleFighterIsAlive(&BATTLE.fighters[fighterIndex])
|
||||||
|
&& BATTLE.fighters[fighterIndex].controller == controller
|
||||||
|
&& BATTLE.actions[fighterIndex].type == BATTLE_ACTION_NONE;
|
||||||
|
}
|
||||||
|
|
||||||
|
void battleAdvanceSelection(void) {
|
||||||
|
while(BATTLE.selectionIndex < BATTLE.executionCount) {
|
||||||
|
const uint8_t fighterIndex = BATTLE.executionOrder[BATTLE.selectionIndex];
|
||||||
|
if(
|
||||||
|
battleFighterNeedsDecision(fighterIndex, BATTLE_FIGHTER_CONTROLLER_PLAYER)
|
||||||
|
) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
BATTLE.selectionIndex++;
|
||||||
|
}
|
||||||
|
|
||||||
|
battleSetState(BATTLE_STATE_AI_SELECTION);
|
||||||
|
}
|
||||||
|
|
||||||
|
void battleUpdatePreRound(void) {
|
||||||
|
// No need to clear BATTLE.actions here: every living fighter's action is
|
||||||
|
// unconditionally reset to BATTLE_ACTION_NONE as it's processed in
|
||||||
|
// battleUpdateMovesExecuting, and round 1 starts pre-zeroed by
|
||||||
|
// battleInit(). Clearing it here would also wipe out any action a
|
||||||
|
// cutscene force-queued while parked at BATTLE_STATE_PRE_ROUND.
|
||||||
|
battleBuildExecutionOrder(BATTLE.round == 1);
|
||||||
|
|
||||||
|
BATTLE.selectionIndex = 0;
|
||||||
|
battleSetState(BATTLE_STATE_PLAYER_SELECTION);
|
||||||
|
battleAdvanceSelection();
|
||||||
|
}
|
||||||
|
|
||||||
|
void battleUpdateAiSelection(void) {
|
||||||
|
for(uint8_t i = 0; i < BATTLE.executionCount; i++) {
|
||||||
|
const uint8_t fighterIndex = BATTLE.executionOrder[i];
|
||||||
|
if(
|
||||||
|
!battleFighterNeedsDecision(fighterIndex, BATTLE_FIGHTER_CONTROLLER_AI)
|
||||||
|
) continue;
|
||||||
|
|
||||||
|
battlefighter_t *target =
|
||||||
|
battleAIChooseTarget(&BATTLE.fighters[fighterIndex]);
|
||||||
|
if(target == NULL) continue;
|
||||||
|
|
||||||
|
battleQueueAction(fighterIndex, BATTLE_ACTION_ATTACK, target->id);
|
||||||
|
}
|
||||||
|
|
||||||
|
BATTLE.executionIndex = 0;
|
||||||
|
battleSetState(BATTLE_STATE_MOVES_EXECUTING);
|
||||||
|
}
|
||||||
|
|
||||||
|
void battleUpdateMovesExecuting(void) {
|
||||||
|
if(BATTLE.executionIndex >= BATTLE.executionCount) {
|
||||||
|
battleSetState(BATTLE_STATE_POST_ROUND);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const uint8_t fighterIndex = BATTLE.executionOrder[BATTLE.executionIndex++];
|
||||||
|
battlefighter_t *fighter = &BATTLE.fighters[fighterIndex];
|
||||||
|
if(!battleFighterIsAlive(fighter)) return;
|
||||||
|
|
||||||
|
battleaction_t *action = &BATTLE.actions[fighterIndex];
|
||||||
|
if(action->type == BATTLE_ACTION_ATTACK) {
|
||||||
|
battlefighter_t *target = &BATTLE.fighters[action->targetIndex];
|
||||||
|
if(battleFighterIsAlive(target)) battleResolveAttack(fighter, target);
|
||||||
|
}
|
||||||
|
action->type = BATTLE_ACTION_NONE;
|
||||||
|
|
||||||
|
battleCheckResult();
|
||||||
|
}
|
||||||
|
|
||||||
|
void battleUpdatePostRound(void) {
|
||||||
|
BATTLE.round++;
|
||||||
|
battleSetState(BATTLE_STATE_PRE_ROUND);
|
||||||
|
}
|
||||||
@@ -0,0 +1,313 @@
|
|||||||
|
/**
|
||||||
|
* Copyright (c) 2026 Dominic Masters
|
||||||
|
*
|
||||||
|
* This software is released under the MIT License.
|
||||||
|
* https://opensource.org/licenses/MIT
|
||||||
|
*/
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
#include "battlefighter.h"
|
||||||
|
|
||||||
|
#define BATTLE_FIGHTER_COUNT_MAX 8
|
||||||
|
|
||||||
|
typedef enum {
|
||||||
|
BATTLE_ENCOUNTER_REGULAR,
|
||||||
|
BATTLE_ENCOUNTER_PLAYER_ADVANTAGE,
|
||||||
|
BATTLE_ENCOUNTER_BACK_ATTACK,
|
||||||
|
|
||||||
|
BATTLE_ENCOUNTER_COUNT
|
||||||
|
} battleencountertype_t;
|
||||||
|
|
||||||
|
typedef enum {
|
||||||
|
BATTLE_RESULT_NONE,
|
||||||
|
BATTLE_RESULT_WIN,
|
||||||
|
BATTLE_RESULT_LOSS,
|
||||||
|
BATTLE_RESULT_FLED,
|
||||||
|
|
||||||
|
BATTLE_RESULT_COUNT
|
||||||
|
} battleresult_t;
|
||||||
|
|
||||||
|
// Where BATTLE currently is within a round. A cutscene can pause progression
|
||||||
|
// (CUTSCENE_PAUSE_BATTLE) and use CUTSCENE_BATTLE_WAIT_STATE to synchronize
|
||||||
|
// with any of these, or CUTSCENE_BATTLE_FORCE_ACTION to decide a fighter's
|
||||||
|
// action ahead of PLAYER_SELECTION/AI_SELECTION reaching them.
|
||||||
|
typedef enum {
|
||||||
|
BATTLE_STATE_NONE, // Battle inactive.
|
||||||
|
|
||||||
|
BATTLE_STATE_OPENING, // Entered once by battleStart().
|
||||||
|
BATTLE_STATE_PRE_ROUND, // Rebuilds execution order, clears the action queue.
|
||||||
|
BATTLE_STATE_PLAYER_SELECTION, // Waits on battlePlayerAttack/Flee.
|
||||||
|
BATTLE_STATE_AI_SELECTION, // Auto-queues every undecided AI fighter.
|
||||||
|
BATTLE_STATE_MOVES_EXECUTING, // Resolves one queued action per update.
|
||||||
|
BATTLE_STATE_POST_ROUND, // Round wrap-up; loops back to PRE_ROUND.
|
||||||
|
|
||||||
|
BATTLE_STATE_ENDED, // Terminal for WIN/LOSS/FLED alike -- see BATTLE.result.
|
||||||
|
|
||||||
|
BATTLE_STATE_COUNT
|
||||||
|
} battlestate_t;
|
||||||
|
|
||||||
|
typedef enum {
|
||||||
|
BATTLE_ACTION_NONE, // No action decided yet for this fighter this round.
|
||||||
|
BATTLE_ACTION_ATTACK,
|
||||||
|
|
||||||
|
BATTLE_ACTION_COUNT
|
||||||
|
} battleactiontype_t;
|
||||||
|
|
||||||
|
typedef struct {
|
||||||
|
battleactiontype_t type;
|
||||||
|
uint8_t targetIndex; // Meaningful for BATTLE_ACTION_ATTACK.
|
||||||
|
} battleaction_t;
|
||||||
|
|
||||||
|
typedef void (*battlestatechangedcallback_t)(
|
||||||
|
const battlestate_t previous,
|
||||||
|
const battlestate_t next
|
||||||
|
);
|
||||||
|
|
||||||
|
typedef void (*battleactiondecidedcallback_t)(
|
||||||
|
const battlefighter_t *fighter,
|
||||||
|
const battleaction_t *action
|
||||||
|
);
|
||||||
|
|
||||||
|
typedef struct {
|
||||||
|
battlestate_t state;
|
||||||
|
battlefighter_t fighters[BATTLE_FIGHTER_COUNT_MAX];
|
||||||
|
battleaction_t actions[BATTLE_FIGHTER_COUNT_MAX];
|
||||||
|
|
||||||
|
battleencountertype_t encounterType;
|
||||||
|
bool_t fleeAvailable;
|
||||||
|
battleresult_t result;
|
||||||
|
|
||||||
|
// Fighter indices (into fighters[]), sorted for the current round.
|
||||||
|
uint8_t executionOrder[BATTLE_FIGHTER_COUNT_MAX];
|
||||||
|
uint8_t executionCount;
|
||||||
|
uint8_t executionIndex;
|
||||||
|
uint16_t round;
|
||||||
|
|
||||||
|
// Cursor into executionOrder used by BATTLE_STATE_PLAYER_SELECTION to find
|
||||||
|
// the next player-controlled fighter that still needs a decision.
|
||||||
|
uint8_t selectionIndex;
|
||||||
|
|
||||||
|
battlestatechangedcallback_t onStateChanged;
|
||||||
|
battleactiondecidedcallback_t onActionDecided;
|
||||||
|
} battle_t;
|
||||||
|
|
||||||
|
extern battle_t BATTLE;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Initializes the battle system. Marks it as inactive with no fighters.
|
||||||
|
*/
|
||||||
|
void battleInit(void);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets an available (unused) fighter slot index.
|
||||||
|
*
|
||||||
|
* @return The index of an available fighter slot, or 0xFF if none are
|
||||||
|
* available.
|
||||||
|
*/
|
||||||
|
uint8_t battleGetAvailableFighter(void);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Adds a fighter to the battle in the next available slot.
|
||||||
|
*
|
||||||
|
* @param team The team the fighter belongs to.
|
||||||
|
* @param controller Who makes decisions for the fighter.
|
||||||
|
* @param stats The fighter's base combat stats.
|
||||||
|
* @param healthMax The fighter's maximum health.
|
||||||
|
* @param mpMax The fighter's maximum mp.
|
||||||
|
* @return Pointer to the newly added fighter, or NULL if the battle is
|
||||||
|
* already full.
|
||||||
|
*/
|
||||||
|
battlefighter_t *battleAddFighter(
|
||||||
|
const battlefighterteam_t team,
|
||||||
|
const battlefightercontroller_t controller,
|
||||||
|
const battlefighterstats_t stats,
|
||||||
|
const uint16_t healthMax,
|
||||||
|
const uint16_t mpMax
|
||||||
|
);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Starts the battle: enters BATTLE_STATE_OPENING and marks the battle
|
||||||
|
* active. Call once every fighter has been added via battleAddFighter.
|
||||||
|
*
|
||||||
|
* @param encounterType Determines the opening round's execution order.
|
||||||
|
* @param fleeAvailable Whether the party may attempt to flee this battle.
|
||||||
|
*/
|
||||||
|
void battleStart(
|
||||||
|
const battleencountertype_t encounterType,
|
||||||
|
const bool_t fleeAvailable
|
||||||
|
);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Disposes of the battle, clearing all fighters and marking it inactive.
|
||||||
|
*/
|
||||||
|
void battleDispose(void);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns the fighter currently awaiting a player decision.
|
||||||
|
*
|
||||||
|
* @return Pointer to the fighter awaiting a decision, or NULL if the battle
|
||||||
|
* isn't in BATTLE_STATE_PLAYER_SELECTION or every player-controlled
|
||||||
|
* fighter has already decided.
|
||||||
|
*/
|
||||||
|
battlefighter_t *battleGetCurrentFighter(void);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns the number of living fighters on a team.
|
||||||
|
*
|
||||||
|
* @param team The team to count.
|
||||||
|
* @return Count of living fighters on that team.
|
||||||
|
*/
|
||||||
|
uint8_t battleGetAliveCount(const battlefighterteam_t team);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Resolves a physical attack from attacker onto defender: damage is the
|
||||||
|
* attacker's attack stat minus the defender's defense stat (minimum 1),
|
||||||
|
* subtracted from the defender's health. The defender is marked dead
|
||||||
|
* once health reaches 0.
|
||||||
|
*
|
||||||
|
* @param attacker The attacking fighter.
|
||||||
|
* @param defender The defending fighter.
|
||||||
|
*/
|
||||||
|
void battleResolveAttack(
|
||||||
|
battlefighter_t *attacker,
|
||||||
|
battlefighter_t *defender
|
||||||
|
);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Checks whether the battle has been won or lost, transitioning to
|
||||||
|
* BATTLE_STATE_ENDED and updating BATTLE.result if so. Does nothing if a
|
||||||
|
* result has already been set (e.g. by a successful flee).
|
||||||
|
*
|
||||||
|
* @return The battle's current result.
|
||||||
|
*/
|
||||||
|
battleresult_t battleCheckResult(void);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Queues an action for a fighter to perform once BATTLE_STATE_MOVES_EXECUTING
|
||||||
|
* reaches them this round, overwriting any action already queued for that
|
||||||
|
* fighter. Fires BATTLE.onActionDecided.
|
||||||
|
*
|
||||||
|
* @param fighterIndex Index into BATTLE.fighters of the deciding fighter.
|
||||||
|
* @param type The type of action to perform.
|
||||||
|
* @param targetIndex Index into BATTLE.fighters of the target, meaningful
|
||||||
|
* for BATTLE_ACTION_ATTACK.
|
||||||
|
*/
|
||||||
|
void battleQueueAction(
|
||||||
|
const uint8_t fighterIndex,
|
||||||
|
const battleactiontype_t type,
|
||||||
|
const uint8_t targetIndex
|
||||||
|
);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Submits the currently-selecting fighter's attack against a target, if the
|
||||||
|
* battle is in BATTLE_STATE_PLAYER_SELECTION and awaiting a decision.
|
||||||
|
* Queues the action and advances the selection cursor.
|
||||||
|
*
|
||||||
|
* @param targetIndex Index into BATTLE.fighters of the target.
|
||||||
|
*/
|
||||||
|
void battlePlayerAttack(const uint8_t targetIndex);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Submits a flee attempt for the currently-selecting fighter, if the battle
|
||||||
|
* is in BATTLE_STATE_PLAYER_SELECTION and fleeing is available for this
|
||||||
|
* battle. Always succeeds, ending the battle with BATTLE_RESULT_FLED.
|
||||||
|
*/
|
||||||
|
void battlePlayerFlee(void);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Updates the battle simulation for one frame, dispatching on BATTLE.state.
|
||||||
|
* No-op if the battle isn't active, has already ended, or
|
||||||
|
* CUTSCENE_PAUSE_BATTLE is set.
|
||||||
|
*/
|
||||||
|
void battleUpdate(void);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Rebuilds BATTLE.executionOrder/executionCount from every currently living
|
||||||
|
* fighter, sorted by speed descending.
|
||||||
|
*
|
||||||
|
* @param applyEncounterBias If true, reorders the freshly speed-sorted
|
||||||
|
* queue so BATTLE.encounterType's favoured team goes first (used only
|
||||||
|
* for the opening round).
|
||||||
|
*/
|
||||||
|
void battleBuildExecutionOrder(const bool_t applyEncounterBias);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Stably partitions BATTLE.executionOrder so every fighter on the given team
|
||||||
|
* comes first, preserving each side's relative (speed-sorted) order.
|
||||||
|
*
|
||||||
|
* @param team The team to move to the front of the execution order.
|
||||||
|
*/
|
||||||
|
void battleMoveTeamFirst(const battlefighterteam_t team);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Picks an AI target for fighter: the lowest-health living fighter on
|
||||||
|
* the opposing team.
|
||||||
|
*
|
||||||
|
* @param fighter The AI-controlled fighter choosing a target.
|
||||||
|
* @return The chosen target, or NULL if the opposing team has no
|
||||||
|
* living fighters.
|
||||||
|
*/
|
||||||
|
battlefighter_t *battleAIChooseTarget(const battlefighter_t *fighter);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sets BATTLE.state and fires BATTLE.onStateChanged with the previous and
|
||||||
|
* new state.
|
||||||
|
*
|
||||||
|
* @param next The state to transition to.
|
||||||
|
*/
|
||||||
|
void battleSetState(const battlestate_t next);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sets BATTLE.result and transitions to BATTLE_STATE_ENDED.
|
||||||
|
*
|
||||||
|
* @param result The result to end the battle with.
|
||||||
|
*/
|
||||||
|
void battleSetResult(const battleresult_t result);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Checks whether a fighter is a live, undecided candidate for the given
|
||||||
|
* controller -- i.e. whether PLAYER_SELECTION or AI_SELECTION should still
|
||||||
|
* be deciding an action for it this round.
|
||||||
|
*
|
||||||
|
* @param fighterIndex Index into BATTLE.fighters to check.
|
||||||
|
* @param controller The controller PLAYER_SELECTION/AI_SELECTION is
|
||||||
|
* currently deciding for.
|
||||||
|
* @return True if the fighter is alive, matches controller, and has no
|
||||||
|
* action queued yet.
|
||||||
|
*/
|
||||||
|
bool_t battleFighterNeedsDecision(
|
||||||
|
const uint8_t fighterIndex,
|
||||||
|
const battlefightercontroller_t controller
|
||||||
|
);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Advances BATTLE.selectionIndex to the next player-controlled fighter that
|
||||||
|
* still needs a decision, or transitions to BATTLE_STATE_AI_SELECTION once
|
||||||
|
* none remain.
|
||||||
|
*/
|
||||||
|
void battleAdvanceSelection(void);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Handles BATTLE_STATE_PRE_ROUND: rebuilds the execution order and moves on
|
||||||
|
* to BATTLE_STATE_PLAYER_SELECTION, positioning the selection cursor.
|
||||||
|
*/
|
||||||
|
void battleUpdatePreRound(void);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Handles BATTLE_STATE_AI_SELECTION: queues an attack for every undecided
|
||||||
|
* AI-controlled fighter, then moves on to BATTLE_STATE_MOVES_EXECUTING.
|
||||||
|
*/
|
||||||
|
void battleUpdateAiSelection(void);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Handles BATTLE_STATE_MOVES_EXECUTING: resolves one queued action from
|
||||||
|
* BATTLE.executionOrder per call, or transitions to BATTLE_STATE_POST_ROUND
|
||||||
|
* once every fighter this round has been processed.
|
||||||
|
*/
|
||||||
|
void battleUpdateMovesExecuting(void);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Handles BATTLE_STATE_POST_ROUND: advances BATTLE.round and transitions
|
||||||
|
* back to BATTLE_STATE_PRE_ROUND.
|
||||||
|
*/
|
||||||
|
void battleUpdatePostRound(void);
|
||||||
@@ -0,0 +1,43 @@
|
|||||||
|
/**
|
||||||
|
* Copyright (c) 2026 Dominic Masters
|
||||||
|
*
|
||||||
|
* This software is released under the MIT License.
|
||||||
|
* https://opensource.org/licenses/MIT
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "battlefighter.h"
|
||||||
|
#include "assert/assert.h"
|
||||||
|
#include "util/memory.h"
|
||||||
|
|
||||||
|
void battleFighterInit(
|
||||||
|
battlefighter_t *fighter,
|
||||||
|
const battlefighterteam_t team,
|
||||||
|
const battlefightercontroller_t controller,
|
||||||
|
const battlefighterstats_t stats,
|
||||||
|
const uint16_t healthMax,
|
||||||
|
const uint16_t mpMax
|
||||||
|
) {
|
||||||
|
assertNotNull(fighter, "Fighter pointer cannot be NULL");
|
||||||
|
assertTrue(team < BATTLE_FIGHTER_TEAM_COUNT, "Invalid fighter team");
|
||||||
|
assertTrue(
|
||||||
|
controller < BATTLE_FIGHTER_CONTROLLER_COUNT,
|
||||||
|
"Invalid fighter controller"
|
||||||
|
);
|
||||||
|
|
||||||
|
const uint8_t id = fighter->id;
|
||||||
|
memoryZero(fighter, sizeof(battlefighter_t));
|
||||||
|
fighter->id = id;
|
||||||
|
fighter->status = BATTLE_FIGHTER_STATUS_NORMAL;
|
||||||
|
fighter->team = team;
|
||||||
|
fighter->controller = controller;
|
||||||
|
fighter->stats = stats;
|
||||||
|
fighter->healthMax = healthMax;
|
||||||
|
fighter->health = healthMax;
|
||||||
|
fighter->mpMax = mpMax;
|
||||||
|
fighter->mp = mpMax;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool_t battleFighterIsAlive(const battlefighter_t *fighter) {
|
||||||
|
assertNotNull(fighter, "Fighter pointer cannot be NULL");
|
||||||
|
return fighter->status == BATTLE_FIGHTER_STATUS_NORMAL;
|
||||||
|
}
|
||||||
@@ -0,0 +1,87 @@
|
|||||||
|
/**
|
||||||
|
* Copyright (c) 2026 Dominic Masters
|
||||||
|
*
|
||||||
|
* This software is released under the MIT License.
|
||||||
|
* https://opensource.org/licenses/MIT
|
||||||
|
*/
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
#include "error/error.h"
|
||||||
|
|
||||||
|
// An empty status means the slot in BATTLE.fighters is unused.
|
||||||
|
typedef enum {
|
||||||
|
BATTLE_FIGHTER_STATUS_NULL,
|
||||||
|
|
||||||
|
BATTLE_FIGHTER_STATUS_NORMAL,
|
||||||
|
BATTLE_FIGHTER_STATUS_DEAD,
|
||||||
|
|
||||||
|
BATTLE_FIGHTER_STATUS_COUNT
|
||||||
|
} battlefighterstatus_t;
|
||||||
|
|
||||||
|
typedef enum {
|
||||||
|
BATTLE_FIGHTER_TEAM_ALLY,
|
||||||
|
BATTLE_FIGHTER_TEAM_ENEMY,
|
||||||
|
|
||||||
|
BATTLE_FIGHTER_TEAM_COUNT
|
||||||
|
} battlefighterteam_t;
|
||||||
|
|
||||||
|
typedef enum {
|
||||||
|
BATTLE_FIGHTER_CONTROLLER_PLAYER,
|
||||||
|
BATTLE_FIGHTER_CONTROLLER_AI,
|
||||||
|
|
||||||
|
BATTLE_FIGHTER_CONTROLLER_COUNT
|
||||||
|
} battlefightercontroller_t;
|
||||||
|
|
||||||
|
// Base combat stats, kept separate from the resource pools (health/mp) on
|
||||||
|
// battlefighter_t so that equipment/buffs can later modify them without
|
||||||
|
// touching current health/mp state.
|
||||||
|
typedef struct {
|
||||||
|
uint16_t attack;
|
||||||
|
uint16_t defense;
|
||||||
|
uint16_t magic;
|
||||||
|
uint16_t speed;
|
||||||
|
uint16_t luck;
|
||||||
|
} battlefighterstats_t;
|
||||||
|
|
||||||
|
typedef struct {
|
||||||
|
uint8_t id;
|
||||||
|
battlefighterstatus_t status;
|
||||||
|
battlefighterteam_t team;
|
||||||
|
battlefightercontroller_t controller;
|
||||||
|
|
||||||
|
uint16_t health;
|
||||||
|
uint16_t healthMax;
|
||||||
|
uint16_t mp;
|
||||||
|
uint16_t mpMax;
|
||||||
|
|
||||||
|
battlefighterstats_t stats;
|
||||||
|
} battlefighter_t;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Initializes a battle fighter in place, filling health/mp to their maximum
|
||||||
|
* values and setting its status to normal.
|
||||||
|
*
|
||||||
|
* @param fighter Pointer to the fighter to initialize.
|
||||||
|
* @param team The team the fighter belongs to.
|
||||||
|
* @param controller Who makes decisions for the fighter.
|
||||||
|
* @param stats The fighter's base combat stats.
|
||||||
|
* @param healthMax The fighter's maximum health.
|
||||||
|
* @param mpMax The fighter's maximum mp.
|
||||||
|
*/
|
||||||
|
void battleFighterInit(
|
||||||
|
battlefighter_t *fighter,
|
||||||
|
const battlefighterteam_t team,
|
||||||
|
const battlefightercontroller_t controller,
|
||||||
|
const battlefighterstats_t stats,
|
||||||
|
const uint16_t healthMax,
|
||||||
|
const uint16_t mpMax
|
||||||
|
);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns true if the fighter is in a state where it can still act (i.e.
|
||||||
|
* is not dead).
|
||||||
|
*
|
||||||
|
* @param fighter Pointer to the fighter to check.
|
||||||
|
* @returns True if the fighter can act.
|
||||||
|
*/
|
||||||
|
bool_t battleFighterIsAlive(const battlefighter_t *fighter);
|
||||||
@@ -0,0 +1,71 @@
|
|||||||
|
/**
|
||||||
|
* Copyright (c) 2026 Dominic Masters
|
||||||
|
*
|
||||||
|
* This software is released under the MIT License.
|
||||||
|
* https://opensource.org/licenses/MIT
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "party.h"
|
||||||
|
#include "assert/assert.h"
|
||||||
|
#include "util/memory.h"
|
||||||
|
|
||||||
|
party_t PARTY;
|
||||||
|
|
||||||
|
void partyInit(void) {
|
||||||
|
memoryZero(&PARTY, sizeof(party_t));
|
||||||
|
for(uint8_t i = 0; i < PARTY_MEMBER_COUNT_MAX; i++) {
|
||||||
|
PARTY.members[i].id = i;
|
||||||
|
}
|
||||||
|
for(uint8_t i = 0; i < PARTY_ACTIVE_SIZE_MAX; i++) {
|
||||||
|
PARTY.order[i] = PARTY_ORDER_EMPTY;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
uint8_t partyGetAvailableMember(void) {
|
||||||
|
for(uint8_t i = 0; i < PARTY_MEMBER_COUNT_MAX; i++) {
|
||||||
|
if(PARTY.members[i].status == BATTLE_FIGHTER_STATUS_NULL) return i;
|
||||||
|
}
|
||||||
|
|
||||||
|
return 0xFF;
|
||||||
|
}
|
||||||
|
|
||||||
|
battlefighter_t *partyAddMember(
|
||||||
|
const battlefighterstats_t stats,
|
||||||
|
const uint16_t healthMax,
|
||||||
|
const uint16_t mpMax
|
||||||
|
) {
|
||||||
|
const uint8_t index = partyGetAvailableMember();
|
||||||
|
if(index == 0xFF) return NULL;
|
||||||
|
|
||||||
|
battlefighter_t *member = &PARTY.members[index];
|
||||||
|
battleFighterInit(
|
||||||
|
member, BATTLE_FIGHTER_TEAM_ALLY, BATTLE_FIGHTER_CONTROLLER_PLAYER,
|
||||||
|
stats, healthMax, mpMax
|
||||||
|
);
|
||||||
|
|
||||||
|
for(uint8_t i = 0; i < PARTY_ACTIVE_SIZE_MAX; i++) {
|
||||||
|
if(PARTY.order[i] != PARTY_ORDER_EMPTY) continue;
|
||||||
|
PARTY.order[i] = index;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
return member;
|
||||||
|
}
|
||||||
|
|
||||||
|
battlefighter_t *partyGetOrderMember(const uint8_t slot) {
|
||||||
|
assertTrue(slot < PARTY_ACTIVE_SIZE_MAX, "Invalid party order slot");
|
||||||
|
|
||||||
|
const uint8_t index = PARTY.order[slot];
|
||||||
|
if(index == PARTY_ORDER_EMPTY) return NULL;
|
||||||
|
return &PARTY.members[index];
|
||||||
|
}
|
||||||
|
|
||||||
|
void partySetOrder(const uint8_t slot, const uint8_t memberIndex) {
|
||||||
|
assertTrue(slot < PARTY_ACTIVE_SIZE_MAX, "Invalid party order slot");
|
||||||
|
assertTrue(
|
||||||
|
memberIndex == PARTY_ORDER_EMPTY || memberIndex < PARTY_MEMBER_COUNT_MAX,
|
||||||
|
"Invalid party member index"
|
||||||
|
);
|
||||||
|
|
||||||
|
PARTY.order[slot] = memberIndex;
|
||||||
|
}
|
||||||
@@ -0,0 +1,73 @@
|
|||||||
|
/**
|
||||||
|
* Copyright (c) 2026 Dominic Masters
|
||||||
|
*
|
||||||
|
* This software is released under the MIT License.
|
||||||
|
* https://opensource.org/licenses/MIT
|
||||||
|
*/
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
#include "battlefighter.h"
|
||||||
|
|
||||||
|
#define PARTY_MEMBER_COUNT_MAX 4
|
||||||
|
#define PARTY_ACTIVE_SIZE_MAX 3
|
||||||
|
#define PARTY_ORDER_EMPTY 0xFF
|
||||||
|
|
||||||
|
typedef struct {
|
||||||
|
battlefighter_t members[PARTY_MEMBER_COUNT_MAX];
|
||||||
|
|
||||||
|
// Maps an active battle slot to the roster member filling it, or
|
||||||
|
// PARTY_ORDER_EMPTY if the slot is unfilled. Only the first
|
||||||
|
// PARTY_ACTIVE_SIZE_MAX of the PARTY_MEMBER_COUNT_MAX roster members
|
||||||
|
// can be in the active lineup at once.
|
||||||
|
uint8_t order[PARTY_ACTIVE_SIZE_MAX];
|
||||||
|
} party_t;
|
||||||
|
|
||||||
|
extern party_t PARTY;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Initializes the party system with an empty roster and order.
|
||||||
|
*/
|
||||||
|
void partyInit(void);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets an available (unused) party member slot index.
|
||||||
|
*
|
||||||
|
* @return The index of an available slot, or 0xFF if the party is full.
|
||||||
|
*/
|
||||||
|
uint8_t partyGetAvailableMember(void);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Adds a member to the party roster in the next available slot. Party
|
||||||
|
* members are always allies controlled by the player. If there is a
|
||||||
|
* free active order slot, the new member is placed into it.
|
||||||
|
*
|
||||||
|
* @param stats The member's base combat stats.
|
||||||
|
* @param healthMax The member's maximum health.
|
||||||
|
* @param mpMax The member's maximum mp.
|
||||||
|
* @return Pointer to the newly added party member, or NULL if the party is
|
||||||
|
* already full.
|
||||||
|
*/
|
||||||
|
battlefighter_t *partyAddMember(
|
||||||
|
const battlefighterstats_t stats,
|
||||||
|
const uint16_t healthMax,
|
||||||
|
const uint16_t mpMax
|
||||||
|
);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets the roster member currently occupying an active order slot.
|
||||||
|
*
|
||||||
|
* @param slot The active order slot to query.
|
||||||
|
* @return Pointer to the member in that slot, or NULL if the slot is
|
||||||
|
* empty.
|
||||||
|
*/
|
||||||
|
battlefighter_t *partyGetOrderMember(const uint8_t slot);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Assigns a roster member to an active order slot, replacing whatever
|
||||||
|
* was there. Use PARTY_ORDER_EMPTY to clear a slot.
|
||||||
|
*
|
||||||
|
* @param slot The active order slot to assign.
|
||||||
|
* @param memberIndex The roster member index to place there, or
|
||||||
|
* PARTY_ORDER_EMPTY to clear the slot.
|
||||||
|
*/
|
||||||
|
void partySetOrder(const uint8_t slot, const uint8_t memberIndex);
|
||||||
@@ -6,6 +6,5 @@
|
|||||||
# Sources
|
# Sources
|
||||||
target_sources(${DUSK_LIBRARY_TARGET_NAME}
|
target_sources(${DUSK_LIBRARY_TARGET_NAME}
|
||||||
PUBLIC
|
PUBLIC
|
||||||
savevita.c
|
testbattle.c
|
||||||
savestreamvita.c
|
|
||||||
)
|
)
|
||||||
Loaded 100 of 532 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user