summaryrefslogtreecommitdiff
path: root/src/first_app.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/first_app.cpp')
-rwxr-xr-xsrc/first_app.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/first_app.cpp b/src/first_app.cpp
index 561b693..04272ba 100755
--- a/src/first_app.cpp
+++ b/src/first_app.cpp
@@ -11,9 +11,12 @@ FirstApp::~FirstApp() {}
void FirstApp::run() {
- std::shared_ptr<xe::Image> image = xeEngine.loadImageFromFile("res/image/dirt.jpg");
+ std::shared_ptr<xe::Image> dirt = xeEngine.loadImageFromFile("res/image/dirt.jpg");
+ std::shared_ptr<xe::Image> grass = xeEngine.loadImageFromFile("res/image/grass.png");
- SimpleRenderer renderer{xeEngine, image.get()};
+ std::vector<xe::Image*> images = {dirt.get(), grass.get()};
+
+ SimpleRenderer renderer{xeEngine, images};
xe::Sound sound{"res/sound/when_the_world_ends.wav"};
sound.setLooping(true);
@@ -32,7 +35,7 @@ void FirstApp::run() {
xeEngine.getCamera().setViewYXZ(viewerObject.transform.translation, viewerObject.transform.rotation);
if(xeEngine.beginFrame()) {
- renderer.render(gameObjects, xeEngine.getCamera(), image.get());
+ renderer.render(gameObjects, xeEngine.getCamera());
xeEngine.endFrame();
}