Fixed all my pointers
This commit is contained in:
@ -7,16 +7,16 @@
|
||||
|
||||
using namespace Dawn;
|
||||
|
||||
DawnGame::DawnGame(std::weak_ptr<DawnHost> host) :
|
||||
renderManager(weak_from_this())
|
||||
DawnGame::DawnGame(DawnHost &host) :
|
||||
host(host),
|
||||
renderManager(*this)
|
||||
{
|
||||
this->host = host;
|
||||
}
|
||||
|
||||
int32_t DawnGame::init() {
|
||||
this->renderManager.init();
|
||||
|
||||
this->scene = std::make_shared<Scene>(weak_from_this());
|
||||
this->scene = std::make_shared<Scene>(*this);
|
||||
|
||||
auto cameraObject = this->scene->createSceneItem();
|
||||
auto camera = cameraObject->addComponent<Camera>();
|
||||
@ -24,20 +24,14 @@ int32_t DawnGame::init() {
|
||||
auto cubeObject = this->scene->createSceneItem();
|
||||
auto cubeMeshRenderer = cubeObject->addComponent<MeshRenderer>();
|
||||
cubeMeshRenderer->mesh = std::make_shared<Mesh>();
|
||||
TriangleMesh::createTriangleMesh(cubeMeshRenderer->mesh);
|
||||
TriangleMesh::createTriangleMesh(*cubeMeshRenderer->mesh);
|
||||
|
||||
return DAWN_GAME_INIT_RESULT_SUCCESS;
|
||||
}
|
||||
|
||||
int32_t DawnGame::update(float_t delta) {
|
||||
this->renderManager.update();
|
||||
if(this->scene != nullptr) this->scene->update();
|
||||
|
||||
auto meshRenderer = this->scene->findComponent<MeshRenderer>();
|
||||
if(meshRenderer != nullptr) {
|
||||
meshRenderer->mesh->draw(MESH_DRAW_MODE_TRIANGLES, 0, -1);
|
||||
}
|
||||
|
||||
this->renderManager.update();
|
||||
return DAWN_GAME_UPDATE_RESULT_SUCCESS;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user