From 09178512879d061f2e1195aff6ce0ad6768c4ad0 Mon Sep 17 00:00:00 2001 From: Dominic Masters Date: Sun, 18 Jun 2023 13:46:15 -0700 Subject: [PATCH] Test back --- src/dawnliminal/game/LiminalGame.cpp | 4 ++-- src/dawnliminal/scenes/HelloWorldScene.hpp | 10 ++++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/dawnliminal/game/LiminalGame.cpp b/src/dawnliminal/game/LiminalGame.cpp index 0b992f0f..3341dd8c 100644 --- a/src/dawnliminal/game/LiminalGame.cpp +++ b/src/dawnliminal/game/LiminalGame.cpp @@ -10,6 +10,6 @@ using namespace Dawn; Scene * Dawn::dawnGameGetInitialScene(DawnGame *game) { - // return new HelloWorldScene(game); - return new Scene1Prologue(game); + return new HelloWorldScene(game); + // return new Scene1Prologue(game); } \ No newline at end of file diff --git a/src/dawnliminal/scenes/HelloWorldScene.hpp b/src/dawnliminal/scenes/HelloWorldScene.hpp index 8b1dfc2b..0f0aa532 100644 --- a/src/dawnliminal/scenes/HelloWorldScene.hpp +++ b/src/dawnliminal/scenes/HelloWorldScene.hpp @@ -25,16 +25,18 @@ namespace Dawn { auto canvasItem = this->createSceneItem(); auto canvas = canvasItem->addComponent(); canvas->camera = camera; - - auto vnTextbox = VNTextbox::prefabCreate(this); - vnTextbox->transform.setParent(canvas->transform); + + auto textboxItem = this->createSceneItem(); + auto textbox = textboxItem->addComponent(); + textbox->richText = "Hello World"; + textbox->transform->setParent(canvas->transform); } std::vector getRequiredAssets() override { auto assMan = &this->game->assetManager; std::vector assets; vectorAppend(&assets, SimpleSpinningCubePrefab::getRequiredAssets(assMan)); - vectorAppend(&assets, VNTextbox::prefabAssets(assMan)); + assets.push_back(assMan->get("font_main")); return assets; }