Scene.set() JS lifecycle, UI sprite caching, emulator test scripts
- Add Scene.set(module) so JerryScript can switch scenes via
require()'d {init, update, dispose} modules; wire it into
engineUpdate() and rework overworldscene.js/init.js to the new shape.
- Fix scriptManagerExecFile() never pushing its own file's directory
onto the require() dir stack, breaking relative require() calls from
a top-level entry script (e.g. init.js -> ./overworldscene.js).
- Cache sprite geometry across frames for uislider/uitab/uiframe
(dialogs/textbox/settings) and give uitextbox a per-page glyph cache
instead of one spriteBatchBuffer call per visible character. uiconsole
drops its alloc/free vertex buffer for a fixed-size one. uifps skips
rebuilding its label when the text hasn't changed.
- Add PSP_OPTIMIZATION_PLAN.md and a handful of UI/spritebatch unit
tests covering the new caching logic.
- Add Dolphin/PPSSPP emulator smoke-test scripts (+ Docker variants and
CI jobs) for GameCube/Wii/PSP.
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
@@ -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);
|
||||
}
|
||||
Reference in New Issue
Block a user