zoriya/Bomberman
1
0
Fork 0
mirror of https://github.com/zoriya/Bomberman.git synced 2026-06-06 03:12:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix compile errors

Browse Source
This commit is contained in:
arthur.jamet
2021-06-17 20:50:43 +02:00
parent 1cf820bf87
commit 051096a194
43 changed files with 124 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sources/Component/Collision/CollisionComponent.cpp
+19 -19
View File
@@ -16,43 +16,43 @@ namespace BBM
}
CollisionComponent::CollisionComponent(WAL::Entity &entity,
const WAL::Callback<WAL::Entity &, const WAL::Entity &, CollidedAxis> &onCollide,
const WAL::Callback<WAL::Entity &, const WAL::Entity &, CollidedAxis> &onCollided,
Vector3f positionOffset,
Vector3f bound)
const WAL::Callback<WAL::Entity &, const WAL::Entity &, CollidedAxis> &onCollideCallback,
const WAL::Callback<WAL::Entity &, const WAL::Entity &, CollidedAxis> &onCollidedCallback,
Vector3f positionOffsetVector,
Vector3f boundVector)
: WAL::Component(entity),
onCollide(onCollide),
onCollided(onCollided),
bound(bound),
positionOffset(positionOffset)
onCollide(onCollideCallback),
onCollided(onCollidedCallback),
bound(boundVector),
positionOffset(positionOffsetVector)
{}
CollisionComponent::CollisionComponent(WAL::Entity &entity,
const WAL::Callback<WAL::Entity &, const WAL::Entity &, CollidedAxis> &onCollide,
const WAL::Callback<WAL::Entity &, const WAL::Entity &, CollidedAxis> &onCollided,
float positionOffset,
const WAL::Callback<WAL::Entity &, const WAL::Entity &, CollidedAxis> &onCollideCallback,
const WAL::Callback<WAL::Entity &, const WAL::Entity &, CollidedAxis> &onCollidedCallback,
float positionOffsetFloat,
float boundSize)
: WAL::Component(entity),
onCollide(onCollide),
onCollided(onCollided),
onCollide(onCollideCallback),
onCollided(onCollidedCallback),
bound({boundSize, boundSize, boundSize}),
positionOffset({positionOffset, positionOffset, positionOffset})
positionOffset({positionOffsetFloat, positionOffsetFloat, positionOffsetFloat})
{}
CollisionComponent::CollisionComponent(WAL::Entity &entity, Vector3f positionOffset, Vector3f bound)
CollisionComponent::CollisionComponent(WAL::Entity &entity, Vector3f positionOffsetVector, Vector3f boundVector)
: WAL::Component(entity),
onCollide(),
onCollided(),
bound(bound),
positionOffset(positionOffset)
bound(boundVector),
positionOffset(positionOffsetVector)
{}
CollisionComponent::CollisionComponent(WAL::Entity &entity, float positionOffset, float boundSize)
CollisionComponent::CollisionComponent(WAL::Entity &entity, float positionOffsetFloat, float boundSize)
: WAL::Component(entity),
onCollide(),
onCollided(),
bound({boundSize, boundSize, boundSize}),
positionOffset({positionOffset, positionOffset, positionOffset})
positionOffset({positionOffsetFloat, positionOffsetFloat, positionOffsetFloat})
{}
CollisionComponent::CollidedAxis operator|(CollisionComponent::CollidedAxis first,