zv0n/game
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Mario: better side collision handling

Browse Source
This commit is contained in:
zvon 2021-05-27 16:33:00 +02:00
parent 6e61eb03b9
commit b8c56c06fd
3 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mario/main.cpp
View File

@ -10,6 +10,7 @@
#endif // UNIX #endif // UNIX
#include <thread> #include <thread>
#include <mutex>
#include "global_vars.hpp" #include "global_vars.hpp"
#include "objectids.hpp" #include "objectids.hpp"
#include "blocks.hpp" #include "blocks.hpp"
@ -24,6 +25,8 @@ std::shared_ptr< SDLPP::RectangleRender > leftStop = nullptr;
std::shared_ptr< SDLPP::Renderer > renderer = nullptr; std::shared_ptr< SDLPP::Renderer > renderer = nullptr;
std::shared_ptr< SDLPP::TextRenderer > fps = nullptr; std::shared_ptr< SDLPP::TextRenderer > fps = nullptr;
std::mutex render_mutex;
void handleKeyDown( SDL_Keycode key, SDLPP::Scene &scene ) { void handleKeyDown( SDL_Keycode key, SDLPP::Scene &scene ) {
switch ( key ) { switch ( key ) {
case SDLK_ESCAPE: case SDLK_ESCAPE:
@ -125,14 +128,14 @@ void doInput( std::shared_ptr< SDLPP::Scene > scene ) {
while ( true ) { while ( true ) {
SDL_framerateDelay( &gFPS ); SDL_framerateDelay( &gFPS );
pollEvents( *scene ); pollEvents( *scene );
auto prevPos = mario->getDoubleRect().first; std::lock_guard<std::mutex> lock(render_mutex);
scene->updateScene(); scene->updateScene();
MarioVisitor mv(mario->getMovement().getY() < 0); MarioVisitor mv(mario->getMovement().getY() < 0);
scene->visitCollisions( *mario, mv ); scene->visitCollisions( *mario, mv );
if ( mv.isDead() ) { if ( mv.isDead() ) {
quit = true; quit = true;
} }
mario->handleVisitor(mv, prevPos); mario->handleVisitor(mv);
// if player is > 0.7 of playground, move everything left // if player is > 0.7 of playground, move everything left
auto playerX = mario->getRect().x; auto playerX = mario->getRect().x;
@ -227,6 +230,7 @@ int main() {
while ( !quit ) { while ( !quit ) {
SDL_PumpEvents(); SDL_PumpEvents();
SDL_framerateDelay( &gFPS ); SDL_framerateDelay( &gFPS );
std::lock_guard<std::mutex> lock(render_mutex);
mario->setStanding(); mario->setStanding();
if(update) { if(update) {
scene->updateSizeAndPosition(); scene->updateSizeAndPosition();

26
mario/mario.cpp
View File

@ -12,18 +12,21 @@ Mario::Mario(const std::shared_ptr< SDLPP::Renderer > &renderer) : SDLPP::Rectan
setMovement( 0, 0 ); setMovement( 0, 0 );
setMovementSpeed( 1 ); setMovementSpeed( 1 );
auto bottom_detect = SDLPP::RectColider( 0.2, 1, 0.6, 0, MARIO_FLOOR_DETECT ); auto bottom_detect = SDLPP::RectColider( 0.2, 1, 0.6, 0, MARIO_FLOOR_DETECT );
bottom_detect.setColor("#FF0000");
bottom_detect.setOutlineColor("#FF0000");
bottom_detect.setMinHeight(1); bottom_detect.setMinHeight(1);
addCollision(bottom_detect); addCollision(bottom_detect);
addCollision( addCollision(
SDLPP::RectColider( 0.05, 0.1, 0.1, 0.89, MARIO_LEFT_SIDE_DETECT ) ); SDLPP::RectColider( 0, 0.1, 0.1, 0.85, MARIO_LEFT_SIDE_DETECT ) );
addCollision( addCollision(
SDLPP::RectColider( 0.85, 0.1, 0.1, 0.89, MARIO_RIGHT_SIDE_DETECT ) ); SDLPP::RectColider( 0.9, 0.1, 0.1, 0.85, MARIO_RIGHT_SIDE_DETECT ) );
addCollision( addCollision(
SDLPP::RectColider( 0.05, 0, 0.1, 0.1, MARIO_TOP_LEFT_DETECT ) ); SDLPP::RectColider( 0, 0, 0.1, 0.1, MARIO_TOP_LEFT_DETECT ) );
addCollision( addCollision(
SDLPP::RectColider( 0.85, 0, 0.1, 0.1, MARIO_TOP_LEFT_DETECT ) ); SDLPP::RectColider( 0.9, 0, 0.1, 0.1, MARIO_TOP_LEFT_DETECT ) );
top_collision = std::make_shared<SDLPP::RectColider>( 0.5, 0, 0.2, 0.15, MARIO_TOP_DETECT ); top_collision = std::make_shared<SDLPP::RectColider>( 0.5, 0, 0.2, 0.15, MARIO_TOP_DETECT );
addCollision( top_collision ); addCollision( top_collision );
setColiderColor("#FF0000");
setStatic( false ); setStatic( false );
} }
void Mario::walkLeft() { void Mario::walkLeft() {
@ -56,7 +59,7 @@ void Mario::setStanding() {
} }
} }
void Mario::handleVisitor(MarioVisitor &visitor, SDLPP::Vec2D<double> previous_position) { void Mario::handleVisitor(MarioVisitor &visitor) {
// TODO - https://web.archive.org/web/20130807122227/http://i276.photobucket.com/albums/kk21/jdaster64/smb_playerphysics.png // TODO - https://web.archive.org/web/20130807122227/http://i276.photobucket.com/albums/kk21/jdaster64/smb_playerphysics.png
// handle gravity // handle gravity
on_ground = visitor.isOnGround(); on_ground = visitor.isOnGround();
@ -71,6 +74,10 @@ void Mario::handleVisitor(MarioVisitor &visitor, SDLPP::Vec2D<double> previous_p
setPos(getPos().getX(), visitor.getGroundY() - BLOCK_SIZE); setPos(getPos().getX(), visitor.getGroundY() - BLOCK_SIZE);
} }
} }
// if we just left ground gravity didn't work in custom_move
if(!on_ground && !jumping && getMovement().getY() == 0) {
addMovement(0, 2*gravity_add_falling);
}
if(visitor.topBlock() && getMovement().getY() < 0) { if(visitor.topBlock() && getMovement().getY() < 0) {
resetMovementY(); resetMovementY();
stop_jump = true; stop_jump = true;
@ -78,16 +85,11 @@ void Mario::handleVisitor(MarioVisitor &visitor, SDLPP::Vec2D<double> previous_p
// make sure Mario isn't stuck inside a wall // make sure Mario isn't stuck inside a wall
// TODO more readable function names // TODO more readable function names
if ( visitor.isStopped() ) { if ( visitor.isStopped() ) {
if(visitor.getStopX() > previous_position.getX()) setPos( visitor.getStopX(), getPos().getY());
previous_position = {visitor.getStopX(), previous_position.getY()};
setPos( previous_position.getX(), getPos().getY() );
} else if ( visitor.canGoLeft() != visitor.canGoRight() ) { } else if ( visitor.canGoLeft() != visitor.canGoRight() ) {
SDLPP::Vec2D<double> next_pos = { visitor.getMovementBlockage().getX() + (visitor.canGoLeft() * -1 + visitor.canGoRight() * 1) * BLOCK_SIZE, getPos().getY() }; SDLPP::Vec2D<double> next_pos = { visitor.getMovementBlockage().getX() + (visitor.canGoLeft() * -1 + visitor.canGoRight() * 1) * BLOCK_SIZE, getPos().getY() };
if((visitor.canGoLeft() && next_pos.getX() > previous_position.getX()) || (visitor.canGoRight() && next_pos.getX() < previous_position.getX())) {
next_pos = previous_position;
}
setPos(next_pos); setPos(next_pos);
} else if (visitor.moveTop() && (jumping && !stop_jump)) { } else if (visitor.moveTop() && jumping && !stop_jump) {
auto objPos = visitor.getRightLeftPos(); auto objPos = visitor.getRightLeftPos();
if(objPos.getX() < getPos().getX()) { if(objPos.getX() < getPos().getX()) {
setPos( objPos.getX() + BLOCK_SIZE, getPos().getY() ); setPos( objPos.getX() + BLOCK_SIZE, getPos().getY() );

2
mario/mario.hpp
View File

@ -11,7 +11,7 @@ public:
void walkLeft(); void walkLeft();
void walkRight(); void walkRight();
void setStanding(); void setStanding();
void handleVisitor(MarioVisitor &visitor, SDLPP::Vec2D<double> previous_position); void handleVisitor(MarioVisitor &visitor);
void jump(); void jump();
void stopJump(); void stopJump();
virtual void custom_move( int ticks ) override; virtual void custom_move( int ticks ) override;