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

changed paths

Browse Source
This commit is contained in:
h4570
2020-12-07 22:05:06 +01:00
parent 96fe7c380e
commit 6d9b93998a
5 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/samples/floors/floors.cpp
+3 -3
View File
@@ -39,15 +39,15 @@ void Floors::onInit()
setBgColorAndAmbientColor();
engine->renderer->setCameraDefinitions(&camera.worldView, &camera.unitCirclePosition, camera.planes);
engine->audio.addSongListener(this);
engine->audio.loadSong("mafikizolo-loot.wav");
engine->audio.loadSong("sounds/mafikizolo-loot.wav");
engine->audio.playSong();
texRepo = engine->renderer->getTextureRepository();
enemy = new Enemy(texRepo);
ui = new Ui(texRepo);
engine->audio.setSongVolume(80);
texRepo->addByMesh("warrior/", player.mesh, BMP);
texRepo->addByMesh("floor/", floorManager.floors[0].mesh, BMP);
texRepo->addByMesh("meshes/player/", player.mesh, BMP);
texRepo->addByMesh("meshes/floor/", floorManager.floors[0].mesh, BMP);
for (u32 i = 1; i < floorManager.floorAmount; i++)
texRepo->getByMesh(floorManager.floors[0].mesh.getId(), floorManager.floors[0].mesh.getMaterial(0).getId())
->addLink(floorManager.floors[i].mesh.getId(), floorManager.floors[i].mesh.getMaterial(0).getId());
src/samples/floors/managers/floor_manager.cpp
+1 -1
View File
@@ -81,7 +81,7 @@ void FloorManager::calcSpiral(int X, int Y)
void FloorManager::initFloors()
{
PRINT_LOG("Initializing floors");
floors[0].mesh.loadObj("floor/", "floor", 3.0F, false);
floors[0].mesh.loadObj("meshes/floor/", "floor", 3.0F, false);
floors[0].mesh.shouldBeFrustumCulled = true;
floors[0].mesh.shouldBeLighted = true;
for (u16 i = 1; i < floorAmount; i++)
src/samples/floors/objects/enemy.cpp
+6 -6
View File
@@ -27,24 +27,24 @@ Enemy::Enemy(TextureRepository *t_texRepo)
meshes = new Mesh[getMeshesCount()];
meshes[0].loadMD2("poss/", "poss_head", 0.3F, false);
meshes[0].loadMD2("meshes/enemy/", "poss_head", 0.3F, false);
meshes[0].rotation.x = -1.566F;
meshes[0].rotation.z = 1.566F;
meshes[1].loadMD2("poss/", "poss_body", 0.3F, false);
meshes[1].loadMD2("meshes/enemy/", "poss_body", 0.3F, false);
meshes[1].rotation.x = -1.566F;
meshes[1].rotation.z = 1.566F;
meshes[2].loadMD2("poss/", "poss_weapon", 0.3F, false);
meshes[2].loadMD2("meshes/enemy/", "poss_weapon", 0.3F, false);
meshes[2].rotation.x = -1.566F;
meshes[2].rotation.z = 1.566F;
Vector3 initPos = Vector3(0.00F, 40.00F, 0.00F);
setPosition(initPos);
t_texRepo->addByMesh("poss/", meshes[0], PNG);
t_texRepo->addByMesh("poss/", meshes[1], PNG);
t_texRepo->addByMesh("poss/", meshes[2], PNG);
t_texRepo->addByMesh("meshes/enemy/", meshes[0], PNG);
t_texRepo->addByMesh("meshes/enemy/", meshes[1], PNG);
t_texRepo->addByMesh("meshes/enemy/", meshes[2], PNG);
meshes[0].playAnimation(1, 6);
meshes[1].playAnimation(1, 6);
src/samples/floors/objects/player.cpp
+4 -4
View File
@@ -36,7 +36,7 @@ Player::Player(Audio *t_audio)
isJumpingAnimationSet = false;
isFightingAnimationSet = false;
mesh.loadMD2("warrior/", "warrior", 0.2F, true);
mesh.loadMD2("meshes/player/", "warrior", 0.2F, true);
mesh.position.set(0.00F, 40.00F, 0.00F);
mesh.rotation.x = -1.566F;
mesh.rotation.z = 1.566F;
@@ -45,9 +45,9 @@ Player::Player(Audio *t_audio)
mesh.setAnimSpeed(0.17F);
mesh.playAnimation(0, 0);
walkAdpcm = audio->loadADPCM("walk.adpcm");
jumpAdpcm = audio->loadADPCM("jump.adpcm");
boomAdpcm = audio->loadADPCM("boom.adpcm");
walkAdpcm = audio->loadADPCM("sounds/walk.adpcm");
jumpAdpcm = audio->loadADPCM("sounds/jump.adpcm");
boomAdpcm = audio->loadADPCM("sounds/boom.adpcm");
audio->setADPCMVolume(70, 0);
PRINT_LOG("Player object created!");
src/samples/floors/ui.cpp
+6 -6
View File
@@ -42,12 +42,12 @@ Ui::Ui(TextureRepository *t_texRepo)
task2Checkbox.size.set(32.0F, 32.0F);
task2Checkbox.position.set(460.0F, 50.0F);
t_texRepo->add("2d/", "reward", BMP)->addLink(reward.getId());
t_texRepo->add("2d/", "info_text", PNG)->addLink(info.getId());
t_texRepo->add("2d/", "check1_text", PNG)->addLink(task1.getId());
t_texRepo->add("2d/", "check2_text", PNG)->addLink(task2.getId());
grayCheckboxTex = t_texRepo->add("2d/", "gray_checkmark", PNG);
blueCheckboxTex = t_texRepo->add("2d/", "blue_checkmark", PNG);
t_texRepo->add("ui/", "reward", BMP)->addLink(reward.getId());
t_texRepo->add("ui/", "info-text", PNG)->addLink(info.getId());
t_texRepo->add("ui/", "check1-text", PNG)->addLink(task1.getId());
t_texRepo->add("ui/", "check2-text", PNG)->addLink(task2.getId());
grayCheckboxTex = t_texRepo->add("ui/", "gray-checkmark", PNG);
blueCheckboxTex = t_texRepo->add("ui/", "blue-checkmark", PNG);
grayCheckboxTex->addLink(task1Checkbox.getId());
grayCheckboxTex->addLink(task2Checkbox.getId());