UI Transition
This commit is contained in:
@@ -8,7 +8,7 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
#include "rpg/item/item.h"
|
#include "rpg/item/item.h"
|
||||||
|
|
||||||
#define ITEM_STACK_QUANTITY_MAX UINT8_MAX
|
#define ITEM_STACK_QUANTITY_MAX 99
|
||||||
|
|
||||||
typedef enum {
|
typedef enum {
|
||||||
INVENTORY_SORT_BY_ID,
|
INVENTORY_SORT_BY_ID,
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ add_subdirectory(frame)
|
|||||||
add_subdirectory(focus)
|
add_subdirectory(focus)
|
||||||
add_subdirectory(overlay)
|
add_subdirectory(overlay)
|
||||||
add_subdirectory(rpg)
|
add_subdirectory(rpg)
|
||||||
|
add_subdirectory(transition)
|
||||||
add_subdirectory(widget)
|
add_subdirectory(widget)
|
||||||
|
|
||||||
# Sources
|
# Sources
|
||||||
|
|||||||
@@ -0,0 +1,10 @@
|
|||||||
|
# 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
|
||||||
|
uitransition.c
|
||||||
|
uitransitionfade.c
|
||||||
|
)
|
||||||
@@ -0,0 +1,81 @@
|
|||||||
|
/**
|
||||||
|
* Copyright (c) 2026 Dominic Masters
|
||||||
|
*
|
||||||
|
* This software is released under the MIT License.
|
||||||
|
* https://opensource.org/licenses/MIT
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "uitransition.h"
|
||||||
|
#include "uitransitionfade.h"
|
||||||
|
#include "assert/assert.h"
|
||||||
|
#include "util/memory.h"
|
||||||
|
#include "time/time.h"
|
||||||
|
#include "util/math.h"
|
||||||
|
|
||||||
|
uitransition_t UI_TRANSITION;
|
||||||
|
|
||||||
|
uitransitiondrawfunc_t UI_TRANSITION_TYPE_DRAW[UI_TRANSITION_TYPE_COUNT] = {
|
||||||
|
[UI_TRANSITION_TYPE_FADE] = uiTransitionFadeDraw
|
||||||
|
};
|
||||||
|
|
||||||
|
errorret_t uiTransitionInit(void) {
|
||||||
|
memoryZero(&UI_TRANSITION, sizeof(uitransition_t));
|
||||||
|
|
||||||
|
// uiTransitionStart((uitransitionstartparams_t){
|
||||||
|
// .duration = 5.0f,
|
||||||
|
// .type = UI_TRANSITION_TYPE_FADE,
|
||||||
|
// .params = {
|
||||||
|
// .fade = {
|
||||||
|
// .easing = EASING_OUT_QUART,
|
||||||
|
// .fromColor = COLOR_TRANSPARENT_BLACK,
|
||||||
|
// .toColor = COLOR_BLACK
|
||||||
|
// }
|
||||||
|
// },
|
||||||
|
// .finished = NULL,
|
||||||
|
// .user = NULL
|
||||||
|
// });
|
||||||
|
|
||||||
|
errorOk();
|
||||||
|
}
|
||||||
|
|
||||||
|
errorret_t uiTransitionUpdate(void) {
|
||||||
|
// Update time.
|
||||||
|
float_t newTime = UI_TRANSITION.data.time + TIME.delta;
|
||||||
|
|
||||||
|
UI_TRANSITION.data.time = mathClamp(
|
||||||
|
newTime,
|
||||||
|
0.0f,
|
||||||
|
UI_TRANSITION.data.duration
|
||||||
|
);
|
||||||
|
UI_TRANSITION.data.t = (
|
||||||
|
(UI_TRANSITION.data.duration <= 0.0f) ?
|
||||||
|
1.0f :
|
||||||
|
(UI_TRANSITION.data.time / UI_TRANSITION.data.duration)
|
||||||
|
);
|
||||||
|
|
||||||
|
if(UI_TRANSITION.data.t >= 1.0f && UI_TRANSITION.finished) {
|
||||||
|
UI_TRANSITION.finished(UI_TRANSITION.user);
|
||||||
|
}
|
||||||
|
|
||||||
|
errorOk();
|
||||||
|
}
|
||||||
|
|
||||||
|
errorret_t uiTransitionDraw(void) {
|
||||||
|
uitransitiondrawfunc_t draw = UI_TRANSITION_TYPE_DRAW[UI_TRANSITION.type];
|
||||||
|
if(!draw) errorOk();
|
||||||
|
return draw(&UI_TRANSITION.data);
|
||||||
|
}
|
||||||
|
|
||||||
|
void uiTransitionStart(const uitransitionstartparams_t info) {
|
||||||
|
assertTrue(info.type > UI_TRANSITION_TYPE_NULL, "Invalid type");
|
||||||
|
assertTrue(info.type < UI_TRANSITION_TYPE_COUNT, "Invalid type");
|
||||||
|
assertTrue(info.duration >= 0.0f, "Duration must be non-negative");
|
||||||
|
|
||||||
|
memoryZero(&UI_TRANSITION, sizeof(uitransition_t));
|
||||||
|
|
||||||
|
UI_TRANSITION.data.duration = info.duration;
|
||||||
|
UI_TRANSITION.type = info.type;
|
||||||
|
UI_TRANSITION.data.params = info.params;
|
||||||
|
UI_TRANSITION.finished = info.finished;
|
||||||
|
UI_TRANSITION.user = info.user;
|
||||||
|
}
|
||||||
@@ -0,0 +1,74 @@
|
|||||||
|
/**
|
||||||
|
* 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/color.h"
|
||||||
|
#include "animation/easing.h"
|
||||||
|
#include "uitransitiondata.h"
|
||||||
|
|
||||||
|
typedef void (*uitransitioncallback_t)(void *user);
|
||||||
|
|
||||||
|
typedef enum {
|
||||||
|
UI_TRANSITION_TYPE_NULL,
|
||||||
|
|
||||||
|
UI_TRANSITION_TYPE_FADE,
|
||||||
|
|
||||||
|
UI_TRANSITION_TYPE_COUNT
|
||||||
|
} uitransitiontype_t;
|
||||||
|
|
||||||
|
extern uitransitiondrawfunc_t UI_TRANSITION_TYPE_DRAW[UI_TRANSITION_TYPE_COUNT];
|
||||||
|
|
||||||
|
|
||||||
|
typedef struct {
|
||||||
|
uitransitiondata_t data;
|
||||||
|
uitransitiontype_t type;
|
||||||
|
uitransitioncallback_t finished;
|
||||||
|
void *user;
|
||||||
|
} uitransition_t;
|
||||||
|
|
||||||
|
extern uitransition_t UI_TRANSITION;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Initializes the transition overlay, zeroing all fields and wiring the
|
||||||
|
* onTransitionEnd event.
|
||||||
|
*
|
||||||
|
* @return Any error that occurs.
|
||||||
|
*/
|
||||||
|
errorret_t uiTransitionInit(void);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Advances the transition. Fires onTransitionEnd once when it completes.
|
||||||
|
* Safe to call when no transition is running.
|
||||||
|
*
|
||||||
|
* @return Any error that occurs.
|
||||||
|
*/
|
||||||
|
errorret_t uiTransitionUpdate(void);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Renders the transition overlay. Skipped entirely when the current alpha
|
||||||
|
* is zero.
|
||||||
|
*
|
||||||
|
* @return Any error that occurs.
|
||||||
|
*/
|
||||||
|
errorret_t uiTransitionDraw(void);
|
||||||
|
|
||||||
|
typedef struct {
|
||||||
|
float_t duration;
|
||||||
|
uitransitiontype_t type;
|
||||||
|
uitransitionparams_t params;
|
||||||
|
uitransitioncallback_t finished;
|
||||||
|
void *user;
|
||||||
|
} uitransitionstartparams_t;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Starts a transition described by an info struct.
|
||||||
|
*
|
||||||
|
* @param info Transition parameters.
|
||||||
|
*/
|
||||||
|
void uiTransitionStart(const uitransitionstartparams_t info);
|
||||||
|
|
||||||
@@ -0,0 +1,23 @@
|
|||||||
|
/**
|
||||||
|
* 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 "uitransitionfade.h"
|
||||||
|
|
||||||
|
typedef union uitransitionparams_u {
|
||||||
|
uitransitionfade_t fade;
|
||||||
|
} uitransitionparams_t;
|
||||||
|
|
||||||
|
typedef struct uitransitiondata_s {
|
||||||
|
float_t time;
|
||||||
|
float_t duration;
|
||||||
|
float_t t;
|
||||||
|
uitransitionparams_t params;
|
||||||
|
} uitransitiondata_t;
|
||||||
|
|
||||||
|
typedef errorret_t (*uitransitiondrawfunc_t)(const uitransitiondata_t *data);
|
||||||
@@ -0,0 +1,56 @@
|
|||||||
|
/**
|
||||||
|
* Copyright (c) 2026 Dominic Masters
|
||||||
|
*
|
||||||
|
* This software is released under the MIT License.
|
||||||
|
* https://opensource.org/licenses/MIT
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "uitransition.h"
|
||||||
|
#include "assert/assert.h"
|
||||||
|
#include "display/screen/screen.h"
|
||||||
|
#include "display/texture/texture.h"
|
||||||
|
#include "display/spritebatch/spritebatch.h"
|
||||||
|
#include "display/shader/shaderunlit.h"
|
||||||
|
|
||||||
|
errorret_t uiTransitionFadeDraw(const uitransitiondata_t *data) {
|
||||||
|
assertNotNull(data, "data must not be NULL");
|
||||||
|
|
||||||
|
float_t e = easingApply(data->params.fade.easing, data->t);
|
||||||
|
|
||||||
|
float_t r = (float_t)(
|
||||||
|
data->params.fade.toColor.r - data->params.fade.fromColor.r
|
||||||
|
) * e;
|
||||||
|
float_t g = (float_t)(
|
||||||
|
data->params.fade.toColor.g - data->params.fade.fromColor.g
|
||||||
|
) * e;
|
||||||
|
float_t b = (float_t)(
|
||||||
|
data->params.fade.toColor.b - data->params.fade.fromColor.b
|
||||||
|
) * e;
|
||||||
|
float_t a = (float_t)(
|
||||||
|
data->params.fade.toColor.a - data->params.fade.fromColor.a
|
||||||
|
) * e;
|
||||||
|
|
||||||
|
color_t color = color4b(
|
||||||
|
data->params.fade.fromColor.r + (uint8_t)r,
|
||||||
|
data->params.fade.fromColor.g + (uint8_t)g,
|
||||||
|
data->params.fade.fromColor.b + (uint8_t)b,
|
||||||
|
data->params.fade.fromColor.a + (uint8_t)a
|
||||||
|
);
|
||||||
|
|
||||||
|
if(color.a == 0) errorOk();
|
||||||
|
|
||||||
|
spritebatchsprite_t sprite = {
|
||||||
|
.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 material = {
|
||||||
|
.unlit = {
|
||||||
|
.color = color,
|
||||||
|
.texture = NULL
|
||||||
|
}
|
||||||
|
};
|
||||||
|
errorChain(spriteBatchBuffer(&sprite, 1, &SHADER_UNLIT, material));
|
||||||
|
return spriteBatchFlush();
|
||||||
|
}
|
||||||
@@ -0,0 +1,29 @@
|
|||||||
|
/**
|
||||||
|
* 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/color.h"
|
||||||
|
#include "animation/easing.h"
|
||||||
|
|
||||||
|
typedef struct uitransitiondata_s uitransitiondata_t;
|
||||||
|
|
||||||
|
typedef struct {
|
||||||
|
color_t fromColor;
|
||||||
|
color_t toColor;
|
||||||
|
easingtype_t easing;
|
||||||
|
} uitransitionfade_t;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Renders a full-screen color overlay interpolated between fade->fromColor
|
||||||
|
* and fade->toColor using fade->easing. t is the raw normalized progress
|
||||||
|
* in [0, 1] before easing is applied. No-op when the resulting alpha is zero.
|
||||||
|
*
|
||||||
|
* @param fade The fade parameters.
|
||||||
|
* @return Any error that occurs.
|
||||||
|
*/
|
||||||
|
errorret_t uiTransitionFadeDraw(const uitransitiondata_t *fade);
|
||||||
@@ -14,6 +14,7 @@
|
|||||||
#include "ui/overlay/uiloading.h"
|
#include "ui/overlay/uiloading.h"
|
||||||
#include "ui/debug/uiplayerpos.h"
|
#include "ui/debug/uiplayerpos.h"
|
||||||
#include "ui/overlay/uicrop.h"
|
#include "ui/overlay/uicrop.h"
|
||||||
|
#include "ui/transition/uitransition.h"
|
||||||
#include "ui/debug/uiconsole.h"
|
#include "ui/debug/uiconsole.h"
|
||||||
#include "ui/frame/uisettings.h"
|
#include "ui/frame/uisettings.h"
|
||||||
#include "ui/rpg/uitextboxmain.h"
|
#include "ui/rpg/uitextboxmain.h"
|
||||||
@@ -44,6 +45,12 @@ uielement_t UI_ELEMENTS[] = {
|
|||||||
.draw = uiTextboxMainDraw
|
.draw = uiTextboxMainDraw
|
||||||
},
|
},
|
||||||
|
|
||||||
|
{
|
||||||
|
.init = uiTransitionInit,
|
||||||
|
.update = uiTransitionUpdate,
|
||||||
|
.draw = uiTransitionDraw
|
||||||
|
},
|
||||||
|
|
||||||
// Fullbox over: above absolutely everything.
|
// Fullbox over: above absolutely everything.
|
||||||
{
|
{
|
||||||
.init = uiFullboxOverInit,
|
.init = uiFullboxOverInit,
|
||||||
|
|||||||
Reference in New Issue
Block a user