Merge branch 'JoeyDeVries:master' into master

This commit is contained in:
Jonas Sorgenfrei
2022-05-06 13:33:54 +02:00
committed by GitHub

View File

@@ -98,7 +98,7 @@ int main()
// load entities
// -----------
Model model = Model(FileSystem::getPath("resources/objects/planet/planet.obj"));
Model model = Model(FileSystem::getPath("resources/objects/planet/planet.obj"));
Entity ourEntity(model);
ourEntity.transform.setLocalPosition({ 10, 0, 0 });
const float scale = 0.75;
@@ -109,7 +109,6 @@ int main()
for (unsigned int i = 0; i < 10; ++i)
{
Model model = Model(FileSystem::getPath("resources/objects/planet/planet.obj"));
lastEntity->addChild(model);
lastEntity = lastEntity->children.back().get();