Add code to register objects to the collider.
The character and the platforms can register now, but collision is not triggered for some reason.
This commit is contained in:
parent
42fb50e93e
commit
cdd37fead7
13 changed files with 133 additions and 10 deletions
|
@ -14,6 +14,7 @@ find_package(Boost 1.55.0 REQUIRED)
|
|||
add_definitions(
|
||||
${PNG_DEFINITIONS}
|
||||
-DWITH_VERBOSE_OBS_MANAGER
|
||||
-DWITH_VERBOSE_COLLIDER
|
||||
)
|
||||
|
||||
include_directories(SYSTEM
|
||||
|
|
|
@ -20,6 +20,7 @@
|
|||
#include "character.hpp"
|
||||
#include "sdlmain.hpp"
|
||||
#include "texture.hpp"
|
||||
#include "collider.hpp"
|
||||
#include <cassert>
|
||||
|
||||
namespace cloonel {
|
||||
|
@ -52,6 +53,12 @@ namespace cloonel {
|
|||
Character::~Character() noexcept {
|
||||
}
|
||||
|
||||
///-------------------------------------------------------------------------
|
||||
///-------------------------------------------------------------------------
|
||||
void Character::RegisterForCollision (ColliderRegisterFunc parRegisterCollision) {
|
||||
parRegisterCollision(&m_bottomBar);
|
||||
}
|
||||
|
||||
///-------------------------------------------------------------------------
|
||||
///-------------------------------------------------------------------------
|
||||
void Character::Prepare() {
|
||||
|
|
|
@ -25,6 +25,7 @@
|
|||
#include "vector.hpp"
|
||||
#include "sizenotifiable.hpp"
|
||||
#include "horzcollisionbar.hpp"
|
||||
#include "collidertypedef.hpp"
|
||||
#include <string>
|
||||
#include <memory>
|
||||
|
||||
|
@ -35,12 +36,13 @@ namespace cloonel {
|
|||
class Character : public Placeable, public Drawable {
|
||||
public:
|
||||
Character ( const std::string& parPath, SDLMain* parMain, float2 parSize );
|
||||
Character ( const std::string&& parPath, SDLMain* parMai, float2 parSize );
|
||||
Character ( const std::string&& parPath, SDLMain* parMain, float2 parSize );
|
||||
virtual ~Character ( void ) noexcept;
|
||||
|
||||
void Prepare ( void );
|
||||
void Destroy ( void ) noexcept;
|
||||
virtual void Draw ( void ) const;
|
||||
void RegisterForCollision ( ColliderRegisterFunc parRegisterCollision );
|
||||
|
||||
private:
|
||||
HorzCollisionBar m_bottomBar;
|
||||
|
|
|
@ -85,7 +85,7 @@ namespace cloonel {
|
|||
|
||||
if (Collide(parDeltaT, *bar1, *bar2, overlap)) {
|
||||
#if defined(VERBOSE_COLLIDER)
|
||||
std::cout << "Collider: Collision while testing group " << parGroup1 << " and " << parGroup2 << " ";
|
||||
std::cout << "Collider: Collision ";
|
||||
std::cout << "between " << bar1 << " and " << bar2 << "\n";
|
||||
#endif
|
||||
const auto dir1 = normalized(bar1->GetPos() - bar1->From());
|
||||
|
@ -122,6 +122,9 @@ namespace cloonel {
|
|||
///--------------------------------------------------------------------------
|
||||
///--------------------------------------------------------------------------
|
||||
void Collider::TieGroups (GroupIDType parGroup1, GroupIDType parGroup2) {
|
||||
#if defined(VERBOSE_COLLIDER)
|
||||
std::cout << "Collider: Tying group " << parGroup1 << " to " << parGroup2 << " for collision tests\n";
|
||||
#endif
|
||||
assert(m_relationships.end() == std::find(m_relationships.begin(), m_relationships.end(), std::make_pair(parGroup1, parGroup2)));
|
||||
assert(m_relationships.end() == std::find(m_relationships.begin(), m_relationships.end(), std::make_pair(parGroup2, parGroup1)));
|
||||
assert(isGroupRegistered(m_collisionBars, parGroup1));
|
||||
|
@ -132,11 +135,31 @@ namespace cloonel {
|
|||
///--------------------------------------------------------------------------
|
||||
///--------------------------------------------------------------------------
|
||||
void Collider::RegisterBar (GroupIDType parGroup, const CollisionBar* parBar) {
|
||||
#if defined(VERBOSE_COLLIDER)
|
||||
std::cout << "Collider: Registering bar " << parBar << " in group " << parGroup << "\n";
|
||||
#endif
|
||||
CollisionBarListType& group = findOrAddGroup(m_collisionBars, parGroup);
|
||||
assert(isGroupRegistered(m_collisionBars, parGroup));
|
||||
assert(parBar);
|
||||
group.push_back(parBar);
|
||||
}
|
||||
|
||||
///--------------------------------------------------------------------------
|
||||
///--------------------------------------------------------------------------
|
||||
void Collider::UnregisterBar (GroupIDType parGroup, const CollisionBar* parBar) {
|
||||
assert(isGroupRegistered(m_collisionBars, parGroup));
|
||||
CollisionBarListType& group = findOrAddGroup(m_collisionBars, parGroup);
|
||||
auto itdele = std::find(group.begin(), group.end(), parBar);
|
||||
assert(itdele != group.end());
|
||||
group.erase(itdele);
|
||||
}
|
||||
|
||||
///--------------------------------------------------------------------------
|
||||
///--------------------------------------------------------------------------
|
||||
void Collider::Reset() noexcept {
|
||||
m_relationships.clear();
|
||||
m_collisionBars.clear();
|
||||
}
|
||||
} //namespace cloonel
|
||||
|
||||
#if defined(VERBOSE_COLLIDER)
|
||||
|
|
|
@ -40,6 +40,8 @@ namespace cloonel {
|
|||
void RunCollisionTests ( float parDeltaT ) const;
|
||||
void TieGroups ( GroupIDType parGroup1, GroupIDType parGroup2 );
|
||||
void RegisterBar ( GroupIDType parGroup, const CollisionBar* parBar );
|
||||
void UnregisterBar ( GroupIDType parGroup, const CollisionBar* parBar );
|
||||
void Reset ( void ) noexcept;
|
||||
|
||||
private:
|
||||
typedef std::vector<std::pair<GroupIDType, std::vector<const CollisionBar*>>> CollisionBarGroupListType;
|
||||
|
|
32
src/collidertypedef.hpp
Normal file
32
src/collidertypedef.hpp
Normal file
|
@ -0,0 +1,32 @@
|
|||
/*
|
||||
Copyright 2014 Michele "King_DuckZ" Santullo
|
||||
|
||||
This file is part of CloonelJump.
|
||||
|
||||
CloonelJump is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
CloonelJump is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with CloonelJump. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
*/
|
||||
|
||||
#ifndef id3DF7C722C6AE4978874605F38F26E350
|
||||
#define id3DF7C722C6AE4978874605F38F26E350
|
||||
|
||||
#include <functional>
|
||||
|
||||
namespace cloonel {
|
||||
class HorzCollisionBar;
|
||||
typedef std::function<void(HorzCollisionBar*)> ColliderRegisterFunc;
|
||||
typedef std::function<void(HorzCollisionBar*)> ColliderUnregisterFunc;
|
||||
} //namespace cloonel
|
||||
|
||||
#endif
|
|
@ -49,6 +49,7 @@ namespace cloonel {
|
|||
///--------------------------------------------------------------------------
|
||||
///--------------------------------------------------------------------------
|
||||
void GameplayScene::Destroy() noexcept {
|
||||
m_collider.Reset();
|
||||
}
|
||||
|
||||
///--------------------------------------------------------------------------
|
||||
|
|
|
@ -40,7 +40,7 @@ namespace cloonel {
|
|||
virtual void Destroy ( void ) noexcept;
|
||||
|
||||
protected:
|
||||
Collider* GetCollider ( void );
|
||||
Collider* GetCollider ( void ) { return &m_collider; }
|
||||
|
||||
private:
|
||||
virtual void OnRender ( void );
|
||||
|
|
|
@ -32,6 +32,7 @@
|
|||
#include <algorithm>
|
||||
#include <SDL2/SDL_scancode.h>
|
||||
#include <ciso646>
|
||||
#include <functional>
|
||||
|
||||
namespace cloonel {
|
||||
namespace {
|
||||
|
@ -39,6 +40,12 @@ namespace cloonel {
|
|||
GameAction_Left,
|
||||
GameAction_Right
|
||||
};
|
||||
|
||||
enum {
|
||||
CollisionID_Platforms,
|
||||
CollisionID_Player,
|
||||
CollisionID_Enemies
|
||||
};
|
||||
} //unnamed namespace
|
||||
|
||||
///--------------------------------------------------------------------------
|
||||
|
@ -62,6 +69,7 @@ namespace cloonel {
|
|||
///--------------------------------------------------------------------------
|
||||
void GameplaySceneClassic::OnPrepare() {
|
||||
const float halfRefHeight = static_cast<float>(REFERENCE_HEIGHT) / 2.0f;
|
||||
Collider& collider = *this->GetCollider();
|
||||
|
||||
std::unique_ptr<MoverSine> moverSine(new MoverSine());
|
||||
std::unique_ptr<Character> player(new Character("resources/graphics/player.png", SDLObject(), float2(80.0f, 120.0f)));
|
||||
|
@ -80,6 +88,15 @@ namespace cloonel {
|
|||
moverWorld->RegisterPlaceable(platforms.get());
|
||||
wallpaper->Reload();
|
||||
|
||||
{
|
||||
auto regPlayerCollision(std::bind(&Collider::RegisterBar, &collider, CollisionID_Player, std::placeholders::_1));
|
||||
player->RegisterForCollision(regPlayerCollision);
|
||||
|
||||
auto regPlatfCollision(std::bind(&Collider::RegisterBar, &collider, CollisionID_Platforms, std::placeholders::_1));
|
||||
auto unregPlatfCollision(std::bind(&Collider::UnregisterBar, &collider, CollisionID_Platforms, std::placeholders::_1));
|
||||
platforms->RegisterForCollision(regPlatfCollision, unregPlatfCollision);
|
||||
}
|
||||
|
||||
std::swap(moverSine, m_moverSine);
|
||||
std::swap(player, m_player);
|
||||
std::swap(moverLeftRight, m_moverLeftRight);
|
||||
|
@ -96,6 +113,9 @@ namespace cloonel {
|
|||
|
||||
const float jumpPower = halfRefHeight * 1.29f;
|
||||
m_moverSine->SetPower(jumpPower);
|
||||
|
||||
collider.TieGroups(CollisionID_Platforms, CollisionID_Player);
|
||||
//collider.TieGroups(CollisionID_Enemies, CollisionID_Player);
|
||||
}
|
||||
|
||||
///--------------------------------------------------------------------------
|
||||
|
@ -110,7 +130,6 @@ namespace cloonel {
|
|||
m_moverLeftRight = std::move(std::unique_ptr<MoverLeftRight>(nullptr));
|
||||
m_player = std::move(std::unique_ptr<Character>(nullptr));
|
||||
m_moverSine = std::move(std::unique_ptr<MoverSine>(nullptr));
|
||||
|
||||
}
|
||||
|
||||
///--------------------------------------------------------------------------
|
||||
|
|
|
@ -19,16 +19,18 @@
|
|||
|
||||
#include "platform.hpp"
|
||||
#include "texture.hpp"
|
||||
#include "horzcollisionbar.hpp"
|
||||
#include <cassert>
|
||||
#include <algorithm>
|
||||
|
||||
namespace cloonel {
|
||||
///--------------------------------------------------------------------------
|
||||
///--------------------------------------------------------------------------
|
||||
Platform::Platform (SDLMain* parSdlMain, const float2& parPos, Texture* parTexture, const float2& parSize) :
|
||||
Placeable(parPos),
|
||||
m_collisionTop(parPos, parSize.x()),
|
||||
m_screenRatio(parSdlMain),
|
||||
m_size(parSize),
|
||||
m_collisionTop(new HorzCollisionBar(parPos, parSize.x())),
|
||||
m_surface(parTexture)
|
||||
{
|
||||
assert(m_surface);
|
||||
|
@ -38,13 +40,18 @@ namespace cloonel {
|
|||
///--------------------------------------------------------------------------
|
||||
Platform::Platform (Platform&& parOther) noexcept :
|
||||
Placeable(parOther.GetPos()),
|
||||
m_collisionTop(parOther.m_collisionTop),
|
||||
m_screenRatio(std::move(parOther.m_screenRatio)),
|
||||
m_size(parOther.m_size),
|
||||
m_collisionTop(std::move(parOther.m_collisionTop)),
|
||||
m_surface(parOther.m_surface)
|
||||
{
|
||||
}
|
||||
|
||||
///--------------------------------------------------------------------------
|
||||
///--------------------------------------------------------------------------
|
||||
Platform::~Platform() noexcept {
|
||||
}
|
||||
|
||||
///--------------------------------------------------------------------------
|
||||
///--------------------------------------------------------------------------
|
||||
void Platform::Draw() const {
|
||||
|
@ -65,6 +72,12 @@ namespace cloonel {
|
|||
///--------------------------------------------------------------------------
|
||||
///--------------------------------------------------------------------------
|
||||
void Platform::OnRegister (Mover& parMover, Mover::PlaceableTicketType parParentTicket) {
|
||||
parMover.RegisterPlaceable(&m_collisionTop, parParentTicket);
|
||||
parMover.RegisterPlaceable(m_collisionTop.get(), parParentTicket);
|
||||
}
|
||||
|
||||
///--------------------------------------------------------------------------
|
||||
///--------------------------------------------------------------------------
|
||||
void Platform::RegisterForCollision (ColliderRegisterFunc parReg) {
|
||||
parReg(m_collisionTop.get());
|
||||
}
|
||||
} //namespace cloonel
|
||||
|
|
|
@ -23,31 +23,37 @@
|
|||
#include "sizenotifiable.hpp"
|
||||
#include "drawable.hpp"
|
||||
#include "placeable.hpp"
|
||||
#include "horzcollisionbar.hpp"
|
||||
#include "collidertypedef.hpp"
|
||||
#include <memory>
|
||||
|
||||
namespace cloonel {
|
||||
class Texture;
|
||||
class SDLMain;
|
||||
class HorzCollisionBar;
|
||||
|
||||
class Platform : public Drawable, public Placeable {
|
||||
public:
|
||||
Platform ( SDLMain* parSdlMain, const float2& parPos, Texture* parTexture, const float2& parSize );
|
||||
Platform ( Platform&& parOther ) noexcept;
|
||||
Platform ( const Platform& ) = delete;
|
||||
virtual ~Platform ( void ) noexcept = default;
|
||||
virtual ~Platform ( void ) noexcept;
|
||||
Platform& operator= ( const Platform& parOther );
|
||||
|
||||
float2 TopLeft ( void ) const { return GetPos(); }
|
||||
float2 BottomRight ( void ) const { return TopLeft() + m_size; }
|
||||
|
||||
void RegisterForCollision ( ColliderRegisterFunc parReg );
|
||||
|
||||
//Overrides
|
||||
virtual void Draw ( void ) const;
|
||||
virtual void OnRegister ( Mover& parMover, Mover::PlaceableTicketType parParentTicket );
|
||||
|
||||
private:
|
||||
HorzCollisionBar m_collisionTop;
|
||||
SizeNotifiable<regbehaviours::AutoRegister> m_screenRatio;
|
||||
float2 m_size;
|
||||
ColliderRegisterFunc m_registerToCollider;
|
||||
ColliderUnregisterFunc m_unregisterFromCollider;
|
||||
std::unique_ptr<HorzCollisionBar> m_collisionTop;
|
||||
Texture* m_surface;
|
||||
};
|
||||
} //namespace cloonel
|
||||
|
|
|
@ -23,6 +23,7 @@
|
|||
#include "texture.hpp"
|
||||
#include "gameplayscene.hpp"
|
||||
#include "mover.hpp"
|
||||
#include "collider.hpp"
|
||||
#include <ciso646>
|
||||
#include <cstdlib>
|
||||
#include <cassert>
|
||||
|
@ -167,6 +168,17 @@ namespace cloonel {
|
|||
}
|
||||
}
|
||||
|
||||
///--------------------------------------------------------------------------
|
||||
///--------------------------------------------------------------------------
|
||||
void PlatformSystem::RegisterForCollision (ColliderRegisterFunc parReg, ColliderUnregisterFunc parUnreg) {
|
||||
m_registerToCollider = parReg;
|
||||
m_unregisterFromCollider = parUnreg;
|
||||
|
||||
for (auto& platf : m_localdata->platforms) {
|
||||
platf.platform->RegisterForCollision(m_registerToCollider);
|
||||
}
|
||||
}
|
||||
|
||||
///--------------------------------------------------------------------------
|
||||
///--------------------------------------------------------------------------
|
||||
void PlatformSystem::Destroy() noexcept {
|
||||
|
|
|
@ -20,11 +20,13 @@
|
|||
#ifndef id17908979556C47F8A978688BBE4A9D22
|
||||
|
||||
#include "placeable.hpp"
|
||||
#include "collidertypedef.hpp"
|
||||
#include <memory>
|
||||
|
||||
namespace cloonel {
|
||||
class SDLMain;
|
||||
class GameplayScene;
|
||||
class Collider;
|
||||
|
||||
class PlatformSystem : public Placeable {
|
||||
public:
|
||||
|
@ -36,6 +38,7 @@ namespace cloonel {
|
|||
PlatformSystem& operator= ( const PlatformSystem& ) = delete;
|
||||
|
||||
void Prepare ( void );
|
||||
void RegisterForCollision ( ColliderRegisterFunc parReg, ColliderUnregisterFunc parUnreg );
|
||||
void AddDrawables ( void );
|
||||
void Destroy ( void ) noexcept;
|
||||
void SpawnPlatforms ( void );
|
||||
|
@ -47,6 +50,8 @@ namespace cloonel {
|
|||
struct LocalData;
|
||||
|
||||
const std::unique_ptr<LocalData> m_localdata;
|
||||
ColliderRegisterFunc m_registerToCollider;
|
||||
ColliderUnregisterFunc m_unregisterFromCollider;
|
||||
};
|
||||
} //namespace cloonel
|
||||
|
||||
|
|
Loading…
Reference in a new issue