YourWishes/dusk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cutscene tests

Browse Source
This commit is contained in:
Dominic Masters
2026-07-02 11:18:36 -05:00
parent 01d89cf22c
commit 7b98e40ccf
15 changed files with 49 additions and 245 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/dusk/rpg/CMakeLists.txt
-1
View File
@@ -8,7 +8,6 @@ target_sources(${DUSK_LIBRARY_TARGET_NAME}
PUBLIC
rpg.c
rpgcamera.c
rpgtextbox.c
)
# Subdirs
src/dusk/rpg/cutscene/cutscene.h
+2
View File
@@ -7,8 +7,10 @@
#pragma once
#include "rpg/cutscene/item/cutsceneitem.h"
#include "cutscenepause.h"
typedef struct cutscene_s {
const cutsceneitem_t *items;
uint8_t itemCount;
cutscenepause_t pause;
} cutscene_t;
src/dusk/rpg/cutscene/cutscenepause.h
+20
View File
@@ -0,0 +1,20 @@
/**
* Copyright (c) 2026 Dominic Masters
*
* This software is released under the MIT License.
* https://opensource.org/licenses/MIT
*/
#pragma once
#include "dusk.h"
typedef uint8_t cutscenepause_t;
#define CUTSCENE_PAUSE_NPC ((cutscenepause_t)(1 << 0))
#define CUTSCENE_PAUSE_PLAYER ((cutscenepause_t)(1 << 1))
#define CUTSCENE_PAUSE_WORLD ((cutscenepause_t)(1 << 2))
#define CUTSCENE_PAUSE_DEFAULT \
((cutscenepause_t)(CUTSCENE_PAUSE_NPC | CUTSCENE_PAUSE_PLAYER))
#define CUTSCENE_PAUSE_ALL \
((cutscenepause_t)(CUTSCENE_PAUSE_NPC | CUTSCENE_PAUSE_PLAYER | CUTSCENE_PAUSE_WORLD))
src/dusk/rpg/cutscene/item/cutsceneitem.c
+4 -7
View File
@@ -9,16 +9,13 @@
#include "cutsceneentitymove.h"
#include "input/input.h"
#include "time/time.h"
#include "ui/rpg/uitextboxmain.h"
void cutsceneItemStart(const cutsceneitem_t *item, cutsceneitemdata_t *data) {
switch(item->type) {
case CUTSCENE_ITEM_TYPE_TEXT: {
rpgTextboxShow(
item->text.position,
item->text.text
);
case CUTSCENE_ITEM_TYPE_TEXT:
uiTextboxMainSetText(item->text.text);
break;
}
case CUTSCENE_ITEM_TYPE_WAIT:
data->wait = item->wait;
@@ -44,7 +41,7 @@ void cutsceneItemStart(const cutsceneitem_t *item, cutsceneitemdata_t *data) {
void cutsceneItemUpdate(const cutsceneitem_t *item, cutsceneitemdata_t *data) {
switch(item->type) {
case CUTSCENE_ITEM_TYPE_TEXT:
if(rpgTextboxIsVisible()) return;
if(uiTextboxMainIsActive()) return;
cutsceneSystemNext();
break;
src/dusk/rpg/cutscene/item/cutscenetext.h
+4 -3
View File
@@ -6,9 +6,10 @@
*/
#pragma once
#include "rpg/rpgtextbox.h"
#include "dusk.h"
#define CUTSCENE_TEXT_MAX_CHARS 256
typedef struct {
char_t text[RPG_TEXTBOX_MAX_CHARS];
rpgtextboxpos_t position;
char_t text[CUTSCENE_TEXT_MAX_CHARS];
} cutscenetext_t;
src/dusk/rpg/cutscene/scene/testcutscene.h
+5 -4
View File
@@ -9,9 +9,9 @@
#include "rpg/cutscene/cutscenesystem.h"
static const cutsceneitem_t TEST_CUTSCENE_ONE_ITEMS[] = {
{ .type = CUTSCENE_ITEM_TYPE_TEXT, .text = { .text = "This is a test cutscene.", .position = RPG_TEXTBOX_POS_BOTTOM } },
{ .type = CUTSCENE_ITEM_TYPE_WAIT, .wait = 2.0f },
{ .type = CUTSCENE_ITEM_TYPE_TEXT, .text = { .text = "It has multiple lines of text.\nAnd waits in between.", .position = RPG_TEXTBOX_POS_TOP } },
{ .type = CUTSCENE_ITEM_TYPE_TEXT, .text = { .text = "This is a test cutscene." } },
{ .type = CUTSCENE_ITEM_TYPE_WAIT, .wait = 0.5f },
{ .type = CUTSCENE_ITEM_TYPE_TEXT, .text = { .text = "It has multiple lines of text.\nAnd waits in between." } },
};
static const cutscene_t TEST_CUTSCENE_ONE = {
@@ -20,11 +20,12 @@ static const cutscene_t TEST_CUTSCENE_ONE = {
};
static const cutsceneitem_t TEST_CUTSCENE_TWO_ITEMS[] = {
{ .type = CUTSCENE_ITEM_TYPE_WAIT, .wait = 1.0f },
{ .type = CUTSCENE_ITEM_TYPE_WAIT, .wait = 0.1f },
{ .type = CUTSCENE_ITEM_TYPE_CUTSCENE, .cutscene = &TEST_CUTSCENE_ONE },
};
static const cutscene_t TEST_CUTSCENE = {
.items = TEST_CUTSCENE_TWO_ITEMS,
.pause = CUTSCENE_PAUSE_NPC,
.itemCount = sizeof(TEST_CUTSCENE_TWO_ITEMS) / sizeof(cutsceneitem_t)
};
src/dusk/rpg/entity/npc/npc.c
+6 -2
View File
@@ -7,9 +7,9 @@
#include "rpg/entity/entity.h"
#include "assert/assert.h"
#include "rpg/cutscene/cutscenesystem.h"
#include "rpg/cutscene/scene/testcutscene.h"
#include "rpg/rpgtextbox.h"
const npcmovecallback_t NPC_MOVE_CALLBACKS[NPC_MOVE_TYPE_COUNT] = {
[NPC_MOVE_TYPE_NULL] = { 0 },
@@ -50,7 +50,11 @@ void npcSetMoveType(entity_t *entity, const npcmovetype_t moveType) {
void npcMovement(entity_t *entity) {
assertNotNull(entity, "Entity pointer cannot be NULL");
if(
CUTSCENE_SYSTEM.scene != NULL &&
(CUTSCENE_SYSTEM.scene->pause & CUTSCENE_PAUSE_NPC)
) return;
npc_t *npc = &entity->data.npc;
if(npc->interactState != NPC_INTERACT_STATE_NONE) return;
src/dusk/rpg/entity/player.c
+5
View File
@@ -12,6 +12,7 @@
#include "time/time.h"
#include "ui/focus/uifocus.h"
#include "ui/frame/uisettings.h"
#include "rpg/cutscene/cutscenesystem.h"
void playerInit(entity_t *entity) {
assertNotNull(entity, "Entity pointer cannot be NULL");
@@ -23,6 +24,10 @@ bool_t playerCanInteract(entity_t *entity) {
void playerInput(entity_t *entity) {
assertNotNull(entity, "Entity pointer cannot be NULL");
if(
CUTSCENE_SYSTEM.scene != NULL &&
(CUTSCENE_SYSTEM.scene->pause & CUTSCENE_PAUSE_PLAYER)
) return;
// Toggle settings on pause
if(uiSettingsIsOpen() && inputPressed(INPUT_ACTION_PAUSE)) {
src/dusk/rpg/rpg.c
+3 -5
View File
@@ -9,9 +9,9 @@
#include "entity/entity.h"
#include "rpg/overworld/map.h"
#include "rpg/cutscene/cutscenesystem.h"
#include "rpg/cutscene/scene/testcutscene.h"
#include "time/time.h"
#include "rpgcamera.h"
#include "rpgtextbox.h"
#include "util/memory.h"
#include "util/string.h"
#include "assert/assert.h"
@@ -25,8 +25,6 @@ errorret_t rpgInit(void) {
errorChain(mapInit());
rpgCameraInit();
rpgTextboxInit();
// Init world
errorChain(mapPositionSet((chunkpos_t){ 0, 0, 0 }));
@@ -50,8 +48,8 @@ errorret_t rpgInit(void) {
entityInit(npc, ENTITY_TYPE_NPC);
npcSetMoveType(npc, NPC_MOVE_TYPE_PATH);
npc->position = (worldpos_t){ 8, 8, 1 };
npc->interact.type = ENTITY_INTERACT_PRINT;
npc->interact.data.message = "hello world";
npc->interact.type = ENTITY_INTERACT_CUTSCENE;
npc->interact.data.cutscene = &TEST_CUTSCENE;
{
chunkpos_t cp;
worldPosToChunkPos(&npc->position, &cp);
src/dusk/rpg/rpgtextbox.c
-39
View File
@@ -1,39 +0,0 @@
/**
* Copyright (c) 2025 Dominic Masters
*
* This software is released under the MIT License.
* https://opensource.org/licenses/MIT
*/
#include "rpgtextbox.h"
#include "util/memory.h"
#include "util/string.h"
#include "assert/assert.h"
rpgtextbox_t RPG_TEXTBOX;
void rpgTextboxInit() {
memoryZero(&RPG_TEXTBOX, sizeof(rpgtextbox_t));
}
void rpgTextboxShow(
const rpgtextboxpos_t position,
const char_t *text
) {
RPG_TEXTBOX.position = position;
RPG_TEXTBOX.visible = true;
stringCopy(
RPG_TEXTBOX.text,
text,
RPG_TEXTBOX_MAX_CHARS
);
}
void rpgTextboxHide() {
RPG_TEXTBOX.visible = false;
}
bool_t rpgTextboxIsVisible() {
return RPG_TEXTBOX.visible;
}
src/dusk/rpg/rpgtextbox.h
-52
View File
@@ -1,52 +0,0 @@
/**
* Copyright (c) 2025 Dominic Masters
*
* This software is released under the MIT License.
* https://opensource.org/licenses/MIT
*/
#pragma once
#include "dusk.h"
#define RPG_TEXTBOX_MAX_CHARS 256
typedef enum {
RPG_TEXTBOX_POS_TOP,
RPG_TEXTBOX_POS_BOTTOM,
} rpgtextboxpos_t;
typedef struct {
rpgtextboxpos_t position;
bool_t visible;
char_t text[RPG_TEXTBOX_MAX_CHARS];
} rpgtextbox_t;
extern rpgtextbox_t RPG_TEXTBOX;
/**
* Initializes the RPG textbox.
*/
void rpgTextboxInit();
/**
* Shows the RPG textbox at a specified position.
*
* @param position The position to show the textbox at.
* @param text The text to display in the textbox (copied).
*/
void rpgTextboxShow(
const rpgtextboxpos_t position,
const char_t *text
);
/**
* Hides the RPG textbox.
*/
void rpgTextboxHide();
/**
* Checks if the RPG textbox is currently visible.
*
* @return true if the textbox is visible, false otherwise.
*/
bool_t rpgTextboxIsVisible();