diff options
Diffstat (limited to 'src/first_app.cpp')
-rwxr-xr-x | src/first_app.cpp | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/src/first_app.cpp b/src/first_app.cpp index b4aa3d5..80ee78c 100755 --- a/src/first_app.cpp +++ b/src/first_app.cpp @@ -11,8 +11,7 @@ FirstApp::~FirstApp() {} void FirstApp::run() { - std::shared_ptr<xe::Image> image = xeEngine.loadImageFromFile("res/image/texture.png"); - std::shared_ptr<xe::Image> image2 = xeEngine.loadImageFromFile("res/image/scaly.png"); + std::shared_ptr<xe::Image> image = xeEngine.loadImageFromFile("res/image/dirt.jpg"); SimpleRenderer renderer{xeEngine, image.get()}; @@ -33,7 +32,7 @@ void FirstApp::run() { xeEngine.getCamera().setViewYXZ(viewerObject.transform.translation, viewerObject.transform.rotation); if(xeEngine.beginFrame()) { - renderer.render(gameObjects, xeEngine.getCamera(), image2.get()); + renderer.render(gameObjects, xeEngine.getCamera(), image.get()); xeEngine.endFrame(); } @@ -46,27 +45,13 @@ void FirstApp::run() { } void FirstApp::loadGameObjects() { - std::shared_ptr<xe::Model> xeModel = xeEngine.loadModelFromFile("res/models/stanford-dragon.obj"); - - auto dragon = xe::GameObject::createGameObject(); - dragon.model = xeModel; - dragon.transform.translation = {.0f, .0f, 2.5f}; - dragon.transform.scale = {.5f, .5f, .5f}; - gameObjects.push_back(std::move(dragon)); - - auto dragon2 = xe::GameObject::createGameObject(); - dragon2.model = xeModel; - dragon2.transform.translation = {5.0f, .0f, -1.5f}; - dragon2.transform.rotation.y = glm::radians(90.f); - dragon2.transform.scale = {.35f, .35f, .35f}; - gameObjects.push_back(std::move(dragon2)); Chunk* chunk = Chunk::newChunk(0, 0, 123); chunk->createMesh(); auto chunkObject = xe::GameObject::createGameObject(); chunkObject.model = chunk->getMesh(); - chunkObject.transform.translation = {5.f, 5.f, 5.f}; + chunkObject.transform.translation = {0.f, 0.f, 0.f}; gameObjects.push_back(std::move(chunkObject)); } |