Added talkey to texty

src/dawnpokergame/CMakeLists.txt

@@ -36,7 +36,7 @@ tool_tileset(tileset_death texture_death ${DIR_GAME_ASSETS}/characters/death/she
 
 tool_truetype(truetype_alice ${DIR_GAME_ASSETS}/font/Alice-Regular.ttf truetype_alice 2048 2048 120)
 
-tool_audio(audio_test borrowed/sample_long.wav)
+tool_audio(audio_test borrowed/sample_short.wav)
 
 add_dependencies(${DAWN_TARGET_NAME}
   language_en

src/dawnpokergame/game/DawnGame.cpp

@@ -25,7 +25,7 @@ int32_t DawnGame::init() {
   this->renderManager.init();
   this->audioManager.init();
 
-  this->scene = new SubSceneRendererScene<Scene_1>(this);
+  this->scene = new Scene_1(this);
   
   return DAWN_GAME_INIT_RESULT_SUCCESS;
 }

src/dawnpokergame/prefabs/characters/DeathPrefab.hpp

@@ -18,10 +18,13 @@ namespace Dawn {
       VisualNovelCharacter *vnCharacter;
       AnimationController *animation;
 
+      struct VisualNovelCharacterEmotion emotionDefault;
+
       static std::vector<Asset*> prefabAssets(AssetManager *assMan) {
         return std::vector<Asset*>{
           assMan->get<TextureAsset>("texture_death"),
-          assMan->get<TilesetAsset>("tileset_death")
+          assMan->get<TilesetAsset>("tileset_death"),
+          assMan->get<AudioAsset>("audio_test")
         };
       }
 
@@ -33,6 +36,10 @@ namespace Dawn {
       void prefabInit(AssetManager *man) override {
         auto textureAsset = man->get<TextureAsset>("texture_death");
         auto tilesetAsset = man->get<TilesetAsset>("tileset_death");
+        auto audioAsset = man->get<AudioAsset>("audio_test");
+
+        // Emotions
+        this->emotionDefault.talkSound = audioAsset;
 
         auto meshRenderer = this->addComponent<MeshRenderer>();
         auto meshHost = this->addComponent<MeshHost>();
@@ -48,6 +55,8 @@ namespace Dawn {
         auto tiledSprite = this->addComponent<TiledSprite>();
         tiledSprite->setTilesetAndSize(&tilesetAsset->tileset);
         tiledSprite->setTile(0);
+
+        this->addComponent<AudioSource>();
         
         this->transform.setLocalPosition(glm::vec3(0, 0, 0)); 
       }

src/dawnpokergame/scenes/PixelVNScene.cpp

@@ -23,6 +23,6 @@ std::vector<Asset*> PixelVNScene::getRequiredAssets() {
 
 void PixelVNScene::vnStage() {
   this->renderTarget.setClearColor(COLOR_RED);
-  this->camera->setRenderTarget(&this->renderTarget);
+  // this->camera->setRenderTarget(&this->renderTarget);
   auto pixelPerfectCamera = this->camera->item->addComponent<PixelPerfectCamera>();
 }

src/dawnpokergame/scenes/Scene_1.hpp

@@ -7,23 +7,19 @@
 #include "scenes/PixelVNScene.hpp"
 #include "scenes/Scene_2.hpp"
 #include "prefabs/characters/DeathPrefab.hpp"
-#include "scene/components/audio/AudioListener.hpp"
-#include "scene/components/audio/AudioSource.hpp"
 #include "visualnovel/events/characters/VisualNovelFadeCharacterEvent.hpp"
+#include "visualnovel/events/characters/VIsualNovelTransformItemEvent.hpp"
 #include "visualnovel/events/timing/VisualNovelBatchEvent.hpp"
 
 namespace Dawn {
   class Scene_1 : public PixelVNScene {
     protected:
       DeathPrefab *death;
-      DeathPrefab *death2;
 
       void vnStage() override {
         PixelVNScene::vnStage();
         
         this->death = DeathPrefab::create(this);
-        this->death2 = DeathPrefab::create(this);
-        this->death2->transform.setLocalPosition(glm::vec3(100, 0, 0));
       }
 
       void onSceneEnded() {
@@ -52,26 +48,7 @@ namespace Dawn {
       IVisualNovelEvent * getVNEvent() override {
         auto start = new VisualNovelPauseEvent(vnManager, 0.1f);
         start
-          ->then(new VisualNovelBatchEvent(
-            vnManager,
-            std::vector<IVisualNovelEvent*>{
-              new VisualNovelFadeCharacterEvent(
-                vnManager,
-                this->death->vnCharacter,
-                true,
-                &easeLinear,
-                2.0f
-              ),
-              new VisualNovelFadeCharacterEvent(
-                vnManager,
-                this->death2->vnCharacter,
-                false,
-                &easeLinear,
-                2.0f
-              )
-            }
-          ))
-          ->then(new VisualNovelTextboxEvent(vnManager, nullptr, "scene.1.1"))
+          ->then(new VisualNovelTextboxEvent(vnManager, this->death->vnCharacter, this->death->emotionDefault, "scene.1.1"))
           // ->then(new VisualNovelCallbackEvent<Scene_1>(vnManager, this, &Scene_1::onSceneEnded))
         ;
         return start;

src/dawnpokergame/scenes/Scene_10.hpp

@@ -36,7 +36,7 @@ namespace Dawn {
       IVisualNovelEvent * getVNEvent() override {
         auto start = new VisualNovelPauseEvent(vnManager, 0.1f);
         start
-          ->then(new VisualNovelTextboxEvent(vnManager, nullptr, "scene.10.1"))
+          ->then(new VisualNovelTextboxEvent(vnManager, "scene.10.1"))
           ->then(new VisualNovelCallbackEvent<Scene_10>(vnManager, this, &Scene_10::onSceneEnded))
         ;
         return start;

src/dawnpokergame/scenes/Scene_11.hpp

@@ -36,7 +36,7 @@ namespace Dawn {
       IVisualNovelEvent * getVNEvent() override {
         auto start = new VisualNovelPauseEvent(vnManager, 0.1f);
         start
-          ->then(new VisualNovelTextboxEvent(vnManager, nullptr, "scene.11.1"))
+          ->then(new VisualNovelTextboxEvent(vnManager, "scene.11.1"))
           ->then(new VisualNovelCallbackEvent<Scene_11>(vnManager, this, &Scene_11::onSceneEnded))
         ;
         return start;

src/dawnpokergame/scenes/Scene_12.hpp

@@ -56,7 +56,7 @@ namespace Dawn {
       }
 
       IVisualNovelEvent * getVNEvent() override {
-        auto start = new VisualNovelTextboxEvent(vnManager, penny->vnCharacter, "scene.12.1");
+        auto start = new VisualNovelTextboxEvent(vnManager, "scene.12.1");
         start
           ->then(new VisualNovelCallbackEvent<Scene_12>(vnManager, this, &Scene_12::onSceneEnded))
         ;

src/dawnpokergame/scenes/Scene_13.hpp

@@ -36,7 +36,7 @@ namespace Dawn {
       IVisualNovelEvent * getVNEvent() override {
         auto start = new VisualNovelPauseEvent(vnManager, 0.1f);
         start
-          ->then(new VisualNovelTextboxEvent(vnManager, nullptr, "scene.13.1"))
+          ->then(new VisualNovelTextboxEvent(vnManager, "scene.13.1"))
           ->then(new VisualNovelCallbackEvent<Scene_13>(vnManager, this, &Scene_13::onSceneEnded))
         ;
         return start;

src/dawnpokergame/scenes/Scene_14.hpp

@@ -36,7 +36,7 @@ namespace Dawn {
       IVisualNovelEvent * getVNEvent() override {
         auto start = new VisualNovelPauseEvent(vnManager, 0.1f);
         start
-          ->then(new VisualNovelTextboxEvent(vnManager, nullptr, "scene.14.1"))
+          ->then(new VisualNovelTextboxEvent(vnManager, "scene.14.1"))
           ->then(new VisualNovelCallbackEvent<Scene_14>(vnManager, this, &Scene_14::onSceneEnded))
         ;
         return start;

src/dawnpokergame/scenes/Scene_15.hpp

@@ -36,7 +36,7 @@ namespace Dawn {
       IVisualNovelEvent * getVNEvent() override {
         auto start = new VisualNovelPauseEvent(vnManager, 0.1f);
         start
-          ->then(new VisualNovelTextboxEvent(vnManager, nullptr, "scene.15.1"))
+          ->then(new VisualNovelTextboxEvent(vnManager, "scene.15.1"))
           ->then(new VisualNovelCallbackEvent<Scene_15>(vnManager, this, &Scene_15::onSceneEnded))
         ;
         return start;

src/dawnpokergame/scenes/Scene_16.hpp

@@ -35,7 +35,7 @@ namespace Dawn {
       IVisualNovelEvent * getVNEvent() override {
         auto start = new VisualNovelPauseEvent(vnManager, 0.1f);
         start
-          ->then(new VisualNovelTextboxEvent(vnManager, nullptr, "scene.16.1"))
+          ->then(new VisualNovelTextboxEvent(vnManager, "scene.16.1"))
           ->then(new VisualNovelCallbackEvent<Scene_16>(vnManager, this, &Scene_16::onSceneEnded))
         ;
         return start;

src/dawnpokergame/scenes/Scene_17.hpp

@@ -56,7 +56,7 @@ namespace Dawn {
       }
 
       IVisualNovelEvent * getVNEvent() override {
-        auto start = new VisualNovelTextboxEvent(vnManager, penny->vnCharacter, "scene.17.1");
+        auto start = new VisualNovelTextboxEvent(vnManager, "scene.17.1");
         start
           ->then(new VisualNovelCallbackEvent<Scene_17>(vnManager, this, &Scene_17::onSceneEnded))
         ;

src/dawnpokergame/scenes/Scene_18.hpp

@@ -28,7 +28,7 @@ namespace Dawn {
       IVisualNovelEvent * getVNEvent() override {
         auto start = new VisualNovelPauseEvent(vnManager, 0.1f);
         start
-          ->then(new VisualNovelTextboxEvent(vnManager, nullptr, "scene.18.1"))
+          ->then(new VisualNovelTextboxEvent(vnManager, "scene.18.1"))
           ->then(new VisualNovelCallbackEvent<Scene_18>(vnManager, this, &Scene_18::onSceneEnded))
         ;
         return start;

src/dawnpokergame/scenes/Scene_2.hpp

@@ -37,7 +37,7 @@ namespace Dawn {
       IVisualNovelEvent * getVNEvent() override {
         auto start = new VisualNovelPauseEvent(vnManager, 0.1f);
         start
-          ->then(new VisualNovelTextboxEvent(vnManager, nullptr, "scene.2.1"))
+          ->then(new VisualNovelTextboxEvent(vnManager, "scene.2.1"))
           ->then(new VisualNovelCallbackEvent<Scene_2>(vnManager, this, &Scene_2::onSceneEnded))
         ;
         return start;

src/dawnpokergame/scenes/Scene_3.hpp

@@ -37,7 +37,7 @@ namespace Dawn {
       IVisualNovelEvent * getVNEvent() override {
         auto start = new VisualNovelPauseEvent(vnManager, 0.1f);
         start
-          ->then(new VisualNovelTextboxEvent(vnManager, nullptr, "scene.3.1"))
+          ->then(new VisualNovelTextboxEvent(vnManager, "scene.3.1"))
           ->then(new VisualNovelCallbackEvent<Scene_3>(vnManager, this, &Scene_3::onSceneEnded))
         ;
         return start;

src/dawnpokergame/scenes/Scene_4.hpp

@@ -56,7 +56,7 @@ namespace Dawn {
       }
 
       IVisualNovelEvent * getVNEvent() override {
-        auto start = new VisualNovelTextboxEvent(vnManager, penny->vnCharacter, "scene.4.1");
+        auto start = new VisualNovelTextboxEvent(vnManager, "scene.4.1");
         start
           ->then(new VisualNovelCallbackEvent<Scene_4>(vnManager, this, &Scene_4::onSceneEnded))
         ;

src/dawnpokergame/scenes/Scene_5.hpp

@@ -37,7 +37,7 @@ namespace Dawn {
       IVisualNovelEvent * getVNEvent() override {
         auto start = new VisualNovelPauseEvent(vnManager, 0.1f);
         start
-          ->then(new VisualNovelTextboxEvent(vnManager, nullptr, "scene.5.1"))
+          ->then(new VisualNovelTextboxEvent(vnManager, "scene.5.1"))
           ->then(new VisualNovelCallbackEvent<Scene_5>(vnManager, this, &Scene_5::onSceneEnded))
         ;
         return start;

src/dawnpokergame/scenes/Scene_6.hpp

@@ -37,7 +37,7 @@ namespace Dawn {
       IVisualNovelEvent * getVNEvent() override {
         auto start = new VisualNovelPauseEvent(vnManager, 0.1f);
         start
-          ->then(new VisualNovelTextboxEvent(vnManager, nullptr, "scene.6.1"))
+          ->then(new VisualNovelTextboxEvent(vnManager, "scene.6.1"))
           ->then(new VisualNovelCallbackEvent<Scene_6>(vnManager, this, &Scene_6::onSceneEnded))
         ;
         return start;

src/dawnpokergame/scenes/Scene_7.hpp

@@ -36,7 +36,7 @@ namespace Dawn {
       IVisualNovelEvent * getVNEvent() override {
         auto start = new VisualNovelPauseEvent(vnManager, 0.1f);
         start
-          ->then(new VisualNovelTextboxEvent(vnManager, nullptr, "scene.7.1"))
+          ->then(new VisualNovelTextboxEvent(vnManager, "scene.7.1"))
           ->then(new VisualNovelCallbackEvent<Scene_7>(vnManager, this, &Scene_7::onSceneEnded))
         ;
         return start;

src/dawnpokergame/scenes/Scene_8.hpp

@@ -56,7 +56,7 @@ namespace Dawn {
       }
 
       IVisualNovelEvent * getVNEvent() override {
-        auto start = new VisualNovelTextboxEvent(vnManager, penny->vnCharacter, "scene.8.1");
+        auto start = new VisualNovelTextboxEvent(vnManager, "scene.8.1");
         start
           ->then(new VisualNovelCallbackEvent<Scene_8>(vnManager, this, &Scene_8::onSceneEnded))
         ;

src/dawnpokergame/scenes/Scene_9.hpp

@@ -36,7 +36,7 @@ namespace Dawn {
       IVisualNovelEvent * getVNEvent() override {
         auto start = new VisualNovelPauseEvent(vnManager, 0.1f);
         start
-          ->then(new VisualNovelTextboxEvent(vnManager, nullptr, "scene.9.1"))
+          ->then(new VisualNovelTextboxEvent(vnManager, "scene.9.1"))
           ->then(new VisualNovelCallbackEvent<Scene_9>(vnManager, this, &Scene_9::onSceneEnded))
         ;
         return start;