Compare commits
54
Commits
00b73050ad
..
ac2
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b639bc6c4f | ||
|
|
7ee04c78cd | ||
|
|
7b58addf7e | ||
|
|
ae52be591b | ||
|
|
93ab7690ba | ||
|
|
68c3f88181 | ||
|
|
830864aa8a | ||
|
|
5f34cb34b2 | ||
|
|
b9d2fe60fd | ||
|
|
06bc4fcd55 | ||
|
|
42cb84b610 | ||
|
|
f8607d114c | ||
|
|
56230dd340 | ||
|
|
df9fdf26c8 | ||
|
|
8f8fa8f8d1 | ||
|
|
07f98c119a | ||
|
|
d49194fc4d | ||
|
|
e61914bad4 | ||
|
|
015d90519f | ||
|
|
7b4f0abfb8 | ||
|
|
0667a44e14 | ||
|
|
0852b8463b | ||
|
|
1436fda858 | ||
|
|
0826908068 | ||
|
|
7ceb9e571d | ||
|
|
38c2f6b6f9 | ||
|
|
b9f06fef7a | ||
|
|
373f1c1010 | ||
|
|
e80d693d85 | ||
|
|
ef60ddf6a8 | ||
|
|
de0ff2e263 | ||
|
|
13a435e9c1 | ||
|
|
725338cd5a | ||
|
|
acd14f46a8 | ||
|
|
ef78f023ed | ||
|
|
85b6109792 | ||
|
|
6c5738c863 | ||
|
|
1174e471f6 | ||
|
|
a618ff46fe | ||
|
|
1fa5cd316e | ||
|
|
11e5d37563 | ||
|
|
9f86c20129 | ||
|
|
8fb1c9fb42 | ||
|
|
5f08337726 | ||
|
|
0bc80d5df3 | ||
|
|
2432443ea6 | ||
|
|
fa138971e7 | ||
|
|
d7982599d1 | ||
|
|
f16c80aa0f | ||
|
|
ef5adf8274 | ||
|
|
2ffc65b1b1 | ||
|
|
d4a17bd98d | ||
|
|
dcf5f434c5 | ||
|
|
78cd973a33 |
No files matched your search
@@ -33,3 +33,74 @@ jobs:
|
||||
libssl-dev
|
||||
- name: Run tests
|
||||
run: ./scripts/test-linux.sh
|
||||
|
||||
# Emulator smoke tests: boot the built disc/EBOOT for a fixed window and
|
||||
# confirm the emulator doesn't crash. Not yet verified against a real
|
||||
# runner (no CI run has exercised these) -- continue-on-error so a
|
||||
# flaky/broken emulator step doesn't block the required Linux test job.
|
||||
run-tests-gamecube-dolphin:
|
||||
runs-on: ubuntu-latest
|
||||
continue-on-error: true
|
||||
container:
|
||||
image: ghcr.io/extremscorner/libogc2:latest
|
||||
steps:
|
||||
- name: Install Node.js
|
||||
run: apt-get update && apt-get install -y nodejs
|
||||
- name: Checkout repository
|
||||
uses: actions/checkout@v4
|
||||
- name: Install additional dependencies
|
||||
run: |
|
||||
apt-get install -y \
|
||||
python3-pip python3-polib python3-pil \
|
||||
python3-dotenv python3-pyqt5 python3-opengl xorriso \
|
||||
dolphin-emu xvfb
|
||||
dkp-pacman -Syu --noconfirm
|
||||
dkp-pacman -S --needed --noconfirm \
|
||||
gamecube-sdl2 ppc-liblzma ppc-libzip \
|
||||
gamecube-tools ppc-libmad ppc-zlib-ng ppc-bzip2 ppc-zstd
|
||||
- name: Build GameCube ISO and boot it in Dolphin
|
||||
run: ./scripts/test-gamecube-dolphin.sh
|
||||
|
||||
run-tests-wii-dolphin:
|
||||
runs-on: ubuntu-latest
|
||||
continue-on-error: true
|
||||
container:
|
||||
image: ghcr.io/extremscorner/libogc2:latest
|
||||
steps:
|
||||
- name: Install Node.js
|
||||
run: apt-get update && apt-get install -y nodejs
|
||||
- name: Checkout repository
|
||||
uses: actions/checkout@v4
|
||||
- name: Install additional dependencies
|
||||
run: |
|
||||
apt-get install -y \
|
||||
python3-pip python3-polib python3-pil \
|
||||
python3-dotenv python3-pyqt5 python3-opengl xorriso \
|
||||
dolphin-emu xvfb
|
||||
dkp-pacman -Syu --noconfirm
|
||||
dkp-pacman -S --needed --noconfirm \
|
||||
gamecube-sdl2 ppc-liblzma ppc-libzip \
|
||||
gamecube-tools ppc-libmad ppc-zlib-ng ppc-bzip2 ppc-zstd
|
||||
- name: Build Wii ISO and boot it in Dolphin
|
||||
run: ./scripts/test-wii-dolphin.sh
|
||||
|
||||
run-tests-psp-ppsspp:
|
||||
runs-on: ubuntu-latest
|
||||
continue-on-error: true
|
||||
steps:
|
||||
- name: Checkout repository
|
||||
uses: actions/checkout@v4
|
||||
- name: Setup pspdev
|
||||
uses: ./.github/actions/setup-pspdev
|
||||
- name: Install PPSSPPHeadless build dependencies
|
||||
run: |
|
||||
sudo apt-get update
|
||||
sudo apt-get install -y git cmake ninja-build libsdl2-dev zlib1g-dev
|
||||
- name: Build PPSSPPHeadless
|
||||
run: |
|
||||
git clone --recursive --depth 1 https://github.com/hrydgard/ppsspp.git /tmp/ppsspp
|
||||
cmake -S /tmp/ppsspp -B /tmp/ppsspp/build -DCMAKE_BUILD_TYPE=Release
|
||||
cmake --build /tmp/ppsspp/build --target PPSSPPHeadless -- -j$(nproc)
|
||||
echo "PPSSPP_HEADLESS_BIN=/tmp/ppsspp/build/PPSSPPHeadless" >> "$GITHUB_ENV"
|
||||
- name: Build PSP EBOOT and boot it in PPSSPPHeadless
|
||||
run: ./scripts/test-psp-ppsspp.sh
|
||||
+1
-2
@@ -106,5 +106,4 @@ yarn.lock
|
||||
/build*
|
||||
/assets/test
|
||||
/tools_old
|
||||
/assets/test.png
|
||||
/assets/audio/boa.mp3
|
||||
/assets/test.png
|
||||
+22
-53
@@ -8,22 +8,17 @@ cmake_minimum_required(VERSION 3.13)
|
||||
|
||||
set(CMAKE_C_STANDARD 11)
|
||||
set(CMAKE_C_STANDARD_REQUIRED ON)
|
||||
set(CMAKE_MODULE_PATH
|
||||
${CMAKE_MODULE_PATH}
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules
|
||||
)
|
||||
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)
|
||||
cmake_policy(SET CMP0079 NEW)
|
||||
# set(FETCHCONTENT_UPDATES_DISCONNECTED ON)
|
||||
|
||||
option(DUSK_BUILD_TESTS "Enable tests" OFF)
|
||||
option(DUSK_NETWORK "Enable network support" ON)
|
||||
option(DUSK_NETWORKING "Enable networking support" OFF)
|
||||
|
||||
set(DUSK_GAME_NAME "Dusk" CACHE STRING "Game display name")
|
||||
set(DUSK_GAME_AUTHOR "YourWishes" CACHE STRING "Game author / coder")
|
||||
set(DUSK_GAME_SHORT_DESCRIPTION "Dusk game" CACHE STRING "One-line description")
|
||||
set(DUSK_GAME_LONG_DESCRIPTION
|
||||
"No description yet." CACHE STRING "Full description"
|
||||
)
|
||||
set(DUSK_GAME_LONG_DESCRIPTION "No description yet." CACHE STRING "Full description")
|
||||
|
||||
# Prep cache
|
||||
set(DUSK_CACHE_TARGET "dusk-target")
|
||||
@@ -37,19 +32,13 @@ set(DUSK_TEMP_DIR "${DUSK_BUILD_DIR}/temp")
|
||||
set(DUSK_TOOLS_DIR "${DUSK_ROOT_DIR}/tools")
|
||||
set(DUSK_DATA_DIR "${DUSK_ROOT_DIR}/data")
|
||||
set(DUSK_ASSETS_DIR "${DUSK_ROOT_DIR}/assets")
|
||||
set(DUSK_BUILT_ASSETS_DIR "${DUSK_BUILD_DIR}/built_assets"
|
||||
CACHE INTERNAL ${DUSK_CACHE_TARGET}
|
||||
)
|
||||
set(DUSK_BUILT_ASSETS_DIR "${DUSK_BUILD_DIR}/built_assets" CACHE INTERNAL ${DUSK_CACHE_TARGET})
|
||||
set(DUSK_GENERATED_HEADERS_DIR "${DUSK_BUILD_DIR}/generated")
|
||||
set(DUSK_BUILD_BINARY ${DUSK_BUILD_DIR}/Dusk
|
||||
CACHE INTERNAL ${DUSK_CACHE_TARGET}
|
||||
)
|
||||
set(DUSK_BUILD_BINARY ${DUSK_BUILD_DIR}/Dusk CACHE INTERNAL ${DUSK_CACHE_TARGET})
|
||||
set(DUSK_ASSETS "" CACHE INTERNAL ${DUSK_CACHE_TARGET})
|
||||
set(DUSK_LIBRARY_TARGET_NAME "DuskCore" CACHE INTERNAL ${DUSK_CACHE_TARGET})
|
||||
set(DUSK_BINARY_TARGET_NAME "Dusk" CACHE INTERNAL ${DUSK_CACHE_TARGET})
|
||||
set(DUSK_ASSETS_ZIP "${DUSK_BUILD_DIR}/dusk.dsk"
|
||||
CACHE INTERNAL ${DUSK_CACHE_TARGET}
|
||||
)
|
||||
set(DUSK_ASSETS_ZIP "${DUSK_BUILD_DIR}/dusk.dsk" CACHE INTERNAL ${DUSK_CACHE_TARGET})
|
||||
|
||||
if(NOT DEFINED DUSK_TARGET_SYSTEM)
|
||||
set(DUSK_TARGET_SYSTEM "linux")
|
||||
@@ -84,9 +73,7 @@ if(DUSK_BUILD_TESTS)
|
||||
${DUSK_LIBRARY_TARGET_NAME}
|
||||
)
|
||||
else()
|
||||
set(DUSK_LIBRARY_TARGET_NAME "${DUSK_BINARY_TARGET_NAME}"
|
||||
CACHE INTERNAL ${DUSK_CACHE_TARGET}
|
||||
)
|
||||
set(DUSK_LIBRARY_TARGET_NAME "${DUSK_BINARY_TARGET_NAME}" CACHE INTERNAL ${DUSK_CACHE_TARGET})
|
||||
endif()
|
||||
|
||||
if(NOT DEFINED DUSK_VERSION)
|
||||
@@ -104,9 +91,9 @@ target_compile_definitions(${DUSK_LIBRARY_TARGET_NAME}
|
||||
DUSK_VERSION="${DUSK_VERSION}"
|
||||
)
|
||||
|
||||
if(DUSK_NETWORK)
|
||||
if(DUSK_NETWORKING)
|
||||
target_compile_definitions(${DUSK_LIBRARY_TARGET_NAME} PUBLIC
|
||||
DUSK_NETWORK
|
||||
DUSK_NETWORKING
|
||||
)
|
||||
endif()
|
||||
|
||||
@@ -135,38 +122,20 @@ if(DUSK_BUILD_TESTS)
|
||||
add_subdirectory(test)
|
||||
endif()
|
||||
|
||||
# Build assets. Runs unconditionally on every build (rather than being
|
||||
# gated behind a custom_command's file-level DEPENDS list) because
|
||||
# CONFIGURE_DEPENDS globs only pick up added/removed files on the next
|
||||
# CMake configure, so that approach could miss/lag a rebuild behind an
|
||||
# asset edit. tools.asset.pack itself decides whether anything actually
|
||||
# changed (see its manifest check) and no-ops quickly when nothing did,
|
||||
# so this stays cheap on a build where assets are untouched.
|
||||
#
|
||||
# A .ds script under assets/ is compiled to .dsb by duskscriptcc as part of
|
||||
# packing, so dusk.dsk only ever carries bytecode. duskscriptcc is a host
|
||||
# tool, only built when target_system is the build host (linux/knulli, see
|
||||
# src/CMakeLists.txt) - a cross-compiled console target has no duskscriptcc
|
||||
# of its own to depend on or pass down, so it can only pack assets with no
|
||||
# .ds in them until something sets up a host-built duskscriptcc for it too.
|
||||
if(DUSK_TARGET_SYSTEM STREQUAL "linux" OR DUSK_TARGET_SYSTEM STREQUAL "knulli")
|
||||
set(DUSK_ASSET_PACK_DUSKSCRIPTCC_ARGS --duskscriptcc "$<TARGET_FILE:duskscriptcc>")
|
||||
set(DUSK_ASSET_PACK_DEPENDS duskscriptcc)
|
||||
else()
|
||||
set(DUSK_ASSET_PACK_DUSKSCRIPTCC_ARGS "")
|
||||
set(DUSK_ASSET_PACK_DEPENDS "")
|
||||
endif()
|
||||
|
||||
add_custom_target(DUSK_ASSETS_BUILT ALL
|
||||
# Build assets
|
||||
# Deliberately not CONFIGURE_DEPENDS: that reruns the full CMake configure
|
||||
# step (which invalidates generated headers and forces a huge rebuild) on
|
||||
# every single asset edit. Re-run cmake manually when assets are added or
|
||||
# removed.
|
||||
file(GLOB_RECURSE DUSK_ASSET_FILES "${DUSK_ASSETS_DIR}/*")
|
||||
add_custom_command(
|
||||
OUTPUT "${DUSK_ASSETS_ZIP}"
|
||||
COMMAND ${CMAKE_COMMAND} -E make_directory "${DUSK_ASSETS_DIR}"
|
||||
COMMAND ${Python3_EXECUTABLE} -m tools.asset.pack
|
||||
--input "${DUSK_ASSETS_DIR}"
|
||||
--output "${DUSK_ASSETS_ZIP}"
|
||||
${DUSK_ASSET_PACK_DUSKSCRIPTCC_ARGS}
|
||||
WORKING_DIRECTORY "${DUSK_ROOT_DIR}"
|
||||
BYPRODUCTS "${DUSK_ASSETS_ZIP}"
|
||||
DEPENDS ${DUSK_ASSET_PACK_DEPENDS}
|
||||
COMMENT "Packing assets into dusk.dsk"
|
||||
COMMAND ${CMAKE_COMMAND} -E rm -f "${DUSK_ASSETS_ZIP}"
|
||||
COMMAND ${CMAKE_COMMAND} -E tar "cf" "${DUSK_ASSETS_ZIP}" --format=zip -- .
|
||||
WORKING_DIRECTORY "${DUSK_ASSETS_DIR}"
|
||||
DEPENDS ${DUSK_ASSET_FILES}
|
||||
VERBATIM
|
||||
)
|
||||
add_custom_target(DUSK_ASSETS_BUILT DEPENDS "${DUSK_ASSETS_ZIP}")
|
||||
add_dependencies(${DUSK_LIBRARY_TARGET_NAME} DUSK_ASSETS_BUILT)
|
||||
@@ -9,18 +9,15 @@ following packages, depending on your system;
|
||||
|
||||
Fedora;
|
||||
```
|
||||
sudo dnf install git make gcc cmake python python-polib python3-pillow python3-dotenv python3-numpy python-qt5 python3-pyopengl SDL2-devel zlib-devel libzip-devel bzip2-devel openssl-devel lzma-sdk-devel xz xz-devel lua-devel libmad-devel
|
||||
sudo dnf install git make gcc cmake python python-polib python3-pillow python3-dotenv python3-numpy python-qt5 python3-pyopengl SDL2-devel zlib-devel libzip-devel bzip2-devel openssl-devel lzma-sdk-devel xz xz-devel lua-devel
|
||||
```
|
||||
`libmad-devel` (used for MP3 decoding) is GPL-licensed and ships in the
|
||||
[RPM Fusion](https://rpmfusion.org/) free repository rather than Fedora's
|
||||
base repos - make sure RPM Fusion is enabled first.
|
||||
|
||||
Ubuntu;
|
||||
```
|
||||
sudo apt-get install git build-essential gcc python python-polib python3-pillow python3-dotenv python3-numpy python3-pyqt5 python3-opengl libmad0-dev
|
||||
sudo apt-get install git build-essential gcc python python-polib python3-pillow python3-dotenv python3-numpy python3-pyqt5 python3-opengl
|
||||
```
|
||||
|
||||
Arch Linux;
|
||||
```
|
||||
sudo pacman -S git base-devel gcc python python-polib python-pillow python-dotenv python-numpy python-pyqt5 python-opengl libmad
|
||||
sudo pacman -S git base-devel gcc python python-polib python-pillow python-dotenv python-numpy python-pyqt5 python-opengl
|
||||
```
|
||||
@@ -3,11 +3,16 @@
|
||||
# This software is released under the MIT License.
|
||||
# https://opensource.org/licenses/MIT
|
||||
|
||||
add_subdirectory(debug)
|
||||
add_subdirectory(frame)
|
||||
add_subdirectory(focus)
|
||||
add_subdirectory(overlay)
|
||||
add_subdirectory(transition)
|
||||
add_subdirectory(widget)
|
||||
|
||||
# Sources
|
||||
target_sources(${DUSK_LIBRARY_TARGET_NAME}
|
||||
PUBLIC
|
||||
audiostream.c
|
||||
audiostreampcm.c
|
||||
audiostreammp3.c
|
||||
audiostreamtype.c
|
||||
ui.c
|
||||
uielement.c
|
||||
)
|
||||
@@ -5,5 +5,6 @@
|
||||
|
||||
target_sources(${DUSK_LIBRARY_TARGET_NAME}
|
||||
PUBLIC
|
||||
assetmp3loader.c
|
||||
uiconsole.c
|
||||
uifps.c
|
||||
)
|
||||
@@ -0,0 +1,138 @@
|
||||
/**
|
||||
* Copyright (c) 2026 Dominic Masters
|
||||
*
|
||||
* This software is released under the MIT License.
|
||||
* https://opensource.org/licenses/MIT
|
||||
*/
|
||||
|
||||
#include "uiconsole.h"
|
||||
#include "assert/assert.h"
|
||||
#include "console/console.h"
|
||||
#include "display/screen/screen.h"
|
||||
#include "display/text/text.h"
|
||||
#include "display/spritebatch/spritebatch.h"
|
||||
#include "display/shader/shaderunlit.h"
|
||||
#include "display/mesh/mesh.h"
|
||||
#include "util/memory.h"
|
||||
|
||||
typedef struct {
|
||||
mesh_t mesh;
|
||||
bool_t built;
|
||||
meshvertex_t vertices[UI_CONSOLE_CACHE_VERTEX_MAX];
|
||||
int32_t vertexCount;
|
||||
int32_t cachedScanX;
|
||||
int32_t cachedScanY;
|
||||
} uiconsolecache_t;
|
||||
|
||||
uiconsolecache_t UI_CONSOLE_CACHE;
|
||||
|
||||
errorret_t uiConsoleDraw(void) {
|
||||
if(!CONSOLE.visible) errorOk();
|
||||
|
||||
if(
|
||||
CONSOLE.dirty ||
|
||||
UI_CONSOLE_CACHE.cachedScanX != SCREEN.scanX ||
|
||||
UI_CONSOLE_CACHE.cachedScanY != SCREEN.scanY
|
||||
) {
|
||||
errorChain(uiConsoleRebuild());
|
||||
}
|
||||
|
||||
if(UI_CONSOLE_CACHE.vertexCount == 0) errorOk();
|
||||
|
||||
shadermaterial_t material = {
|
||||
.unlit = {
|
||||
.color = COLOR_RED,
|
||||
.texture = FONT_DEFAULT.texture
|
||||
}
|
||||
};
|
||||
|
||||
errorChain(shaderBind(&SHADER_UNLIT));
|
||||
errorChain(shaderSetMaterial(&SHADER_UNLIT, &material));
|
||||
return meshDraw(&UI_CONSOLE_CACHE.mesh, 0, UI_CONSOLE_CACHE.vertexCount);
|
||||
}
|
||||
|
||||
errorret_t uiConsoleRebuild(void) {
|
||||
int32_t spriteCount = 0;
|
||||
for(uint32_t i = 0; i < CONSOLE_HISTORY_MAX; i++) {
|
||||
char_t c;
|
||||
int32_t j = 0;
|
||||
while((c = CONSOLE.line[i][j++]) != '\0') {
|
||||
if(c != ' ' && c != '\n') spriteCount++;
|
||||
}
|
||||
}
|
||||
|
||||
assertTrue(
|
||||
spriteCount <= UI_CONSOLE_CACHE_GLYPH_MAX,
|
||||
"Console history exceeds fixed cache capacity"
|
||||
);
|
||||
|
||||
const int32_t vertexCount = spriteCount * QUAD_VERTEX_COUNT;
|
||||
UI_CONSOLE_CACHE.vertexCount = vertexCount;
|
||||
|
||||
if(vertexCount > 0) {
|
||||
const float_t lineH = (float_t)FONT_DEFAULT.tileset->tileHeight;
|
||||
const float_t charW = (float_t)FONT_DEFAULT.tileset->tileWidth;
|
||||
|
||||
int32_t index = 0;
|
||||
int32_t row = 0;
|
||||
for(uint32_t i = 0; i < CONSOLE_HISTORY_MAX; i++) {
|
||||
float_t posX = (float_t)SCREEN.scanX;
|
||||
float_t posY = (float_t)SCREEN.scanY + lineH * (float_t)row;
|
||||
|
||||
char_t c;
|
||||
int32_t j = 0;
|
||||
while((c = CONSOLE.line[i][j++]) != '\0') {
|
||||
if(c == '\n') {
|
||||
posX = (float_t)SCREEN.scanX;
|
||||
posY += lineH;
|
||||
row++;
|
||||
continue;
|
||||
}
|
||||
|
||||
if(c == ' ') {
|
||||
posX += charW;
|
||||
continue;
|
||||
}
|
||||
|
||||
const spritebatchsprite_t sprite = textGetSprite(
|
||||
(vec2){ posX, posY }, c, &FONT_DEFAULT
|
||||
);
|
||||
spriteBatchBufferToMesh(
|
||||
&sprite, 1,
|
||||
&UI_CONSOLE_CACHE.vertices[index], QUAD_VERTEX_COUNT
|
||||
);
|
||||
|
||||
index += QUAD_VERTEX_COUNT;
|
||||
posX += charW;
|
||||
}
|
||||
|
||||
row++;
|
||||
}
|
||||
|
||||
if(!UI_CONSOLE_CACHE.built) {
|
||||
errorChain(meshInit(
|
||||
&UI_CONSOLE_CACHE.mesh,
|
||||
QUAD_PRIMITIVE_TYPE,
|
||||
UI_CONSOLE_CACHE_VERTEX_MAX,
|
||||
UI_CONSOLE_CACHE.vertices
|
||||
));
|
||||
UI_CONSOLE_CACHE.built = true;
|
||||
} else {
|
||||
errorChain(meshFlush(&UI_CONSOLE_CACHE.mesh, 0, vertexCount));
|
||||
}
|
||||
}
|
||||
|
||||
UI_CONSOLE_CACHE.cachedScanX = SCREEN.scanX;
|
||||
UI_CONSOLE_CACHE.cachedScanY = SCREEN.scanY;
|
||||
CONSOLE.dirty = false;
|
||||
errorOk();
|
||||
}
|
||||
|
||||
errorret_t uiConsoleDispose(void) {
|
||||
if(UI_CONSOLE_CACHE.built) {
|
||||
errorChain(meshDispose(&UI_CONSOLE_CACHE.mesh));
|
||||
}
|
||||
|
||||
memoryZero(&UI_CONSOLE_CACHE, sizeof(uiconsolecache_t));
|
||||
errorOk();
|
||||
}
|
||||
@@ -0,0 +1,48 @@
|
||||
/**
|
||||
* Copyright (c) 2026 Dominic Masters
|
||||
*
|
||||
* This software is released under the MIT License.
|
||||
* https://opensource.org/licenses/MIT
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
#include "error/error.h"
|
||||
#include "display/mesh/quad.h"
|
||||
|
||||
// Fixed capacity for the console's cached glyph mesh, in glyphs -- the
|
||||
// mesh/vertex buffer is sized to this once and never grown/shrunk, so
|
||||
// history producing more non-space characters than this asserts (see
|
||||
// uiConsoleRebuild) instead of reallocating.
|
||||
#define UI_CONSOLE_CACHE_GLYPH_MAX 512
|
||||
#define UI_CONSOLE_CACHE_VERTEX_MAX (\
|
||||
UI_CONSOLE_CACHE_GLYPH_MAX * QUAD_VERTEX_COUNT \
|
||||
)
|
||||
|
||||
/**
|
||||
* Renders the console history into the scan-safe area, drawing a mesh
|
||||
* that is only rebuilt when the history changes or the scan-safe origin
|
||||
* moves, rather than rebuffering vertices every frame. No-ops when the
|
||||
* console is not visible.
|
||||
*
|
||||
* @return Any error that occurs.
|
||||
*/
|
||||
errorret_t uiConsoleDraw(void);
|
||||
|
||||
/**
|
||||
* Rebuilds the cached mesh for the console's current history and
|
||||
* scan-safe origin. Called automatically by uiConsoleDraw() whenever
|
||||
* needed; only needs calling directly to force an immediate rebuild.
|
||||
* The underlying vertex buffer is a fixed-size array (see
|
||||
* UI_CONSOLE_CACHE_VERTEX_MAX) -- asserts if the history produces more
|
||||
* glyphs than that capacity, rather than growing it.
|
||||
*
|
||||
* @return Any error that occurs.
|
||||
*/
|
||||
errorret_t uiConsoleRebuild(void);
|
||||
|
||||
/**
|
||||
* Frees the mesh and vertex buffer built up by uiConsoleDraw().
|
||||
*
|
||||
* @return Any error that occurs.
|
||||
*/
|
||||
errorret_t uiConsoleDispose(void);
|
||||
@@ -1,6 +1,6 @@
|
||||
/**
|
||||
* Copyright (c) 2026 Dominic Masters
|
||||
*
|
||||
*
|
||||
* This software is released under the MIT License.
|
||||
* https://opensource.org/licenses/MIT
|
||||
*/
|
||||
@@ -8,41 +8,23 @@
|
||||
#include "uifps.h"
|
||||
#include "time/time.h"
|
||||
#include "util/string.h"
|
||||
#include "display/spritebatch/spritebatch.h"
|
||||
#include "display/color.h"
|
||||
#include "display/text/text.h"
|
||||
#include "display/screen/screen.h"
|
||||
#include "engine/engine.h"
|
||||
|
||||
uifps_t UIFPS;
|
||||
|
||||
errorret_t uiFPSInit() {
|
||||
uiLabelInit(
|
||||
&UIFPS.fpsLabel,
|
||||
UIFPS.fpsText,
|
||||
UIFPS.fpsSprites, UI_FPS_SPRITES_MAX
|
||||
);
|
||||
uiLabelSetX(&UIFPS.fpsLabel, (float_t)SCREEN.scanX);
|
||||
uiLabelSetY(&UIFPS.fpsLabel, (float_t)SCREEN.scanY);
|
||||
|
||||
uiLabelInit(
|
||||
&UIFPS.versionLabel,
|
||||
UIFPS.versionText,
|
||||
UIFPS.versionSprites, UI_FPS_VERSION_SPRITES_MAX
|
||||
);
|
||||
stringCopy(UIFPS.versionText, ENGINE.version, UI_FPS_VERSION_TEXT_MAX - 1);
|
||||
UIFPS.versionLabel.dirty = true;
|
||||
uiLabelRebuffer(&UIFPS.versionLabel);
|
||||
uiLabelSetX(&UIFPS.versionLabel, (float_t)(
|
||||
SCREEN.scanX + SCREEN.scanWidth - UIFPS.versionLabel.width
|
||||
));
|
||||
uiLabelSetY(&UIFPS.versionLabel, (float_t)(
|
||||
SCREEN.scanY + SCREEN.scanHeight - UIFPS.versionLabel.height
|
||||
));
|
||||
|
||||
uiLabelInit(&UIFPS.fpsLabel, &FONT_DEFAULT);
|
||||
uiLabelInit(&UIFPS.versionLabel, &FONT_DEFAULT);
|
||||
uiLabelSetText(&UIFPS.versionLabel, ENGINE.version);
|
||||
uiLabelSetColor(&UIFPS.versionLabel, color(255, 255, 255, 128));
|
||||
errorOk();
|
||||
}
|
||||
|
||||
errorret_t uiFPSDraw() {
|
||||
char_t fpsText[32];
|
||||
|
||||
// Get now.
|
||||
dusktimeepoch_t now = timeGetEpoch();
|
||||
double_t delta = now.time - UIFPS.lastTick.time;
|
||||
@@ -59,14 +41,13 @@ errorret_t uiFPSDraw() {
|
||||
UIFPS.fpsAverage = alpha * fps + (1.0f - alpha) * UIFPS.fpsAverage;
|
||||
}
|
||||
|
||||
stringFormat(
|
||||
UIFPS.fpsText,
|
||||
UI_FPS_TEXT_MAX - 1,
|
||||
snprintf(
|
||||
fpsText,
|
||||
sizeof(fpsText),
|
||||
"%.1f/%.1fms",
|
||||
UIFPS.fpsAverage,
|
||||
delta * 1000.0f
|
||||
);
|
||||
UIFPS.fpsLabel.dirty = true;
|
||||
|
||||
color_t textColor;
|
||||
if(fps >= 55.0f) {
|
||||
@@ -77,10 +58,21 @@ errorret_t uiFPSDraw() {
|
||||
textColor = COLOR_RED;
|
||||
}
|
||||
|
||||
errorChain(uiLabelRender(&UIFPS.fpsLabel, textColor));
|
||||
errorChain(spriteBatchFlush());
|
||||
uiLabelSetColor(&UIFPS.fpsLabel, textColor);
|
||||
if(stringCompare(fpsText, UIFPS.fpsLabel.text) != 0) {
|
||||
uiLabelSetText(&UIFPS.fpsLabel, fpsText);
|
||||
}
|
||||
errorChain(uiLabelDraw(
|
||||
&UIFPS.fpsLabel, (float_t)SCREEN.scanX, (float_t)SCREEN.scanY
|
||||
));
|
||||
|
||||
errorChain(uiLabelRender(&UIFPS.versionLabel, color(255, 255, 255, 128)));
|
||||
int32_t versionWidth, versionHeight;
|
||||
uiLabelGetSize(&UIFPS.versionLabel, &versionWidth, &versionHeight);
|
||||
errorChain(uiLabelDraw(
|
||||
&UIFPS.versionLabel,
|
||||
(float_t)(SCREEN.scanX + SCREEN.scanWidth - versionWidth),
|
||||
(float_t)(SCREEN.scanY + SCREEN.scanHeight - versionHeight)
|
||||
));
|
||||
|
||||
return spriteBatchFlush();
|
||||
}
|
||||
errorOk();
|
||||
}
|
||||
@@ -10,28 +10,17 @@
|
||||
#include "time/timeepoch.h"
|
||||
#include "ui/widget/uilabel.h"
|
||||
|
||||
#define UI_FPS_TEXT_MAX 32
|
||||
#define UI_FPS_SPRITES_MAX UI_FPS_TEXT_MAX
|
||||
#define UI_FPS_VERSION_TEXT_MAX 32
|
||||
#define UI_FPS_VERSION_SPRITES_MAX UI_FPS_VERSION_TEXT_MAX
|
||||
|
||||
typedef struct {
|
||||
dusktimeepoch_t lastTick;
|
||||
float_t fpsAverage;
|
||||
|
||||
uilabel_t fpsLabel;
|
||||
char_t fpsText[UI_FPS_TEXT_MAX];
|
||||
spritebatchsprite_t fpsSprites[UI_FPS_SPRITES_MAX];
|
||||
|
||||
uilabel_t versionLabel;
|
||||
char_t versionText[UI_FPS_VERSION_TEXT_MAX];
|
||||
spritebatchsprite_t versionSprites[UI_FPS_VERSION_SPRITES_MAX];
|
||||
} uifps_t;
|
||||
|
||||
extern uifps_t UIFPS;
|
||||
|
||||
/**
|
||||
* Initializes the FPS counter's labels.
|
||||
* Initializes the FPS counter, caching the (static) version label.
|
||||
*
|
||||
* @return Any error that occurs.
|
||||
*/
|
||||
File renamed without changes.
@@ -12,11 +12,11 @@
|
||||
#include "time/time.h"
|
||||
|
||||
const uifocusdirmap_t UI_FOCUS_DIR_MAP[] = {
|
||||
{ INPUT_ACTION_UP, UI_FOCUS_DIRECTION_UP, 0, -1 },
|
||||
{ INPUT_ACTION_DOWN, UI_FOCUS_DIRECTION_DOWN, 0, 1 },
|
||||
{ INPUT_ACTION_LEFT, UI_FOCUS_DIRECTION_LEFT, -1, 0 },
|
||||
{ INPUT_ACTION_RIGHT, UI_FOCUS_DIRECTION_RIGHT, 1, 0 },
|
||||
{ INPUT_ACTION_NULL, UI_FOCUS_DIRECTION_NONE, 0, 0 },
|
||||
{ INPUT_BIND_UP, UI_FOCUS_DIRECTION_UP, 0, -1 },
|
||||
{ INPUT_BIND_DOWN, UI_FOCUS_DIRECTION_DOWN, 0, 1 },
|
||||
{ INPUT_BIND_LEFT, UI_FOCUS_DIRECTION_LEFT, -1, 0 },
|
||||
{ INPUT_BIND_RIGHT, UI_FOCUS_DIRECTION_RIGHT, 1, 0 },
|
||||
{ INPUT_BIND_NULL, UI_FOCUS_DIRECTION_NONE, 0, 0 },
|
||||
};
|
||||
|
||||
uifocus_t UI_FOCUS;
|
||||
@@ -58,15 +58,10 @@ uifocusitem_t * uiFocusPush(
|
||||
|
||||
void uiFocusPop(void) {
|
||||
assertTrue(UI_FOCUS.count > 0, "UI focus stack underflow");
|
||||
|
||||
// Count is decremented before the closed callback fires so that a
|
||||
// push triggered from within it (e.g. reopening a menu once another
|
||||
// one reports it closed with no result) lands in the now-free slot
|
||||
// instead of one past it, which would silently strand the new item
|
||||
// above the tracked stack top.
|
||||
UI_FOCUS.count--;
|
||||
uifocusitem_t *item = &UI_FOCUS.items[UI_FOCUS.count];
|
||||
|
||||
uifocusitem_t *item = &UI_FOCUS.items[UI_FOCUS.count - 1];
|
||||
if(item->closed != NULL) item->closed(item);
|
||||
UI_FOCUS.count--;
|
||||
}
|
||||
|
||||
void uiFocusPopItem(uifocusitem_t *item) {
|
||||
@@ -113,22 +108,14 @@ void uiFocusMoveDirection(
|
||||
) {
|
||||
for(
|
||||
const uifocusdirmap_t *m = UI_FOCUS_DIR_MAP;
|
||||
m->action != INPUT_ACTION_NULL;
|
||||
m->action != INPUT_BIND_NULL;
|
||||
m++
|
||||
) {
|
||||
if(m->direction != dir) continue;
|
||||
|
||||
// Widened to int16_t so a move off the left/top edge (e.g. x=0,
|
||||
// dx=-1) stays negative here instead of wrapping straight to 255 via
|
||||
// a uint8_t truncation - that would then land on `255 % cols`
|
||||
// (column 3 of a 14-wide grid, not the intended last column) rather
|
||||
// than wrapping to the row/column's actual last cell.
|
||||
int16_t x = (int16_t)item->x + m->dx;
|
||||
int16_t y = (int16_t)item->y + m->dy;
|
||||
if(x < 0) x += item->cols;
|
||||
if(y < 0) y += item->rows;
|
||||
|
||||
uiFocusSetPosition(item, (uint8_t)x, (uint8_t)y);
|
||||
uint8_t x = (uint8_t)(item->x + m->dx);
|
||||
uint8_t y = (uint8_t)(item->y + m->dy);
|
||||
uiFocusSetPosition(item, x, y);
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -155,20 +142,19 @@ void uiFocusUpdate(void) {
|
||||
|
||||
uifocusitem_t *item = &UI_FOCUS.items[UI_FOCUS.count - 1];
|
||||
|
||||
if(inputPressed(INPUT_ACTION_ACCEPT)) {
|
||||
if(inputPressed(INPUT_BIND_ACCEPT)) {
|
||||
if(item->selected != NULL) item->selected(item);
|
||||
return;
|
||||
}
|
||||
|
||||
if(inputPressed(INPUT_ACTION_CANCEL)) {
|
||||
if(item->cancel != NULL && item->cancel(item)) return;
|
||||
if(!item->disableBack) uiFocusPop();
|
||||
if(inputPressed(INPUT_BIND_CANCEL)) {
|
||||
uiFocusPop();
|
||||
return;
|
||||
}
|
||||
|
||||
for(
|
||||
const uifocusdirmap_t *m = UI_FOCUS_DIR_MAP;
|
||||
m->action != INPUT_ACTION_NULL;
|
||||
m->action != INPUT_BIND_NULL;
|
||||
m++
|
||||
) {
|
||||
if(!inputPressed(m->action)) continue;
|
||||
@@ -181,7 +167,7 @@ void uiFocusUpdate(void) {
|
||||
bool_t held = false;
|
||||
for(
|
||||
const uifocusdirmap_t *m = UI_FOCUS_DIR_MAP;
|
||||
m->action != INPUT_ACTION_NULL;
|
||||
m->action != INPUT_BIND_NULL;
|
||||
m++
|
||||
) {
|
||||
if(m->direction != UI_FOCUS.direction) continue;
|
||||
@@ -23,7 +23,7 @@
|
||||
#define UI_FOCUS_HOLD_REPEAT 0.1f
|
||||
|
||||
typedef struct {
|
||||
inputaction_t action;
|
||||
inputbind_t action;
|
||||
uifocusdirection_t direction;
|
||||
int8_t dx;
|
||||
int8_t dy;
|
||||
@@ -31,7 +31,7 @@ typedef struct {
|
||||
|
||||
/**
|
||||
* Mapping of input actions to focus directions, terminated by an
|
||||
* entry with action == INPUT_ACTION_NULL.
|
||||
* entry with action == INPUT_BIND_NULL.
|
||||
*/
|
||||
extern const uifocusdirmap_t UI_FOCUS_DIR_MAP[];
|
||||
|
||||
@@ -53,19 +53,5 @@ struct uifocusitem_s {
|
||||
uifocusitemcallback_t changed;
|
||||
uifocusitemcallback_t closed;
|
||||
uifocusitemdirectioncallback_t direction;
|
||||
|
||||
// Called when INPUT_ACTION_CANCEL is pressed, before disableBack/the
|
||||
// default pop is applied; may be NULL. Returns true if fully handled
|
||||
// (e.g. it did something else instead, or popped itself), which skips
|
||||
// the default pop; false to fall through to the default disableBack/
|
||||
// pop behavior below.
|
||||
uifocusitemcallback_t cancel;
|
||||
|
||||
void *user;
|
||||
|
||||
// When true, INPUT_ACTION_CANCEL is ignored while this item is the
|
||||
// topmost focus item - it does not pop. Does not affect a
|
||||
// programmatic uiFocusPop()/uiFocusPopItem() call. Only consulted
|
||||
// when cancel is unset or returns false.
|
||||
bool_t disableBack;
|
||||
};
|
||||
@@ -5,8 +5,8 @@
|
||||
|
||||
target_sources(${DUSK_LIBRARY_TARGET_NAME}
|
||||
PUBLIC
|
||||
uiframe.c
|
||||
uiconfirm.c
|
||||
)
|
||||
|
||||
add_subdirectory(save)
|
||||
add_subdirectory(keyboard)
|
||||
add_subdirectory(settings)
|
||||
@@ -0,0 +1,13 @@
|
||||
# Copyright (c) 2026 Dominic Masters
|
||||
#
|
||||
# This software is released under the MIT License.
|
||||
# https://opensource.org/licenses/MIT
|
||||
|
||||
target_sources(${DUSK_LIBRARY_TARGET_NAME}
|
||||
PUBLIC
|
||||
uisettings.c
|
||||
uisettingsgeneral.c
|
||||
uisettingsinput.c
|
||||
uisettingsdisplay.c
|
||||
uisettingsaudio.c
|
||||
)
|
||||
@@ -0,0 +1,248 @@
|
||||
/**
|
||||
* Copyright (c) 2026 Dominic Masters
|
||||
*
|
||||
* This software is released under the MIT License.
|
||||
* https://opensource.org/licenses/MIT
|
||||
*/
|
||||
|
||||
#include "uisettings.h"
|
||||
#include "uisettingsgeneral.h"
|
||||
#include "uisettingsinput.h"
|
||||
#include "uisettingsdisplay.h"
|
||||
#include "uisettingsaudio.h"
|
||||
#include "ui/frame/uiframe.h"
|
||||
#include "ui/frame/uiconfirm.h"
|
||||
#include "util/memory.h"
|
||||
#include "display/text/text.h"
|
||||
#include "display/screen/screen.h"
|
||||
#include "assert/assert.h"
|
||||
#include "locale/localemanager.h"
|
||||
#include "asset/loader/locale/assetlocaleloader.h"
|
||||
|
||||
uisettings_t UI_SETTINGS;
|
||||
|
||||
uisettingstabdef_t UI_SETTINGS_TAB_DEFS[UI_SETTINGS_TAB_COUNT] = {
|
||||
{
|
||||
.localeId = "ui.settings.tabs.general",
|
||||
.init = uiSettingsGeneralInit,
|
||||
.menu = (uimenu_t *)&UI_SETTINGS.data,
|
||||
.load = uiSettingsGeneralLoad,
|
||||
.apply = uiSettingsGeneralApply,
|
||||
.hasChanges = uiSettingsGeneralHasChanges
|
||||
},
|
||||
|
||||
{
|
||||
.localeId = "ui.settings.tabs.input",
|
||||
.init = uiSettingsInputInit,
|
||||
.menu = (uimenu_t *)&UI_SETTINGS.data,
|
||||
.load = uiSettingsInputLoad,
|
||||
.apply = uiSettingsInputApply,
|
||||
.hasChanges = uiSettingsInputHasChanges
|
||||
},
|
||||
|
||||
{
|
||||
.localeId = "ui.settings.tabs.display",
|
||||
.init = uiSettingsDisplayInit,
|
||||
.menu = (uimenu_t *)&UI_SETTINGS.data,
|
||||
.load = uiSettingsDisplayLoad,
|
||||
.apply = uiSettingsDisplayApply,
|
||||
.hasChanges = uiSettingsDisplayHasChanges
|
||||
},
|
||||
|
||||
{
|
||||
.localeId = "ui.settings.tabs.audio",
|
||||
.init = uiSettingsAudioInit,
|
||||
.menu = (uimenu_t *)&UI_SETTINGS.data,
|
||||
.load = uiSettingsAudioLoad,
|
||||
.apply = uiSettingsAudioApply,
|
||||
.hasChanges = uiSettingsAudioHasChanges
|
||||
}
|
||||
};
|
||||
|
||||
static uisettingstabdef_t UI_SETTINGS_TOP_DEF = {
|
||||
.menu = &UI_SETTINGS.tabsMenu,
|
||||
.load = uiSettingsLoad,
|
||||
.hasChanges = uiSettingsHasChanges
|
||||
};
|
||||
|
||||
static uisettingstabdef_t *UI_SETTINGS_PENDING_DISCARD = NULL;
|
||||
static uisettingstabdef_t *UI_SETTINGS_ACTIVE_TAB = NULL;
|
||||
|
||||
errorret_t uiSettingsActivateTab(uisettingstabdef_t *def) {
|
||||
if(def == UI_SETTINGS_ACTIVE_TAB) errorOk();
|
||||
|
||||
errorChain(def->init(&UI_SETTINGS.data));
|
||||
def->menu->user = def;
|
||||
def->load();
|
||||
UI_SETTINGS_ACTIVE_TAB = def;
|
||||
|
||||
errorOk();
|
||||
}
|
||||
|
||||
void uiSettingsTabChanged(
|
||||
const uimenu_t *menu,
|
||||
const uint8_t index,
|
||||
const uimenuitem_t *item
|
||||
) {
|
||||
if(index >= UI_SETTINGS_TAB_COUNT) return;
|
||||
errorCatch(uiSettingsActivateTab(&UI_SETTINGS_TAB_DEFS[index]));
|
||||
}
|
||||
|
||||
void uiSettingsTabSelected(
|
||||
const uimenu_t *menu,
|
||||
const uint8_t index,
|
||||
const uimenuitem_t *item
|
||||
) {
|
||||
if(index >= UI_SETTINGS_TAB_COUNT) return;
|
||||
|
||||
uisettingstabdef_t *def = &UI_SETTINGS_TAB_DEFS[index];
|
||||
errorCatch(uiSettingsActivateTab(def));
|
||||
uiMenuOpen(def->menu);
|
||||
}
|
||||
|
||||
errorret_t uiSettingsInit(void) {
|
||||
memoryZero(&UI_SETTINGS, sizeof(uisettings_t));
|
||||
UI_SETTINGS_ACTIVE_TAB = NULL;
|
||||
|
||||
for(uint8_t i = 0; i < UI_SETTINGS_TAB_COUNT; i++) {
|
||||
errorChain(assetLocaleGetString(
|
||||
&LOCALE.entry->data.locale,
|
||||
UI_SETTINGS_TAB_DEFS[i].localeId,
|
||||
0,
|
||||
UI_SETTINGS.tabLabels[i],
|
||||
UI_SETTINGS_TAB_LABEL_MAX
|
||||
));
|
||||
}
|
||||
|
||||
MENU_BEGIN(
|
||||
&UI_SETTINGS.tabsMenu, UI_SETTINGS.tabs, uiSettingsTabSelected,
|
||||
uiSettingsDiscardMenuClosed, uiSettingsTabChanged
|
||||
);
|
||||
for(uint8_t i = 0; i < UI_SETTINGS_TAB_COUNT; i++) {
|
||||
MENU_TAB(UI_SETTINGS.tabLabels[i]);
|
||||
}
|
||||
MENU_END(UI_SETTINGS.tabs, menuIndex);
|
||||
|
||||
UI_SETTINGS.tabsMenu.user = &UI_SETTINGS_TOP_DEF;
|
||||
|
||||
errorChain(assetLocaleGetString(
|
||||
&LOCALE.entry->data.locale,
|
||||
"ui.settings.apply",
|
||||
0,
|
||||
UI_SETTINGS.applyLabel,
|
||||
UI_SETTINGS_APPLY_LABEL_MAX
|
||||
));
|
||||
|
||||
errorChain(uiSettingsActivateTab(&UI_SETTINGS_TAB_DEFS[0]));
|
||||
|
||||
errorOk();
|
||||
}
|
||||
|
||||
errorret_t uiSettingsDraw(void) {
|
||||
if(!uiMenuIsActive(&UI_SETTINGS.tabsMenu)) errorOk();
|
||||
|
||||
const float_t width = SCREEN.width;
|
||||
const float_t height = SCREEN.height;
|
||||
const float_t x = (float_t)SCREEN.scanX +
|
||||
((float_t)SCREEN.scanWidth - width) * 0.5f;
|
||||
const float_t y = (float_t)SCREEN.scanY +
|
||||
((float_t)SCREEN.scanHeight - height) * 0.5f;
|
||||
|
||||
errorChain(uiFrameDrawCached(&UI_SETTINGS.frameCache, x, y, width, height));
|
||||
|
||||
const float_t contentX = x + UI_FRAME_START_X;
|
||||
const float_t contentY = y + UI_FRAME_START_Y;
|
||||
const float_t contentWidth = width - (UI_FRAME_START_X * 2);
|
||||
const float_t contentHeight = height - (UI_FRAME_START_Y * 2);
|
||||
|
||||
errorChain(uiMenuDraw(
|
||||
&UI_SETTINGS.tabsMenu,
|
||||
contentX,
|
||||
contentY,
|
||||
contentWidth,
|
||||
contentHeight
|
||||
));
|
||||
|
||||
const float_t tabsRowHeight = (float_t)FONT_DEFAULT.tileset->tileHeight;
|
||||
const float_t pageY = contentY + tabsRowHeight + UI_FRAME_PADDING_Y;
|
||||
const float_t pageHeight = contentHeight - tabsRowHeight - UI_FRAME_PADDING_Y;
|
||||
|
||||
if(UI_SETTINGS_ACTIVE_TAB != NULL) {
|
||||
errorChain(uiMenuDraw(
|
||||
UI_SETTINGS_ACTIVE_TAB->menu, contentX, pageY, contentWidth, pageHeight
|
||||
));
|
||||
}
|
||||
|
||||
errorOk();
|
||||
}
|
||||
|
||||
errorret_t uiSettingsUpdate(void) {
|
||||
if(!UI_SETTINGS_PENDING_DISCARD) errorOk();
|
||||
|
||||
uisettingstabdef_t *def = UI_SETTINGS_PENDING_DISCARD;
|
||||
UI_SETTINGS_PENDING_DISCARD = NULL;
|
||||
|
||||
return uiSettingsDiscardUpdate(def);
|
||||
}
|
||||
|
||||
bool_t uiSettingsIsOpen(void) {
|
||||
return uiMenuIsActive(&UI_SETTINGS.tabsMenu);
|
||||
}
|
||||
|
||||
void uiSettingsOpen() {
|
||||
uiSettingsLoad();
|
||||
uiMenuOpen(&UI_SETTINGS.tabsMenu);
|
||||
}
|
||||
|
||||
void uiSettingsClose() {
|
||||
uiMenuClose(&UI_SETTINGS.tabsMenu);
|
||||
}
|
||||
|
||||
errorret_t uiSettingsDispose(void) {
|
||||
errorOk();
|
||||
}
|
||||
|
||||
void uiSettingsLoad(void) {
|
||||
if(UI_SETTINGS_ACTIVE_TAB != NULL) UI_SETTINGS_ACTIVE_TAB->load();
|
||||
}
|
||||
|
||||
void uiSettingsApply(void) {
|
||||
if(UI_SETTINGS_ACTIVE_TAB != NULL) UI_SETTINGS_ACTIVE_TAB->apply();
|
||||
}
|
||||
|
||||
bool_t uiSettingsHasChanges(void) {
|
||||
return UI_SETTINGS_ACTIVE_TAB != NULL && UI_SETTINGS_ACTIVE_TAB->hasChanges();
|
||||
}
|
||||
|
||||
void uiSettingsDiscardMenuClosed(const uimenu_t *menu) {
|
||||
uisettingstabdef_t *def = (uisettingstabdef_t *)menu->user;
|
||||
if(def->hasChanges()) UI_SETTINGS_PENDING_DISCARD = def;
|
||||
}
|
||||
|
||||
errorret_t uiSettingsDiscardUpdate(uisettingstabdef_t *def) {
|
||||
#define UI_SETTINGS_DISCARD_TEXT_MAX 128
|
||||
char_t text[UI_SETTINGS_DISCARD_TEXT_MAX];
|
||||
errorChain(assetLocaleGetString(
|
||||
&LOCALE.entry->data.locale,
|
||||
"ui.confirm.discard_changes",
|
||||
0,
|
||||
text,
|
||||
UI_SETTINGS_DISCARD_TEXT_MAX
|
||||
));
|
||||
#undef UI_SETTINGS_DISCARD_TEXT_MAX
|
||||
|
||||
uiConfirmOpen(text, uiSettingsDiscardConfirmResult, def);
|
||||
|
||||
errorOk();
|
||||
}
|
||||
|
||||
void uiSettingsDiscardConfirmResult(const bool_t result, void *user) {
|
||||
uisettingstabdef_t *def = (uisettingstabdef_t *)user;
|
||||
|
||||
if(!result) {
|
||||
uiMenuOpen(def->menu);
|
||||
return;
|
||||
}
|
||||
|
||||
def->load();
|
||||
}
|
||||
@@ -0,0 +1,135 @@
|
||||
/**
|
||||
* Copyright (c) 2026 Dominic Masters
|
||||
*
|
||||
* This software is released under the MIT License.
|
||||
* https://opensource.org/licenses/MIT
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
#include "error/error.h"
|
||||
#include "ui/widget/uimenu.h"
|
||||
#include "ui/frame/uiframe.h"
|
||||
#include "uisettingsdata.h"
|
||||
|
||||
#define UI_SETTINGS_TAB_COUNT 4
|
||||
#define UI_SETTINGS_TAB_LABEL_MAX 32
|
||||
#define UI_SETTINGS_APPLY_LABEL_MAX 32
|
||||
|
||||
typedef struct {
|
||||
const char_t *localeId;
|
||||
errorret_t (*init)(uisettingsdata_t *data);
|
||||
uimenu_t *menu;
|
||||
void (*load)(void);
|
||||
void (*apply)(void);
|
||||
bool_t (*hasChanges)(void);
|
||||
} uisettingstabdef_t;
|
||||
|
||||
typedef struct {
|
||||
uimenu_t tabsMenu;
|
||||
uimenuitem_t tabs[UI_SETTINGS_TAB_COUNT];
|
||||
char_t tabLabels[UI_SETTINGS_TAB_COUNT][UI_SETTINGS_TAB_LABEL_MAX];
|
||||
char_t applyLabel[UI_SETTINGS_APPLY_LABEL_MAX];
|
||||
uisettingsdata_t data;
|
||||
uiframecache_t frameCache;
|
||||
} uisettings_t;
|
||||
|
||||
extern uisettings_t UI_SETTINGS;
|
||||
extern uisettingstabdef_t UI_SETTINGS_TAB_DEFS[UI_SETTINGS_TAB_COUNT];
|
||||
|
||||
/**
|
||||
* Menu closed callback that flags a pending discard-changes
|
||||
* confirmation if the menu's settings page/panel reports unsaved
|
||||
* changes. Pass this directly as a settings page menu's closed
|
||||
* callback. The pending def is picked up by uiSettingsUpdate on the
|
||||
* next tick.
|
||||
*
|
||||
* @param menu The menu that was just closed.
|
||||
*/
|
||||
void uiSettingsDiscardMenuClosed(const uimenu_t *menu);
|
||||
|
||||
/**
|
||||
* Shows the discard-changes confirmation dialog for def. Called once
|
||||
* by uiSettingsUpdate when uiSettingsDiscardMenuClosed has flagged a
|
||||
* pending def.
|
||||
*
|
||||
* @param def The tab/panel def to show the confirmation for.
|
||||
* @return Any error that occurs.
|
||||
*/
|
||||
errorret_t uiSettingsDiscardUpdate(uisettingstabdef_t *def);
|
||||
|
||||
/**
|
||||
* Callback passed to uiConfirmOpen by uiSettingsDiscardUpdate. Reopens
|
||||
* the menu if the user chose to keep editing, otherwise reloads the
|
||||
* widgets back to the actual engine values.
|
||||
*
|
||||
* @param result True if the user confirmed discarding changes, false
|
||||
* to keep editing.
|
||||
* @param user The uisettingstabdef_t* this confirmation belongs to.
|
||||
*/
|
||||
void uiSettingsDiscardConfirmResult(const bool_t result, void *user);
|
||||
|
||||
/**
|
||||
* Initializes the settings panel and all of its category pages.
|
||||
*
|
||||
* @return Any error that occurs.
|
||||
*/
|
||||
errorret_t uiSettingsInit(void);
|
||||
|
||||
/**
|
||||
* Draws the settings panel. No-op when not visible.
|
||||
*
|
||||
* @return Any error that occurs.
|
||||
*/
|
||||
errorret_t uiSettingsDraw(void);
|
||||
|
||||
/**
|
||||
* Updates the settings panel. Shows a discard-changes confirmation if
|
||||
* the panel was just closed with unsaved changes.
|
||||
*
|
||||
* @return Any error that occurs.
|
||||
*/
|
||||
errorret_t uiSettingsUpdate(void);
|
||||
|
||||
/**
|
||||
* Returns true when the settings panel is currently open.
|
||||
*
|
||||
* @returns True if open.
|
||||
*/
|
||||
bool_t uiSettingsIsOpen(void);
|
||||
|
||||
/**
|
||||
* Opens the settings panel. No-op when already open.
|
||||
*/
|
||||
void uiSettingsOpen();
|
||||
|
||||
/**
|
||||
* Closes the settings panel. No-op when already closed.
|
||||
*/
|
||||
void uiSettingsClose();
|
||||
|
||||
/**
|
||||
* Disposes of the settings panel.
|
||||
*
|
||||
* @return Any error that occurs.
|
||||
*/
|
||||
errorret_t uiSettingsDispose(void);
|
||||
|
||||
/**
|
||||
* Loads every category page's widgets from the current engine settings.
|
||||
* Called automatically by uiSettingsOpen.
|
||||
*/
|
||||
void uiSettingsLoad(void);
|
||||
|
||||
/**
|
||||
* Applies every category page's widget values to the engine settings.
|
||||
* Called automatically when a page's own Apply button is pressed.
|
||||
*/
|
||||
void uiSettingsApply(void);
|
||||
|
||||
/**
|
||||
* Returns whether any category page has a widget value that differs
|
||||
* from what was loaded.
|
||||
*
|
||||
* @returns True if there are unsaved changes.
|
||||
*/
|
||||
bool_t uiSettingsHasChanges(void);
|
||||
@@ -0,0 +1,47 @@
|
||||
/**
|
||||
* Copyright (c) 2026 Dominic Masters
|
||||
*
|
||||
* This software is released under the MIT License.
|
||||
* https://opensource.org/licenses/MIT
|
||||
*/
|
||||
|
||||
#include "uisettingsaudio.h"
|
||||
#include "uisettings.h"
|
||||
#include "assert/assert.h"
|
||||
#include "util/memory.h"
|
||||
|
||||
void uiSettingsAudioSelected(
|
||||
const uimenu_t *menu,
|
||||
const uint8_t index,
|
||||
const uimenuitem_t *item
|
||||
) {
|
||||
if(index != UI_SETTINGS_AUDIO_INDEX_APPLY) return;
|
||||
uiSettingsAudioApply();
|
||||
}
|
||||
|
||||
errorret_t uiSettingsAudioInit(uisettingsdata_t *data) {
|
||||
uisettingsaudio_t *audio = &data->audio;
|
||||
memoryZero(audio, sizeof(uisettingsaudio_t));
|
||||
|
||||
MENU_BEGIN(
|
||||
&audio->menu, audio->items,
|
||||
uiSettingsAudioSelected, uiSettingsDiscardMenuClosed, NULL
|
||||
);
|
||||
MENU_LABEL("No audio settings yet");
|
||||
MENU_BUTTON(UI_SETTINGS.applyLabel);
|
||||
|
||||
MENU_END(audio->items, 1);
|
||||
|
||||
errorOk();
|
||||
}
|
||||
|
||||
void uiSettingsAudioLoad(void) {
|
||||
}
|
||||
|
||||
void uiSettingsAudioApply(void) {
|
||||
uiMenuClose(&UI_SETTINGS.data.audio.menu);
|
||||
}
|
||||
|
||||
bool_t uiSettingsAudioHasChanges(void) {
|
||||
return false;
|
||||
}
|
||||
@@ -0,0 +1,36 @@
|
||||
/**
|
||||
* Copyright (c) 2026 Dominic Masters
|
||||
*
|
||||
* This software is released under the MIT License.
|
||||
* https://opensource.org/licenses/MIT
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
#include "error/error.h"
|
||||
#include "uisettingsdata.h"
|
||||
|
||||
/**
|
||||
* Initializes the audio settings page into the shared settings data
|
||||
* union.
|
||||
*
|
||||
* @param data The shared settings data union to initialize into.
|
||||
* @return Any error that occurs.
|
||||
*/
|
||||
errorret_t uiSettingsAudioInit(uisettingsdata_t *data);
|
||||
|
||||
/**
|
||||
* Loads the page's widgets from the current engine audio settings.
|
||||
*/
|
||||
void uiSettingsAudioLoad(void);
|
||||
|
||||
/**
|
||||
* Applies the page's widget values to the engine audio settings.
|
||||
*/
|
||||
void uiSettingsAudioApply(void);
|
||||
|
||||
/**
|
||||
* Returns whether any widget's value differs from what was loaded.
|
||||
*
|
||||
* @returns True if there are unsaved changes.
|
||||
*/
|
||||
bool_t uiSettingsAudioHasChanges(void);
|
||||
@@ -0,0 +1,67 @@
|
||||
/**
|
||||
* Copyright (c) 2026 Dominic Masters
|
||||
*
|
||||
* This software is released under the MIT License.
|
||||
* https://opensource.org/licenses/MIT
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
#include "error/error.h"
|
||||
#include "ui/widget/uimenu.h"
|
||||
|
||||
#define UI_SETTINGS_GENERAL_ITEM_COUNT 3
|
||||
#define UI_SETTINGS_GENERAL_INDEX_LANGUAGE 0
|
||||
#define UI_SETTINGS_GENERAL_INDEX_LANGUAGE_DETAIL 1
|
||||
#define UI_SETTINGS_GENERAL_INDEX_APPLY 2
|
||||
#define UI_SETTINGS_GENERAL_LOCALE_COUNT 3
|
||||
#define UI_SETTINGS_GENERAL_LABEL_MAX 32
|
||||
#define UI_SETTINGS_GENERAL_INFO_MAX 64
|
||||
|
||||
typedef struct {
|
||||
uimenu_t menu;
|
||||
uimenuitem_t items[UI_SETTINGS_GENERAL_ITEM_COUNT];
|
||||
const char_t *localeNames[UI_SETTINGS_GENERAL_LOCALE_COUNT];
|
||||
char_t languageLabel[UI_SETTINGS_GENERAL_LABEL_MAX];
|
||||
char_t labelInfo[UI_SETTINGS_GENERAL_INFO_MAX];
|
||||
} uisettingsgeneral_t;
|
||||
|
||||
#define UI_SETTINGS_INPUT_ITEM_COUNT 2
|
||||
#define UI_SETTINGS_INPUT_LABEL_MAX 32
|
||||
#define UI_SETTINGS_INPUT_INDEX_DEADZONE 0
|
||||
#define UI_SETTINGS_INPUT_INDEX_APPLY 1
|
||||
|
||||
typedef struct {
|
||||
uimenu_t menu;
|
||||
uimenuitem_t items[UI_SETTINGS_INPUT_ITEM_COUNT];
|
||||
char_t deadzoneLabel[UI_SETTINGS_INPUT_LABEL_MAX];
|
||||
} uisettingsinput_t;
|
||||
|
||||
#define UI_SETTINGS_DISPLAY_ITEM_COUNT 2
|
||||
#define UI_SETTINGS_DISPLAY_INDEX_APPLY 1
|
||||
|
||||
typedef struct {
|
||||
uimenu_t menu;
|
||||
uimenuitem_t items[UI_SETTINGS_DISPLAY_ITEM_COUNT];
|
||||
} uisettingsdisplay_t;
|
||||
|
||||
#define UI_SETTINGS_AUDIO_ITEM_COUNT 2
|
||||
#define UI_SETTINGS_AUDIO_INDEX_APPLY 1
|
||||
|
||||
typedef struct {
|
||||
uimenu_t menu;
|
||||
uimenuitem_t items[UI_SETTINGS_AUDIO_ITEM_COUNT];
|
||||
} uisettingsaudio_t;
|
||||
|
||||
/**
|
||||
* Shared, overlapping storage for every settings tab's page data. Only
|
||||
* one member is ever live at a time -- the active tab's Init writes
|
||||
* into it, overwriting whatever the previously active tab left there.
|
||||
* This trades simultaneous access to every tab for a memory footprint
|
||||
* of only the single largest page.
|
||||
*/
|
||||
typedef union {
|
||||
uisettingsgeneral_t general;
|
||||
uisettingsinput_t input;
|
||||
uisettingsdisplay_t display;
|
||||
uisettingsaudio_t audio;
|
||||
} uisettingsdata_t;
|
||||
@@ -0,0 +1,47 @@
|
||||
/**
|
||||
* Copyright (c) 2026 Dominic Masters
|
||||
*
|
||||
* This software is released under the MIT License.
|
||||
* https://opensource.org/licenses/MIT
|
||||
*/
|
||||
|
||||
#include "uisettingsdisplay.h"
|
||||
#include "uisettings.h"
|
||||
#include "assert/assert.h"
|
||||
#include "util/memory.h"
|
||||
|
||||
void uiSettingsDisplaySelected(
|
||||
const uimenu_t *menu,
|
||||
const uint8_t index,
|
||||
const uimenuitem_t *item
|
||||
) {
|
||||
if(index != UI_SETTINGS_DISPLAY_INDEX_APPLY) return;
|
||||
uiSettingsDisplayApply();
|
||||
}
|
||||
|
||||
errorret_t uiSettingsDisplayInit(uisettingsdata_t *data) {
|
||||
uisettingsdisplay_t *display = &data->display;
|
||||
memoryZero(display, sizeof(uisettingsdisplay_t));
|
||||
|
||||
MENU_BEGIN(
|
||||
&display->menu, display->items,
|
||||
uiSettingsDisplaySelected, uiSettingsDiscardMenuClosed, NULL
|
||||
);
|
||||
MENU_LABEL("No display settings yet");
|
||||
MENU_BUTTON(UI_SETTINGS.applyLabel);
|
||||
|
||||
MENU_END(display->items, 1);
|
||||
|
||||
errorOk();
|
||||
}
|
||||
|
||||
void uiSettingsDisplayLoad(void) {
|
||||
}
|
||||
|
||||
void uiSettingsDisplayApply(void) {
|
||||
uiMenuClose(&UI_SETTINGS.data.display.menu);
|
||||
}
|
||||
|
||||
bool_t uiSettingsDisplayHasChanges(void) {
|
||||
return false;
|
||||
}
|
||||
@@ -0,0 +1,36 @@
|
||||
/**
|
||||
* Copyright (c) 2026 Dominic Masters
|
||||
*
|
||||
* This software is released under the MIT License.
|
||||
* https://opensource.org/licenses/MIT
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
#include "error/error.h"
|
||||
#include "uisettingsdata.h"
|
||||
|
||||
/**
|
||||
* Initializes the display settings page into the shared settings data
|
||||
* union.
|
||||
*
|
||||
* @param data The shared settings data union to initialize into.
|
||||
* @return Any error that occurs.
|
||||
*/
|
||||
errorret_t uiSettingsDisplayInit(uisettingsdata_t *data);
|
||||
|
||||
/**
|
||||
* Loads the page's widgets from the current engine display settings.
|
||||
*/
|
||||
void uiSettingsDisplayLoad(void);
|
||||
|
||||
/**
|
||||
* Applies the page's widget values to the engine display settings.
|
||||
*/
|
||||
void uiSettingsDisplayApply(void);
|
||||
|
||||
/**
|
||||
* Returns whether any widget's value differs from what was loaded.
|
||||
*
|
||||
* @returns True if there are unsaved changes.
|
||||
*/
|
||||
bool_t uiSettingsDisplayHasChanges(void);
|
||||
@@ -0,0 +1,117 @@
|
||||
/**
|
||||
* Copyright (c) 2026 Dominic Masters
|
||||
*
|
||||
* This software is released under the MIT License.
|
||||
* https://opensource.org/licenses/MIT
|
||||
*/
|
||||
|
||||
#include "uisettingsgeneral.h"
|
||||
#include "uisettings.h"
|
||||
#include "assert/assert.h"
|
||||
#include "util/memory.h"
|
||||
#include "util/string.h"
|
||||
#include "locale/localemanager.h"
|
||||
#include "locale/localeinfo.h"
|
||||
#include "asset/loader/locale/assetlocaleloader.h"
|
||||
|
||||
static const localeinfo_t *const UI_SETTINGS_GENERAL_LOCALES[
|
||||
UI_SETTINGS_GENERAL_LOCALE_COUNT
|
||||
] = {
|
||||
&LOCALE_EN_US,
|
||||
&LOCALE_JP_JP,
|
||||
&LOCALE_ES_MX
|
||||
};
|
||||
|
||||
void uiSettingsGeneralSelected(
|
||||
const uimenu_t *menu,
|
||||
const uint8_t index,
|
||||
const uimenuitem_t *item
|
||||
) {
|
||||
switch(index) {
|
||||
case UI_SETTINGS_GENERAL_INDEX_APPLY:
|
||||
uiSettingsGeneralApply();
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
errorret_t uiSettingsGeneralInit(uisettingsdata_t *data) {
|
||||
uisettingsgeneral_t *general = &data->general;
|
||||
memoryZero(general, sizeof(uisettingsgeneral_t));
|
||||
|
||||
for(uint8_t i = 0; i < UI_SETTINGS_GENERAL_LOCALE_COUNT; i++) {
|
||||
general->localeNames[i] = UI_SETTINGS_GENERAL_LOCALES[i]->name;
|
||||
}
|
||||
|
||||
errorChain(assetLocaleGetString(
|
||||
&LOCALE.entry->data.locale,
|
||||
"ui.settings.general.language",
|
||||
0,
|
||||
general->languageLabel,
|
||||
UI_SETTINGS_GENERAL_LABEL_MAX
|
||||
));
|
||||
errorChain(assetLocaleGetString(
|
||||
&LOCALE.entry->data.locale,
|
||||
"ui.settings.general.language_detail",
|
||||
0,
|
||||
general->labelInfo,
|
||||
UI_SETTINGS_GENERAL_INFO_MAX
|
||||
));
|
||||
|
||||
MENU_BEGIN(
|
||||
&general->menu, general->items,
|
||||
uiSettingsGeneralSelected, uiSettingsDiscardMenuClosed, NULL
|
||||
);
|
||||
|
||||
MENU_DROPDOWN(
|
||||
general->languageLabel, general->localeNames,
|
||||
UI_SETTINGS_GENERAL_LOCALE_COUNT, 0
|
||||
);
|
||||
MENU_LABEL(general->labelInfo);
|
||||
|
||||
MENU_BUTTON(UI_SETTINGS.applyLabel);
|
||||
MENU_END(general->items, 1);
|
||||
|
||||
errorOk();
|
||||
}
|
||||
|
||||
void uiSettingsGeneralLoad(void) {
|
||||
uisettingsgeneral_t *general = &UI_SETTINGS.data.general;
|
||||
|
||||
uint8_t index = 0;
|
||||
for(uint8_t i = 0; i < UI_SETTINGS_GENERAL_LOCALE_COUNT; i++) {
|
||||
if(stringCompare(LOCALE.locale->file, UI_SETTINGS_GENERAL_LOCALES[i]->file) != 0) {
|
||||
continue;
|
||||
}
|
||||
index = i;
|
||||
break;
|
||||
}
|
||||
|
||||
uiDropdownSetSelectedIndex(
|
||||
&general->items[UI_SETTINGS_GENERAL_INDEX_LANGUAGE].dropdown, index
|
||||
);
|
||||
}
|
||||
|
||||
void uiSettingsGeneralApply(void) {
|
||||
uisettingsgeneral_t *general = &UI_SETTINGS.data.general;
|
||||
|
||||
uint8_t index = uiDropdownGetSelectedIndex(
|
||||
&general->items[UI_SETTINGS_GENERAL_INDEX_LANGUAGE].dropdown
|
||||
);
|
||||
errorCatch(localeManagerSetLocale(UI_SETTINGS_GENERAL_LOCALES[index]));
|
||||
|
||||
uiMenuClose(&general->menu);
|
||||
}
|
||||
|
||||
bool_t uiSettingsGeneralHasChanges(void) {
|
||||
uisettingsgeneral_t *general = &UI_SETTINGS.data.general;
|
||||
|
||||
uint8_t index = uiDropdownGetSelectedIndex(
|
||||
&general->items[UI_SETTINGS_GENERAL_INDEX_LANGUAGE].dropdown
|
||||
);
|
||||
return stringCompare(
|
||||
LOCALE.locale->file, UI_SETTINGS_GENERAL_LOCALES[index]->file
|
||||
) != 0;
|
||||
}
|
||||
@@ -0,0 +1,36 @@
|
||||
/**
|
||||
* Copyright (c) 2026 Dominic Masters
|
||||
*
|
||||
* This software is released under the MIT License.
|
||||
* https://opensource.org/licenses/MIT
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
#include "error/error.h"
|
||||
#include "uisettingsdata.h"
|
||||
|
||||
/**
|
||||
* Initializes the general settings page into the shared settings data
|
||||
* union.
|
||||
*
|
||||
* @param data The shared settings data union to initialize into.
|
||||
* @return Any error that occurs.
|
||||
*/
|
||||
errorret_t uiSettingsGeneralInit(uisettingsdata_t *data);
|
||||
|
||||
/**
|
||||
* Loads the page's widgets from the current engine general settings.
|
||||
*/
|
||||
void uiSettingsGeneralLoad(void);
|
||||
|
||||
/**
|
||||
* Applies the page's widget values to the engine general settings.
|
||||
*/
|
||||
void uiSettingsGeneralApply(void);
|
||||
|
||||
/**
|
||||
* Returns whether any widget's value differs from what was loaded.
|
||||
*
|
||||
* @returns True if there are unsaved changes.
|
||||
*/
|
||||
bool_t uiSettingsGeneralHasChanges(void);
|
||||
@@ -0,0 +1,82 @@
|
||||
/**
|
||||
* Copyright (c) 2026 Dominic Masters
|
||||
*
|
||||
* This software is released under the MIT License.
|
||||
* https://opensource.org/licenses/MIT
|
||||
*/
|
||||
|
||||
#include "uisettingsinput.h"
|
||||
#include "uisettings.h"
|
||||
#include "assert/assert.h"
|
||||
#include "util/memory.h"
|
||||
#include "locale/localemanager.h"
|
||||
#include "asset/loader/locale/assetlocaleloader.h"
|
||||
#include "input/input.h"
|
||||
#include "save/savesettings.h"
|
||||
|
||||
void uiSettingsInputSelected(
|
||||
const uimenu_t *menu,
|
||||
const uint8_t index,
|
||||
const uimenuitem_t *item
|
||||
) {
|
||||
if(index != UI_SETTINGS_INPUT_INDEX_APPLY) return;
|
||||
uiSettingsInputApply();
|
||||
}
|
||||
|
||||
errorret_t uiSettingsInputInit(uisettingsdata_t *data) {
|
||||
uisettingsinput_t *input = &data->input;
|
||||
memoryZero(input, sizeof(uisettingsinput_t));
|
||||
|
||||
MENU_BEGIN(
|
||||
&input->menu, input->items,
|
||||
uiSettingsInputSelected, uiSettingsDiscardMenuClosed, NULL
|
||||
);
|
||||
#ifdef DUSK_INPUT_GAMEPAD
|
||||
errorChain(assetLocaleGetString(
|
||||
&LOCALE.entry->data.locale,
|
||||
"ui.settings.input.deadzone",
|
||||
0,
|
||||
input->deadzoneLabel,
|
||||
UI_SETTINGS_INPUT_LABEL_MAX
|
||||
));
|
||||
MENU_SLIDER_FLOAT(
|
||||
input->deadzoneLabel, INPUT_DEADZONE_DEFAULT, 0.0f, 1.0f, 0.05f
|
||||
);
|
||||
#else
|
||||
MENU_LABEL("No input settings yet");
|
||||
#endif
|
||||
|
||||
MENU_BUTTON(UI_SETTINGS.applyLabel);
|
||||
MENU_END(input->items, 1);
|
||||
|
||||
errorOk();
|
||||
}
|
||||
|
||||
void uiSettingsInputLoad(void) {
|
||||
#ifdef DUSK_INPUT_GAMEPAD
|
||||
uiSliderSetFloat(
|
||||
&UI_SETTINGS.data.input.items[UI_SETTINGS_INPUT_INDEX_DEADZONE].slider,
|
||||
INPUT.deadzone
|
||||
);
|
||||
#endif
|
||||
}
|
||||
|
||||
void uiSettingsInputApply(void) {
|
||||
#ifdef DUSK_INPUT_GAMEPAD
|
||||
INPUT.deadzone = uiSliderGetFloat(
|
||||
&UI_SETTINGS.data.input.items[UI_SETTINGS_INPUT_INDEX_DEADZONE].slider
|
||||
);
|
||||
#endif
|
||||
errorCatch(errorPrint(saveSettingsWrite()));
|
||||
uiMenuClose(&UI_SETTINGS.data.input.menu);
|
||||
}
|
||||
|
||||
bool_t uiSettingsInputHasChanges(void) {
|
||||
#ifdef DUSK_INPUT_GAMEPAD
|
||||
if(uiSliderGetFloat(
|
||||
&UI_SETTINGS.data.input.items[UI_SETTINGS_INPUT_INDEX_DEADZONE].slider
|
||||
) != INPUT.deadzone) return true;
|
||||
#endif
|
||||
|
||||
return false;
|
||||
}
|
||||
@@ -0,0 +1,36 @@
|
||||
/**
|
||||
* Copyright (c) 2026 Dominic Masters
|
||||
*
|
||||
* This software is released under the MIT License.
|
||||
* https://opensource.org/licenses/MIT
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
#include "error/error.h"
|
||||
#include "uisettingsdata.h"
|
||||
|
||||
/**
|
||||
* Initializes the input settings page into the shared settings data
|
||||
* union.
|
||||
*
|
||||
* @param data The shared settings data union to initialize into.
|
||||
* @return Any error that occurs.
|
||||
*/
|
||||
errorret_t uiSettingsInputInit(uisettingsdata_t *data);
|
||||
|
||||
/**
|
||||
* Loads the page's widgets from the current engine input settings.
|
||||
*/
|
||||
void uiSettingsInputLoad(void);
|
||||
|
||||
/**
|
||||
* Applies the page's widget values to the engine input settings.
|
||||
*/
|
||||
void uiSettingsInputApply(void);
|
||||
|
||||
/**
|
||||
* Returns whether any widget's value differs from what was loaded.
|
||||
*
|
||||
* @returns True if there are unsaved changes.
|
||||
*/
|
||||
bool_t uiSettingsInputHasChanges(void);
|
||||
@@ -0,0 +1,126 @@
|
||||
/**
|
||||
* Copyright (c) 2026 Dominic Masters
|
||||
*
|
||||
* This software is released under the MIT License.
|
||||
* https://opensource.org/licenses/MIT
|
||||
*/
|
||||
|
||||
#include "uiconfirm.h"
|
||||
#include "uiframe.h"
|
||||
#include "assert/assert.h"
|
||||
#include "util/memory.h"
|
||||
#include "util/math.h"
|
||||
#include "display/screen/screen.h"
|
||||
#include "display/text/text.h"
|
||||
#include "display/color.h"
|
||||
#include "display/spritebatch/spritebatch.h"
|
||||
#include "display/texture/texture.h"
|
||||
#include "display/shader/shaderunlit.h"
|
||||
|
||||
#define UI_CONFIRM_BACKDROP_COLOR color4b(0, 0, 0, 160)
|
||||
|
||||
uiconfirm_t UI_CONFIRM;
|
||||
|
||||
void uiConfirmSelected(
|
||||
const uimenu_t *menu,
|
||||
const uint8_t index,
|
||||
const uimenuitem_t *item
|
||||
) {
|
||||
UI_CONFIRM.result = index == UI_CONFIRM_INDEX_CONFIRM;
|
||||
uiConfirmClose();
|
||||
}
|
||||
|
||||
void uiConfirmClosed(const uimenu_t *menu) {
|
||||
if(UI_CONFIRM.callback != NULL) {
|
||||
UI_CONFIRM.callback(UI_CONFIRM.result, UI_CONFIRM.user);
|
||||
}
|
||||
}
|
||||
|
||||
errorret_t uiConfirmInit(void) {
|
||||
memoryZero(&UI_CONFIRM, sizeof(uiconfirm_t));
|
||||
uiLabelInit(&UI_CONFIRM.textLabel, &FONT_DEFAULT);
|
||||
|
||||
MENU_BEGIN(
|
||||
&UI_CONFIRM.menu, UI_CONFIRM.items, uiConfirmSelected, uiConfirmClosed, NULL
|
||||
);
|
||||
MENU_BUTTON("Confirm");
|
||||
MENU_BUTTON("Cancel");
|
||||
|
||||
MENU_END(UI_CONFIRM.items, menuIndex);
|
||||
|
||||
errorOk();
|
||||
}
|
||||
|
||||
errorret_t uiConfirmDraw(void) {
|
||||
if(!uiMenuIsActive(&UI_CONFIRM.menu)) errorOk();
|
||||
|
||||
spritebatchsprite_t backdropSprite = {
|
||||
.min = { 0.0f, 0.0f, 0.0f },
|
||||
.max = { (float_t)SCREEN.width, (float_t)SCREEN.height, 0.0f },
|
||||
.uvMin = { 0.0f, 0.0f },
|
||||
.uvMax = { 1.0f, 1.0f }
|
||||
};
|
||||
shadermaterial_t backdropMaterial = {
|
||||
.unlit = {
|
||||
.color = UI_CONFIRM_BACKDROP_COLOR,
|
||||
.texture = &TEXTURE_WHITE
|
||||
}
|
||||
};
|
||||
errorChain(
|
||||
spriteBatchBuffer(&backdropSprite, 1, &SHADER_UNLIT, backdropMaterial)
|
||||
);
|
||||
|
||||
int32_t textW, textH;
|
||||
uiLabelGetSize(&UI_CONFIRM.textLabel, &textW, &textH);
|
||||
|
||||
float_t rowHeight = (float_t)FONT_DEFAULT.tileset->tileHeight;
|
||||
float_t width = mathMax(
|
||||
(float_t)textW + (UI_FRAME_START_X * 2), UI_CONFIRM_MIN_WIDTH
|
||||
);
|
||||
float_t height = (UI_FRAME_START_Y * 2) + rowHeight + UI_FRAME_PADDING_Y +
|
||||
rowHeight;
|
||||
float_t x = (float_t)SCREEN.scanX + ((float_t)SCREEN.scanWidth - width) * 0.5f;
|
||||
float_t y = (float_t)SCREEN.scanY + ((float_t)SCREEN.scanHeight - height) * 0.5f;
|
||||
|
||||
errorChain(uiFrameDrawCached(&UI_CONFIRM.frameCache, x, y, width, height));
|
||||
|
||||
float_t contentX = x + UI_FRAME_START_X;
|
||||
float_t contentY = y + UI_FRAME_START_Y;
|
||||
float_t contentWidth = width - (UI_FRAME_START_X * 2);
|
||||
|
||||
errorChain(uiLabelDraw(&UI_CONFIRM.textLabel, contentX, contentY));
|
||||
|
||||
float_t buttonsY = contentY + rowHeight + UI_FRAME_PADDING_Y;
|
||||
errorChain(uiMenuDraw(&UI_CONFIRM.menu, contentX, buttonsY, contentWidth, rowHeight));
|
||||
|
||||
errorOk();
|
||||
}
|
||||
|
||||
bool_t uiConfirmIsOpen(void) {
|
||||
return uiMenuIsActive(&UI_CONFIRM.menu);
|
||||
}
|
||||
|
||||
bool_t uiConfirmGetResult(void) {
|
||||
return UI_CONFIRM.result;
|
||||
}
|
||||
|
||||
void uiConfirmOpen(
|
||||
const char_t *question,
|
||||
uiconfirmcallback_t callback,
|
||||
void *user
|
||||
) {
|
||||
assertNotNull(question, "Question cannot be NULL");
|
||||
uiLabelSetText(&UI_CONFIRM.textLabel, question);
|
||||
UI_CONFIRM.callback = callback;
|
||||
UI_CONFIRM.user = user;
|
||||
UI_CONFIRM.result = false;
|
||||
uiMenuOpen(&UI_CONFIRM.menu);
|
||||
}
|
||||
|
||||
void uiConfirmClose(void) {
|
||||
uiMenuClose(&UI_CONFIRM.menu);
|
||||
}
|
||||
|
||||
errorret_t uiConfirmDispose(void) {
|
||||
errorOk();
|
||||
}
|
||||
@@ -7,21 +7,32 @@
|
||||
|
||||
#pragma once
|
||||
#include "error/error.h"
|
||||
#include "ui/widget/uimenu.h"
|
||||
#include "ui/widget/uilabel.h"
|
||||
#include "ui/frame/uiframe.h"
|
||||
|
||||
#define UI_CONFIRM_MIN_WIDTH 160.0f
|
||||
#define UI_CONFIRM_INDEX_CONFIRM 0
|
||||
#define UI_CONFIRM_INDEX_CANCEL 1
|
||||
#define UI_CONFIRM_ITEM_COUNT 2
|
||||
|
||||
/**
|
||||
* Callback invoked once a confirm dialog is dismissed. Back/cancel
|
||||
* input is disabled while it's open, so the dialog can only be
|
||||
* dismissed by picking Confirm or Cancel.
|
||||
* Callback invoked once a confirm dialog is dismissed.
|
||||
*
|
||||
* @param result True if Confirm was selected, false if Cancel was
|
||||
* selected.
|
||||
* selected or the dialog was backed out of.
|
||||
* @param user Arbitrary pointer passed to uiConfirmOpen.
|
||||
*/
|
||||
typedef void (*uiconfirmcallback_t)(const bool_t result, void *user);
|
||||
|
||||
typedef struct {
|
||||
uilabel_t textLabel;
|
||||
uimenu_t menu;
|
||||
uimenuitem_t items[UI_CONFIRM_ITEM_COUNT];
|
||||
uiconfirmcallback_t callback;
|
||||
void *user;
|
||||
bool_t result;
|
||||
uiframecache_t frameCache;
|
||||
} uiconfirm_t;
|
||||
|
||||
extern uiconfirm_t UI_CONFIRM;
|
||||
@@ -33,6 +44,15 @@ extern uiconfirm_t UI_CONFIRM;
|
||||
*/
|
||||
errorret_t uiConfirmInit(void);
|
||||
|
||||
/**
|
||||
* Draws the confirm dialog: a semi-transparent black backdrop covering
|
||||
* the whole screen, then its own centered frame with the question text
|
||||
* and Confirm/Cancel buttons. No-op when not open.
|
||||
*
|
||||
* @return Any error that occurs.
|
||||
*/
|
||||
errorret_t uiConfirmDraw(void);
|
||||
|
||||
/**
|
||||
* Returns true when the confirm dialog is currently open.
|
||||
*
|
||||
@@ -48,12 +68,11 @@ bool_t uiConfirmIsOpen(void);
|
||||
bool_t uiConfirmGetResult(void);
|
||||
|
||||
/**
|
||||
* Opens a confirm dialog, backed by the shared uimodal_t, with the given
|
||||
* question text and Confirm/Cancel buttons. callback is invoked exactly
|
||||
* once with the result once a button is selected.
|
||||
* Opens the confirm dialog with the given question text. callback is
|
||||
* invoked exactly once with the result, whether the dialog was
|
||||
* dismissed by selecting a button or by pressing cancel/back.
|
||||
*
|
||||
* @param question Display text, or a locale message ID; copied
|
||||
* internally by uimodal, safe to be transient.
|
||||
* @param question Display text; copied internally, safe to be transient.
|
||||
* @param callback Called with the result once the dialog closes. May be
|
||||
* NULL.
|
||||
* @param user Arbitrary pointer passed through to callback.
|
||||
@@ -72,6 +72,17 @@ errorret_t uiFrameDraw(
|
||||
}
|
||||
};
|
||||
spritebatchsprite_t sprites[9];
|
||||
uiFrameBuildSprites(sprites, x, y, width, height);
|
||||
return spriteBatchBuffer(sprites, 9, &SHADER_UNLIT, material);
|
||||
}
|
||||
|
||||
void uiFrameBuildSprites(
|
||||
spritebatchsprite_t sprites[9],
|
||||
const float_t x,
|
||||
const float_t y,
|
||||
const float_t width,
|
||||
const float_t height
|
||||
) {
|
||||
float_t tileW = (float_t)UI_FRAME_BORDER_WIDTH;
|
||||
float_t tileH = (float_t)UI_FRAME_BORDER_HEIGHT;
|
||||
|
||||
@@ -112,8 +123,37 @@ errorret_t uiFrameDraw(
|
||||
&UI_FRAME.tileset, 2, 2,
|
||||
x + width - tileW, y + height - tileH, tileW, tileH
|
||||
);
|
||||
}
|
||||
|
||||
return spriteBatchBuffer(sprites, 9, &SHADER_UNLIT, material);
|
||||
errorret_t uiFrameDrawCached(
|
||||
uiframecache_t *cache,
|
||||
const float_t x,
|
||||
const float_t y,
|
||||
const float_t width,
|
||||
const float_t height
|
||||
) {
|
||||
assertNotNull(cache, "Frame cache cannot be NULL");
|
||||
|
||||
if(
|
||||
!cache->built ||
|
||||
cache->lastX != x || cache->lastY != y ||
|
||||
cache->lastWidth != width || cache->lastHeight != height
|
||||
) {
|
||||
uiFrameBuildSprites(cache->sprites, x, y, width, height);
|
||||
cache->lastX = x;
|
||||
cache->lastY = y;
|
||||
cache->lastWidth = width;
|
||||
cache->lastHeight = height;
|
||||
cache->built = true;
|
||||
}
|
||||
|
||||
shadermaterial_t material = {
|
||||
.unlit = {
|
||||
.color = COLOR_WHITE,
|
||||
.texture = &UI_FRAME.texture
|
||||
}
|
||||
};
|
||||
return spriteBatchBuffer(cache->sprites, 9, &SHADER_UNLIT, material);
|
||||
}
|
||||
|
||||
errorret_t uiFrameDispose(void) {
|
||||
@@ -0,0 +1,122 @@
|
||||
/**
|
||||
* Copyright (c) 2026 Dominic Masters
|
||||
*
|
||||
* This software is released under the MIT License.
|
||||
* https://opensource.org/licenses/MIT
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
#include "error/error.h"
|
||||
#include "display/texture/texture.h"
|
||||
#include "display/texture/tileset.h"
|
||||
#include "display/spritebatch/spritebatchsprite.h"
|
||||
|
||||
#define UI_FRAME_BORDER_WIDTH 6
|
||||
#define UI_FRAME_BORDER_HEIGHT 6
|
||||
#define UI_FRAME_PADDING_X 2
|
||||
#define UI_FRAME_PADDING_Y 2
|
||||
#define UI_FRAME_START_X (UI_FRAME_BORDER_WIDTH + UI_FRAME_PADDING_X)
|
||||
#define UI_FRAME_START_Y (UI_FRAME_BORDER_HEIGHT + UI_FRAME_PADDING_Y)
|
||||
#define UI_FRAME_TILE_WIDTH 1
|
||||
#define UI_FRAME_TILE_HEIGHT 1
|
||||
#define UI_FRAME_TEXTURE_WIDTH (UI_FRAME_TILE_WIDTH * 3)
|
||||
#define UI_FRAME_TEXTURE_HEIGHT (UI_FRAME_TILE_HEIGHT * 3)
|
||||
#define UI_FRAME_TEXTURE_WIDTH_POW2 4
|
||||
#define UI_FRAME_TEXTURE_HEIGHT_POW2 4
|
||||
|
||||
typedef struct {
|
||||
tileset_t tileset;
|
||||
texture_t texture;
|
||||
color_t pixels[UI_FRAME_BORDER_WIDTH * UI_FRAME_BORDER_HEIGHT];
|
||||
} uiframe_t;
|
||||
|
||||
extern uiframe_t UI_FRAME;
|
||||
|
||||
/**
|
||||
* Initializes the global UI_FRAME: builds the dummy texture and
|
||||
* configures the tileset. Call once after displayInit().
|
||||
*
|
||||
* @return Any error that occurs.
|
||||
*/
|
||||
errorret_t uiFrameInit(void);
|
||||
|
||||
/**
|
||||
* Draws UI_FRAME using 9-slice rendering from its 3x3 tileset.
|
||||
* Pushes quads to the sprite batch without flushing.
|
||||
*
|
||||
* @param x Screen x position.
|
||||
* @param y Screen y position.
|
||||
* @param width Total width of the frame.
|
||||
* @param height Total height of the frame.
|
||||
* @return Any error that occurs.
|
||||
*/
|
||||
errorret_t uiFrameDraw(
|
||||
const float_t x,
|
||||
const float_t y,
|
||||
const float_t width,
|
||||
const float_t height
|
||||
);
|
||||
|
||||
/**
|
||||
* Builds the 9 sprites for a 9-slice frame at the given rect. Used
|
||||
* internally by uiFrameDraw and uiFrameDrawCached -- call directly only
|
||||
* if you need the raw sprites instead of buffering them.
|
||||
*
|
||||
* @param sprites Destination array of exactly 9 sprites.
|
||||
* @param x Screen x position.
|
||||
* @param y Screen y position.
|
||||
* @param width Total width of the frame.
|
||||
* @param height Total height of the frame.
|
||||
*/
|
||||
void uiFrameBuildSprites(
|
||||
spritebatchsprite_t sprites[9],
|
||||
const float_t x,
|
||||
const float_t y,
|
||||
const float_t width,
|
||||
const float_t height
|
||||
);
|
||||
|
||||
/**
|
||||
* A frame's cached 9-slice sprites, plus the rect they were built for.
|
||||
* Owned by whichever widget/screen draws a frame repeatedly (dialogs,
|
||||
* textboxes, settings panels) so uiFrameDrawCached can skip rebuilding
|
||||
* the sprites when the rect hasn't moved since the last draw.
|
||||
*/
|
||||
typedef struct {
|
||||
spritebatchsprite_t sprites[9];
|
||||
bool_t built;
|
||||
float_t lastX;
|
||||
float_t lastY;
|
||||
float_t lastWidth;
|
||||
float_t lastHeight;
|
||||
} uiframecache_t;
|
||||
|
||||
/**
|
||||
* Draws a 9-slice frame using a caller-owned cache, only rebuilding the
|
||||
* sprites (via uiFrameBuildSprites) when x/y/width/height differ from
|
||||
* the last call -- unlike uiFrameDraw, which rebuilds unconditionally
|
||||
* every time. Prefer this for frames redrawn every frame at a fixed or
|
||||
* rarely-changing rect (dialogs, panels); use plain uiFrameDraw for
|
||||
* genuinely one-off or per-frame-varying rects.
|
||||
*
|
||||
* @param cache Caller-owned cache, zero-initialized before first use.
|
||||
* @param x Screen x position.
|
||||
* @param y Screen y position.
|
||||
* @param width Total width of the frame.
|
||||
* @param height Total height of the frame.
|
||||
* @return Any error that occurs.
|
||||
*/
|
||||
errorret_t uiFrameDrawCached(
|
||||
uiframecache_t *cache,
|
||||
const float_t x,
|
||||
const float_t y,
|
||||
const float_t width,
|
||||
const float_t height
|
||||
);
|
||||
|
||||
/**
|
||||
* Disposes of the global UI_FRAME, releasing its GPU texture.
|
||||
*
|
||||
* @return Any error that occurs.
|
||||
*/
|
||||
errorret_t uiFrameDispose(void);
|
||||
@@ -8,5 +8,4 @@ target_sources(${DUSK_LIBRARY_TARGET_NAME}
|
||||
uicrop.c
|
||||
uifullbox.c
|
||||
uiloading.c
|
||||
uifatalerror.c
|
||||
)
|
||||
@@ -85,5 +85,5 @@ errorret_t uiCropDraw(void) {
|
||||
}
|
||||
};
|
||||
errorChain(spriteBatchBuffer(sprites, count, &SHADER_UNLIT, material));
|
||||
return spriteBatchFlush();
|
||||
errorOk();
|
||||
}
|
||||
File renamed without changes.
@@ -20,6 +20,12 @@ uifullbox_t UI_FULLBOX_OVER;
|
||||
void uiFullboxInit(uifullbox_t *fullbox) {
|
||||
assertNotNull(fullbox, "fullbox must not be NULL");
|
||||
memoryZero(fullbox, sizeof(uifullbox_t));
|
||||
eventInit(
|
||||
&fullbox->onTransitionEnd,
|
||||
fullbox->onTransitionEndCallbacks,
|
||||
fullbox->onTransitionEndUsers,
|
||||
4
|
||||
);
|
||||
}
|
||||
|
||||
void uiFullboxUpdate(uifullbox_t *fullbox, float_t delta) {
|
||||
@@ -29,13 +35,11 @@ void uiFullboxUpdate(uifullbox_t *fullbox, float_t delta) {
|
||||
fullbox->time += delta;
|
||||
if(fullbox->time >= fullbox->duration) {
|
||||
fullbox->time = fullbox->duration;
|
||||
if(fullbox->onTransitionEnd) {
|
||||
fullbox->onTransitionEnd(fullbox, fullbox->onTransitionEndUser);
|
||||
}
|
||||
eventInvoke(&fullbox->onTransitionEnd, fullbox);
|
||||
}
|
||||
}
|
||||
|
||||
color_t uiFullboxGetColor(const uifullbox_t *fullbox) {
|
||||
static color_t uiFullboxGetColor(const uifullbox_t *fullbox) {
|
||||
if(fullbox->duration <= 0.0f || fullbox->time >= fullbox->duration) {
|
||||
return fullbox->toColor;
|
||||
}
|
||||
@@ -71,7 +75,7 @@ errorret_t uiFullboxDraw(uifullbox_t *fullbox) {
|
||||
}
|
||||
};
|
||||
errorChain(spriteBatchBuffer(&sprite, 1, &SHADER_UNLIT, material));
|
||||
return spriteBatchFlush();
|
||||
errorOk();
|
||||
}
|
||||
|
||||
void uiFullboxTransition(
|
||||
@@ -9,26 +9,18 @@
|
||||
#include "error/error.h"
|
||||
#include "display/color.h"
|
||||
#include "animation/easing.h"
|
||||
#include "event/event.h"
|
||||
|
||||
typedef struct uifullbox_s uifullbox_t;
|
||||
|
||||
/**
|
||||
* Callback fired once when a fullbox transition completes.
|
||||
*
|
||||
* @param fullbox The uifullbox_t the transition ran on.
|
||||
* @param user The user pointer passed alongside the callback.
|
||||
*/
|
||||
typedef void (*uifullboxcallback_t)(uifullbox_t *fullbox, void *user);
|
||||
|
||||
struct uifullbox_s {
|
||||
typedef struct {
|
||||
color_t fromColor;
|
||||
color_t toColor;
|
||||
float_t duration;
|
||||
float_t time;
|
||||
easingtype_t easing;
|
||||
uifullboxcallback_t onTransitionEnd;
|
||||
void *onTransitionEndUser;
|
||||
};
|
||||
eventcallback_t onTransitionEndCallbacks[4];
|
||||
void *onTransitionEndUsers[4];
|
||||
event_t onTransitionEnd;
|
||||
} uifullbox_t;
|
||||
|
||||
extern uifullbox_t UI_FULLBOX_UNDER;
|
||||
extern uifullbox_t UI_FULLBOX_OVER;
|
||||
@@ -49,15 +41,6 @@ void uiFullboxInit(uifullbox_t *fullbox);
|
||||
*/
|
||||
void uiFullboxUpdate(uifullbox_t *fullbox, float_t delta);
|
||||
|
||||
/**
|
||||
* Computes the fullbox's current color, interpolating between fromColor and
|
||||
* toColor based on the transition's elapsed time and easing function.
|
||||
*
|
||||
* @param fullbox The fullbox to compute the color for.
|
||||
* @return The current interpolated color.
|
||||
*/
|
||||
color_t uiFullboxGetColor(const uifullbox_t *fullbox);
|
||||
|
||||
/**
|
||||
* Renders the fullbox. Skipped entirely when the current alpha is zero.
|
||||
*
|
||||
@@ -11,20 +11,22 @@
|
||||
#include "time/time.h"
|
||||
#include "display/text/text.h"
|
||||
#include "display/screen/screen.h"
|
||||
#include "display/spritebatch/spritebatch.h"
|
||||
#include "uifullbox.h"
|
||||
#include "locale/localemanager.h"
|
||||
#include "asset/loader/locale/assetlocaleloader.h"
|
||||
|
||||
#define UI_LOADING_TEXT "loading"
|
||||
|
||||
uiloading_t UI_LOADING;
|
||||
|
||||
errorret_t uiLoadingInit(void) {
|
||||
memoryZero(&UI_LOADING, sizeof(uiloading_t));
|
||||
|
||||
errorChain(localeManagerGetString(
|
||||
"ui.loading.text", UI_LOADING.text, UI_LOADING_TEXT_MAX, 0
|
||||
));
|
||||
|
||||
uiLabelInit(&UI_LOADING.textLabel, &FONT_DEFAULT);
|
||||
uiLabelSetText(&UI_LOADING.textLabel, UI_LOADING_TEXT);
|
||||
eventInit(
|
||||
&UI_LOADING.onTransitionEnd,
|
||||
UI_LOADING.onTransitionEndCallbacks,
|
||||
UI_LOADING.onTransitionEndUsers,
|
||||
4
|
||||
);
|
||||
errorOk();
|
||||
}
|
||||
|
||||
@@ -33,9 +35,7 @@ errorret_t uiLoadingUpdate(void) {
|
||||
UI_LOADING.time += TIME.delta;
|
||||
if(UI_LOADING.time >= UI_LOADING.duration) {
|
||||
UI_LOADING.time = UI_LOADING.duration;
|
||||
if(UI_LOADING.onTransitionEnd) {
|
||||
UI_LOADING.onTransitionEnd(&UI_LOADING, UI_LOADING.onTransitionEndUser);
|
||||
}
|
||||
eventInvoke(&UI_LOADING.onTransitionEnd, &UI_LOADING);
|
||||
}
|
||||
}
|
||||
errorOk();
|
||||
@@ -54,7 +54,7 @@ errorret_t uiLoadingDraw(void) {
|
||||
if(alpha <= 0.0f) errorOk();
|
||||
|
||||
int32_t textW, textH;
|
||||
textMeasure(UI_LOADING.text, &FONT_DEFAULT, &textW, &textH);
|
||||
uiLabelGetSize(&UI_LOADING.textLabel, &textW, &textH);
|
||||
|
||||
float_t x = (float_t)(SCREEN.scanX + SCREEN.scanWidth) -
|
||||
(float_t)textW - UI_LOADING_MARGIN;
|
||||
@@ -63,26 +63,32 @@ errorret_t uiLoadingDraw(void) {
|
||||
|
||||
color_t color = COLOR_WHITE;
|
||||
color.a = (uint8_t)(alpha * 255.0f);
|
||||
uiLabelSetColor(&UI_LOADING.textLabel, color);
|
||||
|
||||
errorChain(textDraw(x, y, UI_LOADING.text, color, &FONT_DEFAULT));
|
||||
return spriteBatchFlush();
|
||||
errorChain(uiLabelDraw(&UI_LOADING.textLabel, x, y));
|
||||
errorOk();
|
||||
}
|
||||
|
||||
void uiLoadingTransition(
|
||||
static void uiLoadingTransition(
|
||||
const float_t from,
|
||||
const float_t to,
|
||||
const uiloadingcallback_t callback,
|
||||
const eventcallback_t callback,
|
||||
void *user
|
||||
) {
|
||||
UI_LOADING.fromAlpha = from;
|
||||
UI_LOADING.toAlpha = to;
|
||||
UI_LOADING.duration = UI_LOADING_FADE_DURATION;
|
||||
UI_LOADING.time = 0.0f;
|
||||
UI_LOADING.onTransitionEnd = callback;
|
||||
UI_LOADING.onTransitionEndUser = user;
|
||||
eventInit(
|
||||
&UI_LOADING.onTransitionEnd,
|
||||
UI_LOADING.onTransitionEndCallbacks,
|
||||
UI_LOADING.onTransitionEndUsers,
|
||||
4
|
||||
);
|
||||
if(callback) eventSubscribe(&UI_LOADING.onTransitionEnd, callback, user);
|
||||
}
|
||||
|
||||
void uiLoadingShow(uiloadingcallback_t callback, void *user) {
|
||||
void uiLoadingShow(eventcallback_t callback, void *user) {
|
||||
uiLoadingTransition(0.0f, 1.0f, callback, user);
|
||||
uiFullboxTransition(
|
||||
&UI_FULLBOX_OVER,
|
||||
@@ -93,7 +99,7 @@ void uiLoadingShow(uiloadingcallback_t callback, void *user) {
|
||||
);
|
||||
}
|
||||
|
||||
void uiLoadingHide(uiloadingcallback_t callback, void *user) {
|
||||
void uiLoadingHide(eventcallback_t callback, void *user) {
|
||||
uiLoadingTransition(1.0f, 0.0f, callback, user);
|
||||
uiFullboxTransition(
|
||||
&UI_FULLBOX_OVER,
|
||||
@@ -7,30 +7,22 @@
|
||||
|
||||
#pragma once
|
||||
#include "error/error.h"
|
||||
#include "event/event.h"
|
||||
#include "ui/widget/uilabel.h"
|
||||
|
||||
#define UI_LOADING_FADE_DURATION 0.5f
|
||||
#define UI_LOADING_MARGIN 8.0f
|
||||
#define UI_LOADING_TEXT_MAX 32
|
||||
|
||||
typedef struct uiloading_s uiloading_t;
|
||||
|
||||
/**
|
||||
* Callback fired once when a loading indicator fade transition completes.
|
||||
*
|
||||
* @param loading The uiloading_t the transition ran on.
|
||||
* @param user The user pointer passed alongside the callback.
|
||||
*/
|
||||
typedef void (*uiloadingcallback_t)(uiloading_t *loading, void *user);
|
||||
|
||||
struct uiloading_s {
|
||||
typedef struct {
|
||||
float_t fromAlpha;
|
||||
float_t toAlpha;
|
||||
float_t duration;
|
||||
float_t time;
|
||||
uiloadingcallback_t onTransitionEnd;
|
||||
void *onTransitionEndUser;
|
||||
char_t text[UI_LOADING_TEXT_MAX];
|
||||
};
|
||||
eventcallback_t onTransitionEndCallbacks[4];
|
||||
void *onTransitionEndUsers[4];
|
||||
event_t onTransitionEnd;
|
||||
uilabel_t textLabel;
|
||||
} uiloading_t;
|
||||
|
||||
extern uiloading_t UI_LOADING;
|
||||
|
||||
@@ -56,29 +48,13 @@ errorret_t uiLoadingUpdate(void);
|
||||
*/
|
||||
errorret_t uiLoadingDraw(void);
|
||||
|
||||
/**
|
||||
* Begins a loading indicator fade transition, replacing any transition
|
||||
* already in progress along with its pending callback.
|
||||
*
|
||||
* @param from Starting alpha.
|
||||
* @param to Ending alpha.
|
||||
* @param callback Called when the transition completes. May be NULL.
|
||||
* @param user Forwarded to the callback unchanged.
|
||||
*/
|
||||
void uiLoadingTransition(
|
||||
const float_t from,
|
||||
const float_t to,
|
||||
const uiloadingcallback_t callback,
|
||||
void *user
|
||||
);
|
||||
|
||||
/**
|
||||
* Fades the loading indicator in. Invokes callback when fully visible.
|
||||
*
|
||||
* @param callback Called when the fade-in completes. May be NULL.
|
||||
* @param user Forwarded to the callback unchanged.
|
||||
*/
|
||||
void uiLoadingShow(uiloadingcallback_t callback, void *user);
|
||||
void uiLoadingShow(eventcallback_t callback, void *user);
|
||||
|
||||
/**
|
||||
* Fades the loading indicator out. Invokes callback when fully hidden.
|
||||
@@ -86,4 +62,4 @@ void uiLoadingShow(uiloadingcallback_t callback, void *user);
|
||||
* @param callback Called when the fade-out completes. May be NULL.
|
||||
* @param user Forwarded to the callback unchanged.
|
||||
*/
|
||||
void uiLoadingHide(uiloadingcallback_t callback, void *user);
|
||||
void uiLoadingHide(eventcallback_t callback, void *user);
|
||||
File renamed without changes.
@@ -54,15 +54,7 @@ errorret_t uiTransitionUpdate(void) {
|
||||
);
|
||||
|
||||
if(UI_TRANSITION.data.t >= 1.0f && UI_TRANSITION.finished) {
|
||||
// Saved and cleared before firing so a callback that immediately
|
||||
// starts another transition isn't clobbered by this function's own
|
||||
// cleanup running after it - same reentrancy hazard as uiFocusPop,
|
||||
// see src/dusk/ui/focus/uifocus.c. Without this, finished would also
|
||||
// just keep re-firing every frame forever once t reaches 1.0.
|
||||
uitransitioncallback_t finished = UI_TRANSITION.finished;
|
||||
void *user = UI_TRANSITION.user;
|
||||
UI_TRANSITION.finished = NULL;
|
||||
finished(user);
|
||||
UI_TRANSITION.finished(UI_TRANSITION.user);
|
||||
}
|
||||
|
||||
errorOk();
|
||||
File renamed without changes.
File renamed without changes.
+1
-1
@@ -52,5 +52,5 @@ errorret_t uiTransitionFadeDraw(const uitransitiondata_t *data) {
|
||||
}
|
||||
};
|
||||
errorChain(spriteBatchBuffer(&sprite, 1, &SHADER_UNLIT, material));
|
||||
return spriteBatchFlush();
|
||||
errorOk();
|
||||
}
|
||||
File renamed without changes.
@@ -0,0 +1,62 @@
|
||||
/**
|
||||
* Copyright (c) 2026 Dominic Masters
|
||||
*
|
||||
* This software is released under the MIT License.
|
||||
* https://opensource.org/licenses/MIT
|
||||
*/
|
||||
|
||||
#include "ui.h"
|
||||
#include "util/memory.h"
|
||||
#include "assert/assert.h"
|
||||
#include "display/spritebatch/spritebatch.h"
|
||||
#include "display/screen/screen.h"
|
||||
#include "ui/uielement.h"
|
||||
#include "ui/focus/uifocus.h"
|
||||
|
||||
ui_t UI;
|
||||
|
||||
errorret_t uiInit(void) {
|
||||
memoryZero(&UI, sizeof(ui_t));
|
||||
uiFocusInit();
|
||||
uiElementsSort();
|
||||
|
||||
uielement_t *element = &UI_ELEMENTS[0];
|
||||
while(!uiElementIsNull(element)) {
|
||||
errorChain(uiElementInit(element));
|
||||
element++;
|
||||
}
|
||||
|
||||
errorOk();
|
||||
}
|
||||
|
||||
errorret_t uiUpdate(void) {
|
||||
uiFocusUpdate();
|
||||
|
||||
uielement_t *element = &UI_ELEMENTS[0];
|
||||
while(!uiElementIsNull(element)) {
|
||||
errorChain(uiElementUpdate(element));
|
||||
element++;
|
||||
}
|
||||
|
||||
errorOk();
|
||||
}
|
||||
|
||||
errorret_t uiRender(void) {
|
||||
const uielement_t *element = &UI_ELEMENTS[0];
|
||||
while(!uiElementIsNull(element)) {
|
||||
errorChain(uiElementDraw(element));
|
||||
element++;
|
||||
}
|
||||
|
||||
errorChain(spriteBatchFlush());
|
||||
errorOk();
|
||||
}
|
||||
|
||||
errorret_t uiDispose(void) {
|
||||
uielement_t *element = &UI_ELEMENTS[0];
|
||||
while(!uiElementIsNull(element)) {
|
||||
errorChain(uiElementDispose(element));
|
||||
element++;
|
||||
}
|
||||
errorOk();
|
||||
}
|
||||
@@ -0,0 +1,41 @@
|
||||
/**
|
||||
* 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 {
|
||||
void *nothing;
|
||||
} ui_t;
|
||||
|
||||
extern ui_t UI;
|
||||
|
||||
/**
|
||||
* Initializes the UI system.
|
||||
*/
|
||||
errorret_t uiInit(void);
|
||||
|
||||
/**
|
||||
* Updates the UI system.
|
||||
*
|
||||
* @return Any error that occurs.
|
||||
*/
|
||||
errorret_t uiUpdate(void);
|
||||
|
||||
/**
|
||||
* Renders the UI system.
|
||||
*
|
||||
* @return Any error that occurs.
|
||||
*/
|
||||
errorret_t uiRender(void);
|
||||
|
||||
/**
|
||||
* Disposes of the UI system.
|
||||
*
|
||||
* @return Any error that occurs.
|
||||
*/
|
||||
errorret_t uiDispose(void);
|
||||
@@ -0,0 +1,86 @@
|
||||
/**
|
||||
* Copyright (c) 2026 Dominic Masters
|
||||
*
|
||||
* This software is released under the MIT License.
|
||||
* https://opensource.org/licenses/MIT
|
||||
*/
|
||||
|
||||
#include "uielement.h"
|
||||
#include "assert/assert.h"
|
||||
#include "util/sort.h"
|
||||
#include "ui/frame/uiframe.h"
|
||||
#include "ui/debug/uifps.h"
|
||||
#include "engine/engine.h"
|
||||
#include "ui/overlay/uifullbox.h"
|
||||
#include "ui/overlay/uiloading.h"
|
||||
#include "ui/overlay/uicrop.h"
|
||||
#include "ui/transition/uitransition.h"
|
||||
#include "ui/debug/uiconsole.h"
|
||||
#include "ui/frame/uiconfirm.h"
|
||||
|
||||
// Priming pass: X does nothing here, so this only exists to process any
|
||||
// #include directives nested in uielementlist.h/ui/uielementgame.h at
|
||||
// file scope (each such header's own #pragma once makes it a no-op on
|
||||
// the real pass below, which happens inside UI_ELEMENTS[]'s braces,
|
||||
// where a raw #include of a declaration would be invalid).
|
||||
#define X(initFn, updateFn, drawFn, disposeFn, order) // do nothing
|
||||
#include "uielementlist.h"
|
||||
#undef X
|
||||
|
||||
uielement_t UI_ELEMENTS[] = {
|
||||
#define X(initFn, updateFn, drawFn, disposeFn, elementOrder) \
|
||||
{ \
|
||||
.init = initFn, .update = updateFn, .draw = drawFn, \
|
||||
.dispose = disposeFn, .order = elementOrder \
|
||||
},
|
||||
#include "uielementlist.h"
|
||||
#undef X
|
||||
|
||||
{ 0 } // Null terminator
|
||||
};
|
||||
|
||||
bool_t uiElementIsNull(const uielement_t *element) {
|
||||
return element->init == NULL &&
|
||||
element->update == NULL &&
|
||||
element->draw == NULL &&
|
||||
element->dispose == NULL;
|
||||
}
|
||||
|
||||
int_t uiElementCompareOrder(const void *a, const void *b) {
|
||||
const uielement_t *elementA = (const uielement_t *)a;
|
||||
const uielement_t *elementB = (const uielement_t *)b;
|
||||
if(elementA->order < elementB->order) return -1;
|
||||
if(elementA->order > elementB->order) return 1;
|
||||
return 0;
|
||||
}
|
||||
|
||||
void uiElementsSort(void) {
|
||||
// The trailing null terminator is always the last static entry -- sort
|
||||
// everything before it, and leave it in place.
|
||||
const size_t count = (sizeof(UI_ELEMENTS) / sizeof(UI_ELEMENTS[0])) - 1;
|
||||
sortBubble(UI_ELEMENTS, count, sizeof(uielement_t), uiElementCompareOrder);
|
||||
}
|
||||
|
||||
errorret_t uiElementInit(uielement_t *element) {
|
||||
assertNotNull(element, "element must not be NULL");
|
||||
if(element->init != NULL) errorChain(element->init());
|
||||
errorOk();
|
||||
}
|
||||
|
||||
errorret_t uiElementUpdate(uielement_t *element) {
|
||||
assertNotNull(element, "element must not be NULL");
|
||||
if(element->update != NULL) errorChain(element->update());
|
||||
errorOk();
|
||||
}
|
||||
|
||||
errorret_t uiElementDraw(const uielement_t *element) {
|
||||
assertNotNull(element, "element must not be NULL");
|
||||
if(element->draw != NULL) errorChain(element->draw());
|
||||
errorOk();
|
||||
}
|
||||
|
||||
errorret_t uiElementDispose(uielement_t *element) {
|
||||
assertNotNull(element, "element must not be NULL");
|
||||
if(element->dispose != NULL) errorChain(element->dispose());
|
||||
errorOk();
|
||||
}
|
||||
@@ -0,0 +1,84 @@
|
||||
/**
|
||||
* Copyright (c) 2026 Dominic Masters
|
||||
*
|
||||
* This software is released under the MIT License.
|
||||
* https://opensource.org/licenses/MIT
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
#include "error/error.h"
|
||||
|
||||
// Built-in order tiers. Lower values update/render first; ties preserve
|
||||
// their relative UI_ELEMENTS declaration order (uiElementsSort uses a
|
||||
// stable sort). Game-specific elements can use any int32_t value -- these
|
||||
// are just the ones the engine itself relies on.
|
||||
#define UI_ELEMENT_ORDER_DEFAULT 0
|
||||
#define UI_ELEMENT_ORDER_DEBUG 1000
|
||||
|
||||
typedef struct {
|
||||
errorret_t (*init)();
|
||||
errorret_t (*update)();
|
||||
errorret_t (*draw)();
|
||||
errorret_t (*dispose)();
|
||||
int32_t order;
|
||||
} uielement_t;
|
||||
|
||||
extern uielement_t UI_ELEMENTS[];
|
||||
|
||||
/**
|
||||
* Returns true when all four callbacks on the element are NULL,
|
||||
* which marks the end of the UI_ELEMENTS array.
|
||||
*
|
||||
* @param element The element to test.
|
||||
* @returns True if the element is the null terminator.
|
||||
*/
|
||||
bool_t uiElementIsNull(const uielement_t *element);
|
||||
|
||||
/**
|
||||
* Compares two elements by their .order field, ascending. Matches
|
||||
* sortcompare_t, for use with the project's sort utilities.
|
||||
*
|
||||
* @param a First uielement_t to compare.
|
||||
* @param b Second uielement_t to compare.
|
||||
* @return Negative if a < b, zero if a == b, positive if a > b.
|
||||
*/
|
||||
int_t uiElementCompareOrder(const void *a, const void *b);
|
||||
|
||||
/**
|
||||
* Stably sorts UI_ELEMENTS in place by .order, ascending. The trailing
|
||||
* null terminator is never moved. Called once by uiInit -- element order
|
||||
* is static after that, so there's no need to re-sort every frame.
|
||||
*/
|
||||
void uiElementsSort(void);
|
||||
|
||||
/**
|
||||
* Initializes a UI element, invoking its init callback if set.
|
||||
*
|
||||
* @param element The element to initialize.
|
||||
* @return Any error that occurs.
|
||||
*/
|
||||
errorret_t uiElementInit(uielement_t *element);
|
||||
|
||||
/**
|
||||
* Updates a UI element, calling its update callback if set.
|
||||
*
|
||||
* @param element The element to update.
|
||||
* @return Any error that occurs.
|
||||
*/
|
||||
errorret_t uiElementUpdate(uielement_t *element);
|
||||
|
||||
/**
|
||||
* Draws a UI element, calling its draw callback if set.
|
||||
*
|
||||
* @param element The element to render.
|
||||
* @return Any error that occurs.
|
||||
*/
|
||||
errorret_t uiElementDraw(const uielement_t *element);
|
||||
|
||||
/**
|
||||
* Disposes of a UI element, invoking its dispose callback if set.
|
||||
*
|
||||
* @param element The element to dispose.
|
||||
* @return Any error that occurs.
|
||||
*/
|
||||
errorret_t uiElementDispose(uielement_t *element);
|
||||
@@ -0,0 +1,47 @@
|
||||
/**
|
||||
* Copyright (c) 2026 Dominic Masters
|
||||
*
|
||||
* This software is released under the MIT License.
|
||||
* https://opensource.org/licenses/MIT
|
||||
*/
|
||||
|
||||
// X(init, update, draw, dispose, order) -- pass NULL for any callback the
|
||||
// element doesn't need. order controls update/draw sequence (lower first,
|
||||
// see UI_ELEMENT_ORDER_* in uielement.h); ties preserve declaration order.
|
||||
// See uielement.c for how this expands.
|
||||
|
||||
X(uiFrameInit, NULL, NULL, uiFrameDispose, UI_ELEMENT_ORDER_DEFAULT)
|
||||
|
||||
// Fullbox under: above scene, below system UI.
|
||||
X(
|
||||
uiFullboxUnderInit, uiFullboxUnderUpdate, uiFullboxUnderDraw, NULL,
|
||||
UI_ELEMENT_ORDER_DEFAULT
|
||||
)
|
||||
|
||||
// Text stuffs
|
||||
X(uiConfirmInit, NULL, uiConfirmDraw, uiConfirmDispose, UI_ELEMENT_ORDER_DEFAULT)
|
||||
|
||||
X(
|
||||
uiTransitionInit, uiTransitionUpdate, uiTransitionDraw, NULL,
|
||||
UI_ELEMENT_ORDER_DEFAULT
|
||||
)
|
||||
|
||||
// Fullbox over: above absolutely everything (except debug).
|
||||
X(
|
||||
uiFullboxOverInit, uiFullboxOverUpdate, uiFullboxOverDraw, NULL,
|
||||
UI_ELEMENT_ORDER_DEFAULT
|
||||
)
|
||||
|
||||
X(
|
||||
uiLoadingInit, uiLoadingUpdate, uiLoadingDraw, NULL,
|
||||
UI_ELEMENT_ORDER_DEFAULT
|
||||
)
|
||||
|
||||
X(uiCropInit, NULL, uiCropDraw, NULL, UI_ELEMENT_ORDER_DEFAULT)
|
||||
|
||||
// Debug items -- always last.
|
||||
X(NULL, NULL, uiConsoleDraw, uiConsoleDispose, UI_ELEMENT_ORDER_DEBUG)
|
||||
X(uiFPSInit, NULL, uiFPSDraw, NULL, UI_ELEMENT_ORDER_DEBUG)
|
||||
|
||||
// Game-specific UI elements (duskrpg)
|
||||
#include "ui/uielementgame.h"
|
||||
@@ -0,0 +1,17 @@
|
||||
# Copyright (c) 2026 Dominic Masters
|
||||
#
|
||||
# This software is released under the MIT License.
|
||||
# https://opensource.org/licenses/MIT
|
||||
|
||||
target_sources(${DUSK_LIBRARY_TARGET_NAME}
|
||||
PUBLIC
|
||||
uibutton.c
|
||||
uicheckbox.c
|
||||
uitab.c
|
||||
uislider.c
|
||||
uidropdown.c
|
||||
uiscrolling.c
|
||||
uimenu.c
|
||||
uilabel.c
|
||||
uiwidgetlabel.c
|
||||
)
|
||||
@@ -7,16 +7,15 @@
|
||||
|
||||
#include "uibutton.h"
|
||||
#include "assert/assert.h"
|
||||
#include "util/memory.h"
|
||||
#include "display/text/text.h"
|
||||
#include "display/color.h"
|
||||
|
||||
void uiButtonInit(uibutton_t *button, const char_t *label) {
|
||||
assertNotNull(button, "Button cannot be NULL");
|
||||
assertNotNull(label, "Label cannot be NULL");
|
||||
|
||||
memoryZero(button, sizeof(uibutton_t));
|
||||
uiLabelInit(&button->label, label, button->sprites, UI_BUTTON_SPRITES_MAX);
|
||||
button->label.dirty = true;
|
||||
uiWidgetLabelInit(&button->label, &FONT_DEFAULT);
|
||||
uiWidgetLabelSetText(&button->label, label);
|
||||
button->highlighted = false;
|
||||
}
|
||||
|
||||
bool_t uiButtonIsHighlighted(const uibutton_t *button) {
|
||||
@@ -27,32 +26,17 @@ bool_t uiButtonIsHighlighted(const uibutton_t *button) {
|
||||
void uiButtonSetHighlighted(uibutton_t *button, const bool_t highlighted) {
|
||||
assertNotNull(button, "Button cannot be NULL");
|
||||
button->highlighted = highlighted;
|
||||
}
|
||||
|
||||
bool_t uiButtonIsActive(const uibutton_t *button) {
|
||||
assertNotNull(button, "Button cannot be NULL");
|
||||
return button->active;
|
||||
}
|
||||
|
||||
void uiButtonSetActive(uibutton_t *button, const bool_t active) {
|
||||
assertNotNull(button, "Button cannot be NULL");
|
||||
button->active = active;
|
||||
uiWidgetLabelSetColor(
|
||||
&button->label, highlighted ? COLOR_RED : COLOR_WHITE
|
||||
);
|
||||
}
|
||||
|
||||
errorret_t uiButtonDraw(
|
||||
uibutton_t *button,
|
||||
const uibutton_t *button,
|
||||
const float_t x,
|
||||
const float_t y
|
||||
) {
|
||||
assertNotNull(button, "Button cannot be NULL");
|
||||
|
||||
uiLabelSetX(&button->label, x);
|
||||
uiLabelSetY(&button->label, y);
|
||||
|
||||
return uiLabelRender(
|
||||
&button->label,
|
||||
button->active ? COLOR_GREEN :
|
||||
button->highlighted ? COLOR_RED :
|
||||
COLOR_WHITE
|
||||
);
|
||||
errorChain(uiWidgetLabelDraw(&button->label, x, y));
|
||||
errorOk();
|
||||
}
|
||||
@@ -7,27 +7,18 @@
|
||||
|
||||
#pragma once
|
||||
#include "error/error.h"
|
||||
#include "ui/widget/uilabel.h"
|
||||
|
||||
#define UI_BUTTON_SPRITES_MAX 32
|
||||
#include "ui/widget/uiwidgetlabel.h"
|
||||
|
||||
typedef struct {
|
||||
uilabel_t label;
|
||||
spritebatchsprite_t sprites[UI_BUTTON_SPRITES_MAX];
|
||||
uiwidgetlabel_t label;
|
||||
bool_t highlighted;
|
||||
// Independent of highlighted (which the focus system drives based on
|
||||
// what's currently focused) - for a button that also needs to show a
|
||||
// toggled-on state regardless of focus, e.g. the keyboard's CAPS/SHIFT
|
||||
// keys.
|
||||
bool_t active;
|
||||
} uibutton_t;
|
||||
|
||||
/**
|
||||
* Initializes a button.
|
||||
*
|
||||
* @param button The button to initialize.
|
||||
* @param label Display label; never written to, safe to be a caller-
|
||||
* owned or immutable string.
|
||||
* @param label Display label.
|
||||
*/
|
||||
void uiButtonInit(uibutton_t *button, const char_t *label);
|
||||
|
||||
@@ -47,23 +38,6 @@ bool_t uiButtonIsHighlighted(const uibutton_t *button);
|
||||
*/
|
||||
void uiButtonSetHighlighted(uibutton_t *button, const bool_t highlighted);
|
||||
|
||||
/**
|
||||
* Returns whether the button is active.
|
||||
*
|
||||
* @param button The button to query.
|
||||
* @returns True if active.
|
||||
*/
|
||||
bool_t uiButtonIsActive(const uibutton_t *button);
|
||||
|
||||
/**
|
||||
* Sets the active state of the button - a toggled-on indicator drawn
|
||||
* the same way as highlighted, but independent of focus.
|
||||
*
|
||||
* @param button The button to update.
|
||||
* @param active The new active state.
|
||||
*/
|
||||
void uiButtonSetActive(uibutton_t *button, const bool_t active);
|
||||
|
||||
/**
|
||||
* Draws the button at the given screen position.
|
||||
*
|
||||
@@ -73,7 +47,7 @@ void uiButtonSetActive(uibutton_t *button, const bool_t active);
|
||||
* @return Any error that occurs.
|
||||
*/
|
||||
errorret_t uiButtonDraw(
|
||||
uibutton_t *button,
|
||||
const uibutton_t *button,
|
||||
const float_t x,
|
||||
const float_t y
|
||||
);
|
||||
@@ -7,6 +7,7 @@
|
||||
|
||||
#include "uicheckbox.h"
|
||||
#include "util/memory.h"
|
||||
#include "util/string.h"
|
||||
#include "display/text/text.h"
|
||||
#include "display/color.h"
|
||||
|
||||
@@ -15,7 +16,9 @@ void uiCheckboxInit(
|
||||
const char_t *label
|
||||
) {
|
||||
memoryZero(checkbox, sizeof(uicheckbox_t));
|
||||
checkbox->label = label;
|
||||
checkbox->rawLabel = label;
|
||||
uiWidgetLabelInit(&checkbox->label, &FONT_DEFAULT);
|
||||
uiCheckboxRebuildLabel(checkbox);
|
||||
}
|
||||
|
||||
bool_t uiCheckboxIsChecked(const uicheckbox_t *checkbox) {
|
||||
@@ -24,6 +27,7 @@ bool_t uiCheckboxIsChecked(const uicheckbox_t *checkbox) {
|
||||
|
||||
void uiCheckboxSetChecked(uicheckbox_t *checkbox, const bool_t checked) {
|
||||
checkbox->checked = checked;
|
||||
uiCheckboxRebuildLabel(checkbox);
|
||||
}
|
||||
|
||||
void uiCheckboxToggle(uicheckbox_t *checkbox) {
|
||||
@@ -34,10 +38,11 @@ bool_t uiCheckboxIsHighlighted(const uicheckbox_t *checkbox) {
|
||||
return checkbox->highlighted;
|
||||
}
|
||||
|
||||
void uiCheckboxSetHighlighted(
|
||||
uicheckbox_t *checkbox, const bool_t highlighted
|
||||
) {
|
||||
void uiCheckboxSetHighlighted(uicheckbox_t *checkbox, const bool_t highlighted) {
|
||||
checkbox->highlighted = highlighted;
|
||||
uiWidgetLabelSetColor(
|
||||
&checkbox->label, highlighted ? COLOR_RED : COLOR_WHITE
|
||||
);
|
||||
}
|
||||
|
||||
errorret_t uiCheckboxDraw(
|
||||
@@ -45,15 +50,15 @@ errorret_t uiCheckboxDraw(
|
||||
const float_t x,
|
||||
const float_t y
|
||||
) {
|
||||
color_t color = checkbox->highlighted ? COLOR_RED : COLOR_WHITE;
|
||||
const char_t *mark = checkbox->checked ? "Y " : "N ";
|
||||
errorChain(textDraw(x, y, mark, color, &FONT_DEFAULT));
|
||||
|
||||
int32_t markW, markH;
|
||||
textMeasure(mark, &FONT_DEFAULT, &markW, &markH);
|
||||
errorChain(textDraw(
|
||||
x + (float_t)markW, y, checkbox->label, color, &FONT_DEFAULT
|
||||
));
|
||||
|
||||
errorChain(uiWidgetLabelDraw(&checkbox->label, x, y));
|
||||
errorOk();
|
||||
}
|
||||
|
||||
void uiCheckboxRebuildLabel(uicheckbox_t *checkbox) {
|
||||
char_t combined[UI_WIDGET_LABEL_TEXT_MAX];
|
||||
stringFormat(
|
||||
combined, UI_WIDGET_LABEL_TEXT_MAX - 1, "%s %s",
|
||||
checkbox->checked ? "Y" : "N", checkbox->rawLabel
|
||||
);
|
||||
uiWidgetLabelSetText(&checkbox->label, combined);
|
||||
}
|
||||
@@ -7,9 +7,11 @@
|
||||
|
||||
#pragma once
|
||||
#include "error/error.h"
|
||||
#include "ui/widget/uiwidgetlabel.h"
|
||||
|
||||
typedef struct uicheckbox_s {
|
||||
const char_t *label;
|
||||
const char_t *rawLabel;
|
||||
uiwidgetlabel_t label;
|
||||
bool_t checked;
|
||||
bool_t highlighted;
|
||||
} uicheckbox_t;
|
||||
@@ -77,3 +79,12 @@ errorret_t uiCheckboxDraw(
|
||||
const float_t x,
|
||||
const float_t y
|
||||
);
|
||||
|
||||
/**
|
||||
* Rebuilds the checkbox's cached label ("Y "/"N " mark plus rawLabel)
|
||||
* from its current checked state. Called internally whenever checked
|
||||
* changes.
|
||||
*
|
||||
* @param checkbox The checkbox to update.
|
||||
*/
|
||||
void uiCheckboxRebuildLabel(uicheckbox_t *checkbox);
|
||||
@@ -25,10 +25,13 @@ void uiDropdownInit(
|
||||
assertTrue(optionCount > 0, "Dropdown must have at least one option");
|
||||
|
||||
memoryZero(dropdown, sizeof(uidropdown_t));
|
||||
dropdown->label = label;
|
||||
uiWidgetLabelInit(&dropdown->label, &FONT_DEFAULT);
|
||||
uiWidgetLabelSetText(&dropdown->label, label);
|
||||
uiWidgetLabelInit(&dropdown->value, &FONT_DEFAULT);
|
||||
dropdown->options = options;
|
||||
dropdown->optionCount = optionCount;
|
||||
dropdown->selectedIndex = selectedIndex < optionCount ? selectedIndex : 0;
|
||||
uiDropdownRebuildValue(dropdown);
|
||||
}
|
||||
|
||||
uint8_t uiDropdownGetSelectedIndex(const uidropdown_t *dropdown) {
|
||||
@@ -45,18 +48,21 @@ void uiDropdownSetSelectedIndex(uidropdown_t *dropdown, const uint8_t index) {
|
||||
assertNotNull(dropdown, "Dropdown cannot be NULL");
|
||||
assertTrue(index < dropdown->optionCount, "Dropdown index out of range");
|
||||
dropdown->selectedIndex = index;
|
||||
uiDropdownRebuildValue(dropdown);
|
||||
}
|
||||
|
||||
void uiDropdownStepNext(uidropdown_t *dropdown) {
|
||||
assertNotNull(dropdown, "Dropdown cannot be NULL");
|
||||
dropdown->selectedIndex =
|
||||
(dropdown->selectedIndex + 1) % dropdown->optionCount;
|
||||
uiDropdownRebuildValue(dropdown);
|
||||
}
|
||||
|
||||
void uiDropdownStepPrev(uidropdown_t *dropdown) {
|
||||
assertNotNull(dropdown, "Dropdown cannot be NULL");
|
||||
dropdown->selectedIndex = dropdown->selectedIndex == 0 ?
|
||||
dropdown->optionCount - 1 : dropdown->selectedIndex - 1;
|
||||
uiDropdownRebuildValue(dropdown);
|
||||
}
|
||||
|
||||
bool_t uiDropdownIsHighlighted(const uidropdown_t *dropdown) {
|
||||
@@ -70,6 +76,9 @@ void uiDropdownSetHighlighted(
|
||||
) {
|
||||
assertNotNull(dropdown, "Dropdown cannot be NULL");
|
||||
dropdown->highlighted = highlighted;
|
||||
color_t color = highlighted ? COLOR_RED : COLOR_WHITE;
|
||||
uiWidgetLabelSetColor(&dropdown->label, color);
|
||||
uiWidgetLabelSetColor(&dropdown->value, color);
|
||||
}
|
||||
|
||||
errorret_t uiDropdownDraw(
|
||||
@@ -79,22 +88,23 @@ errorret_t uiDropdownDraw(
|
||||
) {
|
||||
assertNotNull(dropdown, "Dropdown cannot be NULL");
|
||||
|
||||
color_t color = dropdown->highlighted ? COLOR_RED : COLOR_WHITE;
|
||||
|
||||
errorChain(textDraw(x, y, dropdown->label, color, &FONT_DEFAULT));
|
||||
errorChain(uiWidgetLabelDraw(&dropdown->label, x, y));
|
||||
|
||||
int32_t labelW, labelH;
|
||||
textMeasure(dropdown->label, &FONT_DEFAULT, &labelW, &labelH);
|
||||
uiWidgetLabelGetSize(&dropdown->label, &labelW, &labelH);
|
||||
|
||||
char_t valueText[UI_DROPDOWN_VALUE_TEXT_MAX];
|
||||
stringFormat(
|
||||
valueText, UI_DROPDOWN_VALUE_TEXT_MAX - 1, "< %s >",
|
||||
uiDropdownGetSelectedOption(dropdown)
|
||||
);
|
||||
|
||||
errorChain(textDraw(
|
||||
x + (float_t)labelW + UI_DROPDOWN_GAP, y, valueText, color, &FONT_DEFAULT
|
||||
errorChain(uiWidgetLabelDraw(
|
||||
&dropdown->value, x + (float_t)labelW + UI_DROPDOWN_GAP, y
|
||||
));
|
||||
|
||||
errorOk();
|
||||
}
|
||||
|
||||
void uiDropdownRebuildValue(uidropdown_t *dropdown) {
|
||||
char_t valueText[UI_WIDGET_LABEL_TEXT_MAX];
|
||||
stringFormat(
|
||||
valueText, UI_WIDGET_LABEL_TEXT_MAX - 1, "< %s >",
|
||||
uiDropdownGetSelectedOption(dropdown)
|
||||
);
|
||||
uiWidgetLabelSetText(&dropdown->value, valueText);
|
||||
}
|
||||
@@ -7,12 +7,13 @@
|
||||
|
||||
#pragma once
|
||||
#include "error/error.h"
|
||||
#include "ui/widget/uiwidgetlabel.h"
|
||||
|
||||
#define UI_DROPDOWN_GAP 4.0f
|
||||
#define UI_DROPDOWN_VALUE_TEXT_MAX 64
|
||||
|
||||
typedef struct {
|
||||
const char_t *label;
|
||||
uiwidgetlabel_t label;
|
||||
uiwidgetlabel_t value;
|
||||
const char_t *const *options;
|
||||
uint8_t optionCount;
|
||||
uint8_t selectedIndex;
|
||||
@@ -111,3 +112,12 @@ errorret_t uiDropdownDraw(
|
||||
const float_t x,
|
||||
const float_t y
|
||||
);
|
||||
|
||||
/**
|
||||
* Rebuilds the dropdown's cached value label ("< option >") from its
|
||||
* current selectedIndex. Called internally whenever selectedIndex
|
||||
* changes.
|
||||
*
|
||||
* @param dropdown The dropdown to update.
|
||||
*/
|
||||
void uiDropdownRebuildValue(uidropdown_t *dropdown);
|
||||
@@ -0,0 +1,70 @@
|
||||
/**
|
||||
* Copyright (c) 2026 Dominic Masters
|
||||
*
|
||||
* This software is released under the MIT License.
|
||||
* https://opensource.org/licenses/MIT
|
||||
*/
|
||||
|
||||
#include "uilabel.h"
|
||||
#include "assert/assert.h"
|
||||
#include "util/memory.h"
|
||||
#include "util/string.h"
|
||||
#include "display/text/text.h"
|
||||
|
||||
void uiLabelInit(uilabel_t *label, font_t *font) {
|
||||
assertNotNull(label, "Label cannot be NULL");
|
||||
assertNotNull(font, "Font cannot be NULL");
|
||||
|
||||
memoryZero(label, sizeof(uilabel_t));
|
||||
label->font = font;
|
||||
label->color = COLOR_WHITE;
|
||||
}
|
||||
|
||||
void uiLabelSetText(uilabel_t *label, const char_t *text) {
|
||||
assertNotNull(label, "Label cannot be NULL");
|
||||
assertNotNull(text, "Text cannot be NULL");
|
||||
assertStrLenMax(text, UI_LABEL_TEXT_MAX, "Label text too long");
|
||||
|
||||
stringCopy(label->text, text, UI_LABEL_TEXT_MAX);
|
||||
label->spriteCount = textBuildSpriteCache(
|
||||
label->text, label->font, label->sprites, UI_LABEL_SPRITE_COUNT_MAX,
|
||||
&label->width, &label->height
|
||||
);
|
||||
}
|
||||
|
||||
void uiLabelSetColor(uilabel_t *label, const color_t color) {
|
||||
assertNotNull(label, "Label cannot be NULL");
|
||||
label->color = color;
|
||||
}
|
||||
|
||||
void uiLabelGetSize(
|
||||
const uilabel_t *label,
|
||||
int32_t *outWidth,
|
||||
int32_t *outHeight
|
||||
) {
|
||||
assertNotNull(label, "Label cannot be NULL");
|
||||
assertNotNull(outWidth, "Output width cannot be NULL");
|
||||
assertNotNull(outHeight, "Output height cannot be NULL");
|
||||
*outWidth = label->width;
|
||||
*outHeight = label->height;
|
||||
}
|
||||
|
||||
errorret_t uiLabelDraw(
|
||||
const uilabel_t *label,
|
||||
const float_t x,
|
||||
const float_t y
|
||||
) {
|
||||
assertNotNull(label, "Label cannot be NULL");
|
||||
if(label->spriteCount == 0) errorOk();
|
||||
|
||||
// Cached sprites are relative to (0,0); textDrawSpriteCache translates
|
||||
// into the requested screen position here instead of in
|
||||
// uiLabelSetText, so a label can be repositioned every frame without
|
||||
// rebuilding the (much more expensive) glyph/UV cache.
|
||||
spritebatchsprite_t scratch[UI_LABEL_SPRITE_COUNT_MAX];
|
||||
errorChain(textDrawSpriteCache(
|
||||
label->sprites, label->spriteCount, scratch, x, y, label->color,
|
||||
label->font->texture
|
||||
));
|
||||
errorOk();
|
||||
}
|
||||
@@ -0,0 +1,85 @@
|
||||
/**
|
||||
* Copyright (c) 2026 Dominic Masters
|
||||
*
|
||||
* This software is released under the MIT License.
|
||||
* https://opensource.org/licenses/MIT
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
#include "error/error.h"
|
||||
#include "display/text/font.h"
|
||||
#include "display/spritebatch/spritebatchsprite.h"
|
||||
#include "display/color.h"
|
||||
|
||||
#define UI_LABEL_TEXT_MAX 256
|
||||
#define UI_LABEL_SPRITE_COUNT_MAX UI_LABEL_TEXT_MAX
|
||||
|
||||
typedef struct {
|
||||
char_t text[UI_LABEL_TEXT_MAX];
|
||||
color_t color;
|
||||
font_t *font;
|
||||
|
||||
spritebatchsprite_t sprites[UI_LABEL_SPRITE_COUNT_MAX];
|
||||
uint32_t spriteCount;
|
||||
int32_t width;
|
||||
int32_t height;
|
||||
} uilabel_t;
|
||||
|
||||
/**
|
||||
* Initializes a label, defaulting to white text and no text set.
|
||||
*
|
||||
* @param label The label to initialize.
|
||||
* @param font Font to use for rendering. Must outlive the label.
|
||||
*/
|
||||
void uiLabelInit(uilabel_t *label, font_t *font);
|
||||
|
||||
/**
|
||||
* Sets the label's text, rebuilding its cached sprites (glyph lookup, UV,
|
||||
* and layout) immediately. This is the only way the sprite cache gets
|
||||
* rebuilt -- uiLabelDraw never recomputes it, so call this whenever the
|
||||
* text changes rather than once up front and expecting it to stay in sync.
|
||||
*
|
||||
* @param label The label to update.
|
||||
* @param text Null-terminated string to display. Must be shorter than
|
||||
* UI_LABEL_TEXT_MAX.
|
||||
*/
|
||||
void uiLabelSetText(uilabel_t *label, const char_t *text);
|
||||
|
||||
/**
|
||||
* Sets the label's tint color. Cheap -- doesn't touch the sprite cache,
|
||||
* since color is applied via the draw material, not baked into sprites.
|
||||
*
|
||||
* @param label The label to update.
|
||||
* @param color The new tint color.
|
||||
*/
|
||||
void uiLabelSetColor(uilabel_t *label, const color_t color);
|
||||
|
||||
/**
|
||||
* Gets the measured size (in pixels) of the label's current text, cached
|
||||
* from the last uiLabelSetText call.
|
||||
*
|
||||
* @param label The label to query.
|
||||
* @param outWidth Pointer to store the width.
|
||||
* @param outHeight Pointer to store the height.
|
||||
*/
|
||||
void uiLabelGetSize(
|
||||
const uilabel_t *label,
|
||||
int32_t *outWidth,
|
||||
int32_t *outHeight
|
||||
);
|
||||
|
||||
/**
|
||||
* Draws the label's cached sprites at the given screen position in a
|
||||
* single batched buffer call. Does not recompute glyph layout -- call
|
||||
* uiLabelSetText first whenever the text changes.
|
||||
*
|
||||
* @param label The label to draw.
|
||||
* @param x Screen x position.
|
||||
* @param y Screen y position.
|
||||
* @return Any error that occurs.
|
||||
*/
|
||||
errorret_t uiLabelDraw(
|
||||
const uilabel_t *label,
|
||||
const float_t x,
|
||||
const float_t y
|
||||
);
|
||||
@@ -10,6 +10,7 @@
|
||||
#include "util/memory.h"
|
||||
#include "display/text/text.h"
|
||||
#include "display/color.h"
|
||||
#include "ui/widget/uiwidgetlabel.h"
|
||||
#include "ui/widget/uibutton.h"
|
||||
#include "ui/widget/uitab.h"
|
||||
#include "ui/widget/uislider.h"
|
||||
@@ -67,8 +68,6 @@ void uiMenuOpen(uimenu_t *menu) {
|
||||
uiMenuFocusDirection,
|
||||
menu
|
||||
);
|
||||
menu->focusItem->disableBack = menu->disableBack;
|
||||
menu->focusItem->cancel = menu->cancel != NULL ? uiMenuFocusCancel : NULL;
|
||||
}
|
||||
|
||||
void uiMenuClose(uimenu_t *menu) {
|
||||
@@ -78,20 +77,6 @@ void uiMenuClose(uimenu_t *menu) {
|
||||
menu->focusItem = NULL;
|
||||
}
|
||||
|
||||
void uiMenuSetDisableBack(uimenu_t *menu, const bool_t disableBack) {
|
||||
assertNotNull(menu, "Menu cannot be NULL");
|
||||
menu->disableBack = disableBack;
|
||||
if(menu->focusItem != NULL) menu->focusItem->disableBack = disableBack;
|
||||
}
|
||||
|
||||
void uiMenuSetCancelCallback(uimenu_t *menu, uimenucancelcallback_t cancel) {
|
||||
assertNotNull(menu, "Menu cannot be NULL");
|
||||
menu->cancel = cancel;
|
||||
if(menu->focusItem != NULL) {
|
||||
menu->focusItem->cancel = cancel != NULL ? uiMenuFocusCancel : NULL;
|
||||
}
|
||||
}
|
||||
|
||||
bool_t uiMenuIsActive(const uimenu_t *menu) {
|
||||
assertNotNull(menu, "Menu cannot be NULL");
|
||||
return menu->focusItem != NULL;
|
||||
@@ -114,16 +99,12 @@ errorret_t uiMenuDraw(
|
||||
uint8_t row = 0;
|
||||
|
||||
for(uint8_t i = 0; i < menu->itemCount; i++) {
|
||||
uimenuitem_t *item = &menu->items[i];
|
||||
const uimenuitem_t *item = &menu->items[i];
|
||||
|
||||
if(item->type == UI_MENU_WIDGET_TYPE_LABEL) {
|
||||
if(col > 0) { row++; col = 0; }
|
||||
errorChain(textDraw(
|
||||
x,
|
||||
y + (float_t)row * rowHeight,
|
||||
item->label,
|
||||
COLOR_WHITE,
|
||||
&FONT_DEFAULT
|
||||
errorChain(uiWidgetLabelDraw(
|
||||
&item->label, x, y + (float_t)row * rowHeight
|
||||
));
|
||||
row++;
|
||||
continue;
|
||||
@@ -230,177 +211,42 @@ bool_t uiMenuFocusDirection(
|
||||
) {
|
||||
assertNotNull(focusItem, "Focus item cannot be NULL");
|
||||
assertNotNull(focusItem->user, "Focus item user cannot be NULL");
|
||||
uimenu_t *menu = (uimenu_t *)focusItem->user;
|
||||
|
||||
if(
|
||||
direction == UI_FOCUS_DIRECTION_LEFT ||
|
||||
direction == UI_FOCUS_DIRECTION_RIGHT
|
||||
) {
|
||||
uint8_t slot = focusItem->y * menu->columns + focusItem->x;
|
||||
uint8_t index = uiMenuFocusSlotToIndex(menu, slot);
|
||||
|
||||
if(index != 0xFF) {
|
||||
uimenuitem_t *item = &menu->items[index];
|
||||
bool_t right = direction == UI_FOCUS_DIRECTION_RIGHT;
|
||||
|
||||
if(item->type == UI_MENU_WIDGET_TYPE_SLIDER) {
|
||||
if(right) {
|
||||
uiSliderStepUp(&item->slider);
|
||||
} else {
|
||||
uiSliderStepDown(&item->slider);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
if(item->type == UI_MENU_WIDGET_TYPE_CHECKBOX) {
|
||||
uiCheckboxToggle(&item->checkbox);
|
||||
return true;
|
||||
}
|
||||
|
||||
if(item->type == UI_MENU_WIDGET_TYPE_DROPDOWN) {
|
||||
if(right) {
|
||||
uiDropdownStepNext(&item->dropdown);
|
||||
} else {
|
||||
uiDropdownStepPrev(&item->dropdown);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return uiMenuFocusSkipBlanks(menu, focusItem, direction);
|
||||
}
|
||||
|
||||
bool_t uiMenuItemIsBlank(const uimenuitem_t *item) {
|
||||
return
|
||||
item->type == UI_MENU_WIDGET_TYPE_BUTTON &&
|
||||
item->button.label.text[0] == '\0';
|
||||
}
|
||||
|
||||
bool_t uiMenuFocusSkipBlanks(
|
||||
uimenu_t *menu,
|
||||
const uifocusitem_t *focusItem,
|
||||
const uifocusdirection_t direction
|
||||
) {
|
||||
int8_t dx = 0;
|
||||
int8_t dy = 0;
|
||||
for(
|
||||
const uifocusdirmap_t *m = UI_FOCUS_DIR_MAP;
|
||||
m->action != INPUT_ACTION_NULL;
|
||||
m++
|
||||
) {
|
||||
if(m->direction != direction) continue;
|
||||
dx = m->dx;
|
||||
dy = m->dy;
|
||||
break;
|
||||
}
|
||||
if(dx == 0 && dy == 0) return false;
|
||||
|
||||
// Horizontal: a straight scan along the row. There's no "nearest"
|
||||
// ambiguity here - the next non-blank cell in the pressed direction is
|
||||
// always the right one, wrapping within the row as needed.
|
||||
if(dy == 0) {
|
||||
int16_t x = focusItem->x;
|
||||
for(uint8_t i = 0; i < menu->columns; i++) {
|
||||
x += dx;
|
||||
if(x < 0) x += menu->columns;
|
||||
x %= menu->columns;
|
||||
|
||||
uint8_t slot = focusItem->y * menu->columns + (uint8_t)x;
|
||||
uint8_t index = uiMenuFocusSlotToIndex(menu, slot);
|
||||
// Treat a missing item (label/spacer slot) the same as a blank
|
||||
// button - both get skipped over transparently.
|
||||
if(index != 0xFF && !uiMenuItemIsBlank(&menu->items[index])) {
|
||||
uiMenuSetPosition(menu, (uint8_t)x, focusItem->y);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
if(direction != UI_FOCUS_DIRECTION_LEFT && direction != UI_FOCUS_DIRECTION_RIGHT) {
|
||||
return false;
|
||||
}
|
||||
|
||||
// Vertical: search every cell strictly further in the pressed
|
||||
// direction (no wrap - the rows below are only ever "below", never
|
||||
// "above via the far edge") and land on whichever non-blank cell has
|
||||
// the smallest combined row+column distance from where we moved from.
|
||||
// This lets an exact column match several rows away beat an
|
||||
// approximate match one row away, while still reaching something like
|
||||
// SPACE from a key with nothing directly below it. Ties on total
|
||||
// distance favor the smaller column distance - e.g. moving straight
|
||||
// down two rows onto an exact column match beats landing one row down
|
||||
// one column over, even though both are three cells away.
|
||||
int16_t rowStart = dy > 0 ? focusItem->y + 1 : 0;
|
||||
int16_t rowEnd = dy > 0 ? focusItem->rows - 1 : focusItem->y - 1;
|
||||
uimenu_t *menu = (uimenu_t *)focusItem->user;
|
||||
uint8_t slot = focusItem->y * menu->columns + focusItem->x;
|
||||
uint8_t index = uiMenuFocusSlotToIndex(menu, slot);
|
||||
if(index == 0xFF) return false;
|
||||
|
||||
bool_t found = false;
|
||||
uint16_t bestDistance = 0;
|
||||
uint8_t bestColDistance = 0;
|
||||
uint8_t bestX = 0;
|
||||
uint8_t bestY = 0;
|
||||
uimenuitem_t *item = &menu->items[index];
|
||||
bool_t right = direction == UI_FOCUS_DIRECTION_RIGHT;
|
||||
|
||||
for(int16_t yy = rowStart; yy <= rowEnd; yy++) {
|
||||
uint8_t rowDistance = dy > 0 ?
|
||||
(uint8_t)(yy - focusItem->y) : (uint8_t)(focusItem->y - yy);
|
||||
|
||||
for(uint8_t xx = 0; xx < menu->columns; xx++) {
|
||||
uint8_t colDistance = xx > focusItem->x ?
|
||||
xx - focusItem->x : focusItem->x - xx;
|
||||
uint16_t distance = rowDistance + colDistance;
|
||||
if(found && distance > bestDistance) continue;
|
||||
if(found && distance == bestDistance && colDistance >= bestColDistance) {
|
||||
continue;
|
||||
}
|
||||
|
||||
uint8_t slot = (uint8_t)yy * menu->columns + xx;
|
||||
uint8_t index = uiMenuFocusSlotToIndex(menu, slot);
|
||||
if(index == 0xFF || uiMenuItemIsBlank(&menu->items[index])) continue;
|
||||
|
||||
found = true;
|
||||
bestDistance = distance;
|
||||
bestColDistance = colDistance;
|
||||
bestX = xx;
|
||||
bestY = (uint8_t)yy;
|
||||
if(item->type == UI_MENU_WIDGET_TYPE_SLIDER) {
|
||||
if(right) {
|
||||
uiSliderStepUp(&item->slider);
|
||||
} else {
|
||||
uiSliderStepDown(&item->slider);
|
||||
}
|
||||
}
|
||||
|
||||
// Nothing further in that direction at all (already on the edge row) -
|
||||
// wrap to the opposite edge as a last resort, landing on its nearest
|
||||
// column. This only ever kicks in when the non-wrapped search above
|
||||
// found literally nothing, so it can't hijack a real nearby match the
|
||||
// way wrapping during the main search could.
|
||||
if(!found && focusItem->rows > 1) {
|
||||
uint8_t wrapY = dy > 0 ? 0 : focusItem->rows - 1;
|
||||
for(uint8_t xx = 0; xx < menu->columns; xx++) {
|
||||
uint8_t colDistance = xx > focusItem->x ?
|
||||
xx - focusItem->x : focusItem->x - xx;
|
||||
if(found && colDistance >= bestDistance) continue;
|
||||
|
||||
uint8_t slot = wrapY * menu->columns + xx;
|
||||
uint8_t index = uiMenuFocusSlotToIndex(menu, slot);
|
||||
if(index == 0xFF || uiMenuItemIsBlank(&menu->items[index])) continue;
|
||||
|
||||
found = true;
|
||||
bestDistance = colDistance;
|
||||
bestX = xx;
|
||||
bestY = wrapY;
|
||||
}
|
||||
}
|
||||
|
||||
if(found) {
|
||||
uiMenuSetPosition(menu, bestX, bestY);
|
||||
return true;
|
||||
}
|
||||
|
||||
// Nothing non-blank in that direction at all - fall through to the
|
||||
// default single-step move.
|
||||
return false;
|
||||
}
|
||||
if(item->type == UI_MENU_WIDGET_TYPE_CHECKBOX) {
|
||||
uiCheckboxToggle(&item->checkbox);
|
||||
return true;
|
||||
}
|
||||
|
||||
bool_t uiMenuFocusCancel(const uifocusitem_t *focusItem) {
|
||||
assertNotNull(focusItem, "Focus item cannot be NULL");
|
||||
assertNotNull(focusItem->user, "Focus item user cannot be NULL");
|
||||
uimenu_t *menu = (uimenu_t *)focusItem->user;
|
||||
if(menu->cancel == NULL) return false;
|
||||
return menu->cancel(menu);
|
||||
if(item->type == UI_MENU_WIDGET_TYPE_DROPDOWN) {
|
||||
if(right) {
|
||||
uiDropdownStepNext(&item->dropdown);
|
||||
} else {
|
||||
uiDropdownStepPrev(&item->dropdown);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
uint8_t uiMenuFocusableCount(const uimenu_t *menu) {
|
||||
@@ -408,9 +254,7 @@ uint8_t uiMenuFocusableCount(const uimenu_t *menu) {
|
||||
uint8_t count = 0;
|
||||
for(uint8_t i = 0; i < menu->itemCount; i++) {
|
||||
uimenuwidgettype_t t = menu->items[i].type;
|
||||
if(t != UI_MENU_WIDGET_TYPE_LABEL && t != UI_MENU_WIDGET_TYPE_SPACER) {
|
||||
count++;
|
||||
}
|
||||
if(t != UI_MENU_WIDGET_TYPE_LABEL && t != UI_MENU_WIDGET_TYPE_SPACER) count++;
|
||||
}
|
||||
return count;
|
||||
}
|
||||
@@ -420,15 +264,20 @@ uint8_t uiMenuFocusSlotToIndex(const uimenu_t *menu, const uint8_t slot) {
|
||||
uint8_t focusable = 0;
|
||||
for(uint8_t i = 0; i < menu->itemCount; i++) {
|
||||
uimenuwidgettype_t t = menu->items[i].type;
|
||||
if(t == UI_MENU_WIDGET_TYPE_LABEL || t == UI_MENU_WIDGET_TYPE_SPACER) {
|
||||
continue;
|
||||
}
|
||||
if(t == UI_MENU_WIDGET_TYPE_LABEL || t == UI_MENU_WIDGET_TYPE_SPACER) continue;
|
||||
if(focusable == slot) return i;
|
||||
focusable++;
|
||||
}
|
||||
return 0xFF;
|
||||
}
|
||||
|
||||
void uiMenuLabelInit(uimenuitem_t *item, const char_t *text) {
|
||||
assertNotNull(item, "Item cannot be NULL");
|
||||
assertNotNull(text, "Text cannot be NULL");
|
||||
uiWidgetLabelInit(&item->label, &FONT_DEFAULT);
|
||||
uiWidgetLabelSetText(&item->label, text);
|
||||
}
|
||||
|
||||
void uiMenuItemSetHighlighted(uimenuitem_t *item, const bool_t highlighted) {
|
||||
if(item->type == UI_MENU_WIDGET_TYPE_CHECKBOX) {
|
||||
uiCheckboxSetHighlighted(&item->checkbox, highlighted);
|
||||
@@ -8,14 +8,13 @@
|
||||
#pragma once
|
||||
#include "error/error.h"
|
||||
#include "ui/focus/uifocus.h"
|
||||
#include "ui/widget/uiwidgetlabel.h"
|
||||
#include "ui/widget/uibutton.h"
|
||||
#include "ui/widget/uicheckbox.h"
|
||||
#include "ui/widget/uitab.h"
|
||||
#include "ui/widget/uislider.h"
|
||||
#include "ui/widget/uidropdown.h"
|
||||
|
||||
#define UI_MENU_LABEL_MAX UI_CHECKBOX_LABEL_MAX
|
||||
|
||||
typedef struct uimenu_s uimenu_t;
|
||||
|
||||
typedef enum {
|
||||
@@ -32,7 +31,7 @@ typedef enum {
|
||||
typedef struct {
|
||||
uimenuwidgettype_t type;
|
||||
union {
|
||||
char_t *label;
|
||||
uiwidgetlabel_t label;
|
||||
uicheckbox_t checkbox;
|
||||
uibutton_t button;
|
||||
uitab_t tab;
|
||||
@@ -55,16 +54,6 @@ typedef void (*uimenuchangedcallback_t)(
|
||||
|
||||
typedef void (*uimenuclosedcallback_t)(const uimenu_t *menu);
|
||||
|
||||
/**
|
||||
* Callback invoked when INPUT_ACTION_CANCEL is pressed while the menu is
|
||||
* focused - see uiMenuSetCancelCallback.
|
||||
*
|
||||
* @param menu The menu that was cancelled.
|
||||
* @returns True if fully handled (skips the default disableBack/pop
|
||||
* behavior); false to fall through to it.
|
||||
*/
|
||||
typedef bool_t (*uimenucancelcallback_t)(const uimenu_t *menu);
|
||||
|
||||
typedef struct uimenu_s {
|
||||
uimenuitem_t *items;
|
||||
uint8_t itemCount;
|
||||
@@ -74,12 +63,8 @@ typedef struct uimenu_s {
|
||||
uimenuselectedcallback_t selected;
|
||||
uimenuclosedcallback_t closed;
|
||||
uimenuchangedcallback_t changed;
|
||||
uimenucancelcallback_t cancel;
|
||||
|
||||
void *user;
|
||||
|
||||
// See uiMenuSetDisableBack.
|
||||
bool_t disableBack;
|
||||
} uimenu_t;
|
||||
|
||||
/**
|
||||
@@ -133,33 +118,11 @@ void uiMenuOpen(uimenu_t *menu);
|
||||
|
||||
/**
|
||||
* Pops a menu from the UI focus stack, removing it from the active menu.
|
||||
*
|
||||
*
|
||||
* @param menu The menu to pop.
|
||||
*/
|
||||
void uiMenuClose(uimenu_t *menu);
|
||||
|
||||
/**
|
||||
* Sets whether pressing back/cancel is ignored while this menu is the
|
||||
* topmost focus item - it simply does nothing, rather than closing the
|
||||
* menu. Does not affect a deliberate uiMenuClose() call. Safe to call
|
||||
* before or after uiMenuOpen().
|
||||
*
|
||||
* @param menu The menu to update.
|
||||
* @param disableBack True to ignore back/cancel input for this menu.
|
||||
*/
|
||||
void uiMenuSetDisableBack(uimenu_t *menu, const bool_t disableBack);
|
||||
|
||||
/**
|
||||
* Sets a callback given first refusal of INPUT_ACTION_CANCEL while this
|
||||
* menu is the topmost focus item, before disableBack/the default pop is
|
||||
* applied. Safe to call before or after uiMenuOpen().
|
||||
*
|
||||
* @param menu The menu to update.
|
||||
* @param cancel The callback to install, or NULL to remove it and
|
||||
* restore default disableBack/pop behavior.
|
||||
*/
|
||||
void uiMenuSetCancelCallback(uimenu_t *menu, uimenucancelcallback_t cancel);
|
||||
|
||||
/**
|
||||
* Returns whether the menu is currently active (on the UI focus stack).
|
||||
*
|
||||
@@ -215,8 +178,16 @@ uint8_t uiMenuFocusSlotToIndex(const uimenu_t *menu, const uint8_t slot);
|
||||
void uiMenuItemSetHighlighted(uimenuitem_t *item, const bool_t highlighted);
|
||||
|
||||
/**
|
||||
* Internal focus callback - forwards selection to the menu's selected
|
||||
* handler.
|
||||
* Initializes a menu item as a standalone label, caching its text.
|
||||
* Used internally by the MENU_LABEL helper macro.
|
||||
*
|
||||
* @param item The item to initialize.
|
||||
* @param text Display text.
|
||||
*/
|
||||
void uiMenuLabelInit(uimenuitem_t *item, const char_t *text);
|
||||
|
||||
/**
|
||||
* Internal focus callback - forwards selection to the menu's selected handler.
|
||||
*
|
||||
* @param focusItem The active focus item; user field must point to uimenu_t.
|
||||
* @returns True.
|
||||
@@ -241,83 +212,18 @@ bool_t uiMenuFocusClosed(const uifocusitem_t *focusItem);
|
||||
|
||||
/**
|
||||
* Internal focus callback - gives the focused item's widget a chance to
|
||||
* handle LEFT/RIGHT itself (e.g. a slider adjusting its value); failing
|
||||
* that, moves to the next non-blank cell in the given direction (see
|
||||
* uiMenuFocusSkipBlanks) rather than the default single-step move, which
|
||||
* would happily land on a deliberately-blank layout cell (e.g. a
|
||||
* UI_MENU_WIDGET_TYPE_BUTTON with an empty label, used as filler).
|
||||
* handle LEFT/RIGHT itself (e.g. a slider adjusting its value) before
|
||||
* falling back to the default cell-to-cell movement.
|
||||
*
|
||||
* @param focusItem The active focus item; user field must point to uimenu_t.
|
||||
* @param direction The direction that was pressed or held.
|
||||
* @returns True if handled (a widget adjusted itself, or focus moved to
|
||||
* a non-blank cell); false to fall through to the default single-step
|
||||
* move (only when every cell along this line is blank).
|
||||
* @returns True if the focused widget handled the direction.
|
||||
*/
|
||||
bool_t uiMenuFocusDirection(
|
||||
const uifocusitem_t *focusItem,
|
||||
const uifocusdirection_t direction
|
||||
);
|
||||
|
||||
/**
|
||||
* True for a menu item that should be transparently skipped during
|
||||
* d-pad navigation - a UI_MENU_WIDGET_TYPE_BUTTON with an empty label,
|
||||
* used purely to hold a grid cell's position (the menu/focus grid has no
|
||||
* concept of a row narrower than its column count, so short rows are
|
||||
* padded with these instead). Labels/spacers are unaffected by this -
|
||||
* they're already excluded from the focus grid entirely.
|
||||
*
|
||||
* @param item The item to check.
|
||||
* @returns True if this item is blank filler.
|
||||
*/
|
||||
bool_t uiMenuItemIsBlank(const uimenuitem_t *item);
|
||||
|
||||
/**
|
||||
* Moves focusItem to a non-blank cell (see uiMenuItemIsBlank) in the
|
||||
* given direction, wrapping the grid as many times as needed - so, from
|
||||
* the menu's perspective, a blank cell simply isn't there.
|
||||
*
|
||||
* LEFT/RIGHT scan straight along the row, since there's no ambiguity
|
||||
* about which non-blank cell is "next" (wrapping within the row as
|
||||
* needed). UP/DOWN instead considers every cell strictly further in the
|
||||
* pressed direction and lands on whichever non-blank cell has the
|
||||
* smallest combined row+column distance from the one moved from - e.g.
|
||||
* moving down off a densely-packed row onto a mostly-blank one lands on
|
||||
* whatever's closest instead of only ever reaching a cell that happens
|
||||
* to share the exact same column, while an exact column match a couple
|
||||
* of rows down still wins over an approximate match one row down. Ties
|
||||
* on total distance favor the smaller column distance, so a straight
|
||||
* move down onto an exact column match beats an equally-far diagonal
|
||||
* one. This search never wraps in either axis while there's still a
|
||||
* real cell further in the pressed direction - column/row 0 is never
|
||||
* treated as adjacent to the far edge just because the grid wraps in
|
||||
* general. Only once already on the edge row (nothing further to search
|
||||
* at all) does it fall back to wrapping to the opposite edge's nearest
|
||||
* column, so pressing up from the top row still goes somewhere instead
|
||||
* of doing nothing.
|
||||
*
|
||||
* Gives up (returning false, so the default single-step move applies
|
||||
* instead) only if every cell on the grid is blank.
|
||||
*
|
||||
* @param menu The menu to move within.
|
||||
* @param focusItem The active focus item; must belong to menu.
|
||||
* @param direction The direction that was pressed or held.
|
||||
* @returns True if a non-blank cell was found and focus moved there.
|
||||
*/
|
||||
bool_t uiMenuFocusSkipBlanks(
|
||||
uimenu_t *menu,
|
||||
const uifocusitem_t *focusItem,
|
||||
const uifocusdirection_t direction
|
||||
);
|
||||
|
||||
/**
|
||||
* Internal focus callback - forwards INPUT_ACTION_CANCEL to the menu's
|
||||
* cancel handler, if one is set.
|
||||
*
|
||||
* @param focusItem The active focus item; user field must point to uimenu_t.
|
||||
* @returns The cancel handler's result, or false if none is set.
|
||||
*/
|
||||
bool_t uiMenuFocusCancel(const uifocusitem_t *focusItem);
|
||||
|
||||
// Helper macros
|
||||
#define MENU_BEGIN(menuPtr, itemsArray, selected, closed, changed) \
|
||||
uimenu_t *menu = (menuPtr); \
|
||||
@@ -329,7 +235,7 @@ bool_t uiMenuFocusCancel(const uifocusitem_t *focusItem);
|
||||
#define MENU_LABEL(text) \
|
||||
assertTrue(menuIndex < menuCapacity, "Menu item count exceeds capacity"); \
|
||||
menu->items[menuIndex].type = UI_MENU_WIDGET_TYPE_LABEL; \
|
||||
menu->items[menuIndex].label = text; \
|
||||
uiMenuLabelInit(&menu->items[menuIndex], text); \
|
||||
++menuIndex
|
||||
|
||||
#define MENU_SPACER() \
|
||||
@@ -0,0 +1,15 @@
|
||||
/**
|
||||
* Copyright (c) 2026 Dominic Masters
|
||||
*
|
||||
* This software is released under the MIT License.
|
||||
* https://opensource.org/licenses/MIT
|
||||
*/
|
||||
|
||||
#include "uiscrolling.h"
|
||||
#include "assert/assert.h"
|
||||
|
||||
void uiScrollingInit(uiscrolling_t *scrolling) {
|
||||
assertNotNull(scrolling, "Scrolling container cannot be NULL");
|
||||
// Nothing to initialize yet -- uiscrolling_t is currently a
|
||||
// placeholder with no fields.
|
||||
}
|
||||
@@ -0,0 +1,21 @@
|
||||
/**
|
||||
* 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 {
|
||||
|
||||
} uiscrolling_t;
|
||||
|
||||
/**
|
||||
* Initializes a scrolling container. Currently a placeholder -- no
|
||||
* scrolling behavior is implemented yet.
|
||||
*
|
||||
* @param scrolling The scrolling container to initialize.
|
||||
*/
|
||||
void uiScrollingInit(uiscrolling_t *scrolling);
|
||||
@@ -30,12 +30,16 @@ void uiSliderInitFloat(
|
||||
assertTrue(step > 0.0f, "Slider step must be greater than zero");
|
||||
|
||||
memoryZero(slider, sizeof(uislider_t));
|
||||
slider->label = label;
|
||||
uiWidgetLabelInit(&slider->label, &FONT_DEFAULT);
|
||||
uiWidgetLabelSetText(&slider->label, label);
|
||||
uiWidgetLabelInit(&slider->valueLabel, &FONT_DEFAULT);
|
||||
slider->type = UI_SLIDER_TYPE_FLOAT;
|
||||
slider->min.f = min;
|
||||
slider->max.f = max;
|
||||
slider->step.f = step;
|
||||
slider->value.f = mathClamp(value, min, max);
|
||||
uiSliderRebuildValueLabel(slider);
|
||||
uiSliderRebuildGeometry(slider);
|
||||
}
|
||||
|
||||
void uiSliderInitInt(
|
||||
@@ -52,12 +56,16 @@ void uiSliderInitInt(
|
||||
assertTrue(step > 0, "Slider step must be greater than zero");
|
||||
|
||||
memoryZero(slider, sizeof(uislider_t));
|
||||
slider->label = label;
|
||||
uiWidgetLabelInit(&slider->label, &FONT_DEFAULT);
|
||||
uiWidgetLabelSetText(&slider->label, label);
|
||||
uiWidgetLabelInit(&slider->valueLabel, &FONT_DEFAULT);
|
||||
slider->type = UI_SLIDER_TYPE_INT;
|
||||
slider->min.i = min;
|
||||
slider->max.i = max;
|
||||
slider->step.i = step;
|
||||
slider->value.i = mathClamp(value, min, max);
|
||||
uiSliderRebuildValueLabel(slider);
|
||||
uiSliderRebuildGeometry(slider);
|
||||
}
|
||||
|
||||
float_t uiSliderGetFloat(const uislider_t *slider) {
|
||||
@@ -80,6 +88,8 @@ void uiSliderSetFloat(uislider_t *slider, const float_t value) {
|
||||
slider->type == UI_SLIDER_TYPE_FLOAT, "Slider is not a float slider"
|
||||
);
|
||||
slider->value.f = mathClamp(value, slider->min.f, slider->max.f);
|
||||
uiSliderRebuildValueLabel(slider);
|
||||
uiSliderRebuildGeometry(slider);
|
||||
}
|
||||
|
||||
void uiSliderSetInt(uislider_t *slider, const int32_t value) {
|
||||
@@ -88,6 +98,8 @@ void uiSliderSetInt(uislider_t *slider, const int32_t value) {
|
||||
slider->type == UI_SLIDER_TYPE_INT, "Slider is not an int slider"
|
||||
);
|
||||
slider->value.i = mathClamp(value, slider->min.i, slider->max.i);
|
||||
uiSliderRebuildValueLabel(slider);
|
||||
uiSliderRebuildGeometry(slider);
|
||||
}
|
||||
|
||||
void uiSliderStepUp(uislider_t *slider) {
|
||||
@@ -138,6 +150,9 @@ bool_t uiSliderIsHighlighted(const uislider_t *slider) {
|
||||
void uiSliderSetHighlighted(uislider_t *slider, const bool_t highlighted) {
|
||||
assertNotNull(slider, "Slider cannot be NULL");
|
||||
slider->highlighted = highlighted;
|
||||
color_t color = highlighted ? COLOR_RED : COLOR_WHITE;
|
||||
uiWidgetLabelSetColor(&slider->label, color);
|
||||
uiWidgetLabelSetColor(&slider->valueLabel, color);
|
||||
}
|
||||
|
||||
errorret_t uiSliderDraw(
|
||||
@@ -147,17 +162,80 @@ errorret_t uiSliderDraw(
|
||||
) {
|
||||
assertNotNull(slider, "Slider cannot be NULL");
|
||||
|
||||
color_t color = slider->highlighted ? COLOR_RED : COLOR_WHITE;
|
||||
errorChain(uiWidgetLabelDraw(&slider->label, x, y));
|
||||
|
||||
errorChain(textDraw(x, y, slider->label, color, &FONT_DEFAULT));
|
||||
shadermaterial_t trackMaterial = {
|
||||
.unlit = {
|
||||
.color = COLOR_DARK_GRAY,
|
||||
.texture = &TEXTURE_WHITE
|
||||
}
|
||||
};
|
||||
spritebatchsprite_t track = spriteBatchSpriteTranslate(
|
||||
&slider->cachedTrack, x, y
|
||||
);
|
||||
errorChain(spriteBatchBuffer(&track, 1, &SHADER_UNLIT, trackMaterial));
|
||||
|
||||
if(slider->cachedFillVisible) {
|
||||
shadermaterial_t fillMaterial = {
|
||||
.unlit = {
|
||||
.color = slider->highlighted ? COLOR_RED : COLOR_WHITE,
|
||||
.texture = &TEXTURE_WHITE
|
||||
}
|
||||
};
|
||||
spritebatchsprite_t fill = spriteBatchSpriteTranslate(
|
||||
&slider->cachedFill, x, y
|
||||
);
|
||||
errorChain(spriteBatchBuffer(&fill, 1, &SHADER_UNLIT, fillMaterial));
|
||||
}
|
||||
|
||||
if(slider->cachedMarkerCount > 0) {
|
||||
spritebatchsprite_t markers[UI_SLIDER_STEP_MARKERS_MAX];
|
||||
for(int32_t i = 0; i < slider->cachedMarkerCount; i++) {
|
||||
markers[i] = spriteBatchSpriteTranslate(&slider->cachedMarkers[i], x, y);
|
||||
}
|
||||
|
||||
shadermaterial_t markerMaterial = {
|
||||
.unlit = {
|
||||
.color = COLOR_WHITE,
|
||||
.texture = &TEXTURE_WHITE
|
||||
}
|
||||
};
|
||||
errorChain(spriteBatchBuffer(
|
||||
markers, slider->cachedMarkerCount, &SHADER_UNLIT, markerMaterial
|
||||
));
|
||||
}
|
||||
|
||||
errorChain(uiWidgetLabelDraw(
|
||||
&slider->valueLabel,
|
||||
x + slider->cachedTrack.max[0] + UI_SLIDER_GAP,
|
||||
y
|
||||
));
|
||||
|
||||
errorOk();
|
||||
}
|
||||
|
||||
void uiSliderRebuildValueLabel(uislider_t *slider) {
|
||||
char_t valueText[UI_WIDGET_LABEL_TEXT_MAX];
|
||||
if(slider->type == UI_SLIDER_TYPE_INT) {
|
||||
stringFormat(
|
||||
valueText, UI_WIDGET_LABEL_TEXT_MAX - 1, "%d", slider->value.i
|
||||
);
|
||||
} else {
|
||||
stringFormat(
|
||||
valueText, UI_WIDGET_LABEL_TEXT_MAX - 1, "%.2f", slider->value.f
|
||||
);
|
||||
}
|
||||
uiWidgetLabelSetText(&slider->valueLabel, valueText);
|
||||
}
|
||||
|
||||
void uiSliderRebuildGeometry(uislider_t *slider) {
|
||||
int32_t labelW, labelH;
|
||||
textMeasure(slider->label, &FONT_DEFAULT, &labelW, &labelH);
|
||||
uiWidgetLabelGetSize(&slider->label, &labelW, &labelH);
|
||||
|
||||
float_t trackX = x + (float_t)labelW + UI_SLIDER_GAP;
|
||||
float_t trackY = y + ((float_t)labelH - UI_SLIDER_TRACK_HEIGHT) * 0.5f;
|
||||
float_t trackX = (float_t)labelW + UI_SLIDER_GAP;
|
||||
float_t trackY = ((float_t)labelH - UI_SLIDER_TRACK_HEIGHT) * 0.5f;
|
||||
|
||||
spritebatchsprite_t trackSprite = {
|
||||
slider->cachedTrack = (spritebatchsprite_t){
|
||||
.min = { trackX, trackY, 0.0f },
|
||||
.max = {
|
||||
trackX + UI_SLIDER_TRACK_WIDTH, trackY + UI_SLIDER_TRACK_HEIGHT, 0.0f
|
||||
@@ -165,31 +243,16 @@ errorret_t uiSliderDraw(
|
||||
.uvMin = { 0.0f, 0.0f },
|
||||
.uvMax = { 1.0f, 1.0f }
|
||||
};
|
||||
shadermaterial_t trackMaterial = {
|
||||
.unlit = {
|
||||
.color = COLOR_DARK_GRAY,
|
||||
.texture = &TEXTURE_WHITE
|
||||
}
|
||||
};
|
||||
errorChain(spriteBatchBuffer(&trackSprite, 1, &SHADER_UNLIT, trackMaterial));
|
||||
errorChain(spriteBatchFlush());
|
||||
|
||||
float_t fillWidth = UI_SLIDER_TRACK_WIDTH * uiSliderGetRatio(slider);
|
||||
if(fillWidth > 0.0f) {
|
||||
spritebatchsprite_t fillSprite = {
|
||||
slider->cachedFillVisible = fillWidth > 0.0f;
|
||||
if(slider->cachedFillVisible) {
|
||||
slider->cachedFill = (spritebatchsprite_t){
|
||||
.min = { trackX, trackY, 0.0f },
|
||||
.max = { trackX + fillWidth, trackY + UI_SLIDER_TRACK_HEIGHT, 0.0f },
|
||||
.uvMin = { 0.0f, 0.0f },
|
||||
.uvMax = { 1.0f, 1.0f }
|
||||
};
|
||||
shadermaterial_t fillMaterial = {
|
||||
.unlit = {
|
||||
.color = color,
|
||||
.texture = &TEXTURE_WHITE
|
||||
}
|
||||
};
|
||||
errorChain(spriteBatchBuffer(&fillSprite, 1, &SHADER_UNLIT, fillMaterial));
|
||||
errorChain(spriteBatchFlush());
|
||||
}
|
||||
|
||||
int32_t stepCount = uiSliderGetStepCount(slider);
|
||||
@@ -197,7 +260,7 @@ errorret_t uiSliderDraw(
|
||||
for(int32_t i = 0; i <= stepCount; i++) {
|
||||
float_t markerX = trackX +
|
||||
UI_SLIDER_TRACK_WIDTH * (float_t)i / (float_t)stepCount;
|
||||
spritebatchsprite_t markerSprite = {
|
||||
slider->cachedMarkers[i] = (spritebatchsprite_t){
|
||||
.min = {
|
||||
markerX - UI_SLIDER_STEP_MARKER_WIDTH * 0.5f,
|
||||
trackY - UI_SLIDER_STEP_MARKER_OVERHANG,
|
||||
@@ -211,34 +274,9 @@ errorret_t uiSliderDraw(
|
||||
.uvMin = { 0.0f, 0.0f },
|
||||
.uvMax = { 1.0f, 1.0f }
|
||||
};
|
||||
shadermaterial_t markerMaterial = {
|
||||
.unlit = {
|
||||
.color = COLOR_WHITE,
|
||||
.texture = &TEXTURE_WHITE
|
||||
}
|
||||
};
|
||||
errorChain(
|
||||
spriteBatchBuffer(&markerSprite, 1, &SHADER_UNLIT, markerMaterial)
|
||||
);
|
||||
errorChain(spriteBatchFlush());
|
||||
}
|
||||
}
|
||||
|
||||
char_t valueText[UI_SLIDER_VALUE_TEXT_MAX];
|
||||
if(slider->type == UI_SLIDER_TYPE_INT) {
|
||||
stringFormat(
|
||||
valueText, UI_SLIDER_VALUE_TEXT_MAX - 1, "%d", slider->value.i
|
||||
);
|
||||
slider->cachedMarkerCount = stepCount + 1;
|
||||
} else {
|
||||
stringFormat(
|
||||
valueText, UI_SLIDER_VALUE_TEXT_MAX - 1, "%.2f", slider->value.f
|
||||
);
|
||||
slider->cachedMarkerCount = 0;
|
||||
}
|
||||
|
||||
errorChain(textDraw(
|
||||
trackX + UI_SLIDER_TRACK_WIDTH + UI_SLIDER_GAP, y,
|
||||
valueText, color, &FONT_DEFAULT
|
||||
));
|
||||
|
||||
errorOk();
|
||||
}
|
||||
@@ -7,13 +7,14 @@
|
||||
|
||||
#pragma once
|
||||
#include "error/error.h"
|
||||
#include "ui/widget/uiwidgetlabel.h"
|
||||
#include "display/spritebatch/spritebatchsprite.h"
|
||||
|
||||
#define UI_SLIDER_TRACK_WIDTH 80.0f
|
||||
#define UI_SLIDER_TRACK_HEIGHT 4.0f
|
||||
#define UI_SLIDER_STEP_MARKER_WIDTH 2.0f
|
||||
#define UI_SLIDER_STEP_MARKER_OVERHANG 1.0f
|
||||
#define UI_SLIDER_GAP 4.0f
|
||||
#define UI_SLIDER_VALUE_TEXT_MAX 16
|
||||
|
||||
/**
|
||||
* Number of discrete steps below which an int slider renders individual
|
||||
@@ -34,13 +35,24 @@ typedef union {
|
||||
} uislidervalue_t;
|
||||
|
||||
typedef struct {
|
||||
const char_t *label;
|
||||
uiwidgetlabel_t label;
|
||||
uiwidgetlabel_t valueLabel;
|
||||
uislidertype_t type;
|
||||
uislidervalue_t value;
|
||||
uislidervalue_t min;
|
||||
uislidervalue_t max;
|
||||
uislidervalue_t step;
|
||||
bool_t highlighted;
|
||||
|
||||
// Track/fill/marker geometry, cached relative to origin (0,0) and only
|
||||
// rebuilt when the value or step configuration changes (see
|
||||
// uiSliderRebuildGeometry) -- uiSliderDraw just translates these into
|
||||
// position instead of re-deriving them every frame.
|
||||
spritebatchsprite_t cachedTrack;
|
||||
spritebatchsprite_t cachedFill;
|
||||
bool_t cachedFillVisible;
|
||||
spritebatchsprite_t cachedMarkers[UI_SLIDER_STEP_MARKERS_MAX];
|
||||
int32_t cachedMarkerCount;
|
||||
} uislider_t;
|
||||
|
||||
/**
|
||||
@@ -183,3 +195,21 @@ errorret_t uiSliderDraw(
|
||||
const float_t x,
|
||||
const float_t y
|
||||
);
|
||||
|
||||
/**
|
||||
* Rebuilds the slider's cached value label from its current value.
|
||||
* Called internally whenever value changes.
|
||||
*
|
||||
* @param slider The slider to update.
|
||||
*/
|
||||
void uiSliderRebuildValueLabel(uislider_t *slider);
|
||||
|
||||
/**
|
||||
* Rebuilds the slider's cached track/fill/marker geometry (relative to
|
||||
* origin (0,0)) from its current label size, value, and step
|
||||
* configuration. Called internally on init and whenever the value
|
||||
* changes -- uiSliderDraw never recomputes this itself.
|
||||
*
|
||||
* @param slider The slider to update.
|
||||
*/
|
||||
void uiSliderRebuildGeometry(uislider_t *slider);
|
||||
@@ -7,7 +7,6 @@
|
||||
|
||||
#include "uitab.h"
|
||||
#include "assert/assert.h"
|
||||
#include "util/memory.h"
|
||||
#include "display/text/text.h"
|
||||
#include "display/color.h"
|
||||
#include "display/spritebatch/spritebatch.h"
|
||||
@@ -17,8 +16,10 @@
|
||||
void uiTabInit(uitab_t *tab, const char_t *label) {
|
||||
assertNotNull(tab, "Tab cannot be NULL");
|
||||
assertNotNull(label, "Label cannot be NULL");
|
||||
memoryZero(tab, sizeof(uitab_t));
|
||||
tab->label = label;
|
||||
uiWidgetLabelInit(&tab->label, &FONT_DEFAULT);
|
||||
uiWidgetLabelSetText(&tab->label, label);
|
||||
tab->active = false;
|
||||
uiTabRebuildBackground(tab);
|
||||
}
|
||||
|
||||
bool_t uiTabIsActive(const uitab_t *tab) {
|
||||
@@ -38,15 +39,9 @@ errorret_t uiTabDraw(
|
||||
) {
|
||||
assertNotNull(tab, "Tab cannot be NULL");
|
||||
|
||||
int32_t labelW, labelH;
|
||||
textMeasure(tab->label, &FONT_DEFAULT, &labelW, &labelH);
|
||||
|
||||
spritebatchsprite_t sprite = {
|
||||
.min = { x, y, 0.0f },
|
||||
.max = { x + (float_t)labelW, y + (float_t)labelH, 0.0f },
|
||||
.uvMin = { 0.0f, 0.0f },
|
||||
.uvMax = { 1.0f, 1.0f }
|
||||
};
|
||||
spritebatchsprite_t sprite = spriteBatchSpriteTranslate(
|
||||
&tab->cachedBackground, x, y
|
||||
);
|
||||
shadermaterial_t material = {
|
||||
.unlit = {
|
||||
.color = tab->active ? COLOR_GREEN : COLOR_RED,
|
||||
@@ -54,9 +49,21 @@ errorret_t uiTabDraw(
|
||||
}
|
||||
};
|
||||
errorChain(spriteBatchBuffer(&sprite, 1, &SHADER_UNLIT, material));
|
||||
errorChain(spriteBatchFlush());
|
||||
|
||||
errorChain(textDraw(x, y, tab->label, COLOR_WHITE, &FONT_DEFAULT));
|
||||
errorChain(uiWidgetLabelDraw(&tab->label, x, y));
|
||||
|
||||
errorOk();
|
||||
}
|
||||
|
||||
void uiTabRebuildBackground(uitab_t *tab) {
|
||||
assertNotNull(tab, "Tab cannot be NULL");
|
||||
|
||||
int32_t labelW, labelH;
|
||||
uiWidgetLabelGetSize(&tab->label, &labelW, &labelH);
|
||||
tab->cachedBackground = (spritebatchsprite_t){
|
||||
.min = { 0.0f, 0.0f, 0.0f },
|
||||
.max = { (float_t)labelW, (float_t)labelH, 0.0f },
|
||||
.uvMin = { 0.0f, 0.0f },
|
||||
.uvMax = { 1.0f, 1.0f }
|
||||
};
|
||||
}
|
||||
@@ -7,10 +7,17 @@
|
||||
|
||||
#pragma once
|
||||
#include "error/error.h"
|
||||
#include "ui/widget/uiwidgetlabel.h"
|
||||
#include "display/spritebatch/spritebatchsprite.h"
|
||||
|
||||
typedef struct {
|
||||
const char_t *label;
|
||||
uiwidgetlabel_t label;
|
||||
bool_t active;
|
||||
|
||||
// Background quad, cached relative to origin (0,0) from the label's
|
||||
// size at init -- uiTabDraw only translates this into position, since
|
||||
// active/inactive only changes the material color, not the geometry.
|
||||
spritebatchsprite_t cachedBackground;
|
||||
} uitab_t;
|
||||
|
||||
/**
|
||||
@@ -51,3 +58,13 @@ errorret_t uiTabDraw(
|
||||
const float_t x,
|
||||
const float_t y
|
||||
);
|
||||
|
||||
/**
|
||||
* Rebuilds the tab's cached background quad (relative to origin (0,0))
|
||||
* from its current label size. Called internally by uiTabInit -- the
|
||||
* background's geometry never changes afterwards, since the tab has no
|
||||
* API to change its label text.
|
||||
*
|
||||
* @param tab The tab to update.
|
||||
*/
|
||||
void uiTabRebuildBackground(uitab_t *tab);
|
||||
@@ -0,0 +1,66 @@
|
||||
/**
|
||||
* Copyright (c) 2026 Dominic Masters
|
||||
*
|
||||
* This software is released under the MIT License.
|
||||
* https://opensource.org/licenses/MIT
|
||||
*/
|
||||
|
||||
#include "uiwidgetlabel.h"
|
||||
#include "assert/assert.h"
|
||||
#include "util/memory.h"
|
||||
#include "util/string.h"
|
||||
#include "display/text/text.h"
|
||||
|
||||
void uiWidgetLabelInit(uiwidgetlabel_t *label, font_t *font) {
|
||||
assertNotNull(label, "Label cannot be NULL");
|
||||
assertNotNull(font, "Font cannot be NULL");
|
||||
|
||||
memoryZero(label, sizeof(uiwidgetlabel_t));
|
||||
label->font = font;
|
||||
label->color = COLOR_WHITE;
|
||||
}
|
||||
|
||||
void uiWidgetLabelSetText(uiwidgetlabel_t *label, const char_t *text) {
|
||||
assertNotNull(label, "Label cannot be NULL");
|
||||
assertNotNull(text, "Text cannot be NULL");
|
||||
assertStrLenMax(text, UI_WIDGET_LABEL_TEXT_MAX, "Label text too long");
|
||||
|
||||
stringCopy(label->text, text, UI_WIDGET_LABEL_TEXT_MAX);
|
||||
label->spriteCount = textBuildSpriteCache(
|
||||
label->text, label->font, label->sprites,
|
||||
UI_WIDGET_LABEL_SPRITE_COUNT_MAX, &label->width, &label->height
|
||||
);
|
||||
}
|
||||
|
||||
void uiWidgetLabelSetColor(uiwidgetlabel_t *label, const color_t color) {
|
||||
assertNotNull(label, "Label cannot be NULL");
|
||||
label->color = color;
|
||||
}
|
||||
|
||||
void uiWidgetLabelGetSize(
|
||||
const uiwidgetlabel_t *label,
|
||||
int32_t *outWidth,
|
||||
int32_t *outHeight
|
||||
) {
|
||||
assertNotNull(label, "Label cannot be NULL");
|
||||
assertNotNull(outWidth, "Output width cannot be NULL");
|
||||
assertNotNull(outHeight, "Output height cannot be NULL");
|
||||
*outWidth = label->width;
|
||||
*outHeight = label->height;
|
||||
}
|
||||
|
||||
errorret_t uiWidgetLabelDraw(
|
||||
const uiwidgetlabel_t *label,
|
||||
const float_t x,
|
||||
const float_t y
|
||||
) {
|
||||
assertNotNull(label, "Label cannot be NULL");
|
||||
if(label->spriteCount == 0) errorOk();
|
||||
|
||||
spritebatchsprite_t scratch[UI_WIDGET_LABEL_SPRITE_COUNT_MAX];
|
||||
errorChain(textDrawSpriteCache(
|
||||
label->sprites, label->spriteCount, scratch, x, y, label->color,
|
||||
label->font->texture
|
||||
));
|
||||
errorOk();
|
||||
}
|
||||
@@ -0,0 +1,90 @@
|
||||
/**
|
||||
* Copyright (c) 2026 Dominic Masters
|
||||
*
|
||||
* This software is released under the MIT License.
|
||||
* https://opensource.org/licenses/MIT
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
#include "error/error.h"
|
||||
#include "display/text/font.h"
|
||||
#include "display/spritebatch/spritebatchsprite.h"
|
||||
#include "display/color.h"
|
||||
|
||||
// A cached, cheap-to-redraw label sized for embedding directly inside
|
||||
// small widgets (buttons, checkboxes, sliders, ...) rather than
|
||||
// referencing text by pointer and re-deriving glyph geometry every
|
||||
// frame. Capacity is intentionally much smaller than uilabel_t's -- it
|
||||
// gets embedded by value in every widget instance (and inside
|
||||
// uimenuitem_t's union, which is often arrayed), so keeping it small
|
||||
// matters on memory-constrained targets. See uilabel_t for the
|
||||
// general-purpose, larger-capacity equivalent.
|
||||
#define UI_WIDGET_LABEL_TEXT_MAX 64
|
||||
#define UI_WIDGET_LABEL_SPRITE_COUNT_MAX UI_WIDGET_LABEL_TEXT_MAX
|
||||
|
||||
typedef struct {
|
||||
char_t text[UI_WIDGET_LABEL_TEXT_MAX];
|
||||
color_t color;
|
||||
font_t *font;
|
||||
|
||||
spritebatchsprite_t sprites[UI_WIDGET_LABEL_SPRITE_COUNT_MAX];
|
||||
uint32_t spriteCount;
|
||||
int32_t width;
|
||||
int32_t height;
|
||||
} uiwidgetlabel_t;
|
||||
|
||||
/**
|
||||
* Initializes a widget label, defaulting to white text and no text set.
|
||||
*
|
||||
* @param label The label to initialize.
|
||||
* @param font Font to use for rendering. Must outlive the label.
|
||||
*/
|
||||
void uiWidgetLabelInit(uiwidgetlabel_t *label, font_t *font);
|
||||
|
||||
/**
|
||||
* Sets the label's text, rebuilding its cached sprites immediately.
|
||||
* Call this whenever the displayed text changes -- uiWidgetLabelDraw
|
||||
* never recomputes it.
|
||||
*
|
||||
* @param label The label to update.
|
||||
* @param text Null-terminated string to display. Must be shorter than
|
||||
* UI_WIDGET_LABEL_TEXT_MAX.
|
||||
*/
|
||||
void uiWidgetLabelSetText(uiwidgetlabel_t *label, const char_t *text);
|
||||
|
||||
/**
|
||||
* Sets the label's tint color. Cheap -- doesn't touch the sprite cache.
|
||||
*
|
||||
* @param label The label to update.
|
||||
* @param color The new tint color.
|
||||
*/
|
||||
void uiWidgetLabelSetColor(uiwidgetlabel_t *label, const color_t color);
|
||||
|
||||
/**
|
||||
* Gets the measured size (in pixels) of the label's current text, cached
|
||||
* from the last uiWidgetLabelSetText call.
|
||||
*
|
||||
* @param label The label to query.
|
||||
* @param outWidth Pointer to store the width.
|
||||
* @param outHeight Pointer to store the height.
|
||||
*/
|
||||
void uiWidgetLabelGetSize(
|
||||
const uiwidgetlabel_t *label,
|
||||
int32_t *outWidth,
|
||||
int32_t *outHeight
|
||||
);
|
||||
|
||||
/**
|
||||
* Draws the label's cached sprites at the given screen position in a
|
||||
* single batched buffer call. Does not recompute glyph layout.
|
||||
*
|
||||
* @param label The label to draw.
|
||||
* @param x Screen x position.
|
||||
* @param y Screen y position.
|
||||
* @return Any error that occurs.
|
||||
*/
|
||||
errorret_t uiWidgetLabelDraw(
|
||||
const uiwidgetlabel_t *label,
|
||||
const float_t x,
|
||||
const float_t y
|
||||
);
|
||||
+2
-2
@@ -3,8 +3,8 @@
|
||||
# This software is released under the MIT License.
|
||||
# https://opensource.org/licenses/MIT
|
||||
|
||||
# Sources
|
||||
target_sources(${DUSK_LIBRARY_TARGET_NAME}
|
||||
PUBLIC
|
||||
assetchunkloader.c
|
||||
uitextbox.c
|
||||
uitextboxmain.c
|
||||
)
|
||||
@@ -14,7 +14,7 @@
|
||||
#include "display/color.h"
|
||||
#include "display/spritebatch/spritebatch.h"
|
||||
#include "display/shader/shaderunlit.h"
|
||||
#include "ui/widget/uiframe.h"
|
||||
#include "ui/frame/uiframe.h"
|
||||
|
||||
void uiTextboxInit(
|
||||
uitextbox_t *box,
|
||||
@@ -33,6 +33,7 @@ void uiTextboxInit(
|
||||
box->maxLength = maxLength;
|
||||
box->lines = lines;
|
||||
box->linesMax = linesMax;
|
||||
box->glyphsBuiltForPage = -1;
|
||||
}
|
||||
|
||||
void uiTextboxSetText(uitextbox_t *box, const char_t *text) {
|
||||
@@ -43,6 +44,7 @@ void uiTextboxSetText(uitextbox_t *box, const char_t *text) {
|
||||
box->scroll = 0;
|
||||
box->layoutWidth = 0.0f;
|
||||
box->layoutHeight = 0.0f;
|
||||
box->glyphsBuiltForPage = -1;
|
||||
}
|
||||
|
||||
void uiTextboxBuildLayout(
|
||||
@@ -52,6 +54,7 @@ void uiTextboxBuildLayout(
|
||||
) {
|
||||
assertNotNull(box, "Textbox cannot be NULL");
|
||||
|
||||
box->glyphsBuiltForPage = -1;
|
||||
box->layoutWidth = width;
|
||||
box->layoutHeight = height;
|
||||
box->lineCount = 0;
|
||||
@@ -138,9 +141,9 @@ void uiTextboxBuildLayout(
|
||||
errorret_t uiTextboxUpdate(uitextbox_t *box) {
|
||||
assertNotNull(box, "Textbox cannot be NULL");
|
||||
|
||||
#ifdef DUSK_TIME_DYNAMIC
|
||||
if(TIME.dynamicUpdate) errorOk();
|
||||
#endif
|
||||
#ifdef DUSK_TIME_DYNAMIC
|
||||
if(TIME.dynamicUpdate) errorOk();
|
||||
#endif
|
||||
|
||||
if(!uiTextboxPageIsComplete(box)) {
|
||||
box->scroll += UI_TEXTBOX_SCROLL_CHARS_PER_TICK;
|
||||
@@ -169,13 +172,30 @@ errorret_t uiTextboxDraw(
|
||||
uiTextboxBuildLayout(box, contentW, contentH);
|
||||
}
|
||||
|
||||
errorChain(uiFrameDraw(x, y, width, height));
|
||||
errorChain(spriteBatchFlush());
|
||||
errorChain(uiFrameDrawCached(&box->frameCache, x, y, width, height));
|
||||
|
||||
if(box->lineCount == 0 || box->text[0] == '\0') errorOk();
|
||||
|
||||
float_t fontW = (float_t)FONT_DEFAULT.tileset->tileWidth;
|
||||
float_t fontH = (float_t)FONT_DEFAULT.tileset->tileHeight;
|
||||
if(box->glyphsBuiltForPage != box->currentPage) {
|
||||
uiTextboxBuildPageGlyphs(box);
|
||||
}
|
||||
|
||||
if(box->glyphCount == 0) errorOk();
|
||||
|
||||
int32_t visibleCount = 0;
|
||||
while(
|
||||
visibleCount < box->glyphCount &&
|
||||
box->glyphs[visibleCount].revealAt <= box->scroll
|
||||
) visibleCount++;
|
||||
|
||||
if(visibleCount == 0) errorOk();
|
||||
|
||||
spritebatchsprite_t scratch[UI_TEXTBOX_PAGE_GLYPHS_MAX];
|
||||
for(int32_t i = 0; i < visibleCount; i++) {
|
||||
scratch[i] = spriteBatchSpriteTranslate(
|
||||
&box->glyphs[i].sprite, contentX, contentY
|
||||
);
|
||||
}
|
||||
|
||||
shadermaterial_t material = {
|
||||
.unlit = {
|
||||
@@ -183,35 +203,47 @@ errorret_t uiTextboxDraw(
|
||||
.texture = FONT_DEFAULT.texture
|
||||
}
|
||||
};
|
||||
errorChain(spriteBatchBuffer(scratch, visibleCount, &SHADER_UNLIT, material));
|
||||
|
||||
errorOk();
|
||||
}
|
||||
|
||||
void uiTextboxBuildPageGlyphs(uitextbox_t *box) {
|
||||
assertNotNull(box, "Textbox cannot be NULL");
|
||||
|
||||
box->glyphCount = 0;
|
||||
|
||||
int32_t pageFirst = box->currentPage * box->linesPerPage;
|
||||
int32_t pageLast = pageFirst + box->linesPerPage;
|
||||
if(pageLast > box->lineCount) pageLast = box->lineCount;
|
||||
|
||||
int32_t charsLeft = box->scroll;
|
||||
float_t fontW = (float_t)FONT_DEFAULT.tileset->tileWidth;
|
||||
float_t fontH = (float_t)FONT_DEFAULT.tileset->tileHeight;
|
||||
|
||||
for(int32_t li = pageFirst; li < pageLast && charsLeft > 0; li++) {
|
||||
int32_t consumed = 0;
|
||||
for(int32_t li = pageFirst; li < pageLast; li++) {
|
||||
uitextboxline_t *line = &box->lines[li];
|
||||
int32_t visible = line->count < charsLeft ? line->count : charsLeft;
|
||||
float_t lineY = contentY +
|
||||
float_t lineY =
|
||||
(float_t)(li - pageFirst) * (fontH + UI_TEXTBOX_LINE_SPACING);
|
||||
|
||||
for(int32_t ci = 0; ci < visible; ci++) {
|
||||
for(int32_t ci = 0; ci < line->count; ci++) {
|
||||
consumed++;
|
||||
char_t c = box->text[line->start + ci];
|
||||
if(c == ' ') continue;
|
||||
spritebatchsprite_t sprite = textGetSprite(
|
||||
(vec2){ contentX + (float_t)ci * fontW, lineY },
|
||||
c,
|
||||
&FONT_DEFAULT
|
||||
);
|
||||
errorChain(spriteBatchBuffer(&sprite, 1, &SHADER_UNLIT, material));
|
||||
}
|
||||
|
||||
charsLeft -= visible;
|
||||
assertTrue(
|
||||
box->glyphCount < UI_TEXTBOX_PAGE_GLYPHS_MAX,
|
||||
"Textbox page produces too many glyphs"
|
||||
);
|
||||
uitextboxglyph_t *glyph = &box->glyphs[box->glyphCount++];
|
||||
glyph->sprite = textGetSprite(
|
||||
(vec2){ (float_t)ci * fontW, lineY }, c, &FONT_DEFAULT
|
||||
);
|
||||
glyph->revealAt = consumed;
|
||||
}
|
||||
}
|
||||
|
||||
errorChain(spriteBatchFlush());
|
||||
errorOk();
|
||||
box->glyphsBuiltForPage = box->currentPage;
|
||||
}
|
||||
|
||||
int32_t uiTextboxGetPageCharCount(const uitextbox_t *box) {
|
||||
@@ -7,16 +7,34 @@
|
||||
|
||||
#pragma once
|
||||
#include "error/error.h"
|
||||
#include "ui/frame/uiframe.h"
|
||||
#include "display/spritebatch/spritebatchsprite.h"
|
||||
|
||||
#define UI_TEXTBOX_LINES_PER_PAGE_MAX 4
|
||||
#define UI_TEXTBOX_SCROLL_CHARS_PER_TICK 1
|
||||
#define UI_TEXTBOX_LINE_SPACING 0.0f
|
||||
|
||||
// Fixed capacity for a page's cached glyph sprites (see uitextboxglyph_t).
|
||||
// Sized generously above UI_TEXTBOX_LINES_PER_PAGE_MAX worth of glyphs at
|
||||
// typical textbox widths; uiTextboxBuildPageGlyphs asserts if a page
|
||||
// somehow produces more than this.
|
||||
#define UI_TEXTBOX_PAGE_GLYPHS_MAX 512
|
||||
|
||||
typedef struct {
|
||||
int32_t start;
|
||||
int32_t count;
|
||||
} uitextboxline_t;
|
||||
|
||||
// A single visible glyph's cached sprite (relative to the textbox's
|
||||
// content origin, i.e. (0,0)) plus the scroll value at/after which it
|
||||
// becomes visible -- lets uiTextboxDraw turn the typewriter scroll into
|
||||
// a simple prefix-count instead of recomputing glyph geometry every
|
||||
// frame.
|
||||
typedef struct {
|
||||
spritebatchsprite_t sprite;
|
||||
int32_t revealAt;
|
||||
} uitextboxglyph_t;
|
||||
|
||||
typedef struct {
|
||||
char_t *text;
|
||||
uint32_t maxLength;
|
||||
@@ -34,6 +52,15 @@ typedef struct {
|
||||
|
||||
int32_t currentPage;
|
||||
int32_t scroll;
|
||||
|
||||
// Cached glyph sprites for the current page (see uitextboxglyph_t),
|
||||
// rebuilt only when currentPage no longer matches
|
||||
// glyphsBuiltForPage -- not every frame/scroll tick.
|
||||
uitextboxglyph_t glyphs[UI_TEXTBOX_PAGE_GLYPHS_MAX];
|
||||
int32_t glyphCount;
|
||||
int32_t glyphsBuiltForPage;
|
||||
|
||||
uiframecache_t frameCache;
|
||||
} uitextbox_t;
|
||||
|
||||
/**
|
||||
@@ -136,3 +163,13 @@ bool_t uiTextboxHasNextPage(const uitextbox_t *box);
|
||||
* @param box The textbox to advance.
|
||||
*/
|
||||
void uiTextboxNextPage(uitextbox_t *box);
|
||||
|
||||
/**
|
||||
* Rebuilds the cached glyph sprites (see uitextboxglyph_t) for the
|
||||
* current page from its line layout. Called automatically by
|
||||
* uiTextboxDraw whenever currentPage no longer matches the page the
|
||||
* cache was last built for.
|
||||
*
|
||||
* @param box The textbox to rebuild.
|
||||
*/
|
||||
void uiTextboxBuildPageGlyphs(uitextbox_t *box);
|
||||
+1
-2
@@ -12,7 +12,7 @@
|
||||
#include "display/color.h"
|
||||
#include "display/spritebatch/spritebatch.h"
|
||||
#include "display/shader/shaderunlit.h"
|
||||
#include "ui/widget/uiframe.h"
|
||||
#include "ui/frame/uiframe.h"
|
||||
|
||||
uitextboxmain_t UI_TEXTBOX_MAIN;
|
||||
static uifocusitem_t *focusItem = NULL;
|
||||
@@ -79,7 +79,6 @@ errorret_t uiTextboxMainDraw(void) {
|
||||
&FONT_DEFAULT
|
||||
);
|
||||
errorChain(spriteBatchBuffer(&caret, 1, &SHADER_UNLIT, material));
|
||||
errorChain(spriteBatchFlush());
|
||||
|
||||
errorOk();
|
||||
}
|
||||
+1
-1
@@ -6,7 +6,7 @@
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
#include "ui/rpg/textbox/uitextbox.h"
|
||||
#include "uitextbox.h"
|
||||
#include "ui/focus/uifocusitem.h"
|
||||
|
||||
#define UI_TEXTBOX_MAIN_LINES 4
|
||||
@@ -0,0 +1,35 @@
|
||||
/**
|
||||
* Copyright (c) 2026 Dominic Masters
|
||||
*
|
||||
* This software is released under the MIT License.
|
||||
* https://opensource.org/licenses/MIT
|
||||
*/
|
||||
|
||||
#include "uitestlabel.h"
|
||||
#include "ui/widget/uilabel.h"
|
||||
#include "display/text/text.h"
|
||||
#include "display/screen/screen.h"
|
||||
#include "engine/engine.h"
|
||||
|
||||
uilabel_t UI_TEST_LABEL;
|
||||
|
||||
errorret_t uiTestLabelInit() {
|
||||
uiLabelInit(&UI_TEST_LABEL, &FONT_DEFAULT);
|
||||
uiLabelSetText(&UI_TEST_LABEL, "duskrpg");
|
||||
errorOk();
|
||||
}
|
||||
|
||||
errorret_t uiTestLabelDraw() {
|
||||
int32_t versionWidth, versionHeight;
|
||||
textMeasure(ENGINE.version, &FONT_DEFAULT, &versionWidth, &versionHeight);
|
||||
|
||||
errorChain(uiLabelDraw(
|
||||
&UI_TEST_LABEL,
|
||||
(float_t)(SCREEN.scanX + SCREEN.scanWidth - UI_TEST_LABEL.width),
|
||||
(float_t)(
|
||||
SCREEN.scanY + SCREEN.scanHeight - versionHeight -
|
||||
UI_TEST_LABEL.height
|
||||
)
|
||||
));
|
||||
errorOk();
|
||||
}
|
||||
@@ -0,0 +1,24 @@
|
||||
/**
|
||||
* Copyright (c) 2026 Dominic Masters
|
||||
*
|
||||
* This software is released under the MIT License.
|
||||
* https://opensource.org/licenses/MIT
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
#include "error/error.h"
|
||||
|
||||
/**
|
||||
* Initializes the test label, a smoke test for the duskrpg-side UI
|
||||
* element extension point (uielementgame.h).
|
||||
*
|
||||
* @return Any error that occurs.
|
||||
*/
|
||||
errorret_t uiTestLabelInit();
|
||||
|
||||
/**
|
||||
* Draws the test label above the engine's debug version number.
|
||||
*
|
||||
* @return Any error that occurs.
|
||||
*/
|
||||
errorret_t uiTestLabelDraw();
|
||||
@@ -0,0 +1,11 @@
|
||||
# Copyright (c) 2026 Dominic Masters
|
||||
#
|
||||
# This software is released under the MIT License.
|
||||
# https://opensource.org/licenses/MIT
|
||||
|
||||
include(dusktest)
|
||||
|
||||
# Tests
|
||||
dusktest(test_uiframe.c)
|
||||
dusktest(test_uislider.c)
|
||||
dusktest(test_uitab.c)
|
||||
@@ -0,0 +1,68 @@
|
||||
/**
|
||||
* Copyright (c) 2026 Dominic Masters
|
||||
*
|
||||
* This software is released under the MIT License.
|
||||
* https://opensource.org/licenses/MIT
|
||||
*/
|
||||
|
||||
#include "dusktest.h"
|
||||
#include "ui/frame/uiframe.h"
|
||||
|
||||
static void test_uiFrameBuildSprites_layout(void **state) {
|
||||
UI_FRAME.tileset = (tileset_t){
|
||||
.tileWidth = 1,
|
||||
.tileHeight = 1,
|
||||
.tileCount = 9,
|
||||
.columns = 3,
|
||||
.rows = 3,
|
||||
.uv = { 0.25f, 0.25f }
|
||||
};
|
||||
|
||||
const float_t x = 100.0f;
|
||||
const float_t y = 50.0f;
|
||||
const float_t width = 40.0f;
|
||||
const float_t height = 30.0f;
|
||||
const float_t tileW = (float_t)UI_FRAME_BORDER_WIDTH;
|
||||
const float_t tileH = (float_t)UI_FRAME_BORDER_HEIGHT;
|
||||
|
||||
spritebatchsprite_t sprites[9];
|
||||
uiFrameBuildSprites(sprites, x, y, width, height);
|
||||
|
||||
// Top-left corner sits exactly at the rect's origin.
|
||||
assert_float_equal(sprites[0].min[0], x, 0.0001f);
|
||||
assert_float_equal(sprites[0].min[1], y, 0.0001f);
|
||||
assert_float_equal(sprites[0].max[0], x + tileW, 0.0001f);
|
||||
assert_float_equal(sprites[0].max[1], y + tileH, 0.0001f);
|
||||
assert_float_equal(sprites[0].uvMin[0], 0.0f, 0.0001f);
|
||||
assert_float_equal(sprites[0].uvMin[1], 0.0f, 0.0001f);
|
||||
assert_float_equal(sprites[0].uvMax[0], 0.25f, 0.0001f);
|
||||
assert_float_equal(sprites[0].uvMax[1], 0.25f, 0.0001f);
|
||||
|
||||
// Top-middle edge stretches to fill the width minus both corners.
|
||||
assert_float_equal(sprites[1].min[0], x + tileW, 0.0001f);
|
||||
assert_float_equal(sprites[1].max[0], x + width - tileW, 0.0001f);
|
||||
assert_float_equal(sprites[1].max[1], y + tileH, 0.0001f);
|
||||
|
||||
// Center tile fills the remaining interior on both axes.
|
||||
assert_float_equal(sprites[4].min[0], x + tileW, 0.0001f);
|
||||
assert_float_equal(sprites[4].min[1], y + tileH, 0.0001f);
|
||||
assert_float_equal(sprites[4].max[0], x + width - tileW, 0.0001f);
|
||||
assert_float_equal(sprites[4].max[1], y + height - tileH, 0.0001f);
|
||||
|
||||
// Bottom-right corner sits exactly at the rect's far corner, sampling
|
||||
// tileset column 2, row 2.
|
||||
assert_float_equal(sprites[8].min[0], x + width - tileW, 0.0001f);
|
||||
assert_float_equal(sprites[8].min[1], y + height - tileH, 0.0001f);
|
||||
assert_float_equal(sprites[8].max[0], x + width, 0.0001f);
|
||||
assert_float_equal(sprites[8].max[1], y + height, 0.0001f);
|
||||
assert_float_equal(sprites[8].uvMin[0], 0.5f, 0.0001f);
|
||||
assert_float_equal(sprites[8].uvMin[1], 0.5f, 0.0001f);
|
||||
}
|
||||
|
||||
int main(int argc, char **argv) {
|
||||
const struct CMUnitTest tests[] = {
|
||||
cmocka_unit_test(test_uiFrameBuildSprites_layout),
|
||||
};
|
||||
|
||||
return cmocka_run_group_tests(tests, NULL, NULL);
|
||||
}
|
||||
@@ -0,0 +1,114 @@
|
||||
/**
|
||||
* Copyright (c) 2026 Dominic Masters
|
||||
*
|
||||
* This software is released under the MIT License.
|
||||
* https://opensource.org/licenses/MIT
|
||||
*/
|
||||
|
||||
#include "dusktest.h"
|
||||
#include "ui/widget/uislider.h"
|
||||
#include "util/memory.h"
|
||||
|
||||
// uiSliderInitFloat/InitInt require a real font (FONT_DEFAULT) to build
|
||||
// the label's glyph cache, which needs a live GL context this test binary
|
||||
// doesn't have -- see the label size caching contract for why this is
|
||||
// safe to bypass here (uiSliderRebuildGeometry only reads slider->label's
|
||||
// already-measured width/height, it never touches the font itself).
|
||||
static void sliderSetupFloat(
|
||||
uislider_t *slider,
|
||||
const float_t value,
|
||||
const float_t min,
|
||||
const float_t max,
|
||||
const float_t step
|
||||
) {
|
||||
memoryZero(slider, sizeof(uislider_t));
|
||||
slider->label.width = 20;
|
||||
slider->label.height = 10;
|
||||
slider->type = UI_SLIDER_TYPE_FLOAT;
|
||||
slider->min.f = min;
|
||||
slider->max.f = max;
|
||||
slider->step.f = step;
|
||||
slider->value.f = value;
|
||||
}
|
||||
|
||||
static void sliderSetupInt(
|
||||
uislider_t *slider,
|
||||
const int32_t value,
|
||||
const int32_t min,
|
||||
const int32_t max,
|
||||
const int32_t step
|
||||
) {
|
||||
memoryZero(slider, sizeof(uislider_t));
|
||||
slider->label.width = 20;
|
||||
slider->label.height = 10;
|
||||
slider->type = UI_SLIDER_TYPE_INT;
|
||||
slider->min.i = min;
|
||||
slider->max.i = max;
|
||||
slider->step.i = step;
|
||||
slider->value.i = value;
|
||||
}
|
||||
|
||||
static void test_uiSliderRebuildGeometry_trackPosition(void **state) {
|
||||
uislider_t slider;
|
||||
sliderSetupFloat(&slider, 0.0f, 0.0f, 1.0f, 0.1f);
|
||||
uiSliderRebuildGeometry(&slider);
|
||||
|
||||
const float_t expectedX = (float_t)slider.label.width + UI_SLIDER_GAP;
|
||||
const float_t expectedY =
|
||||
((float_t)slider.label.height - UI_SLIDER_TRACK_HEIGHT) * 0.5f;
|
||||
|
||||
assert_float_equal(slider.cachedTrack.min[0], expectedX, 0.0001f);
|
||||
assert_float_equal(slider.cachedTrack.min[1], expectedY, 0.0001f);
|
||||
assert_float_equal(
|
||||
slider.cachedTrack.max[0], expectedX + UI_SLIDER_TRACK_WIDTH, 0.0001f
|
||||
);
|
||||
}
|
||||
|
||||
static void test_uiSliderRebuildGeometry_fillVisibility(void **state) {
|
||||
uislider_t slider;
|
||||
|
||||
// At the minimum value, the ratio is 0 -- no fill should be visible.
|
||||
sliderSetupFloat(&slider, 0.0f, 0.0f, 10.0f, 1.0f);
|
||||
uiSliderRebuildGeometry(&slider);
|
||||
assert_false(slider.cachedFillVisible);
|
||||
|
||||
// Halfway to max -- fill should cover half the track.
|
||||
sliderSetupFloat(&slider, 5.0f, 0.0f, 10.0f, 1.0f);
|
||||
uiSliderRebuildGeometry(&slider);
|
||||
assert_true(slider.cachedFillVisible);
|
||||
assert_float_equal(
|
||||
slider.cachedFill.max[0] - slider.cachedFill.min[0],
|
||||
UI_SLIDER_TRACK_WIDTH * 0.5f,
|
||||
0.0001f
|
||||
);
|
||||
}
|
||||
|
||||
static void test_uiSliderRebuildGeometry_stepMarkers(void **state) {
|
||||
uislider_t slider;
|
||||
|
||||
// 5 steps between 0 and 10 -- under the marker cap, so markers render.
|
||||
sliderSetupInt(&slider, 0, 0, 10, 2);
|
||||
uiSliderRebuildGeometry(&slider);
|
||||
assert_int_equal(slider.cachedMarkerCount, 6);
|
||||
assert_float_equal(
|
||||
slider.cachedMarkers[0].min[0], slider.cachedTrack.min[0] -
|
||||
UI_SLIDER_STEP_MARKER_WIDTH * 0.5f,
|
||||
0.0001f
|
||||
);
|
||||
|
||||
// 100 steps -- over the marker cap, so it falls back to a smooth fill
|
||||
// with no markers.
|
||||
sliderSetupInt(&slider, 0, 0, 100, 1);
|
||||
uiSliderRebuildGeometry(&slider);
|
||||
assert_int_equal(slider.cachedMarkerCount, 0);
|
||||
}
|
||||
|
||||
int main(int argc, char **argv) {
|
||||
const struct CMUnitTest tests[] = {
|
||||
cmocka_unit_test(test_uiSliderRebuildGeometry_trackPosition),
|
||||
cmocka_unit_test(test_uiSliderRebuildGeometry_fillVisibility),
|
||||
cmocka_unit_test(test_uiSliderRebuildGeometry_stepMarkers),
|
||||
};
|
||||
|
||||
return cmocka_run_group_tests(tests, NULL, NULL);
|
||||
}
|
||||
@@ -0,0 +1,36 @@
|
||||
/**
|
||||
* Copyright (c) 2026 Dominic Masters
|
||||
*
|
||||
* This software is released under the MIT License.
|
||||
* https://opensource.org/licenses/MIT
|
||||
*/
|
||||
|
||||
#include "dusktest.h"
|
||||
#include "ui/widget/uitab.h"
|
||||
#include "util/memory.h"
|
||||
|
||||
// uiTabInit requires a real font (FONT_DEFAULT) to build the label's
|
||||
// glyph cache, which needs a live GL context this test binary doesn't
|
||||
// have. uiTabRebuildBackground only reads the label's already-measured
|
||||
// width/height, so it's safe to set those directly and exercise it here.
|
||||
static void test_uiTabRebuildBackground_matchesLabelSize(void **state) {
|
||||
uitab_t tab;
|
||||
memoryZero(&tab, sizeof(uitab_t));
|
||||
tab.label.width = 42;
|
||||
tab.label.height = 12;
|
||||
|
||||
uiTabRebuildBackground(&tab);
|
||||
|
||||
assert_float_equal(tab.cachedBackground.min[0], 0.0f, 0.0001f);
|
||||
assert_float_equal(tab.cachedBackground.min[1], 0.0f, 0.0001f);
|
||||
assert_float_equal(tab.cachedBackground.max[0], 42.0f, 0.0001f);
|
||||
assert_float_equal(tab.cachedBackground.max[1], 12.0f, 0.0001f);
|
||||
}
|
||||
|
||||
int main(int argc, char **argv) {
|
||||
const struct CMUnitTest tests[] = {
|
||||
cmocka_unit_test(test_uiTabRebuildBackground_matchesLabelSize),
|
||||
};
|
||||
|
||||
return cmocka_run_group_tests(tests, NULL, NULL);
|
||||
}
|
||||
Binary file not shown.
Binary file not shown.
@@ -1,21 +0,0 @@
|
||||
{
|
||||
"moves": {
|
||||
"fire": {
|
||||
// Target flags
|
||||
"enemies": true,
|
||||
"allies": true,
|
||||
"multiple": false,
|
||||
"self": true,
|
||||
"default": "enemy",
|
||||
"target": "SINGLE_ENEMY"
|
||||
},
|
||||
|
||||
"slash": {
|
||||
"enemies": true,
|
||||
"allies": true,
|
||||
"self": false,
|
||||
"default": "enemy",
|
||||
"target": "SINGLE_ENEMY"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,21 +0,0 @@
|
||||
{
|
||||
"items": [
|
||||
{
|
||||
"type": "MODAL",
|
||||
"title": "Fire",
|
||||
"message": "A burst of flame scorches the target."
|
||||
},
|
||||
{
|
||||
"type": "WAIT",
|
||||
"seconds": 2
|
||||
},
|
||||
{
|
||||
"type": "MODAL_CLOSE"
|
||||
},
|
||||
{
|
||||
"type": "BATTLE_FIGHTER_DAMAGE",
|
||||
"fighter": "target",
|
||||
"amount": 12
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -1,21 +0,0 @@
|
||||
{
|
||||
"items": [
|
||||
{
|
||||
"type": "MODAL",
|
||||
"title": "Slash",
|
||||
"message": "A quick blade strike cuts across the target."
|
||||
},
|
||||
{
|
||||
"type": "WAIT",
|
||||
"seconds": 2
|
||||
},
|
||||
{
|
||||
"type": "MODAL_CLOSE"
|
||||
},
|
||||
{
|
||||
"type": "BATTLE_FIGHTER_DAMAGE",
|
||||
"fighter": "target",
|
||||
"amount": 8
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -1,18 +0,0 @@
|
||||
{
|
||||
"items": [
|
||||
{
|
||||
"type": "BATTLE_START",
|
||||
"enemies": [
|
||||
{
|
||||
"attack": 8, "defense": 4, "magic": 0, "speed": 5, "luck": 2,
|
||||
"healthMax": 30, "mpMax": 0,
|
||||
"abilities": ["fire"]
|
||||
},
|
||||
{
|
||||
"attack": 6, "defense": 3, "magic": 0, "speed": 7, "luck": 2,
|
||||
"healthMax": 20, "mpMax": 0
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -1,68 +0,0 @@
|
||||
{
|
||||
"items": [
|
||||
// First thing, try and find a save device, used for settings and what not.
|
||||
{
|
||||
"type": "MODAL",
|
||||
"title": "initial.checking_save.title",
|
||||
"message": "initial.checking_save.message"
|
||||
},
|
||||
{
|
||||
"type": "WAIT",
|
||||
"seconds": 0.2
|
||||
},
|
||||
{
|
||||
"type": "SAVE_DEVICE_CHECK",
|
||||
"successMarker": "CONTINUE",
|
||||
"failureMarker": "SAVE_DEVICE_NOT_FOUND"
|
||||
},
|
||||
|
||||
// No save device found
|
||||
{
|
||||
"type": "MARKER",
|
||||
"name": "SAVE_DEVICE_NOT_FOUND"
|
||||
},
|
||||
{
|
||||
"type": "MODAL_CLOSE"
|
||||
},
|
||||
{
|
||||
"type": "MODAL_OPTIONS_MARKERS",
|
||||
"title": "initial.no_device.title",
|
||||
"message": "initial.no_device.message",
|
||||
"options": [
|
||||
{
|
||||
"text": "initial.no_device.retry",
|
||||
"marker": "SAVE_DEVICE_RETRY"
|
||||
},
|
||||
{
|
||||
"text": "initial.no_device.continue",
|
||||
"marker": "CONTINUE"
|
||||
}
|
||||
]
|
||||
},
|
||||
|
||||
// Save device not found, user to retry, just close modal and loop
|
||||
{
|
||||
"type": "MARKER",
|
||||
"name": "SAVE_DEVICE_RETRY"
|
||||
},
|
||||
{
|
||||
"type": "MODAL_CLOSE"
|
||||
},
|
||||
{
|
||||
"type": "RESTART"
|
||||
},
|
||||
|
||||
// Save device found (or continuing without one)
|
||||
{
|
||||
"type": "MARKER",
|
||||
"name": "CONTINUE"
|
||||
},
|
||||
{
|
||||
"type": "MODAL_CLOSE"
|
||||
},
|
||||
{
|
||||
"type": "CUTSCENE",
|
||||
"name": "cutscenes/main_menu.jsonc"
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -1,140 +0,0 @@
|
||||
{
|
||||
"items": [
|
||||
{
|
||||
"type": "MARKER",
|
||||
"name": "MAIN_MENU_IDLE"
|
||||
},
|
||||
{
|
||||
"type": "UI_SHOW",
|
||||
"name": "main_menu"
|
||||
},
|
||||
|
||||
// Options button goes here - no options screen yet, so this is just
|
||||
// an alias landing right back on the idle loop below.
|
||||
{
|
||||
"type": "MARKER",
|
||||
"name": "OPTIONS"
|
||||
},
|
||||
{
|
||||
"type": "IDLE"
|
||||
},
|
||||
|
||||
// New Game button goes here.
|
||||
{
|
||||
"type": "MARKER",
|
||||
"name": "NEW_GAME"
|
||||
},
|
||||
{
|
||||
"type": "MODAL",
|
||||
"title": "main_menu.checking_save.title",
|
||||
"message": "main_menu.checking_save.message"
|
||||
},
|
||||
{
|
||||
"type": "WAIT",
|
||||
"seconds": 0.2
|
||||
},
|
||||
{
|
||||
"type": "SAVE_DEVICE_CHECK",
|
||||
"successMarker": "SAVE_DEVICE_FOUND",
|
||||
"failureMarker": "SAVE_DEVICE_NOT_FOUND"
|
||||
},
|
||||
|
||||
// Save device not found
|
||||
{
|
||||
"type": "MARKER",
|
||||
"name": "SAVE_DEVICE_NOT_FOUND"
|
||||
},
|
||||
{
|
||||
"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": "NEW_GAME"
|
||||
},
|
||||
{
|
||||
"text": "main_menu.no_device.continue",
|
||||
"marker": "SAVE_DEVICE_FOUND"
|
||||
}
|
||||
]
|
||||
},
|
||||
|
||||
// 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": "NEW_GAME"
|
||||
}
|
||||
]
|
||||
},
|
||||
|
||||
// Quit Game button goes here. Cancelling jumps back to
|
||||
// MAIN_MENU_IDLE; confirming falls through to QUIT_GAME, which
|
||||
// ends the process directly.
|
||||
{
|
||||
"type": "MARKER",
|
||||
"name": "QUIT"
|
||||
},
|
||||
{
|
||||
"type": "MODAL_OPTIONS_MARKERS",
|
||||
"title": "main_menu.quit_confirm",
|
||||
"options": [
|
||||
{
|
||||
"text": "ui.confirm.confirm",
|
||||
"marker": "QUIT_CONFIRMED"
|
||||
},
|
||||
{
|
||||
"text": "ui.confirm.cancel",
|
||||
"marker": "MAIN_MENU_IDLE"
|
||||
}
|
||||
]
|
||||
},
|
||||
|
||||
{
|
||||
"type": "MARKER",
|
||||
"name": "QUIT_CONFIRMED"
|
||||
},
|
||||
{
|
||||
"type": "QUIT_GAME"
|
||||
},
|
||||
|
||||
// main menu just listens for cutscene ending to show the select save modal
|
||||
// so we have that here.
|
||||
{
|
||||
"type": "MARKER",
|
||||
"name": "SAVE_DEVICE_FOUND"
|
||||
},
|
||||
{
|
||||
"type": "MODAL_CLOSE"
|
||||
},
|
||||
{
|
||||
"type": "SAVE_LOAD_ALL_SLOTS",
|
||||
"successMarker": "LOADED",
|
||||
"failureMarker": "LOAD_ERROR"
|
||||
},
|
||||
|
||||
// Must be the very last item - falling off the end here is what
|
||||
// completes the cutscene and fires uiMainMenuOpenSelectSave (see
|
||||
// cutsceneSystemSetOnComplete in ui/screen/mainmenu/uimainmenu.c).
|
||||
// Placing this anywhere earlier would fall through into whatever
|
||||
// comes next instead (e.g. the QUIT block, if placed just before it).
|
||||
{
|
||||
"type": "MARKER",
|
||||
"name": "LOADED"
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -1,11 +0,0 @@
|
||||
{
|
||||
// Placeholder for the new-game intro flow - just shows a modal for now.
|
||||
"items": [
|
||||
{
|
||||
"type": "MODAL",
|
||||
"title": "New Game",
|
||||
"message": "This is a placeholder for the new game intro.",
|
||||
"blocking": true
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -1 +0,0 @@
|
||||
// Entry point, run once by the engine after every other system is ready.
|
||||
@@ -1,7 +0,0 @@
|
||||
{
|
||||
"items": {
|
||||
"potion": { "type": "MEDICINE" },
|
||||
"potato": { "type": "FOOD" },
|
||||
"apple": { "type": "FOOD" }
|
||||
}
|
||||
}
|
||||
+1
-224
@@ -5,113 +5,11 @@ msgstr ""
|
||||
"Content-Type: text/plain; charset=UTF-8\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.corrupt"
|
||||
msgstr "Corrupted Save"
|
||||
|
||||
msgid "ui.select_save.corrupt_warning"
|
||||
msgstr "This save file is corrupted and could not be loaded. Please contact support if this issue persists."
|
||||
|
||||
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
|
||||
msgid "ui.title"
|
||||
msgstr ""
|
||||
"Welcome"
|
||||
|
||||
msgid "save.linux.mkdirp_failed"
|
||||
msgstr "Failed to create save directory, check the disk is not full or write-protected."
|
||||
|
||||
#: src/dusk/ui/frame/settings/uisettings.c
|
||||
msgid "ui.settings.tabs.general"
|
||||
msgstr "General"
|
||||
@@ -158,118 +56,6 @@ msgstr "Items"
|
||||
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"
|
||||
|
||||
|
||||
#
|
||||
# Items
|
||||
#
|
||||
msgid "item.potion.name"
|
||||
msgstr "Potion"
|
||||
|
||||
@@ -277,13 +63,4 @@ msgid "item.potato.name"
|
||||
msgstr "Potato"
|
||||
|
||||
msgid "item.apple.name"
|
||||
msgstr "Apple"
|
||||
|
||||
#
|
||||
# Moves
|
||||
#
|
||||
msgid "move.fire.name"
|
||||
msgstr "Fire"
|
||||
|
||||
msgid "move.slash.name"
|
||||
msgstr "Slash"
|
||||
msgstr "Apple"
|
||||
@@ -0,0 +1,70 @@
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: ExampleApp 1.0\n"
|
||||
"Language: es\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Plural-Forms: nplurals=2; plural=(n==1 ? 0 : 1);\n"
|
||||
|
||||
#: ui/menu.c:10
|
||||
msgid "ui.title"
|
||||
msgstr ""
|
||||
"Bienvenido"
|
||||
|
||||
#: src/dusk/ui/frame/settings/uisettings.c
|
||||
msgid "ui.settings.tabs.general"
|
||||
msgstr "General"
|
||||
|
||||
#: src/dusk/ui/frame/settings/uisettings.c
|
||||
msgid "ui.settings.tabs.input"
|
||||
msgstr "Entrada"
|
||||
|
||||
#: src/dusk/ui/frame/settings/uisettings.c
|
||||
msgid "ui.settings.tabs.display"
|
||||
msgstr "Pantalla"
|
||||
|
||||
#: src/dusk/ui/frame/settings/uisettings.c
|
||||
msgid "ui.settings.tabs.audio"
|
||||
msgstr "Audio"
|
||||
|
||||
msgid "ui.settings.input.deadzone"
|
||||
msgstr "Deadzone"
|
||||
|
||||
#: src/dusk/ui/frame/settings/uisettingsgeneral.c
|
||||
msgid "ui.settings.general.language"
|
||||
msgstr "Idioma"
|
||||
|
||||
#: src/dusk/ui/frame/settings/uisettingsgeneral.c
|
||||
msgid "ui.settings.general.language_detail"
|
||||
msgstr "Se aplica después de reiniciar la aplicación."
|
||||
|
||||
#: src/dusk/ui/frame/settings/uisettings.c
|
||||
msgid "ui.settings.apply"
|
||||
msgstr "Aplicar"
|
||||
|
||||
#: src/dusk/ui/frame/uiconfirm.c
|
||||
msgid "ui.confirm.discard_changes"
|
||||
msgstr "¿Descartar los cambios no guardados?"
|
||||
|
||||
#: src/dusk/ui/frame/game/uigamemenu.c
|
||||
msgid "ui.game_menu.characters"
|
||||
msgstr "Personajes"
|
||||
|
||||
#: src/dusk/ui/frame/game/uigamemenu.c
|
||||
msgid "ui.game_menu.items"
|
||||
msgstr "Objetos"
|
||||
|
||||
#: src/dusk/ui/frame/game/uigamemenu.c
|
||||
msgid "ui.game_menu.settings"
|
||||
msgstr "Configuración"
|
||||
|
||||
#: src/dusk/rpg/item/item.json
|
||||
msgid "item.potion.name"
|
||||
msgstr "Poción"
|
||||
|
||||
#: src/dusk/rpg/item/item.json
|
||||
msgid "item.potato.name"
|
||||
msgstr "Papa"
|
||||
|
||||
#: src/dusk/rpg/item/item.json
|
||||
msgid "item.apple.name"
|
||||
msgstr "Manzana"
|
||||
@@ -0,0 +1,70 @@
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: ExampleApp 1.0\n"
|
||||
"Language: ja\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Plural-Forms: nplurals=1; plural=(0);\n"
|
||||
|
||||
#: ui/menu.c:10
|
||||
msgid "ui.title"
|
||||
msgstr ""
|
||||
"歓迎"
|
||||
|
||||
#: src/dusk/ui/frame/settings/uisettings.c
|
||||
msgid "ui.settings.tabs.general"
|
||||
msgstr "一般"
|
||||
|
||||
#: src/dusk/ui/frame/settings/uisettings.c
|
||||
msgid "ui.settings.tabs.input"
|
||||
msgstr "入力"
|
||||
|
||||
#: src/dusk/ui/frame/settings/uisettings.c
|
||||
msgid "ui.settings.tabs.display"
|
||||
msgstr "表示"
|
||||
|
||||
#: src/dusk/ui/frame/settings/uisettings.c
|
||||
msgid "ui.settings.tabs.audio"
|
||||
msgstr "オーディオ"
|
||||
|
||||
msgid "ui.settings.input.deadzone"
|
||||
msgstr "デッドゾーン"
|
||||
|
||||
#: src/dusk/ui/frame/settings/uisettingsgeneral.c
|
||||
msgid "ui.settings.general.language"
|
||||
msgstr "言語"
|
||||
|
||||
#: src/dusk/ui/frame/settings/uisettingsgeneral.c
|
||||
msgid "ui.settings.general.language_detail"
|
||||
msgstr "アプリケーションを再起動すると適用されます。"
|
||||
|
||||
#: src/dusk/ui/frame/settings/uisettings.c
|
||||
msgid "ui.settings.apply"
|
||||
msgstr "適用"
|
||||
|
||||
#: src/dusk/ui/frame/uiconfirm.c
|
||||
msgid "ui.confirm.discard_changes"
|
||||
msgstr "未保存の変更を破棄しますか?"
|
||||
|
||||
#: src/dusk/ui/frame/game/uigamemenu.c
|
||||
msgid "ui.game_menu.characters"
|
||||
msgstr "キャラクター"
|
||||
|
||||
#: src/dusk/ui/frame/game/uigamemenu.c
|
||||
msgid "ui.game_menu.items"
|
||||
msgstr "アイテム"
|
||||
|
||||
#: src/dusk/ui/frame/game/uigamemenu.c
|
||||
msgid "ui.game_menu.settings"
|
||||
msgstr "設定"
|
||||
|
||||
#: src/dusk/rpg/item/item.json
|
||||
msgid "item.potion.name"
|
||||
msgstr "ポーション"
|
||||
|
||||
#: src/dusk/rpg/item/item.json
|
||||
msgid "item.potato.name"
|
||||
msgstr "ジャガイモ"
|
||||
|
||||
#: src/dusk/rpg/item/item.json
|
||||
msgid "item.apple.name"
|
||||
msgstr "リンゴ"
|
||||
@@ -1 +0,0 @@
|
||||
{"meshes":[{"file":"house_4_4.dmf","pos":[2,1,0]},{"file":"house_6_3.dmf","pos":[1,9,0]},{"file":"house_2_2.dmf","pos":[12,6,0]}],"tiles":[[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],null,null,null,null,[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],null,null,null,null,[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],null,null,null,null,[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],null,null,null,null,[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],null,null,[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],null,null,[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],null,null,null,null,null,null,[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],null,null,null,null,null,null,[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],null,null,null,null,null,null,[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0]]}
|
||||
@@ -1 +0,0 @@
|
||||
{"tiles":[[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],null,null,null,null,null,[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],null,null,null,null,null,[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],null,null,null,null,null,[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[6,0],[2,0],[2,0],[2,0],[2,0],[2,0],[2,0],[7,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[3,0],[1,1],[1,1],[1,1],[1,1],[1,1],[1,1],[5,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[3,0],[1,1],[1,1],[1,1],[1,1],[1,1],[1,1],[5,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[3,0],[1,1],[1,1],[1,1],[1,1],[1,1],[1,1],[5,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[8,0],[4,0],[4,0],[4,0],[12,0],[1,1],[1,1],[5,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[3,0],[1,1],[1,1],[5,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[3,0],[1,1],[1,1],[5,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[8,0],[4,0],[4,0],[9,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0]],"meshes":[{"file":"house_5_3.dmf","pos":[1,1,0]}],"entities":[{"type":"global","globalId":3,"pos":[8,8,1]},{"type":"global","globalId":4,"pos":[12,2,0]}],"areas":[{"min":[11,3,0],"max":[16,9,10],"callbackId":1,"notify":3,"trigger":6}]}
|
||||
@@ -1 +0,0 @@
|
||||
{"meshes":[{"file":"house_8_4.dmf","pos":[1,1,0]},{"file":"house_3_3.dmf","pos":[11,2,0]},{"file":"house_2_2.dmf","pos":[3,11,0]}],"tiles":[[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],null,null,null,null,null,null,null,null,[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],null,null,null,null,null,null,null,null,[1,0],[1,0],null,null,null,[1,0],[1,0],[1,0],null,null,null,null,null,null,null,null,[1,0],[1,0],null,null,null,[1,0],[1,0],[1,0],null,null,null,null,null,null,null,null,[1,0],[1,0],null,null,null,[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],null,null,[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],null,null,[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0]]}
|
||||
@@ -1 +0,0 @@
|
||||
{"meshes":[{"file":"house_3_2.dmf","pos":[1,1,0]},{"file":"house_2_3.dmf","pos":[7,2,0]},{"file":"house_4_2.dmf","pos":[1,8,0]},{"file":"house_1_1.dmf","pos":[11,10,0]},{"file":"house_5_2.dmf","pos":[13,6,0]}],"tiles":[[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],null,null,null,[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],null,null,null,[1,0],[1,0],[1,0],null,null,[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],null,null,[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],null,null,[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],null,null,null,[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],null,null,null,[1,0],null,null,null,null,[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],null,null,null,null,[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],null,[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0]]}
|
||||
@@ -1 +0,0 @@
|
||||
{"meshes":[{"file":"house_5_5.dmf","pos":[3,2,0]},{"file":"house_2_3.dmf","pos":[10,3,0]},{"file":"house_3_1.dmf","pos":[1,12,0]}],"tiles":[[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],null,null,null,null,null,[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],null,null,null,null,null,[1,0],[1,0],null,null,[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],null,null,null,null,null,[1,0],[1,0],null,null,[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],null,null,null,null,null,[1,0],[1,0],null,null,[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],null,null,null,null,null,[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],null,null,null,[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0]]}
|
||||
@@ -1 +0,0 @@
|
||||
{"tiles":[[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,3],[1,3],[1,3],[1,3],[1,3],[1,3],[1,0],[1,0],[1,0],[1,0],null,null,[1,0],[1,0],[1,0],[1,0],[1,3],[1,3],[1,3],[1,3],[1,3],[1,3],[1,0],[1,0],[1,0],[1,0],null,null,[1,0],[1,0],[1,0],[1,0],[1,3],[1,3],[1,3],[1,3],[1,3],[1,3],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[4,2],[4,2],[4,2],[4,2],[4,2],[4,2],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[4,1],[4,1],[4,1],[4,1],[4,1],[4,1],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[4,0],[4,0],[4,0],[4,0],[4,0],[4,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0],[1,0]],"meshes":[]}
|
||||
Binary file not shown.
Loaded 100 of 1567 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user