mirror of
https://github.com/zoriya/Bomberman.git
synced 2025-12-23 06:45:13 +00:00
Merge branch 'develop' into renderer
# Conflicts: # CMakeLists.txt # lib/wal/CMakeLists.txt # sources/Component/Movable/MovableComponent.cpp # sources/Component/Position/PositionComponent.cpp # sources/Component/Position/PositionComponent.hpp # sources/System/Movable/MovableSystem.cpp # sources/System/Movable/MovableSystem.hpp # sources/main.cpp
This commit is contained in:
@@ -1,45 +0,0 @@
|
||||
//
|
||||
// Created by Zoe Roux on 5/17/21.
|
||||
//
|
||||
|
||||
#include "PositionComponent.hpp"
|
||||
#include "Entity/Entity.hpp"
|
||||
#include "Component/Component.hpp"
|
||||
|
||||
namespace BBM
|
||||
{
|
||||
PositionComponent::PositionComponent(WAL::Entity &entity)
|
||||
: WAL::Component(entity),
|
||||
position()
|
||||
{}
|
||||
|
||||
PositionComponent::PositionComponent(WAL::Entity &entity, WAL::Vector3f pos)
|
||||
: WAL::Component(entity),
|
||||
position(pos)
|
||||
{}
|
||||
|
||||
PositionComponent::PositionComponent(WAL::Entity &entity, float x, float y, float z)
|
||||
: WAL::Component(entity),
|
||||
position(x, y, z)
|
||||
{}
|
||||
|
||||
WAL::Component *PositionComponent::clone(WAL::Entity &entity) const
|
||||
{
|
||||
return new PositionComponent(entity, this->position);
|
||||
}
|
||||
|
||||
float PositionComponent::getX() const
|
||||
{
|
||||
return this->position.x;
|
||||
}
|
||||
|
||||
float PositionComponent::getY() const
|
||||
{
|
||||
return this->position.y;
|
||||
}
|
||||
|
||||
float PositionComponent::getZ() const
|
||||
{
|
||||
return this->position.z;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user