nutomic/dungeon-gunner
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fixed collision detection.

Browse source
This commit is contained in:
Felix Ableitner 2013-05-01 19:07:47 +02:00
parent 027006c966
commit 079c4b539b
3 changed files with 32 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
source/World.cpp
View file

@ -11,6 +11,7 @@
#include "sprites/Tile.h" #include "sprites/Tile.h"
#include "util/Interval.h" #include "util/Interval.h"
#include "util/Log.h"
/** /**
* Insert a drawable into the group. Drawables should only be handled with shared_ptr. * Insert a drawable into the group. Drawables should only be handled with shared_ptr.
@ -75,27 +76,35 @@ World::step(int elapsed) {
it--; it--;
} }
// Apply movement for movable sprites. // Apply movement for movable sprites.
else if (spriteA->getSpeed() != sf::Vector2f()) { else if (spriteA->getSpeed() != sf::Vector2f() &&
bool overlap = false; !doesOverlap(spriteA, elapsed))
for (auto w = mDrawables.begin(); w != mDrawables.end(); w++) { spriteA->setPosition(spriteA->getPosition() + speed);
for (auto& spriteB : w->second) { }
if (spriteA == spriteB) }
continue; }
// Ignore anything that is filtered by masks.
if (!spriteA->collisionEnabled(spriteB->getCategory()) || /**
!spriteB->collisionEnabled(spriteA->getCategory())) * Tests spriteA for overlap with every other sprite (considering collision
continue; * masks).
if (testCollision(spriteA, spriteB, elapsed)) { */
spriteA->onCollide(spriteB); bool
overlap = true; World::doesOverlap(std::shared_ptr<Sprite> spriteA, int elapsed) {
} for (auto w = mDrawables.begin(); w != mDrawables.end(); w++) {
} for (auto& spriteB : w->second) {
} if (spriteA == spriteB)
if (!overlap) continue;
spriteA->setPosition(spriteA->getPosition() + speed); // Ignore anything that is filtered by masks.
if (!spriteA->collisionEnabled(spriteB->getCategory()) ||
!spriteB->collisionEnabled(spriteA->getCategory()))
continue;
if (testCollision(spriteA, spriteB, elapsed)) {
spriteA->onCollide(spriteB);
spriteB->onCollide(spriteA);
return true;
} }
} }
} }
return false;
} }
/** /**
@ -134,7 +143,6 @@ World::testCollision(std::shared_ptr<Sprite> spriteA,
// circle-circle collision // circle-circle collision
if ((spriteA->mShape.type == Sprite::Shape::Type::CIRCLE) && if ((spriteA->mShape.type == Sprite::Shape::Type::CIRCLE) &&
(spriteB->mShape.type == Sprite::Shape::Type::CIRCLE)) { (spriteB->mShape.type == Sprite::Shape::Type::CIRCLE)) {
sf::Vector2f axis = spriteA->getPosition() - spriteB->getPosition(); sf::Vector2f axis = spriteA->getPosition() - spriteB->getPosition();
// If both objects are at the exact same position, allow any movement for unstucking. // If both objects are at the exact same position, allow any movement for unstucking.
if (axis == sf::Vector2f()) if (axis == sf::Vector2f())

5
source/World.h
View file

@ -35,8 +35,9 @@ private:
private: private:
void draw(sf::RenderTarget& target, sf::RenderStates states) const; void draw(sf::RenderTarget& target, sf::RenderStates states) const;
bool testCollision(std::shared_ptr<Sprite> spriteA, std::shared_ptr<Sprite> spriteB, bool testCollision(std::shared_ptr<Sprite> spriteA,
int elapsed) const; std::shared_ptr<Sprite> spriteB, int elapsed) const;
bool doesOverlap(std::shared_ptr<Sprite> spriteA, int elapsed);
private: private:
std::map<Sprite::Category, std::vector<std::shared_ptr<Sprite> > > mDrawables; std::map<Sprite::Category, std::vector<std::shared_ptr<Sprite> > > mDrawables;

3
source/sprites/Tile.cpp
View file

@ -25,7 +25,8 @@ const sf::Vector2i Tile::TILE_SIZE = sf::Vector2i(75, 75);
*/ */
Tile::Tile(Type type, int x, int y) : Tile::Tile(Type type, int x, int y) :
Sprite(Data(sf::Vector2f(x * TILE_SIZE.x, y * TILE_SIZE.y), Sprite(Data(sf::Vector2f(x * TILE_SIZE.x, y * TILE_SIZE.y),
CATEGORY_WORLD, isSolid(type)), Yaml(getConfig(type))), CATEGORY_WORLD, (isSolid(type)) ? 0xffff : 0),
Yaml(getConfig(type))),
mType(type) { mType(type) {
} }