E

src/dawnpokergame/scenes/PokerVNScene.cpp

@@ -14,7 +14,7 @@ PokerVNScene::PokerVNScene(DawnGame *game) : SimpleVNScene(game) {
 std::vector<Asset*> PokerVNScene::getRequiredAssets() {
   auto assMan = &this->game->assetManager;
   std::vector<Asset*> assets, l;
-  vectorAppend(&assets, &(l = SimpleVNScene::getRequiredAssets()));
+  vectorAppend(&assets,SimpleVNScene::getRequiredAssets());
   vectorAppend(&assets, &(l = PokerPlayerDisplay::getAssets(assMan)));
   return assets;
 }
@@ -29,9 +29,9 @@ void PokerVNScene::vnStage() {
   int32_t i = 0;
   while(it != this->pokerPlayers.end()) {
     auto player = *it;
-    auto uiPlayer = canvas->addElement<PokerPlayerDisplay>();
-    uiPlayer->setTransform(UI_COMPONENT_ALIGN_START, UI_COMPONENT_ALIGN_START, glm::vec4(i * 220, 0, 220, 200), 0);
-    uiPlayer->setPlayer(player);
+    // auto uiPlayer = canvas->addElement<PokerPlayerDisplay>();
+    // uiPlayer->setTransform(UI_COMPONENT_ALIGN_START, UI_COMPONENT_ALIGN_START, glm::vec4(i * 220, 0, 220, 200), 0);
+    // uiPlayer->setPlayer(player);
     ++it;
     ++i;
   }

src/dawnpokergame/scenes/PrefabTestingScene.hpp

@@ -1,32 +0,0 @@
-// Copyright (c) 2022 Dominic Masters
-// 
-// This software is released under the MIT License.
-// https://opensource.org/licenses/MIT
-
-#pragma once
-#include "scene/Scene.hpp"
-#include "game/DawnGame.hpp"
-#include "prefabs/display/SimpleCubePrefab.hpp"
-
-namespace Dawn {
-  class PrefabTestingScene : public Scene {
-    protected:
-      SimpleCubePrefab *cube = nullptr;
-      Camera *camera = nullptr;
-
-    public:
-      PrefabTestingScene(DawnGame *game) : Scene(game) {
-        
-      }
-
-      std::vector<Asset*> getRequiredAssets() override {
-        return std::vector<Asset*>();
-      }
-
-      void stage() override {
-        camera = Camera::create(this);
-        camera->transform->lookAt(glm::vec3(5, 5, 5), glm::vec3(0, 0, 0));
-        cube = SimpleCubePrefab::create(this);
-      }
-  };
-}

src/dawnpokergame/scenes/TestScene.hpp

@@ -5,21 +5,21 @@
 
 #pragma once
 #include "PokerVNScene.hpp"
-#include "prefabs/VNPenny.hpp"
+#include "prefabs/characters/PennyPrefab.hpp"
 
 namespace Dawn {
   class TestScene : public PokerVNScene {
     protected:
-      SceneItem *penny;
-      SceneItem *julie;
-      SceneItem *sammy;
-      SceneItem *lucy;
+      PennyPrefab *penny;
+      PennyPrefab *julie;
+      PennyPrefab *sammy;
+      PennyPrefab *lucy;
 
       void vnStage() override {
-        penny = VNPenny::create(this);
-        julie = VNPenny::create(this);
-        sammy = VNPenny::create(this);
-        lucy = VNPenny::create(this);
+        penny = PennyPrefab::create(this);
+        julie = PennyPrefab::create(this);
+        sammy = PennyPrefab::create(this);
+        lucy = PennyPrefab::create(this);
 
         PokerVNScene::vnStage();
       }
@@ -39,27 +39,19 @@ namespace Dawn {
         auto start = new VisualNovelChangeSimpleBackgroundEvent(
           vnManager, &texture->texture
         );
-
-        start
-          ->then(new VisualNovelTextboxEvent(vnManager, penny->getComponent<VisualNovelCharacter>(), "scene.1.1"))
-          // ->then(new PokerNewGameEvent(vnManager))
-          ->then(new VisualNovelTextboxEvent(vnManager, penny->getComponent<VisualNovelCharacter>(), "undefined"))
-          // ->then(new PokerInitialEvent(vnManager))
-        ;
-
+        
+        start->then(new VisualNovelTextboxEvent(vnManager, penny->getComponent<VisualNovelCharacter>(), "scene.1.1"));
         return start;
       }
 
     public:
-      TestScene(DawnGame *game) : PokerVNScene(game) {
-
-      }
+      TestScene(DawnGame *game) : PokerVNScene(game) {}
 
       std::vector<Asset*> getRequiredAssets() override {
         auto assMan = &this->game->assetManager;
         std::vector<Asset*> assets;
-        vectorAppend(&assets, &PokerVNScene::getRequiredAssets());
-        vectorAppend(&assets, &VNPenny::getAssets(assMan));
+        vectorAppend(&assets, PokerVNScene::getRequiredAssets());
+        vectorAppend(&assets, PennyPrefab::getRequiredAssets(assMan));
         assets.push_back(assMan->get<TextureAsset>("texture_tavern_night"));
         return assets;
       }