Part one - removed references and smart pointers
This commit is contained in:
@ -10,13 +10,13 @@
|
||||
|
||||
using namespace Dawn;
|
||||
|
||||
std::shared_ptr<TrueTypeAsset> assetFont;
|
||||
std::shared_ptr<TextureAsset> assetTexture;
|
||||
TrueTypeAsset *assetFont;
|
||||
TextureAsset *assetTexture;
|
||||
|
||||
DawnGame::DawnGame(DawnHost &host) :
|
||||
DawnGame::DawnGame(DawnHost *host) :
|
||||
host(host),
|
||||
renderManager(*this),
|
||||
inputManager(*this)
|
||||
renderManager(this),
|
||||
inputManager(this)
|
||||
{
|
||||
}
|
||||
|
||||
@ -24,11 +24,11 @@ int32_t DawnGame::init() {
|
||||
this->assetManager.init();
|
||||
this->renderManager.init();
|
||||
|
||||
this->scene = std::make_shared<Scene>(*this);
|
||||
this->scene = new Scene(this);
|
||||
|
||||
auto cameraObject = this->scene->createSceneItem();
|
||||
auto camera = cameraObject->addComponent<Camera>();
|
||||
camera->transform.lookAt(glm::vec3(50, 50, 50), glm::vec3(0, 0, 0));
|
||||
camera->transform->lookAt(glm::vec3(50, 50, 50), glm::vec3(0, 0, 0));
|
||||
|
||||
auto canvas = UICanvas::createCanvas(this->scene);
|
||||
|
||||
@ -39,7 +39,7 @@ int32_t DawnGame::init() {
|
||||
}
|
||||
|
||||
auto textbox = canvas->addElement<VisualNovelTextbox>();
|
||||
textbox->setBorder(assetTexture->texture.get(), glm::vec2(16, 16));
|
||||
textbox->setBorder(&assetTexture->texture, glm::vec2(16, 16));
|
||||
textbox->setFont(&assetFont->font);
|
||||
textbox->setText("Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus leo odio, egestas nec imperdiet ac, placerat eget quam. Nam tellus justo, aliquam sed porta quis, ullamcorper in libero. Proin auctor eget elit nec rutrum. Vestibulum tincidunt sem vel nisi sagittis, sed imperdiet eros aliquet. Fusce a ultrices augue, at auctor lacus. Sed lobortis, ante vitae vehicula egestas, lorem turpis cursus dui, sit amet egestas mauris ligula non ipsum. Pellentesque scelerisque posuere lorem sit amet tempor. Praesent ac hendrerit mi. Nulla mollis diam vitae vestibulum aliquam. Nullam metus justo, viverra sed risus eu, tincidunt sodales lacus. Quisque efficitur accumsan posuere. Aliquam posuere volutpat diam quis lacinia. Nullam blandit nulla vestibulum mi placerat varius. Proin egestas lacus nec pellentesque iaculis. Vestibulum ex metus, congue in eleifend et, scelerisque a nulla. Pellentesque cursus lectus sed arcu efficitur tincidunt. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Nulla a felis non velit fermentum ullamcorper.", 40);
|
||||
textbox->setTransform(
|
||||
|
@ -10,13 +10,13 @@
|
||||
namespace Dawn {
|
||||
class DawnGame : public IDawnGame {
|
||||
public:
|
||||
DawnHost &host;
|
||||
DawnHost *host;
|
||||
RenderManager renderManager;
|
||||
AssetManager assetManager;
|
||||
InputManager inputManager;
|
||||
TimeManager timeManager;
|
||||
|
||||
DawnGame(DawnHost &host);
|
||||
DawnGame(DawnHost *host);
|
||||
int32_t init() override;
|
||||
int32_t update(float_t delta) override;
|
||||
};
|
||||
|
Reference in New Issue
Block a user