From 6c82beb383ddebc4f1c44fd021e6b27b585f1419 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20Sobczy=C5=84ski?= Date: Thu, 12 Nov 2020 19:09:57 +0100 Subject: [PATCH] fixed floors sample --- src/samples/floors/Makefile | 1 + src/samples/floors/floors.cpp | 9 ++++----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/samples/floors/Makefile b/src/samples/floors/Makefile index d84aa29..31a9119 100644 --- a/src/samples/floors/Makefile +++ b/src/samples/floors/Makefile @@ -11,6 +11,7 @@ EE_OBJS = \ ../../engine/models/mesh_texture.o \ ../../engine/modules/audio.o \ ../../engine/modules/camera_base.o \ + ../../engine/modules/file_service.o \ ../../engine/modules/gif_sender.o \ ../../engine/modules/light.o \ ../../engine/modules/pad.o \ diff --git a/src/samples/floors/floors.cpp b/src/samples/floors/floors.cpp index 6ca606a..c63a5c8 100644 --- a/src/samples/floors/floors.cpp +++ b/src/samples/floors/floors.cpp @@ -31,11 +31,10 @@ Floors::~Floors() {} void Floors::onInit() { engine->renderer->setCameraDefinitions(&camera.worldView, &camera.unitCirclePosition, camera.planes); - engine->audio.init(1); - engine->audio.addListener(this); + engine->audio.addSongListener(this); engine->audio.loadSong("NF-CHILL.WAV"); - engine->audio.setVolume(100); - engine->audio.play(); + engine->audio.setSongVolume(100); + engine->audio.playSong(); texRepo = engine->renderer->getTextureRepository(); texRepo->addByMesh("warrior/", player.mesh); texRepo->addByMesh("floor/", floorManager.floors[0].mesh); @@ -52,7 +51,7 @@ void Floors::onUpdate() camera.update(engine->pad, player.mesh); floorManager.update(player); player.update(engine->pad, camera, floorManager); - engine->renderer->draw(player.mesh); + // engine->renderer->draw(player.mesh); for (u8 i = 0; i < FLOORS_COUNT; i++) engine->renderer->drawByPath3(floorManager.floors[i].mesh, lightManager.bulbs, lightManager.bulbsCount); }