From 45edf7aedba655391ed4d04a751aaf846baaa2e7 Mon Sep 17 00:00:00 2001 From: Foxar Date: Tue, 8 Dec 2020 14:42:43 +0100 Subject: [PATCH 1/5] Added: Static fps member to dolphin.cpp, auto-updated with engine->fps, made player movement multiplied by deltatime of last frame. --- src/samples/dolphin/dolphin.cpp | 5 ++++- src/samples/dolphin/dolphin.hpp | 1 + src/samples/dolphin/objects/player.cpp | 5 ++++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/samples/dolphin/dolphin.cpp b/src/samples/dolphin/dolphin.cpp index 704a04b..32f0175 100755 --- a/src/samples/dolphin/dolphin.cpp +++ b/src/samples/dolphin/dolphin.cpp @@ -16,6 +16,8 @@ const u8 WATER_SIZE = 100; const u8 OYSTERS_COUNT = 15; +float Dolphin::engineFPS = 60.F; + Dolphin::Dolphin(Engine *t_engine) : engine(t_engine), camera(&engine->screen) { oysters = new Collectible[OYSTERS_COUNT]; @@ -93,8 +95,9 @@ void Dolphin::onInit() void Dolphin::onUpdate() { + Dolphin::engineFPS = engine->fps; if (engine->pad.isCrossClicked) - printf("PlayerPos (%f,%f), FPS:%f\n", player.mesh.position.x, player.mesh.position.z, this->engine->fps); + printf("Delta multiplier: %f\n", 60.0F / engine->fps); float xDist = player.mesh.position.x - water.position.x; float zDist = player.mesh.position.z - water.position.z; diff --git a/src/samples/dolphin/dolphin.hpp b/src/samples/dolphin/dolphin.hpp index 9630f5e..273f0ef 100755 --- a/src/samples/dolphin/dolphin.hpp +++ b/src/samples/dolphin/dolphin.hpp @@ -33,6 +33,7 @@ public: void onUpdate(); Engine *engine; + static float engineFPS; private: LightBulb bulb; diff --git a/src/samples/dolphin/objects/player.cpp b/src/samples/dolphin/objects/player.cpp index aafe048..8051b55 100755 --- a/src/samples/dolphin/objects/player.cpp +++ b/src/samples/dolphin/objects/player.cpp @@ -9,6 +9,7 @@ */ #include "player.hpp" +#include "dolphin.hpp" #include #include @@ -38,7 +39,6 @@ void Player::update(Pad &t_pad) lift += 0.05F; if (lift < 0.1F && lift > -0.1F) lift = 0; - velocity = 0; if (t_pad.lJoyV <= 100) velocity = 1; else if (t_pad.lJoyV >= 200) @@ -81,9 +81,12 @@ void Player::update(Pad &t_pad) mesh.playAnimation(1, 14, 0); } + velocity *= 60.0F / Dolphin::engineFPS; //Moving by deltatime of last frame. mesh.position.z += Math::cos(mesh.rotation.z) * velocity * (bIsJumping + 1); mesh.position.x += Math::sin(mesh.rotation.z) * velocity * (bIsJumping + 1); mesh.position.y += lift; + + velocity = 0; } From 220caba84af7b4f9cc7df2a59ba1a6efcdcb366a Mon Sep 17 00:00:00 2001 From: Foxar Date: Tue, 8 Dec 2020 15:30:48 +0100 Subject: [PATCH 2/5] Fixed: Added MODE_STRETCH to wateroverlay, fixing the tiling issue. --- src/samples/dolphin/dolphin.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/samples/dolphin/dolphin.cpp b/src/samples/dolphin/dolphin.cpp index 32f0175..76526ae 100755 --- a/src/samples/dolphin/dolphin.cpp +++ b/src/samples/dolphin/dolphin.cpp @@ -44,6 +44,7 @@ void Dolphin::onInit() printf("Loading water overlay...\n"); waterOverlay.size.set(640.0F, 480.0F); Texture *watOverlayTex = texRepo->add("2d/", "underwater_overlay", PNG); + waterOverlay.setMode(MODE_STRETCH); watOverlayTex->addLink(waterOverlay.getId()); printf("Loaded.\n"); From f4421b659d629d7970012d5213ed31575dbc0e83 Mon Sep 17 00:00:00 2001 From: Foxar Date: Tue, 8 Dec 2020 16:48:43 +0100 Subject: [PATCH 3/5] Added: Seabed model/code. --- src/samples/dolphin/dolphin.cpp | 8 ++++++++ src/samples/dolphin/dolphin.hpp | 8 +++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/samples/dolphin/dolphin.cpp b/src/samples/dolphin/dolphin.cpp index 76526ae..cc4de00 100755 --- a/src/samples/dolphin/dolphin.cpp +++ b/src/samples/dolphin/dolphin.cpp @@ -55,6 +55,13 @@ void Dolphin::onInit() water.shouldBeFrustumCulled = false; water.shouldBeBackfaceCulled = false; + printf("Loading seabed...\n"); + seabed.loadObj("seabed/", "seabed", 10.0F, false); + seabed.position.set(0, -250.0F, 0); + texRepo->addByMesh("seabed/", seabed, BMP); + seabed.shouldBeBackfaceCulled = false; + seabed.shouldBeFrustumCulled = false; + skybox.loadObj("skybox/", "skybox", 400.0F, false); skybox.shouldBeFrustumCulled = false; @@ -137,6 +144,7 @@ void Dolphin::onUpdate() engine->renderer->draw(water); engine->renderer->draw(skybox); engine->renderer->draw(waterbox); + engine->renderer->draw(seabed); for (u8 i = 0; i < OYSTERS_COUNT; i++) { if (oysters[i].isActive()) diff --git a/src/samples/dolphin/dolphin.hpp b/src/samples/dolphin/dolphin.hpp index 273f0ef..0a42568 100755 --- a/src/samples/dolphin/dolphin.hpp +++ b/src/samples/dolphin/dolphin.hpp @@ -36,13 +36,19 @@ public: static float engineFPS; private: + /*DO NOT TOUCH ORDER OF DECLARATION! + GCC BUG CAUSES RENDERING TO FAIL IN ANY OTHER ORDER OF DECLARATION!*/ + Mesh seabed; + Mesh island; + Mesh skybox; LightBulb bulb; Player player; Camera camera; - Mesh island, skybox, water, waterbox; Collectible *oysters; TextureRepository *texRepo; Sprite waterOverlay; + Mesh water; + Mesh waterbox; }; #endif From c4fc52b043a5367126c5f99d52176bd0968fba68 Mon Sep 17 00:00:00 2001 From: Foxar Date: Tue, 8 Dec 2020 19:27:30 +0100 Subject: [PATCH 4/5] Added: Sprites representing lifes player has left, and life variable. --- src/samples/dolphin/dolphin.cpp | 14 ++++++++++++++ src/samples/dolphin/dolphin.hpp | 1 + src/samples/dolphin/objects/player.cpp | 1 + src/samples/dolphin/objects/player.hpp | 2 ++ 4 files changed, 18 insertions(+) diff --git a/src/samples/dolphin/dolphin.cpp b/src/samples/dolphin/dolphin.cpp index cc4de00..1c12dee 100755 --- a/src/samples/dolphin/dolphin.cpp +++ b/src/samples/dolphin/dolphin.cpp @@ -91,6 +91,16 @@ void Dolphin::onInit() oysters[i].mesh.position.set(i * -100, 5.0F, i * -100); } + Texture *pLifeTex = texRepo->add("2d/", "life", PNG); + //pLifeTex->addLink(lifeSprites[0].getId()); + for (int i = 0; i < 3; i++) + { + lifeSprites[i].size.set(64.0F, 64.0F); + lifeSprites[i].setMode(MODE_STRETCH); + lifeSprites[i].position.set(395 + (64 * i), 0); + pLifeTex->addLink(lifeSprites[i].getId()); + } + texRepo->addByMesh("dolphin/", player.mesh, BMP); texRepo->addByMesh("sunnyisl/", island, BMP); texRepo->addByMesh("skybox/", skybox, BMP); @@ -152,6 +162,10 @@ void Dolphin::onUpdate() engine->renderer->draw(oysters[i].mesh); } } + for (u8 i = 0; i < player.getLifes(); i++) + { + engine->renderer->draw(lifeSprites[i]); + } engine->renderer->draw(player.mesh); if (camera.position.y < WATER_LEVEL) engine->renderer->draw(waterOverlay); diff --git a/src/samples/dolphin/dolphin.hpp b/src/samples/dolphin/dolphin.hpp index 0a42568..1d1ce9c 100755 --- a/src/samples/dolphin/dolphin.hpp +++ b/src/samples/dolphin/dolphin.hpp @@ -49,6 +49,7 @@ private: Sprite waterOverlay; Mesh water; Mesh waterbox; + Sprite lifeSprites[3]; }; #endif diff --git a/src/samples/dolphin/objects/player.cpp b/src/samples/dolphin/objects/player.cpp index 8051b55..a430173 100755 --- a/src/samples/dolphin/objects/player.cpp +++ b/src/samples/dolphin/objects/player.cpp @@ -25,6 +25,7 @@ Player::Player() mesh.rotation.x = -1.6F; mesh.setAnimSpeed(0.05F); bIsJumping = false; + lifes = 3; } Player::~Player() diff --git a/src/samples/dolphin/objects/player.hpp b/src/samples/dolphin/objects/player.hpp index c615d13..39d6f8b 100755 --- a/src/samples/dolphin/objects/player.hpp +++ b/src/samples/dolphin/objects/player.hpp @@ -27,10 +27,12 @@ public: ~Player(); void update(Pad &t_pad); const u8 &isJumping() { return bIsJumping; } + const u8 &getLifes() { return lifes; } private: u8 bIsJumping; Vector3 playerNextPosition; + u8 lifes; }; #endif From f86a1bf190663366bb7a1338531bf3af3f6b8d7d Mon Sep 17 00:00:00 2001 From: Foxar Date: Wed, 9 Dec 2020 14:27:40 +0100 Subject: [PATCH 5/5] Added: Underwater/Above water soundscape, misc sound effects. Reworked player class a bit to contain pointer to the game engine for sound playing. --- src/samples/dolphin/dolphin.cpp | 24 +++++++++++++++++++++++- src/samples/dolphin/dolphin.hpp | 2 ++ src/samples/dolphin/objects/player.cpp | 19 +++++++++++++++++++ src/samples/dolphin/objects/player.hpp | 7 ++++++- 4 files changed, 50 insertions(+), 2 deletions(-) diff --git a/src/samples/dolphin/dolphin.cpp b/src/samples/dolphin/dolphin.cpp index 1c12dee..9df9247 100755 --- a/src/samples/dolphin/dolphin.cpp +++ b/src/samples/dolphin/dolphin.cpp @@ -27,8 +27,20 @@ Dolphin::~Dolphin() {} void Dolphin::onInit() { + player.init(engine); engine->renderer->setCameraDefinitions(&camera.worldView, &camera.position, camera.planes); + engine->audio.loadSong("sound/dirediredocks.wav"); + engine->audio.playSong(); + engine->audio.setSongVolume(60); + + surfaceAmbient = engine->audio.loadADPCM("sound/surface.sad"); + underwaterAmbient = engine->audio.loadADPCM("sound/underwater.sad"); + pickupSound = engine->audio.loadADPCM("sound/pickup.sad"); + + engine->audio.playADPCM(surfaceAmbient, 0); + engine->audio.playADPCM(underwaterAmbient, 1); + texRepo = engine->renderer->getTextureRepository(); engine->renderer->disableVSync(); @@ -138,8 +150,9 @@ void Dolphin::onUpdate() if (dist < 2.5F && player.isJumping() && oysters[i].isActive()) { printf("Pickup %d Dist %d\n", i, dist); - //oysters[i].setActive(false); oysters[i].disappear(); + engine->audio.setADPCMVolume(30, 3); + engine->audio.playADPCM(pickupSound, 3); } } @@ -168,5 +181,14 @@ void Dolphin::onUpdate() } engine->renderer->draw(player.mesh); if (camera.position.y < WATER_LEVEL) + { engine->renderer->draw(waterOverlay); + engine->audio.setADPCMVolume(0, 0); //Surface ambient + engine->audio.setADPCMVolume(65, 1); //Underwater ambient + } + else + { + engine->audio.setADPCMVolume(50, 0); //Surface ambient + engine->audio.setADPCMVolume(0, 1); //Underwater ambient + } } diff --git a/src/samples/dolphin/dolphin.hpp b/src/samples/dolphin/dolphin.hpp index 1d1ce9c..614b94f 100755 --- a/src/samples/dolphin/dolphin.hpp +++ b/src/samples/dolphin/dolphin.hpp @@ -50,6 +50,8 @@ private: Mesh water; Mesh waterbox; Sprite lifeSprites[3]; + audsrv_adpcm_t *underwaterAmbient, *surfaceAmbient; + audsrv_adpcm_t *pickupSound; }; #endif diff --git a/src/samples/dolphin/objects/player.cpp b/src/samples/dolphin/objects/player.cpp index a430173..7a8d70a 100755 --- a/src/samples/dolphin/objects/player.cpp +++ b/src/samples/dolphin/objects/player.cpp @@ -32,6 +32,12 @@ Player::~Player() { } +void Player::init(Engine *t_engine) +{ + pEngine = t_engine; + waterImpact = t_engine->audio.loadADPCM("sound/water_impact.sad"); +} + void Player::update(Pad &t_pad) { if (lift > 0.0F) @@ -81,6 +87,19 @@ void Player::update(Pad &t_pad) printf("Swim animation\n"); mesh.playAnimation(1, 14, 0); } + if (mesh.getCurrentAnimationFrame() == 42) + { + if (!bIsImpactingWater) + { + pEngine->audio.setADPCMVolume(50, 2); + pEngine->audio.playADPCM(waterImpact, 2); + } + bIsImpactingWater = true; + } + else if (bIsImpactingWater) + { + bIsImpactingWater = false; + } velocity *= 60.0F / Dolphin::engineFPS; //Moving by deltatime of last frame. mesh.position.z += diff --git a/src/samples/dolphin/objects/player.hpp b/src/samples/dolphin/objects/player.hpp index 39d6f8b..3c37938 100755 --- a/src/samples/dolphin/objects/player.hpp +++ b/src/samples/dolphin/objects/player.hpp @@ -14,9 +14,10 @@ #define WATER_LEVEL -5.0F #include "../camera.hpp" +#include #include #include - +class Engine; class Player { @@ -25,6 +26,7 @@ public: Mesh mesh; Player(); ~Player(); + void init(Engine *t_engine); void update(Pad &t_pad); const u8 &isJumping() { return bIsJumping; } const u8 &getLifes() { return lifes; } @@ -33,6 +35,9 @@ private: u8 bIsJumping; Vector3 playerNextPosition; u8 lifes; + audsrv_adpcm_t *waterImpact; + Engine *pEngine; + u8 bIsImpactingWater; }; #endif