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

fixes to match latest libpacket2 commit

Browse Source
This commit is contained in:
h4570
2020-11-19 19:59:24 +01:00
parent 8a3485e671
commit 6b821afd86
13 changed files with 152 additions and 452 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/samples/ari/Makefile
+1 -2
View File
@@ -19,7 +19,6 @@ EE_OBJS = \
../../engine/modules/texture_repository.o \
../../engine/modules/timer.o \
../../engine/modules/vif_sender.o \
../../engine/modules/vu1.o \
../../engine/utils/math.o \
../../engine/utils/string.o \
../../engine/loaders/bmp_loader.o \
@@ -33,7 +32,7 @@ EE_OBJS = \
ari.o \
main.o
EE_LIBS = -ldraw -lgraph -lmath3d -lpacket -ldma -lpad -laudsrv -lc -lstdc++
EE_LIBS = -ldraw -lgraph -lmath3d -lpacket -ldma -lpacket2 -lvu -lpad -laudsrv -lc -lstdc++
EE_INCS := -I./../../engine/include $(EE_INCS)
EE_DVP = dvp-as
EE_VCL = vcl
src/samples/ari/ari.cpp
+11 -11
View File
@@ -37,7 +37,7 @@ void Ari::onInit()
engine->audio.loadSong("MOV-CIRC.WAV");
adpcm = engine->audio.loadADPCM("ziobro.adpcm");
texRepo = engine->renderer->getTextureRepository();
engine->renderer->disableVSync();
island.loadDff("sunnyisl/", "sunnyisl", 0.1F, false);
island.rotation.x = -1.6F;
island.position.set(0.0F, 10.0F, 20.0F);
@@ -49,8 +49,8 @@ void Ari::onInit()
islandAddons.rotation.x = -1.6F;
islandAddons.position.set(0.0F, 10.0F, 20.0F);
// skybox.loadObj("skybox/", "skybox", 100.0F, false);
// skybox.shouldBeFrustumCulled = false;
skybox.loadObj("skybox/", "skybox", 100.0F, false);
skybox.shouldBeFrustumCulled = false;
waterFloors[0].loadObj("water/", "water", 5.0F, false);
waterFloors[0].position.set(0.0F, 8.0F, 0.0F);
@@ -71,13 +71,13 @@ void Ari::onInit()
}
texRepo->addByMesh("sunnyisl/", island);
// texRepo->addByMesh("sunnyisl/", islandAddons);
texRepo->addByMesh("sunnyisl/", islandAddons);
// texRepo->addByMesh("skybox/", skybox);
texRepo->addByMesh("skybox/", skybox);
// texRepo->addByMesh("ari/", player.mesh);
texRepo->addByMesh("ari/", player.mesh);
// engine->audio.playSong();
engine->audio.playSong();
}
void Ari::initBulb()
@@ -91,14 +91,14 @@ void Ari::onUpdate()
if (engine->pad.isCrossClicked)
{
engine->audio.loadSong("nob-else.wav");
// engine->audio.playADPCM(adpcm);
engine->audio.playADPCM(adpcm);
printf("FPS:%f\n", engine->fps);
}
camera.update(engine->pad, player.mesh);
// engine->renderer->draw(skybox);
engine->renderer->draw(skybox);
engine->renderer->draw(island);
// engine->renderer->draw(islandAddons);
// engine->renderer->draw(player.mesh);
engine->renderer->draw(islandAddons);
engine->renderer->draw(player.mesh);
for (u8 i = 0; i < WATER_TILES_COUNT; i++)
engine->renderer->drawByPath3(waterFloors[i]);
}
src/samples/ari/objects/player.cpp
+10 -10
View File
@@ -22,16 +22,16 @@
Player::Player()
{
// PRINT_LOG("Creating player object");
// this->gravity = 0.1F;
// this->lift = -1.0F;
// this->mesh.loadMD2("ari/", "ari", 0.0001F, true);
// this->mesh.position.set(0.0F, 10.0F, 0.0F);
// this->mesh.shouldBeBackfaceCulled = true;
// this->mesh.shouldBeFrustumCulled = false;
// this->mesh.shouldBeLighted = true;
// this->mesh.setAnimSpeed(0.05F);
// this->mesh.playAnimation(0, 1);
PRINT_LOG("Creating player object");
this->gravity = 0.1F;
this->lift = -1.0F;
this->mesh.loadMD2("ari/", "ari", 0.0001F, true);
this->mesh.position.set(0.0F, 10.0F, 0.0F);
this->mesh.shouldBeBackfaceCulled = true;
this->mesh.shouldBeFrustumCulled = false;
this->mesh.shouldBeLighted = true;
this->mesh.setAnimSpeed(0.05F);
this->mesh.playAnimation(0, 1);
PRINT_LOG("Player object created!");
}
src/samples/floors/Makefile
+1 -2
View File
@@ -19,7 +19,6 @@ EE_OBJS = \
../../engine/modules/texture_repository.o \
../../engine/modules/timer.o \
../../engine/modules/vif_sender.o \
../../engine/modules/vu1.o \
../../engine/utils/math.o \
../../engine/utils/string.o \
../../engine/loaders/bmp_loader.o \
@@ -37,7 +36,7 @@ EE_OBJS = \
floors.o \
main.o
EE_LIBS = -ldraw -lgraph -lmath3d -lpacket -ldma -lpad -laudsrv -lc -lstdc++
EE_LIBS = -ldraw -lgraph -lmath3d -lpacket -ldma -lpad -lpacket2 -lvu -laudsrv -lc -lstdc++
EE_INCS := -I./../../engine/include $(EE_INCS)
EE_DVP = dvp-as
EE_VCL = openvcl