RuiFPB/tyra-linux
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

fixed floors sample

Browse Source
This commit is contained in:
Sandro Sobczyński
2020-11-12 19:09:57 +01:00
parent fb0df1537e
commit 6c82beb383
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/samples/floors/Makefile
+1
View File
@@ -11,6 +11,7 @@ EE_OBJS = \
../../engine/models/mesh_texture.o \ ../../engine/models/mesh_texture.o \
../../engine/modules/audio.o \ ../../engine/modules/audio.o \
../../engine/modules/camera_base.o \ ../../engine/modules/camera_base.o \
../../engine/modules/file_service.o \
../../engine/modules/gif_sender.o \ ../../engine/modules/gif_sender.o \
../../engine/modules/light.o \ ../../engine/modules/light.o \
../../engine/modules/pad.o \ ../../engine/modules/pad.o \
src/samples/floors/floors.cpp
+4 -5
View File
@@ -31,11 +31,10 @@ Floors::~Floors() {}
void Floors::onInit() void Floors::onInit()
{ {
engine->renderer->setCameraDefinitions(&camera.worldView, &camera.unitCirclePosition, camera.planes); engine->renderer->setCameraDefinitions(&camera.worldView, &camera.unitCirclePosition, camera.planes);
engine->audio.init(1); engine->audio.addSongListener(this);
engine->audio.addListener(this);
engine->audio.loadSong("NF-CHILL.WAV"); engine->audio.loadSong("NF-CHILL.WAV");
engine->audio.setVolume(100); engine->audio.setSongVolume(100);
engine->audio.play(); engine->audio.playSong();
texRepo = engine->renderer->getTextureRepository(); texRepo = engine->renderer->getTextureRepository();
texRepo->addByMesh("warrior/", player.mesh); texRepo->addByMesh("warrior/", player.mesh);
texRepo->addByMesh("floor/", floorManager.floors[0].mesh); texRepo->addByMesh("floor/", floorManager.floors[0].mesh);
@@ -52,7 +51,7 @@ void Floors::onUpdate()
camera.update(engine->pad, player.mesh); camera.update(engine->pad, player.mesh);
floorManager.update(player); floorManager.update(player);
player.update(engine->pad, camera, floorManager); player.update(engine->pad, camera, floorManager);
engine->renderer->draw(player.mesh); // engine->renderer->draw(player.mesh);
for (u8 i = 0; i < FLOORS_COUNT; i++) for (u8 i = 0; i < FLOORS_COUNT; i++)
engine->renderer->drawByPath3(floorManager.floors[i].mesh, lightManager.bulbs, lightManager.bulbsCount); engine->renderer->drawByPath3(floorManager.floors[i].mesh, lightManager.bulbs, lightManager.bulbsCount);
} }