working on cutscenes
This commit is contained in:
1 parent
54cc118df7
commit
6349859e66
47 files changed
+6234
-21
No files matched your search
+1
-1
@@ -801,7 +801,7 @@ namespace ZL
|
||||
|
||||
break;
|
||||
case SDLK_e:
|
||||
currentLocation->dialogueSystem.startCutscene("test_cutscene_01"); //.startDialogue("test_cutscene_pan_dialogue");
|
||||
currentLocation->dialogueSystem.startCutscene("lection_cutscene001"); //.startDialogue("test_cutscene_pan_dialogue");
|
||||
break;
|
||||
|
||||
case SDLK_n:
|
||||
|
||||
+2
-1
@@ -128,9 +128,10 @@ namespace ZL
|
||||
|
||||
setupNavigation(params.navigationJsonPaths);
|
||||
|
||||
|
||||
dialogueSystem.init(renderer, CONST_ZIP_FILE);
|
||||
dialogueSystem.loadDatabase(params.dialoguesJsonPath);
|
||||
dialogueSystem.loadCutsceneDatabase("resources/dialogue/cutscenes.json");
|
||||
dialogueSystem.loadCutsceneDatabase("resources/dialogue/cutscenes003.json");
|
||||
dialogueSystem.setQuestJournal(journal);
|
||||
|
||||
npcNameText = std::make_unique<TextRenderer>();
|
||||
|
||||
@@ -203,6 +203,8 @@ void CutsceneOverlay::draw(Renderer& renderer, const ZL::Dialogue::PresentationM
|
||||
|
||||
// --- Text ---
|
||||
if (model.showCutsceneSubtitle) {
|
||||
const std::string wrapped = wrapTextToWidth(model.visibleText, *cutsceneRenderer, subtitleRect.w - 48.0f, 1.0f);
|
||||
|
||||
if (!model.speaker.empty()) {
|
||||
nameRenderer->drawText(
|
||||
model.speaker,
|
||||
@@ -210,10 +212,14 @@ void CutsceneOverlay::draw(Renderer& renderer, const ZL::Dialogue::PresentationM
|
||||
subtitleRect.y + subtitleRect.h - 32.0f,
|
||||
1.0f, false, { 1.0f, 0.88f, 0.45f, 1.0f }
|
||||
);
|
||||
cutsceneRenderer->drawText(wrapped, subtitleRect.x + 24.0f, subtitleRect.y + subtitleRect.h - 60.0f,
|
||||
1.0f, false, { 1.0f, 1.0f, 1.0f, 1.0f });
|
||||
}
|
||||
else
|
||||
{
|
||||
cutsceneRenderer->drawText(wrapped, subtitleRect.x + 24.0f, subtitleRect.y + subtitleRect.h - 32.0f,
|
||||
1.0f, false, { 1.0f, 1.0f, 1.0f, 1.0f });
|
||||
}
|
||||
const std::string wrapped = wrapTextToWidth(model.visibleText, *cutsceneRenderer, subtitleRect.w - 48.0f, 1.0f);
|
||||
cutsceneRenderer->drawText(wrapped, subtitleRect.x + 24.0f, subtitleRect.y + 30.0f,
|
||||
1.0f, false, { 1.0f, 1.0f, 1.0f, 1.0f });
|
||||
}
|
||||
|
||||
if (model.cutsceneSkippable && cutsceneSkipHintVisible) {
|
||||
|
||||
Reference in new issue
Block a user